[gentoo-dev] [PATCH 1/2] eclass/aspell-dict-r1.eclass: add EAPI 8 support

[gentoo-dev] [PATCH 1/2] eclass/aspell-dict-r1.eclass: add EAPI 8 support

[Conrad Kostecki]

This change adds EAPI 8 support.
No further changed required.

Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 eclass/aspell-dict-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index 24bc5ff2799..09f22dbf8c0 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Seemant Kulleen <seemant@gentoo.org> (original author)
 # David Seifert <soap@gentoo.org> (-r1 author)
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: An eclass to streamline the construction of ebuilds for new Aspell dictionaries.
 # @DESCRIPTION:
 # The aspell-dict-r1 eclass is designed to streamline the construction of ebuilds for
@@ -40,7 +40,7 @@ case ${EAPI:-0} in
 	[0-6])
 		die "${ECLASS} is banned in EAPI ${EAPI:-0}"
 		;;
-	7)
+	[7-8])
 		;;
 	*)
 		die "Unknown EAPI ${EAPI:-0}"
-- 
2.31.1

[gentoo-dev] [PATCH 2/2] eclass/myspell-r2.eclass: add EAPI 8 support

[Conrad Kostecki]

This change adds EAPI 8 support.
No further changed required.

Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 eclass/myspell-r2.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/myspell-r2.eclass b/eclass/myspell-r2.eclass
index e4d9ae69af3..6141be8d66a 100644
--- a/eclass/myspell-r2.eclass
+++ b/eclass/myspell-r2.eclass
@@ -6,7 +6,7 @@
 # Conrad Kostecki <conikost@gentoo.org>
 # @AUTHOR:
 # Tomáš Chvátal <scarabeus@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: An eclass to streamline the construction of ebuilds for new Myspell dictionaries.
 # @DESCRIPTION:
 # The myspell-r2 eclass is designed to streamline the construction of ebuilds for
@@ -34,7 +34,7 @@ case ${EAPI:-0} in
 	[0-4])
 		die "${ECLASS} is banned in EAPI ${EAPI:-0}"
 		;;
-	[5-7])
+	[5-8])
 		;;
 	*)
 		die "Unknown EAPI ${EAPI:-0}"
@@ -46,7 +46,7 @@ EXPORT_FUNCTIONS src_unpack src_install
 # Basically no extra deps needed.
 # Unzip is required for .oxt libreoffice extensions
 # which are just fancy zip files.
-if [[ ${EAPI:-0} == 7 ]]; then
+if [[ ${EAPI:-0} -ge 7 ]]; then
 	BDEPEND="app-arch/unzip"
 else
 	DEPEND="app-arch/unzip"
@@ -128,6 +128,7 @@ myspell-r2_src_install() {
 	rm -rf LICENCE*
 	rm -rf license*
 	rm -rf licence*
+
 	# Readme and so on
 	for x in *.txt README*; do
 		if [[ -f ${x} ]]; then
-- 
2.31.1

Re: [gentoo-dev] [PATCH 2/2] eclass/myspell-r2.eclass: add EAPI 8 support

[Ulrich Mueller]

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

>>>>> On Thu, 24 Jun 2021, Conrad Kostecki wrote:

> -if [[ ${EAPI:-0} == 7 ]]; then
> +if [[ ${EAPI:-0} -ge 7 ]]; then

EAPI is a string, not a number. I'd suggest using a string comparison,
e.g.:

   if [[ ${EAPI} != [56] ]]; then

(Negative logic, so there won't be any need to update it again for the
next EAPI.)

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