Gentoo Archives: gentoo-dev

From: dilfridge@g.o
To: gentoo-dev@l.g.o
Cc: "Andreas K. Hüttel" <dilfridge@g.o>
Subject: [gentoo-dev] [PATCH] perl-module.eclass: Also populate BDEPEND in EAPI=7
Date: Wed, 14 Aug 2019 21:36:15
Message-Id: 20190814213553.25846-1-dilfridge@gentoo.org
In Reply to: Re: [gentoo-dev] [PATCH 2/2] perl-module.class: Enable EAPI=7 support by James Le Cuirot
1 From: Andreas K. Hüttel <dilfridge@g.o>
2
3 In addition, no slot op in DEPEND.
4
5 Signed-off-by: Andreas K. Hüttel <dilfridge@g.o>
6 ---
7 eclass/perl-module.eclass | 31 +++++++++++++++++++++++++++++--
8 1 file changed, 29 insertions(+), 2 deletions(-)
9
10 diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
11 index 81f79992d766..e1fb97df3260 100644
12 --- a/eclass/perl-module.eclass
13 +++ b/eclass/perl-module.eclass
14 @@ -72,13 +72,13 @@ case ${EAPI:-0} in
15 ;;
16 esac
17 ;;
18 - 6|7)
19 + 6)
20 [[ ${CATEGORY} == perl-core ]] && \
21 PERL_EXPF+=" pkg_postinst pkg_postrm"
22
23 case "${GENTOO_DEPEND_ON_PERL:-yes}" in
24 yes)
25 - DEPEND="dev-lang/perl:="
26 + DEPEND="dev-lang/perl"
27 RDEPEND="dev-lang/perl:="
28 ;;
29 noslotop)
30 @@ -97,6 +97,33 @@ case ${EAPI:-0} in
31 die "phase functions, perl-functions.eclass if not."
32 fi
33
34 + EXPORT_FUNCTIONS ${PERL_EXPF}
35 + ;;
36 + 7)
37 + [[ ${CATEGORY} == perl-core ]] && \
38 + PERL_EXPF+=" pkg_postinst pkg_postrm"
39 +
40 + case "${GENTOO_DEPEND_ON_PERL:-yes}" in
41 + yes)
42 + DEPEND="dev-lang/perl"
43 + BDEPEND="dev-lang/perl"
44 + RDEPEND="dev-lang/perl:="
45 + ;;
46 + noslotop)
47 + DEPEND="dev-lang/perl"
48 + BDEPEND="dev-lang/perl"
49 + RDEPEND="dev-lang/perl"
50 + ;;
51 + esac
52 +
53 + if [[ "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" != "yes" ]]; then
54 + die "GENTOO_DEPEND_ON_PERL_SUBSLOT=no is banned in EAPI=6 and later."
55 + fi
56 +
57 + if [[ "${PERL_EXPORT_PHASE_FUNCTIONS}" ]]; then
58 + die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6 and later."
59 + fi
60 +
61 EXPORT_FUNCTIONS ${PERL_EXPF}
62 ;;
63 *)
64 --
65 2.22.0