Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 19 Dec 2015 21:50:39
Message-Id: 1450531031.c4739c29f633ca5c8900a51d8ceb3afc69561d32.dilfridge@gentoo
1 commit: c4739c29f633ca5c8900a51d8ceb3afc69561d32
2 Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 28 21:35:00 2015 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 19 13:17:11 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4739c29
7
8 perl-module.eclass: Inherit default src_prepare from EAPI=6 on (eapply, eapply_user)
9
10 eclass/perl-module.eclass | 12 +++++++++---
11 1 file changed, 9 insertions(+), 3 deletions(-)
12
13 diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
14 index 9b8e36a..8916ad0 100644
15 --- a/eclass/perl-module.eclass
16 +++ b/eclass/perl-module.eclass
17 @@ -131,9 +131,15 @@ perl-module_src_unpack() {
18 # This function is to be called during the ebuild src_prepare() phase.
19 perl-module_src_prepare() {
20 debug-print-function $FUNCNAME "$@"
21 - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
22 - debug-print "$FUNCNAME: applying user patches"
23 - epatch_user
24 +
25 + if [[ ${EAPI:-0} == 5 ]] ; then
26 + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
27 + debug-print "$FUNCNAME: applying user patches"
28 + epatch_user
29 + else
30 + default
31 + fi
32 +
33 if [[ ${PERL_RM_FILES[@]} ]]; then
34 debug-print "$FUNCNAME: stripping unneeded files"
35 perl_rm_files "${PERL_RM_FILES[@]}"