Gentoo Archives: gentoo-dev

From: dilfridge@g.o
To: gentoo-dev@l.g.o
Cc: "Andreas K. Huettel (dilfridge)" <dilfridge@g.o>
Subject: [gentoo-dev] [PATCH 05/15] perl-module.eclass: Use eapply from EAPI=6 on and always call eapply_user
Date: Fri, 11 Dec 2015 21:06:17
Message-Id: 1449867791-30513-5-git-send-email-dilfridge@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/15] perl-module.eclass: Allow EAPI=6, ban PERL_EXPORT_PHASE_FUNCTIONS there, simplify perl dependency by dilfridge@gentoo.org
1 From: "Andreas K. Huettel (dilfridge)" <dilfridge@g.o>
2
3 ---
4 eclass/perl-module.eclass | 14 +++++++++++---
5 1 file changed, 11 insertions(+), 3 deletions(-)
6
7 diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
8 index 8caa981..9d87b17 100644
9 --- a/eclass/perl-module.eclass
10 +++ b/eclass/perl-module.eclass
11 @@ -138,9 +138,17 @@ perl-module_src_unpack() {
12 # This function is to be called during the ebuild src_prepare() phase.
13 perl-module_src_prepare() {
14 debug-print-function $FUNCNAME "$@"
15 - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
16 - debug-print "$FUNCNAME: applying user patches"
17 - epatch_user
18 +
19 + if [[ ${EAPI:-0} = 5 ]] ; then
20 + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
21 + debug-print "$FUNCNAME: applying user patches"
22 + epatch_user
23 + else
24 + [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
25 + debug-print "$FUNCNAME: applying user patches"
26 + eapply_user
27 + fi
28 +
29 if [[ ${PERL_RM_FILES[@]} ]]; then
30 debug-print "$FUNCNAME: stripping unneeded files"
31 perl_rm_files "${PERL_RM_FILES[@]}"
32 --
33 2.6.3

Replies