[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas K. Hüttel]

commit:     843c1d8de0b2eb34a91760c2c9cbffab7dafe5b7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 21:33:11 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 16:37:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=843c1d8d

perl-module.eclass: Also populate BDEPEND in EAPI=7

In addition, no slot op in DEPEND.

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 eclass/perl-module.eclass | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 81f79992d76..e1fb97df326 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -72,13 +72,13 @@ case ${EAPI:-0} in
 				;;
 		esac
 		;;
-	6|7)
+	6)
 		[[ ${CATEGORY} == perl-core ]] && \
 			PERL_EXPF+=" pkg_postinst pkg_postrm"
 
 		case "${GENTOO_DEPEND_ON_PERL:-yes}" in
 			yes)
-				DEPEND="dev-lang/perl:="
+				DEPEND="dev-lang/perl"
 				RDEPEND="dev-lang/perl:="
 				;;
 			noslotop)
@@ -97,6 +97,33 @@ case ${EAPI:-0} in
 			die    "phase functions, perl-functions.eclass if not."
 		fi
 
+		EXPORT_FUNCTIONS ${PERL_EXPF}
+		;;
+	7)
+		[[ ${CATEGORY} == perl-core ]] && \
+			PERL_EXPF+=" pkg_postinst pkg_postrm"
+
+		case "${GENTOO_DEPEND_ON_PERL:-yes}" in
+			yes)
+				DEPEND="dev-lang/perl"
+				BDEPEND="dev-lang/perl"
+				RDEPEND="dev-lang/perl:="
+				;;
+			noslotop)
+				DEPEND="dev-lang/perl"
+				BDEPEND="dev-lang/perl"
+				RDEPEND="dev-lang/perl"
+				;;
+		esac
+
+		if [[ "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" != "yes" ]]; then
+			die "GENTOO_DEPEND_ON_PERL_SUBSLOT=no is banned in EAPI=6 and later."
+		fi
+
+		if [[ "${PERL_EXPORT_PHASE_FUNCTIONS}" ]]; then
+			die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6 and later."
+		fi
+
 		EXPORT_FUNCTIONS ${PERL_EXPF}
 		;;
 	*)