Gentoo Archives: gentoo-dev

From: dilfridge@g.o
To: gentoo-dev@l.g.o
Cc: "Andreas K. Hüttel" <dilfridge@g.o>
Subject: [gentoo-dev] [PATCH 07/15] perl-module.eclass: Do not do any magic with MY_... variables in EAPI=6 anymore
Date: Fri, 11 Dec 2015 21:06:28
Message-Id: 1449867791-30513-7-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. Hüttel <dilfridge@g.o>
2
3 ---
4 eclass/perl-module.eclass | 16 +++++++++++-----
5 1 file changed, 11 insertions(+), 5 deletions(-)
6
7 diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
8 index 6a5f2ff..7434bcf 100644
9 --- a/eclass/perl-module.eclass
10 +++ b/eclass/perl-module.eclass
11 @@ -102,12 +102,18 @@ esac
12
13 LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
14
15 -if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
16 - : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
17 - S=${MY_S:-${WORKDIR}/${MY_P}}
18 +if [[ ${EAPI:-0} = 5 ]] ; then
19 + if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
20 + : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
21 + S=${MY_S:-${WORKDIR}/${MY_P}}
22 + fi
23 + MODULE_NAME=${MY_PN:-${PN}}
24 + MODULE_P=${MY_P:-${P}}
25 +else
26 + MODULE_NAME=${MODULE_NAME:-${PN}}
27 + MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
28 + S=${WORKDIR}/${MODULE_P}
29 fi
30 -MODULE_NAME=${MY_PN:-${PN}}
31 -MODULE_P=${MY_P:-${P}}
32
33 [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
34 MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
35 --
36 2.6.3

Replies