gentoo resync : 20.03.2021

1 files changed, 30 insertions, 32 deletions

diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index 89f7b954dd68..4d0e64ed4e79 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -3,36 +3,40 @@
 
 # @ECLASS: aspell-dict-r1.eclass
 # @MAINTAINER:
-# maintainer-needed@gentoo.org
+# Conrad Kostecki <conikost@gentoo.org>
 # @AUTHOR:
-# Original author: Seemant Kulleen
-#      -r1 author: David Seifert
+# Seemant Kulleen <seemant@gentoo.org> (original author)
+# David Seifert <soap@gentoo.org> (-r1 author)
 # @SUPPORTED_EAPIS: 7
-# @BLURB: An eclass to streamline the construction of ebuilds for new aspell dicts
+# @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 the new aspell dictionaries (from gnu.org) which support
-# aspell-0.50. Support for aspell-0.60 has been added by Sergey Ulanov.
+# The aspell-dict-r1 eclass is designed to streamline the construction of ebuilds for
+# the new Aspell dictionaries (from gnu.org) which support aspell-0.60.
+# Support for aspell-0.60 has been added by Sergey Ulanov.
 
 # @ECLASS-VARIABLE: ASPELL_LANG
 # @REQUIRED
 # @DESCRIPTION:
-# Pure cleartext string that is included into DESCRIPTION. This is the name
-# of the language, for instance "Hungarian". Needs to be defined before
-# inheriting the eclass.
+# Pure cleartext string that is included into DESCRIPTION.
+# This is the name of the language, for instance "Hungarian".
+# Needs to be defined before inheriting the eclass.
+
+# @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-/}
 
 # @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,
-# >=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.
+# What major version of Aspell is this dictionary for? Valid values are 5, 6 or undefined.
+# 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
 	[0-6])
-		die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}"
+		die "${ECLASS} is banned in EAPI ${EAPI:-0}"
 		;;
 	7)
 		;;
@@ -46,36 +50,30 @@ 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-/}
+# Most of those aspell packages have an idiosyncratic versioning scheme,
+# where the last separating version separator is replaced by a '-'.
+_ASPELL_P=aspell${ASPELL_VERSION}-${ASPELL_SPELLANG}-${PV%.*}-${PV##*.}
 
-DESCRIPTION="${ASPELL_LANG} language dictionary for aspell"
+DESCRIPTION="Aspell (${ASPELL_LANG}) language dictionary"
 HOMEPAGE="http://aspell.net"
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${_ASPELL_P}.tar.bz2"
+S="${WORKDIR}/${_ASPELL_P}"
 unset _ASPELL_P
 
 SLOT="0"
 
-_ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-5}
-[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "${ASPELL_VERSION} is not a valid version"
-
-RDEPEND=">=app-text/aspell-0.${_ASPELL_MAJOR_VERSION}0"
+RDEPEND="app-text/aspell"
 DEPEND="${RDEPEND}"
+
+_ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-6}
+[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "Unsupported ASPELL_VERSION=${ASPELL_VERSION}"
 unset _ASPELL_MAJOR_VERSION
 
 # @FUNCTION: aspell-dict-r1_src_configure
 # @DESCRIPTION:
 # The aspell-dict-r1 src_configure function which is exported.
 aspell-dict-r1_src_configure() {
-	# non-autoconf based script, cannot be used with econf
+	# Since it's a non-autoconf based script, 'econf' cannot be used.
 	./configure || die
 }