Signed-off-by: David Seifert <s...@gentoo.org>
---
eclass/aspell-dict-r1.eclass | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index 4d2df961993..170edb4cacd 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: aspell-dict-r1.eclass
@@ -7,7 +7,7 @@
# @AUTHOR:
# Seemant Kulleen <seem...@gentoo.org> (original author)
# David Seifert <s...@gentoo.org> (-r1 author)
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 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
@@ -36,18 +36,13 @@ readonly ASPELL_SPELLANG=${PN/aspell-/}
# This value is used to construct SRC_URI strings.
# If the value needs to be overridden, it needs to be overridden before
inheriting the eclass.
-case ${EAPI:-0} in
- [7-8])
- ;;
- *)
- die "${ECLASS}: EAPI ${EAPI:-0} not supported"
- ;;
+case ${EAPI} in
+ 8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
-EXPORT_FUNCTIONS src_configure src_install
-
-if [[ ! ${_ASPELL_DICT_R1} ]]; then
-_ASPELL_DICT_R1=1
+if [[ ! ${_ASPELL_DICT_R1_ECLASS} ]]; then
+_ASPELL_DICT_R1_ECLASS=1
# Most of those aspell packages have an idiosyncratic versioning scheme,
# where the last separating version separator is replaced by a '-'.
@@ -86,3 +81,5 @@ aspell-dict-r1_src_install() {
}
fi
+
+EXPORT_FUNCTIONS src_configure src_install
--
2.39.0
