Gentoo Archives: gentoo-commits

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