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