From f5c21d64b9e0fa71929d7b23f490e537587c487b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 12 Mar 2021 13:15:39 +0100
Subject: aspell-dict-r1.eclass: Support EAPI-7, fix eclassdoc

Closes: https://bugs.gentoo.org/637710
Closes: https://bugs.gentoo.org/770259
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/aspell-dict-r1.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index b07af61fdf1e..e44e9eb1eb6c 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -1,4 +1,4 @@
-# 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
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Original author: Seemant Kulleen
 #      -r1 author: David Seifert
-# @SUPPORTED_EAPIS: 6
+# @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
@@ -22,6 +22,7 @@
 # inheriting the eclass.
 
 # @ECLASS-VARIABLE: ASPELL_VERSION
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # What major version of aspell is this dictionary for? Valid values are 5, 6 or undefined.
 # This value is used to construct SRC_URI and *DEPEND strings. If defined to 6,
@@ -33,7 +34,7 @@ case ${EAPI:-0} in
 	[0-5])
 		die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}"
 		;;
-	6)
+	[67])
 		;;
 	*)
 		die "Unknown EAPI ${EAPI:-0}"
@@ -43,24 +44,24 @@ esac
 EXPORT_FUNCTIONS src_configure src_install
 
 if [[ ! ${_ASPELL_DICT_R1} ]]; then
+_ASPELL_DICT_R1=1
 
 # aspell packages have an idiosyncratic versioning scheme, that is
 # the last separating version separator is replaced by a '-'.
 _ASPELL_P=aspell${ASPELL_VERSION}-${PN/aspell-/}-${PV%.*}-${PV##*.}
+S="${WORKDIR}/${_ASPELL_P}"
 
 # @ECLASS-VARIABLE: ASPELL_SPELLANG
 # @DESCRIPTION:
 # 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"
 unset _ASPELL_P
 
-IUSE=""
 SLOT="0"
 
 _ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-5}
@@ -86,5 +87,4 @@ aspell-dict-r1_src_install() {
 	[[ -s info ]] && dodoc info
 }
 
-_ASPELL_DICT_R1=1
 fi
-- 
cgit v1.2.3-65-gdbad