Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o, dilfridge@g.o
Cc: "Andreas K. Huettel (dilfridge)" <dilfridge@g.o>
Subject: Re: [gentoo-dev] [PATCH 05/15] perl-module.eclass: Use eapply from EAPI=6 on and always call eapply_user
Date: Sat, 12 Dec 2015 11:55:04
Message-Id: 03238D24-8CDF-4A08-AD2D-05ABE4BCF2D0@gentoo.org
In Reply to: [gentoo-dev] [PATCH 05/15] perl-module.eclass: Use eapply from EAPI=6 on and always call eapply_user by dilfridge@gentoo.org
1 Dnia 11 grudnia 2015 22:03:01 CET, dilfridge@g.o napisał(a):
2 >From: "Andreas K. Huettel (dilfridge)" <dilfridge@g.o>
3 >
4 >---
5 > eclass/perl-module.eclass | 14 +++++++++++---
6 > 1 file changed, 11 insertions(+), 3 deletions(-)
7 >
8 >diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
9 >index 8caa981..9d87b17 100644
10 >--- a/eclass/perl-module.eclass
11 >+++ b/eclass/perl-module.eclass
12 >@@ -138,9 +138,17 @@ perl-module_src_unpack() {
13 > # This function is to be called during the ebuild src_prepare() phase.
14 > perl-module_src_prepare() {
15 > debug-print-function $FUNCNAME "$@"
16 >- [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
17 >- debug-print "$FUNCNAME: applying user patches"
18 >- epatch_user
19 >+
20 >+ if [[ ${EAPI:-0} = 5 ]] ; then
21 >+ [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
22 >+ debug-print "$FUNCNAME: applying user patches"
23 >+ epatch_user
24 >+ else
25 >+ [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
26 >+ debug-print "$FUNCNAME: applying user patches"
27 >+ eapply_user
28
29 Why not just 'default'?
30
31 >+ fi
32 >+
33 > if [[ ${PERL_RM_FILES[@]} ]]; then
34 > debug-print "$FUNCNAME: stripping unneeded files"
35 > perl_rm_files "${PERL_RM_FILES[@]}"
36
37 --
38 Sent from my Android device with K-9 Mail. Please excuse my brevity.

Replies