| 1 |
From: Conrad Kostecki <conikost@g.o> |
| 2 |
|
| 3 |
Those changes add support for EAPI=7 for all aspell-<lang> ebuilds. |
| 4 |
Also slightly adjusted messages and taking ownership. |
| 5 |
|
| 6 |
Closes: https://bugs.gentoo.org/637710 |
| 7 |
Closes: https://bugs.gentoo.org/770259 |
| 8 |
Signed-off-by: Conrad Kostecki <conikost@g.o> |
| 9 |
--- |
| 10 |
eclass/aspell-dict-r1.eclass | 25 +++++++++++++------------ |
| 11 |
1 file changed, 13 insertions(+), 12 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass |
| 14 |
index b07af61fdf1..12d9036bce3 100644 |
| 15 |
--- a/eclass/aspell-dict-r1.eclass |
| 16 |
+++ b/eclass/aspell-dict-r1.eclass |
| 17 |
@@ -1,13 +1,13 @@ |
| 18 |
-# Copyright 1999-2020 Gentoo Authors |
| 19 |
+# Copyright 1999-2021 Gentoo Authors |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
|
| 22 |
# @ECLASS: aspell-dict-r1.eclass |
| 23 |
# @MAINTAINER: |
| 24 |
-# maintainer-needed@g.o |
| 25 |
+# conikost@g.o |
| 26 |
# @AUTHOR: |
| 27 |
# Original author: Seemant Kulleen |
| 28 |
-# -r1 author: David Seifert |
| 29 |
-# @SUPPORTED_EAPIS: 6 |
| 30 |
+# -r1 authors: David Seifert, Conrad Kostecki |
| 31 |
+# @SUPPORTED_EAPIS: 6 7 |
| 32 |
# @BLURB: An eclass to streamline the construction of ebuilds for new aspell dicts |
| 33 |
# @DESCRIPTION: |
| 34 |
# The aspell-dict-r1 eclass is designed to streamline the construction of |
| 35 |
@@ -28,15 +28,16 @@ |
| 36 |
# >=app-text/aspell-0.60 will be added to DEPEND and RDEPEND, otherwise, |
| 37 |
# >=app-text/aspell-0.50 is added to DEPEND and RDEPEND. If the value is to be overridden, |
| 38 |
# it needs to be overridden before inheriting the eclass. |
| 39 |
+: ${ASPELL_VERSION:=5} |
| 40 |
|
| 41 |
case ${EAPI:-0} in |
| 42 |
- [0-5]) |
| 43 |
- die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}" |
| 44 |
+ 0|1|2|3|4|5) |
| 45 |
+ die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}" |
| 46 |
;; |
| 47 |
- 6) |
| 48 |
+ 6|7) |
| 49 |
;; |
| 50 |
*) |
| 51 |
- die "Unknown EAPI ${EAPI:-0}" |
| 52 |
+ die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}" |
| 53 |
;; |
| 54 |
esac |
| 55 |
|
| 56 |
@@ -53,18 +54,17 @@ _ASPELL_P=aspell${ASPELL_VERSION}-${PN/aspell-/}-${PV%.*}-${PV##*.} |
| 57 |
# Short (readonly) form of the language code, generated from ${PN} |
| 58 |
# For instance, 'aspell-hu' yields the value 'hu'. |
| 59 |
readonly ASPELL_SPELLANG=${PN/aspell-/} |
| 60 |
-S="${WORKDIR}/${_ASPELL_P}" |
| 61 |
|
| 62 |
DESCRIPTION="${ASPELL_LANG} language dictionary for aspell" |
| 63 |
HOMEPAGE="http://aspell.net" |
| 64 |
SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${_ASPELL_P}.tar.bz2" |
| 65 |
+S="${WORKDIR}/${_ASPELL_P}" |
| 66 |
unset _ASPELL_P |
| 67 |
|
| 68 |
-IUSE="" |
| 69 |
SLOT="0" |
| 70 |
|
| 71 |
-_ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-5} |
| 72 |
-[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "${ASPELL_VERSION} is not a valid version" |
| 73 |
+_ASPELL_MAJOR_VERSION=${ASPELL_VERSION} |
| 74 |
+[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "Unsupported ASPELL_VERSION=${ASPELL_VERSION} for ${ECLASS}" |
| 75 |
|
| 76 |
RDEPEND=">=app-text/aspell-0.${_ASPELL_MAJOR_VERSION}0" |
| 77 |
DEPEND="${RDEPEND}" |
| 78 |
@@ -88,3 +88,4 @@ aspell-dict-r1_src_install() { |
| 79 |
|
| 80 |
_ASPELL_DICT_R1=1 |
| 81 |
fi |
| 82 |
+ |
| 83 |
-- |
| 84 |
2.30.1 |
Archives