[gentoo-dev] [PATCH 0/3] clean up lua eclass eapi checks

[gentoo-dev] [PATCH 0/3] clean up lua eclass eapi checks

[William Hubbs]

*** BLURB HERE ***
We don't need to differentiate between EAPIs that are too old vs other
unsupported EAPIs.

William Hubbs (3):
  lua-single.eclass: clean up the eapi test
  lua-utils.eclass: clean up the eapi test
  lua.eclass: clean up the eapi test

 eclass/lua-single.eclass | 5 +----
 eclass/lua-utils.eclass  | 5 +----
 eclass/lua.eclass        | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

-- 
2.31.1

[gentoo-dev] [PATCH 1/3] lua-single.eclass: clean up the eapi test

[William Hubbs]

Signed-off-by: William Hubbs <williamh@gentoo.org>
---
 eclass/lua-single.eclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eclass/lua-single.eclass b/eclass/lua-single.eclass
index 7abe1eb6674..3d7ef974bef 100644
--- a/eclass/lua-single.eclass
+++ b/eclass/lua-single.eclass
@@ -63,13 +63,10 @@
 # @CODE
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6)
-		die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
-		;;
 	7|8)
 		;;
 	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
 		;;
 esac
 
-- 
2.31.1

[gentoo-dev] [PATCH 2/3] lua-utils.eclass: clean up the eapi test

[William Hubbs]

Signed-off-by: William Hubbs <williamh@gentoo.org>
---
 eclass/lua-utils.eclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index 59959eaf9c0..80758c15ded 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -18,13 +18,10 @@
 # functions. It can be inherited safely.
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6)
-		die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
-		;;
 	7|8)
 		;;
 	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
 		;;
 esac
 
-- 
2.31.1

[gentoo-dev] [PATCH 3/3] lua.eclass: clean up the eapi test

[William Hubbs]

Signed-off-by: William Hubbs <williamh@gentoo.org>
---
 eclass/lua.eclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index e3a25c5d184..b4cbac7afa8 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -51,13 +51,10 @@
 # @CODE
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6)
-		die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
-		;;
 	7|8)
 		;;
 	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
 		;;
 esac
 
-- 
2.31.1

Re: [gentoo-dev] [PATCH 1/3] lua-single.eclass: clean up the eapi test

[Ulrich Mueller]

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

>>>>> On Fri, 02 Jul 2021, William Hubbs wrote:

>  case ${EAPI:-0} in

This could be just ${EAPI}.

> -	0|1|2|3|4|5|6)
> -		die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
> -		;;
>  	7|8)
>  		;;
>  	*)
> -		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
> +		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
>  		;;

May I suggest that we standardise the error message? Many eclasses have
this (see for example toolchain-funcs.eclass):

	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;

>  esac

Same for the other two eclasses.

Ulrich

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

[gentoo-dev] [PATCH 2/3] lua-utils.eclass: clean up the eapi test

[William Hubbs]

Signed-off-by: William Hubbs <williamh@gentoo.org>
---
 eclass/lua-utils.eclass | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index 59959eaf9c0..278bbca58a3 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -17,15 +17,10 @@
 # This eclass neither sets any metadata variables nor exports any phase
 # functions. It can be inherited safely.
 
-case ${EAPI:-0} in
-	0|1|2|3|4|5|6)
-		die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
-		;;
+case ${EAPI} in
 	7|8)
 		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ ! ${_LUA_UTILS_R0} ]]; then
-- 
2.31.1