Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH 17/18] Ban einstall for EAPI 6
Date: Mon, 01 Dec 2014 21:31:14
Message-Id: 1417469316-25052-18-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 00/18] Updated EAPI 6 patch set by "Michał Górny"
1 ---
2 bin/eapi.sh | 4 ++++
3 bin/phase-helpers.sh | 5 +++++
4 2 files changed, 9 insertions(+)
5
6 diff --git a/bin/eapi.sh b/bin/eapi.sh
7 index 5ab92f4..b27b57c 100644
8 --- a/bin/eapi.sh
9 +++ b/bin/eapi.sh
10 @@ -48,6 +48,10 @@ ___eapi_has_dosed() {
11 [[ ${1-${EAPI}} =~ ^(0|1|2|3)$ ]]
12 }
13
14 +___eapi_has_einstall() {
15 + [[ ${1-${EAPI}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]]
16 +}
17 +
18 ___eapi_has_docompress() {
19 [[ ! ${1-${EAPI}} =~ ^(0|1|2|3)$ ]]
20 }
21 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
22 index 5605efd..6e437da 100644
23 --- a/bin/phase-helpers.sh
24 +++ b/bin/phase-helpers.sh
25 @@ -666,6 +666,11 @@ econf() {
26 }
27
28 einstall() {
29 + if ! ___eapi_has_einstall; then
30 + die "'${FUNCNAME}' has been banned for EAPI '$EAPI'"
31 + exit 1
32 + fi
33 +
34 # CONF_PREFIX is only set if they didn't pass in libdir above.
35 local LOCAL_EXTRA_EINSTALL="${EXTRA_EINSTALL}"
36 if ! ___eapi_has_prefix_variables; then
37 --
38 2.1.3