[gentoo-dev] [PATCH] aspell-dict-r1.eclass: add EAPI=7 support

[gentoo-dev] [PATCH] aspell-dict-r1.eclass: add EAPI=7 support

[conikost]

From: Conrad Kostecki <conikost@gentoo.org>

Those changes add support for EAPI=7 for all aspell-<lang> ebuilds.
Also slightly adjusted messages and taking ownership.

Closes: https://bugs.gentoo.org/637710
Closes: https://bugs.gentoo.org/770259
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 eclass/aspell-dict-r1.eclass | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index b07af61fdf1..12d9036bce3 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: aspell-dict-r1.eclass
 # @MAINTAINER:
-# maintainer-needed@gentoo.org
+# conikost@gentoo.org
 # @AUTHOR:
 # Original author: Seemant Kulleen
-#      -r1 author: David Seifert
-# @SUPPORTED_EAPIS: 6
+#      -r1 authors: David Seifert, Conrad Kostecki
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: An eclass to streamline the construction of ebuilds for new aspell dicts
 # @DESCRIPTION:
 # The aspell-dict-r1 eclass is designed to streamline the construction of
@@ -28,15 +28,16 @@
 # >=app-text/aspell-0.60 will be added to DEPEND and RDEPEND, otherwise,
 # >=app-text/aspell-0.50 is added to DEPEND and RDEPEND. If the value is to be overridden,
 # it needs to be overridden before inheriting the eclass.
+: ${ASPELL_VERSION:=5}
 
 case ${EAPI:-0} in
-	[0-5])
-		die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}"
+	0|1|2|3|4|5)
+		die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
 		;;
-	6)
+	6|7)
 		;;
 	*)
-		die "Unknown EAPI ${EAPI:-0}"
+		die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
 		;;
 esac
 
@@ -53,18 +54,17 @@ _ASPELL_P=aspell${ASPELL_VERSION}-${PN/aspell-/}-${PV%.*}-${PV##*.}
 # Short (readonly) form of the language code, generated from ${PN}
 # For instance, 'aspell-hu' yields the value 'hu'.
 readonly ASPELL_SPELLANG=${PN/aspell-/}
-S="${WORKDIR}/${_ASPELL_P}"
 
 DESCRIPTION="${ASPELL_LANG} language dictionary for aspell"
 HOMEPAGE="http://aspell.net"
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${_ASPELL_P}.tar.bz2"
+S="${WORKDIR}/${_ASPELL_P}"
 unset _ASPELL_P
 
-IUSE=""
 SLOT="0"
 
-_ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-5}
-[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "${ASPELL_VERSION} is not a valid version"
+_ASPELL_MAJOR_VERSION=${ASPELL_VERSION}
+[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "Unsupported ASPELL_VERSION=${ASPELL_VERSION} for ${ECLASS}"
 
 RDEPEND=">=app-text/aspell-0.${_ASPELL_MAJOR_VERSION}0"
 DEPEND="${RDEPEND}"
@@ -88,3 +88,4 @@ aspell-dict-r1_src_install() {
 
 _ASPELL_DICT_R1=1
 fi
+
-- 
2.30.1

Re: [gentoo-dev] [PATCH] aspell-dict-r1.eclass: add EAPI=7 support

[Ulrich Mueller]

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

>>>>> On Sun, 07 Mar 2021, conikost  wrote:
 
>  case ${EAPI:-0} in
> -	[0-5])
> -		die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}"
> +	0|1|2|3|4|5)
> +		die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
>  		;;
> -	6)
> +	6|7)
>  		;;
>  	*)
> -		die "Unknown EAPI ${EAPI:-0}"
> +		die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"

Same message as above? Then the 0-5 case isn't needed.

>  		;;
>  esac

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