[gentoo-dev] [PATCH 0/3] lua eclass cleanup round 2

[gentoo-dev] [PATCH 0/3] lua eclass cleanup round 2

[William Hubbs]

*** BLURB HERE ***
This is the second attempt to clean up these EAPI checks.

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 | 9 ++-------
 eclass/lua-utils.eclass  | 9 ++-------
 eclass/lua.eclass        | 9 ++-------
 3 files changed, 6 insertions(+), 21 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 | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/eclass/lua-single.eclass b/eclass/lua-single.eclass
index 7abe1eb6674..ab4fdb3c75a 100644
--- a/eclass/lua-single.eclass
+++ b/eclass/lua-single.eclass
@@ -62,15 +62,10 @@
 # }
 # @CODE
 
-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_SINGLE_R0} ]]; then
-- 
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 | 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

[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 | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index e3a25c5d184..e9a5c117560 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -50,15 +50,10 @@
 # }
 # @CODE
 
-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_R0} ]]; then
-- 
2.31.1