| 1 |
- No consumers for EAPI<7 remain in ::gentoo tree |
| 2 |
- Simplifies dependency logic |
| 3 |
- fix UnquotedVariable of DISTDIR |
| 4 |
|
| 5 |
Signed-off-by: Arthur Zamarin <arthurzam@g.o> |
| 6 |
--- |
| 7 |
eclass/myspell-r2.eclass | 17 ++++++----------- |
| 8 |
1 file changed, 6 insertions(+), 11 deletions(-) |
| 9 |
|
| 10 |
diff --git a/eclass/myspell-r2.eclass b/eclass/myspell-r2.eclass |
| 11 |
index 6dbd1e19e1..cce75ae4d6 100644 |
| 12 |
--- a/eclass/myspell-r2.eclass |
| 13 |
+++ b/eclass/myspell-r2.eclass |
| 14 |
@@ -1,4 +1,4 @@ |
| 15 |
-# Copyright 1999-2021 Gentoo Authors |
| 16 |
+# Copyright 1999-2022 Gentoo Authors |
| 17 |
# Distributed under the terms of the GNU General Public License v2 |
| 18 |
|
| 19 |
# @ECLASS: myspell-r2.eclass |
| 20 |
@@ -6,7 +6,7 @@ |
| 21 |
# Conrad Kostecki <conikost@g.o> |
| 22 |
# @AUTHOR: |
| 23 |
# Tomáš Chvátal <scarabeus@g.o> |
| 24 |
-# @SUPPORTED_EAPIS: 5 6 7 8 |
| 25 |
+# @SUPPORTED_EAPIS: 7 8 |
| 26 |
# @BLURB: An eclass to streamline the construction of ebuilds for new Myspell dictionaries. |
| 27 |
# @DESCRIPTION: |
| 28 |
# The myspell-r2 eclass is designed to streamline the construction of ebuilds for |
| 29 |
@@ -30,8 +30,8 @@ |
| 30 |
# Array variable containing list of all thesarus files. |
| 31 |
# MYSPELL_THES=( "file.dat" "dir/file2.idx" ) |
| 32 |
|
| 33 |
-case ${EAPI:-0} in |
| 34 |
- [5-8]) |
| 35 |
+case ${EAPI} in |
| 36 |
+ 7|8) |
| 37 |
;; |
| 38 |
*) |
| 39 |
die "${ECLASS}: EAPI ${EAPI:-0} not supported" |
| 40 |
@@ -43,12 +43,7 @@ EXPORT_FUNCTIONS src_unpack src_install |
| 41 |
# Basically no extra deps needed. |
| 42 |
# Unzip is required for .oxt libreoffice extensions |
| 43 |
# which are just fancy zip files. |
| 44 |
-if [[ ${EAPI:-0} != [56] ]]; then |
| 45 |
- BDEPEND="app-arch/unzip" |
| 46 |
-else |
| 47 |
- DEPEND="app-arch/unzip" |
| 48 |
- RDEPEND="" |
| 49 |
-fi |
| 50 |
+BDEPEND="app-arch/unzip" |
| 51 |
|
| 52 |
# by default this stuff does not have any folder in the pack |
| 53 |
S="${WORKDIR}" |
| 54 |
@@ -65,7 +60,7 @@ myspell-r2_src_unpack() { |
| 55 |
case ${f} in |
| 56 |
*.oxt) |
| 57 |
echo ">>> Unpacking "${DISTDIR}/${f}" to ${PWD}" |
| 58 |
- unzip -qoj ${DISTDIR}/${f} |
| 59 |
+ unzip -qoj "${DISTDIR}"/${f} |
| 60 |
assert "failed unpacking ${DISTDIR}/${f}" |
| 61 |
;; |
| 62 |
*) unpack ${f} ;; |
| 63 |
-- |
| 64 |
2.37.3 |
Archives