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 18/18] Deprecate dohtml for EAPI 6
Date: Mon, 01 Dec 2014 21:31:21
Message-Id: 1417469316-25052-19-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/ebuild-helpers/dohtml | 4 ++++
4 2 files changed, 8 insertions(+)
5
6 diff --git a/bin/eapi.sh b/bin/eapi.sh
7 index b27b57c..7e7b54b 100644
8 --- a/bin/eapi.sh
9 +++ b/bin/eapi.sh
10 @@ -52,6 +52,10 @@ ___eapi_has_einstall() {
11 [[ ${1-${EAPI}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]]
12 }
13
14 +___eapi_has_dohtml_deprecated() {
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/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml
22 index 75d3d00..0478e49 100755
23 --- a/bin/ebuild-helpers/dohtml
24 +++ b/bin/ebuild-helpers/dohtml
25 @@ -4,6 +4,10 @@
26
27 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
28
29 +if ___eapi_has_dohtml_deprecated; then
30 + eqawarn "'${0##*/}' is deprecated in EAPI '$EAPI'"
31 +fi
32 +
33 PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
34 PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
35 # Use safe cwd, avoiding unsafe import for bug #469338.
36 --
37 2.1.3