Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 02 Jul 2022 18:14:00
Message-Id: 1656785625.911ff1acf31e688665b7f69bfc49cc682eb6fb3b.soap@gentoo
1 commit: 911ff1acf31e688665b7f69bfc49cc682eb6fb3b
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 2 18:13:45 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 2 18:13:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=911ff1ac
7
8 perl-functions.eclass: remove EAPI 5
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 eclass/perl-functions.eclass | 18 ++++++++----------
13 1 file changed, 8 insertions(+), 10 deletions(-)
14
15 diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass
16 index 4adba921485e..c1b67f54fa75 100644
17 --- a/eclass/perl-functions.eclass
18 +++ b/eclass/perl-functions.eclass
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2019 Gentoo Authors
21 +# Copyright 1999-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 # @ECLASS: perl-functions.eclass
25 @@ -8,7 +8,7 @@
26 # Seemant Kulleen <seemant@g.o>
27 # Andreas K. Huettel <dilfridge@g.o>
28 # Kent Fredric <kentnl@g.o>
29 -# @SUPPORTED_EAPIS: 5 6 7 8
30 +# @SUPPORTED_EAPIS: 6 7 8
31 # @BLURB: helper functions eclass for perl modules
32 # @DESCRIPTION:
33 # The perl-functions eclass is designed to allow easier installation of perl
34 @@ -16,16 +16,16 @@
35 # It provides helper functions, no phases or variable manipulation in
36 # global scope.
37
38 -[[ ${CATEGORY} == "perl-core" ]] && inherit alternatives
39 -
40 -case "${EAPI:-0}" in
41 - 5|6|7|8)
42 +case ${EAPI} in
43 + 6|7|8)
44 ;;
45 *)
46 - die "EAPI=${EAPI} is not supported by perl-functions.eclass"
47 + die "${ECLASS}: EAPI ${EAPI:-0} not supported"
48 ;;
49 esac
50
51 +[[ ${CATEGORY} == "perl-core" ]] && inherit alternatives
52 +
53 perlinfo_done=false
54
55 # @FUNCTION: perl_set_version
56 @@ -237,9 +237,7 @@ perl_rm_files() {
57 # only sense for perl-core packages.
58 perl_link_duallife_scripts() {
59 debug-print-function $FUNCNAME "$@"
60 - if [[ ${CATEGORY} != perl-core ]] || ! has_version ">=dev-lang/perl-5.8.8-r8" ; then
61 - return 0
62 - fi
63 + [[ ${CATEGORY} != perl-core ]] && return 0
64
65 local i ff
66 if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ; then