[gentoo-dev] [PATCH 1/2] common-lisp-3.eclass: Support EAPI 8

[gentoo-dev] [PATCH 1/2] common-lisp-3.eclass: Support EAPI 8

[Ulrich Müller]

Minor stylistic changes.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/common-lisp-3.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
index 26d31268a598..12c7221e41ce 100644
--- a/eclass/common-lisp-3.eclass
+++ b/eclass/common-lisp-3.eclass
@@ -1,17 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: common-lisp-3.eclass
 # @MAINTAINER:
 # Common Lisp project <common-lisp@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: functions to support the installation of Common Lisp libraries
 # @DESCRIPTION:
 # Since Common Lisp libraries share similar structure, this eclass aims
 # to provide a simple way to write ebuilds with these characteristics.
 
 case ${EAPI} in
-	6|7) ;;
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -121,7 +121,7 @@ common-lisp-install-sources() {
 
 	local fpredicate=$(common-lisp-get-fpredicate "${ftype}")
 
-	for path in "${@}" ; do
+	for path ; do
 		if [[ -f ${path} ]] ; then
 			common-lisp-install-one-source ${fpredicate} "${path}" "$(dirname "${path}")"
 		elif [[ -d ${path} ]] ; then
@@ -148,7 +148,7 @@ common-lisp-install-sources() {
 # Installs ${1} asdf file in CLSOURCEROOT/CLPACKAGE and symlinks it in
 # CLSYSTEMROOT.
 common-lisp-install-one-asdf() {
-	[[ $# != 1 ]] && die "${FUNCNAME[0]} must receive exactly one argument"
+	[[ $# = 1 ]] || die "${FUNCNAME[0]} must receive exactly one argument"
 
 	# the suffix «.asd» is optional
 	local source=${1%.asd}.asd
@@ -168,7 +168,7 @@ common-lisp-install-asdf() {
 
 	[[ $# = 0 ]] && set - ${CLSYSTEMS}
 	[[ $# = 0 ]] && set - $(find . -type f -name \*.asd)
-	for sys in "${@}" ; do
+	for sys ; do
 		common-lisp-install-one-asdf ${sys}
 	done
 }
-- 
2.45.2

[gentoo-dev] [PATCH 2/2] common-lisp-3.eclass: sbcl supports --no-sysinit --no-userinit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/common-lisp-3.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
index 12c7221e41ce..f8bcd33de72b 100644
--- a/eclass/common-lisp-3.eclass
+++ b/eclass/common-lisp-3.eclass
@@ -211,7 +211,7 @@ common-lisp-export-impl-args() {
 	case "${CL_BINARY}" in
 		sbcl)
 			CL_BINARY="${CL_BINARY} --non-interactive"
-			CL_NORC="--sysinit /dev/null --userinit /dev/null"
+			CL_NORC="--no-sysinit --no-userinit"
 			CL_LOAD="--load"
 			CL_EVAL="--eval"
 			;;
-- 
2.45.2

Re: [gentoo-dev] [PATCH 1/2] common-lisp-3.eclass: Support EAPI 8

[Arthur Zamarin]

[-- Attachment #1.1: Type: text/plain, Size: 2284 bytes --]

On 08/06/2024 22.40, Ulrich Müller wrote:
> Minor stylistic changes.
> 
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
>  eclass/common-lisp-3.eclass | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
> index 26d31268a598..12c7221e41ce 100644
> --- a/eclass/common-lisp-3.eclass
> +++ b/eclass/common-lisp-3.eclass
> @@ -1,17 +1,17 @@
> -# Copyright 1999-2023 Gentoo Authors
> +# Copyright 1999-2024 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>  
>  # @ECLASS: common-lisp-3.eclass
>  # @MAINTAINER:
>  # Common Lisp project <common-lisp@gentoo.org>
> -# @SUPPORTED_EAPIS: 6 7
> +# @SUPPORTED_EAPIS: 6 7 8
>  # @BLURB: functions to support the installation of Common Lisp libraries
>  # @DESCRIPTION:
>  # Since Common Lisp libraries share similar structure, this eclass aims
>  # to provide a simple way to write ebuilds with these characteristics.
>  
>  case ${EAPI} in
> -	6|7) ;;
> +	6|7|8) ;;
>  	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
>  esac
>  
> @@ -121,7 +121,7 @@ common-lisp-install-sources() {
>  
>  	local fpredicate=$(common-lisp-get-fpredicate "${ftype}")
>  
> -	for path in "${@}" ; do
> +	for path ; do
>  		if [[ -f ${path} ]] ; then
>  			common-lisp-install-one-source ${fpredicate} "${path}" "$(dirname "${path}")"
>  		elif [[ -d ${path} ]] ; then
> @@ -148,7 +148,7 @@ common-lisp-install-sources() {
>  # Installs ${1} asdf file in CLSOURCEROOT/CLPACKAGE and symlinks it in
>  # CLSYSTEMROOT.
>  common-lisp-install-one-asdf() {
> -	[[ $# != 1 ]] && die "${FUNCNAME[0]} must receive exactly one argument"
> +	[[ $# = 1 ]] || die "${FUNCNAME[0]} must receive exactly one argument"
>  
>  	# the suffix «.asd» is optional
>  	local source=${1%.asd}.asd
> @@ -168,7 +168,7 @@ common-lisp-install-asdf() {
>  
>  	[[ $# = 0 ]] && set - ${CLSYSTEMS}
>  	[[ $# = 0 ]] && set - $(find . -type f -name \*.asd)
> -	for sys in "${@}" ; do
> +	for sys ; do
>  		common-lisp-install-one-asdf ${sys}
>  	done
>  }

LGTM, thanks!

-- 
Arthur Zamarin
arthurzam@gentoo.org
Gentoo Linux developer (Python, pkgcore stack, QA, Arch Teams, GURU)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[gentoo-dev] Re: [PATCH 1/2] common-lisp-3.eclass: Support EAPI 8

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

>>>>> On Sat, 08 Jun 2024, Ulrich Müller wrote:

> -	[[ $# != 1 ]] && die "${FUNCNAME[0]} must receive exactly one argument"
> +	[[ $# = 1 ]] || die "${FUNCNAME[0]} must receive exactly one argument"
 
Ten seconds after hitting send I notice that these should use -eq,
not =. Also elsewhere in the eclass.

I've updated it locally.

Ulrich

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]