commit: f5826b3c34d6c6d7ec6356148c192701e2890fc3 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 3 11:30:41 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Mon Sep 12 19:14:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5826b3c
myspell-r2.eclass: drop support for EAPI<7 - No consumers for EAPI<7 remain in ::gentoo tree - Simplifies dependency logic - fix UnquotedVariable of DISTDIR Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> eclass/myspell-r2.eclass | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/eclass/myspell-r2.eclass b/eclass/myspell-r2.eclass index 6dbd1e19e133..cce75ae4d6d2 100644 --- a/eclass/myspell-r2.eclass +++ b/eclass/myspell-r2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: myspell-r2.eclass @@ -6,7 +6,7 @@ # Conrad Kostecki <[email protected]> # @AUTHOR: # Tomáš Chvátal <[email protected]> -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: An eclass to streamline the construction of ebuilds for new Myspell dictionaries. # @DESCRIPTION: # The myspell-r2 eclass is designed to streamline the construction of ebuilds for @@ -30,8 +30,8 @@ # Array variable containing list of all thesarus files. # MYSPELL_THES=( "file.dat" "dir/file2.idx" ) -case ${EAPI:-0} in - [5-8]) +case ${EAPI} in + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" @@ -43,12 +43,7 @@ EXPORT_FUNCTIONS src_unpack src_install # Basically no extra deps needed. # Unzip is required for .oxt libreoffice extensions # which are just fancy zip files. -if [[ ${EAPI:-0} != [56] ]]; then - BDEPEND="app-arch/unzip" -else - DEPEND="app-arch/unzip" - RDEPEND="" -fi +BDEPEND="app-arch/unzip" # by default this stuff does not have any folder in the pack S="${WORKDIR}" @@ -65,7 +60,7 @@ myspell-r2_src_unpack() { case ${f} in *.oxt) echo ">>> Unpacking "${DISTDIR}/${f}" to ${PWD}" - unzip -qoj ${DISTDIR}/${f} + unzip -qoj "${DISTDIR}"/${f} assert "failed unpacking ${DISTDIR}/${f}" ;; *) unpack ${f} ;;
