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

[Andreas Hüttel]

commit:     c4739c29f633ca5c8900a51d8ceb3afc69561d32
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 21:35:00 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 13:17:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4739c29

perl-module.eclass: Inherit default src_prepare from EAPI=6 on (eapply, 
eapply_user)

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

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 9b8e36a..8916ad0 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -131,9 +131,15 @@ perl-module_src_unpack() {
 # This function is to be called during the ebuild src_prepare() phase.
 perl-module_src_prepare() {
        debug-print-function $FUNCNAME "$@"
-       [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-       debug-print "$FUNCNAME: applying user patches"
-       epatch_user
+
+       if [[ ${EAPI:-0} == 5 ]] ; then
+               [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+               debug-print "$FUNCNAME: applying user patches"
+               epatch_user
+       else
+               default
+       fi
+
        if [[ ${PERL_RM_FILES[@]} ]]; then
                debug-print "$FUNCNAME: stripping unneeded files"
                perl_rm_files "${PERL_RM_FILES[@]}"