1 |
commit: 98ba5313957e814e2eb1a6e91f9ce4b1c08baa70 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 12 20:34:51 2019 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 12 20:35:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98ba5313 |
7 |
|
8 |
perl-module.class: Enable EAPI=7 support |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
eclass/perl-module.eclass | 30 +++++++++++++++--------------- |
13 |
1 file changed, 15 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass |
16 |
index 20b9947caca..81f79992d76 100644 |
17 |
--- a/eclass/perl-module.eclass |
18 |
+++ b/eclass/perl-module.eclass |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2015 Gentoo Foundation |
21 |
+# Copyright 1999-2019 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
# @ECLASS: perl-module.eclass |
25 |
@@ -7,7 +7,7 @@ |
26 |
# @AUTHOR: |
27 |
# Seemant Kulleen <seemant@g.o> |
28 |
# Andreas K. Hüttel <dilfridge@g.o> |
29 |
-# @SUPPORTED_EAPIS: 5 6 |
30 |
+# @SUPPORTED_EAPIS: 5 6 7 |
31 |
# @BLURB: eclass for installing Perl module distributions |
32 |
# @DESCRIPTION: |
33 |
# The perl-module eclass is designed to allow easier installation of Perl |
34 |
@@ -23,7 +23,7 @@ case ${EAPI:-0} in |
35 |
inherit eutils multiprocessing unpacker perl-functions |
36 |
PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install" |
37 |
;; |
38 |
- 6) |
39 |
+ 6|7) |
40 |
inherit multiprocessing perl-functions |
41 |
PERL_EXPF="src_prepare src_configure src_compile src_test src_install" |
42 |
;; |
43 |
@@ -72,7 +72,7 @@ case ${EAPI:-0} in |
44 |
;; |
45 |
esac |
46 |
;; |
47 |
- 6) |
48 |
+ 6|7) |
49 |
[[ ${CATEGORY} == perl-core ]] && \ |
50 |
PERL_EXPF+=" pkg_postinst pkg_postrm" |
51 |
|
52 |
@@ -88,12 +88,12 @@ case ${EAPI:-0} in |
53 |
esac |
54 |
|
55 |
if [[ "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" != "yes" ]]; then |
56 |
- eerror "GENTOO_DEPEND_ON_PERL_SUBSLOT=no is banned in EAPI=6. If you don't want a slot operator" |
57 |
+ eerror "GENTOO_DEPEND_ON_PERL_SUBSLOT=no is banned in EAPI=6 and later. If you don't want a slot operator" |
58 |
die "set GENTOO_DEPEND_ON_PERL=noslotop instead." |
59 |
fi |
60 |
|
61 |
if [[ "${PERL_EXPORT_PHASE_FUNCTIONS}" ]]; then |
62 |
- eerror "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. Use perl-module.eclass if you need" |
63 |
+ eerror "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6 and later. Use perl-module.eclass if you need" |
64 |
die "phase functions, perl-functions.eclass if not." |
65 |
fi |
66 |
|
67 |
@@ -108,42 +108,42 @@ LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}" |
68 |
|
69 |
# @ECLASS-VARIABLE: DIST_NAME |
70 |
# @DESCRIPTION: |
71 |
-# (EAPI=6) This variable provides a way to override PN for the calculation of S, |
72 |
+# (EAPI=6 and later) This variable provides a way to override PN for the calculation of S, |
73 |
# SRC_URI, and HOMEPAGE. Defaults to PN. |
74 |
|
75 |
# @ECLASS-VARIABLE: DIST_VERSION |
76 |
# @DESCRIPTION: |
77 |
-# (EAPI=6) This variable provides a way to override PV for the calculation of S and SRC_URI. |
78 |
+# (EAPI=6 and later) This variable provides a way to override PV for the calculation of S and SRC_URI. |
79 |
# Use it to provide the non-normalized, upstream version number. Defaults to PV. |
80 |
# Named MODULE_VERSION in EAPI=5. |
81 |
|
82 |
# @ECLASS-VARIABLE: DIST_A_EXT |
83 |
# @DESCRIPTION: |
84 |
-# (EAPI=6) This variable provides a way to override the distfile extension for the calculation of |
85 |
+# (EAPI=6 and later) This variable provides a way to override the distfile extension for the calculation of |
86 |
# SRC_URI. Defaults to tar.gz. Named MODULE_A_EXT in EAPI=5. |
87 |
|
88 |
# @ECLASS-VARIABLE: DIST_A |
89 |
# @DESCRIPTION: |
90 |
-# (EAPI=6) This variable provides a way to override the distfile name for the calculation of |
91 |
+# (EAPI=6 and later) This variable provides a way to override the distfile name for the calculation of |
92 |
# SRC_URI. Defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT} Named MODULE_A in EAPI=5. |
93 |
|
94 |
# @ECLASS-VARIABLE: DIST_AUTHOR |
95 |
# @DEFAULT_UNSET |
96 |
# @DESCRIPTION: |
97 |
-# (EAPI=6) This variable sets the module author name for the calculation of |
98 |
+# (EAPI=6 and later) This variable sets the module author name for the calculation of |
99 |
# SRC_URI. Named MODULE_AUTHOR in EAPI=5. |
100 |
|
101 |
# @ECLASS-VARIABLE: DIST_SECTION |
102 |
# @DEFAULT_UNSET |
103 |
# @DESCRIPTION: |
104 |
-# (EAPI=6) This variable sets the module section for the calculation of |
105 |
+# (EAPI=6 and later) This variable sets the module section for the calculation of |
106 |
# SRC_URI. Only required in rare cases for very special snowflakes. |
107 |
# Named MODULE_SECTION in EAPI=5. |
108 |
|
109 |
# @ECLASS-VARIABLE: DIST_EXAMPLES |
110 |
# @DEFAULT_UNSET |
111 |
# @DESCRIPTION: |
112 |
-# (EAPI=6) This Bash array allows passing a list of example files to be installed |
113 |
+# (EAPI=6 and later) This Bash array allows passing a list of example files to be installed |
114 |
# in /usr/share/doc/${PF}/examples. If set before inherit, automatically adds |
115 |
# a use-flag examples, if not you'll have to add the useflag in your ebuild. |
116 |
# Examples are installed only if the useflag examples exists and is activated. |
117 |
@@ -314,7 +314,7 @@ perl-module_src_compile() { |
118 |
|
119 |
# @ECLASS-VARIABLE: DIST_TEST |
120 |
# @DESCRIPTION: |
121 |
-# (EAPI=6) Variable that controls if tests are run in the test phase |
122 |
+# (EAPI=6 and later) Variable that controls if tests are run in the test phase |
123 |
# at all, and if yes under which conditions. Defaults to "do parallel" |
124 |
# If neither "do" nor "parallel" is recognized, tests are skipped. |
125 |
# (In EAPI=5 the variable is called SRC_TEST, defaults to "skip", and |
126 |
@@ -328,7 +328,7 @@ perl-module_src_compile() { |
127 |
# @ECLASS-VARIABLE: DIST_TEST_OVERRIDE |
128 |
# @DEFAULT_UNSET |
129 |
# @DESCRIPTION: |
130 |
-# (EAPI=6) Variable that controls if tests are run in the test phase |
131 |
+# (EAPI=6 and later) Variable that controls if tests are run in the test phase |
132 |
# at all, and if yes under which conditions. It is intended for use in |
133 |
# make.conf or the environment by ebuild authors during testing, and |
134 |
# accepts the same values as DIST_TEST. If set, it overrides DIST_TEST |