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

[Andreas Hüttel]

commit:     640c8f78470c0417b610773b4fd5cd239b125d24
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 21:26:22 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 13:17:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640c8f78

perl-module.eclass: Use default unpacking from EAPI=6 on

 eclass/perl-module.eclass | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index bc654a9..9b8e36a 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -15,9 +15,20 @@
 # All exported functions from perl-functions.eclass (inherited here)
 # explicitly also belong to the interface of perl-module.eclass.
 
-inherit eutils multiprocessing unpacker perl-functions
+case "${EAPI:-0}" in
+	5)
+		inherit eutils multiprocessing unpacker perl-functions
+		PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install"
+		;;
+	6)
+		inherit eutils multiprocessing perl-functions
+		PERL_EXPF="src_prepare src_configure src_compile src_test src_install"
+		;;
+	*)
+		die "EAPI=${EAPI} is not supported by perl-module.eclass"
+		;;
+esac
 
-PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install"
 
 case "${EAPI:-0}" in
 	5)
@@ -109,7 +120,7 @@ pm_echovar=""
 # This function is to be called during the ebuild src_unpack() phase.
 perl-module_src_unpack() {
 	debug-print-function $FUNCNAME "$@"
-
+	[[ ${EAPI:-0} == 5 ]] || die "perl-module_src_unpack is banned in EAPI=6 or later"
 	unpacker_src_unpack
 }