commit: 0fa8c7471e3e14a28c11ad4831fd2026e26b3c0b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 17:26:27 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 18:33:32 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0fa8c747
bin: Rename all _E_*DESTTREE_ variables to __E_*DESTTREE
The __* namespace is reserved for package manager use.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
NEWS | 3 +++
bin/dohtml.py | 4 ++--
bin/ebuild-helpers/dobin | 10 +++++-----
bin/ebuild-helpers/doconfd | 6 +++---
bin/ebuild-helpers/dodoc | 4 ++--
bin/ebuild-helpers/doenvd | 6 +++---
bin/ebuild-helpers/doexe | 8 ++++----
bin/ebuild-helpers/doheader | 6 +++---
bin/ebuild-helpers/doinitd | 4 ++--
bin/ebuild-helpers/doins | 16 ++++++++--------
bin/ebuild-helpers/dolib | 6 +++---
bin/ebuild-helpers/domo | 12 ++++++------
bin/ebuild-helpers/dosbin | 10 +++++-----
bin/phase-functions.sh | 10 +++++-----
bin/phase-helpers.sh | 44 ++++++++++++++++++++++----------------------
bin/save-ebuild-env.sh | 2 +-
16 files changed, 77 insertions(+), 74 deletions(-)
diff --git a/NEWS b/NEWS
index 50d96402c..7239cc285 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ Bug fixes:
all options starting with "--with-", "--disable-" or "--enable-", in order
to pass them to configure. This follows a change in PMS (bug #815169).
+* All _E_*DESTTREE_ variables to renamed to __E_*DESTTREE, in order to move
+ them to the __* namespace which is reserved for the package manager.
+
portage-3.0.46 (2023-04-07)
---------------
diff --git a/bin/dohtml.py b/bin/dohtml.py
index 9a8cd4c00..853027300 100755
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -152,8 +152,8 @@ class OptionsClass:
self.ED = os.environ.get("ED", "")
if self.ED:
self.ED = normalize_path(self.ED)
- if "_E_DOCDESTTREE_" in os.environ:
- self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"]
+ if "__E_DOCDESTTREE" in os.environ:
+ self.DOCDESTTREE = os.environ["__E_DOCDESTTREE"]
if self.DOCDESTTREE:
self.DOCDESTTREE = normalize_path(self.DOCDESTTREE)
diff --git a/bin/ebuild-helpers/dobin b/bin/ebuild-helpers/dobin
index 14faab9bf..123a3177a 100755
--- a/bin/ebuild-helpers/dobin
+++ b/bin/ebuild-helpers/dobin
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -18,18 +18,18 @@ if ! ___eapi_has_DESTTREE_INSDESTTREE; then
die "${0##*/}: \${DESTTREE} has been banned for EAPI '${EAPI}';
use 'into' instead"
else
# backwards compatibility
- _E_DESTTREE_=${DESTTREE}
+ __E_DESTTREE=${DESTTREE}
fi
-if [[ ! -d ${ED%/}/${_E_DESTTREE_#/}/bin ]] ; then
- install -d "${ED%/}/${_E_DESTTREE_#/}/bin" || { __helpers_die
"${0##*/}: failed to install ${ED%/}/${_E_DESTTREE_#/}/bin"; exit 2; }
+if [[ ! -d ${ED%/}/${__E_DESTTREE#/}/bin ]] ; then
+ install -d "${ED%/}/${__E_DESTTREE#/}/bin" || { __helpers_die
"${0##*/}: failed to install ${ED%/}/${__E_DESTTREE#/}/bin"; exit 2; }
fi
ret=0
for x in "$@" ; do
if [[ -e ${x} ]] ; then
- install -m0755 -o ${PORTAGE_INST_UID:-0} -g
${PORTAGE_INST_GID:-0} "${x}" "${ED%/}/${_E_DESTTREE_#/}/bin"
+ install -m0755 -o ${PORTAGE_INST_UID:-0} -g
${PORTAGE_INST_GID:-0} "${x}" "${ED%/}/${__E_DESTTREE#/}/bin"
else
echo "!!! ${0##*/}: ${x} does not exist" 1>&2
false
diff --git a/bin/ebuild-helpers/doconfd b/bin/ebuild-helpers/doconfd
index 761fd7309..9fbbc7d5a 100755
--- a/bin/ebuild-helpers/doconfd
+++ b/bin/ebuild-helpers/doconfd
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -9,9 +9,9 @@ if [[ $# -lt 1 ]] ; then
exit 1
fi
-export _E_INSDESTTREE_='/etc/conf.d/'
+export __E_INSDESTTREE='/etc/conf.d/'
if ___eapi_has_DESTTREE_INSDESTTREE; then
- export INSDESTTREE=${_E_INSDESTTREE_}
+ export INSDESTTREE=${__E_INSDESTTREE}
fi
if ! ___eapi_doconfd_respects_insopts; then
diff --git a/bin/ebuild-helpers/dodoc b/bin/ebuild-helpers/dodoc
index 28e58ae0c..240777aac 100755
--- a/bin/ebuild-helpers/dodoc
+++ b/bin/ebuild-helpers/dodoc
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -17,7 +17,7 @@ if ! ___eapi_has_prefix_variables; then
ED=${D}
fi
-dir="${ED%/}/usr/share/doc/${PF}/${_E_DOCDESTTREE_#/}"
+dir="${ED%/}/usr/share/doc/${PF}/${__E_DOCDESTTREE#/}"
if [ ! -d "${dir}" ] ; then
install -d "${dir}"
fi
diff --git a/bin/ebuild-helpers/doenvd b/bin/ebuild-helpers/doenvd
index d801646e3..38b882c7e 100755
--- a/bin/ebuild-helpers/doenvd
+++ b/bin/ebuild-helpers/doenvd
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -9,9 +9,9 @@ if [[ $# -lt 1 ]] ; then
exit 1
fi
-export _E_INSDESTTREE_='/etc/env.d/'
+export __E_INSDESTTREE='/etc/env.d/'
if ___eapi_has_DESTTREE_INSDESTTREE; then
- export INSDESTTREE=${_E_INSDESTTREE_}
+ export INSDESTTREE=${__E_INSDESTTREE}
fi
if ! ___eapi_doenvd_respects_insopts; then
diff --git a/bin/ebuild-helpers/doexe b/bin/ebuild-helpers/doexe
index 9132fb592..5030a0f22 100755
--- a/bin/ebuild-helpers/doexe
+++ b/bin/ebuild-helpers/doexe
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -13,8 +13,8 @@ if ! ___eapi_has_prefix_variables; then
ED=${D}
fi
-if [[ ! -d ${ED%/}/${_E_EXEDESTTREE_#/} ]] ; then
- install -d "${ED%/}/${_E_EXEDESTTREE_#/}"
+if [[ ! -d ${ED%/}/${__E_EXEDESTTREE#/} ]] ; then
+ install -d "${ED%/}/${__E_EXEDESTTREE#/}"
fi
TMP=$(mktemp -d "${T}/.doexe_tmp_XXXXXX")
@@ -33,7 +33,7 @@ for x in "$@" ; do
fi
if [ -e "${mysrc}" ] ; then
- install ${EXEOPTIONS} "${mysrc}" "${ED%/}/${_E_EXEDESTTREE_#/}"
+ install ${EXEOPTIONS} "${mysrc}" "${ED%/}/${__E_EXEDESTTREE#/}"
else
echo "!!! ${0##*/}: ${mysrc} does not exist" 1>&2
false
diff --git a/bin/ebuild-helpers/doheader b/bin/ebuild-helpers/doheader
index 6ca423d6d..5fc9febf5 100755
--- a/bin/ebuild-helpers/doheader
+++ b/bin/ebuild-helpers/doheader
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -13,9 +13,9 @@ if [[ $# -lt 1 ]] || [[ $1 == -r && $# -lt 2 ]] ; then
exit 1
fi
-export _E_INSDESTTREE_='/usr/include/'
+export __E_INSDESTTREE='/usr/include/'
if ___eapi_has_DESTTREE_INSDESTTREE; then
- export INSDESTTREE=${_E_INSDESTTREE_}
+ export INSDESTTREE=${__E_INSDESTTREE}
fi
if ! ___eapi_doheader_respects_insopts; then
diff --git a/bin/ebuild-helpers/doinitd b/bin/ebuild-helpers/doinitd
index fbb94d1f6..cdeb1fef4 100755
--- a/bin/ebuild-helpers/doinitd
+++ b/bin/ebuild-helpers/doinitd
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -15,4 +15,4 @@ if ! ___eapi_doinitd_respects_exeopts; then
export DIROPTIONS=""
fi
-_E_EXEDESTTREE_='/etc/init.d/' exec doexe "$@"
+__E_EXEDESTTREE='/etc/init.d/' exec doexe "$@"
diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index c90eccc90..8e5b45f2c 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -16,14 +16,14 @@ if [[ ${helper} == dodoc ]] ; then
fi
export INSOPTIONS=-m0644
export DIROPTIONS=""
- export _E_INSDESTTREE_=usr/share/doc/${PF}/${_E_DOCDESTTREE_}
+ export __E_INSDESTTREE=usr/share/doc/${PF}/${__E_DOCDESTTREE}
else
if ! ___eapi_has_DESTTREE_INSDESTTREE; then
[[ -n ${INSDESTTREE} ]] &&
die "${0##*/}: \${INSDESTTREE} has been banned for EAPI
'${EAPI}'; use 'into' instead"
else
# backwards compatibility
- _E_INSDESTTREE_=${INSDESTTREE}
+ __E_INSDESTTREE=${INSDESTTREE}
fi
fi
@@ -42,20 +42,20 @@ if ! ___eapi_has_prefix_variables; then
export ED="${D}"
fi
-if [[ ${_E_INSDESTTREE_#${D}} != "${_E_INSDESTTREE_}" ]]; then
+if [[ ${__E_INSDESTTREE#${D}} != "${__E_INSDESTTREE}" ]]; then
__vecho "-------------------------------------------------------" 1>&2
__vecho "You should not use \${D} or \${ED} with helpers." 1>&2
- __vecho " --> ${_E_INSDESTTREE_}" 1>&2
+ __vecho " --> ${__E_INSDESTTREE}" 1>&2
__vecho "-------------------------------------------------------" 1>&2
__helpers_die "${helper} used with \${D} or \${ED}"
exit 1
fi
if [[ -n ${EPREFIX} && \
- ${_E_INSDESTTREE_#${EPREFIX}} != "${_E_INSDESTTREE_}" ]]
+ ${__E_INSDESTTREE#${EPREFIX}} != "${__E_INSDESTTREE}" ]]
then
__vecho "-------------------------------------------------------" 1>&2
__vecho "You should not use \${EPREFIX} with helpers." 1>&2
- __vecho " --> ${_E_INSDESTTREE_}" 1>&2
+ __vecho " --> ${__E_INSDESTTREE}" 1>&2
__vecho "-------------------------------------------------------" 1>&2
__helpers_die "${helper} used with \${EPREFIX}"
exit 1
@@ -94,7 +94,7 @@ fi
DOINS_ARGS+=(
"--helper=${helper}"
- "--dest=${ED%/}/${_E_INSDESTTREE_#/}"
+ "--dest=${ED%/}/${__E_INSDESTTREE#/}"
)
# Explicitly set PYTHONPATH to non empty.
diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib
index ca57199be..44e16f503 100755
--- a/bin/ebuild-helpers/dolib
+++ b/bin/ebuild-helpers/dolib
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -18,7 +18,7 @@ if ! ___eapi_has_DESTTREE_INSDESTTREE; then
die "${0##*/}: \${DESTTREE} has been banned for EAPI '${EAPI}';
use 'into' instead"
else
# backwards compatibility
- _E_DESTTREE_=${DESTTREE}
+ __E_DESTTREE=${DESTTREE}
fi
# Setup ABI cruft
@@ -30,7 +30,7 @@ unset LIBDIR_VAR
# We need this to default to lib so that things dont break
CONF_LIBDIR=${CONF_LIBDIR:-lib}
-libdir="${ED%/}/${_E_DESTTREE_#/}/${CONF_LIBDIR}"
+libdir="${ED%/}/${__E_DESTTREE#/}/${CONF_LIBDIR}"
if [[ $# -lt 1 ]] ; then
__helpers_die "${0##*/}: at least one argument needed"
diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo
index d864bed29..65cd6b8c1 100755
--- a/bin/ebuild-helpers/domo
+++ b/bin/ebuild-helpers/domo
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -19,16 +19,16 @@ if ! ___eapi_has_DESTTREE_INSDESTTREE; then
die "${0##*/}: \${DESTTREE} has been banned for EAPI '${EAPI}';
use 'into' instead"
else
# backwards compatibility
- _E_DESTTREE_=${DESTTREE}
+ __E_DESTTREE=${DESTTREE}
fi
# newer EAPIs force /usr consistently with other /usr/share helpers
if ! ___eapi_domo_respects_into; then
- _E_DESTTREE_=/usr
+ __E_DESTTREE=/usr
fi
-if [ ! -d "${ED%/}/${_E_DESTTREE_#/}/share/locale" ] ; then
- install -d "${ED%/}/${_E_DESTTREE_#/}/share/locale/"
+if [ ! -d "${ED%/}/${__E_DESTTREE#/}/share/locale" ] ; then
+ install -d "${ED%/}/${__E_DESTTREE#/}/share/locale/"
fi
ret=0
@@ -36,7 +36,7 @@ ret=0
for x in "$@" ; do
if [ -e "${x}" ] ; then
mytiny="${x##*/}"
-
mydir="${ED%/}/${_E_DESTTREE_#/}/share/locale/${mytiny%.*}/LC_MESSAGES"
+
mydir="${ED%/}/${__E_DESTTREE#/}/share/locale/${mytiny%.*}/LC_MESSAGES"
if [ ! -d "${mydir}" ] ; then
install -d "${mydir}"
fi
diff --git a/bin/ebuild-helpers/dosbin b/bin/ebuild-helpers/dosbin
index 4d2c8540b..fac546c77 100755
--- a/bin/ebuild-helpers/dosbin
+++ b/bin/ebuild-helpers/dosbin
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
@@ -18,18 +18,18 @@ if ! ___eapi_has_DESTTREE_INSDESTTREE; then
die "${0##*/}: \${DESTTREE} has been banned for EAPI '${EAPI}';
use 'into' instead"
else
# backwards compatibility
- _E_DESTTREE_=${DESTTREE}
+ __E_DESTTREE=${DESTTREE}
fi
-if [[ ! -d ${ED%/}/${_E_DESTTREE_#/}/sbin ]] ; then
- install -d "${ED%/}/${_E_DESTTREE_#/}/sbin" || { __helpers_die
"${0##*/}: failed to install ${ED%/}/${_E_DESTTREE_#/}/sbin"; exit 2; }
+if [[ ! -d ${ED%/}/${__E_DESTTREE#/}/sbin ]] ; then
+ install -d "${ED%/}/${__E_DESTTREE#/}/sbin" || { __helpers_die
"${0##*/}: failed to install ${ED%/}/${__E_DESTTREE#/}/sbin"; exit 2; }
fi
ret=0
for x in "$@" ; do
if [[ -e ${x} ]] ; then
- install -m0755 -o ${PORTAGE_INST_UID:-0} -g
${PORTAGE_INST_GID:-0} "${x}" "${ED%/}/${_E_DESTTREE_#/}/sbin"
+ install -m0755 -o ${PORTAGE_INST_UID:-0} -g
${PORTAGE_INST_GID:-0} "${x}" "${ED%/}/${__E_DESTTREE#/}/sbin"
else
echo "!!! ${0##*/}: ${x} does not exist" 1>&2
false
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 687e1ab03..071941ff7 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Hardcoded bash lists are needed for backward compatibility with
@@ -605,11 +605,11 @@ __dyn_install() {
export DESTTREE=/usr
export INSDESTTREE=""
else
- export _E_DESTTREE_=/usr
- export _E_INSDESTTREE_=""
+ export __E_DESTTREE=/usr
+ export __E_INSDESTTREE=""
fi
- export _E_EXEDESTTREE_=""
- export _E_DOCDESTTREE_=""
+ export __E_EXEDESTTREE=""
+ export __E_DOCDESTTREE=""
__ebuild_phase src_install
>> "${PORTAGE_BUILDDIR}/.installed" || \
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index cc3f85faa..59f1bd26b 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -6,11 +6,11 @@ if ___eapi_has_DESTTREE_INSDESTTREE; then
export DESTTREE=/usr
export INSDESTTREE=""
else
- export _E_DESTTREE_=/usr
- export _E_INSDESTTREE_=""
+ export __E_DESTTREE=/usr
+ export __E_INSDESTTREE=""
fi
-export _E_EXEDESTTREE_=""
-export _E_DOCDESTTREE_=""
+export __E_EXEDESTTREE=""
+export __E_DOCDESTTREE=""
export INSOPTIONS="-m0644"
export EXEOPTIONS="-m0755"
export LIBOPTIONS="-m0644"
@@ -26,14 +26,14 @@ declare -a PORTAGE_DOSTRIP_SKIP=()
into() {
if [[ "$1" == "/" ]]; then
- export _E_DESTTREE_=""
+ export __E_DESTTREE=""
else
- export _E_DESTTREE_=$1
+ export __E_DESTTREE=$1
if ! ___eapi_has_prefix_variables; then
local ED=${D}
fi
- if [[ ! -d "${ED%/}/${_E_DESTTREE_#/}" ]]; then
- install -d "${ED%/}/${_E_DESTTREE_#/}"
+ if [[ ! -d "${ED%/}/${__E_DESTTREE#/}" ]]; then
+ install -d "${ED%/}/${__E_DESTTREE#/}"
local ret=$?
if [[ ${ret} -ne 0 ]] ; then
@@ -44,20 +44,20 @@ into() {
fi
if ___eapi_has_DESTTREE_INSDESTTREE; then
- export DESTTREE=${_E_DESTTREE_}
+ export DESTTREE=${__E_DESTTREE}
fi
}
insinto() {
if [[ "${1}" == "/" ]]; then
- export _E_INSDESTTREE_=""
+ export __E_INSDESTTREE=""
else
- export _E_INSDESTTREE_=${1}
+ export __E_INSDESTTREE=${1}
if ! ___eapi_has_prefix_variables; then
local ED=${D}
fi
- if [[ ! -d "${ED%/}/${_E_INSDESTTREE_#/}" ]]; then
- install -d "${ED%/}/${_E_INSDESTTREE_#/}"
+ if [[ ! -d "${ED%/}/${__E_INSDESTTREE#/}" ]]; then
+ install -d "${ED%/}/${__E_INSDESTTREE#/}"
local ret=$?
if [[ ${ret} -ne 0 ]] ; then
@@ -68,20 +68,20 @@ insinto() {
fi
if ___eapi_has_DESTTREE_INSDESTTREE; then
- export INSDESTTREE=${_E_INSDESTTREE_}
+ export INSDESTTREE=${__E_INSDESTTREE}
fi
}
exeinto() {
if [[ "${1}" == "/" ]]; then
- export _E_EXEDESTTREE_=""
+ export __E_EXEDESTTREE=""
else
- export _E_EXEDESTTREE_="${1}"
+ export __E_EXEDESTTREE="${1}"
if ! ___eapi_has_prefix_variables; then
local ED=${D}
fi
- if [[ ! -d "${ED%/}/${_E_EXEDESTTREE_#/}" ]]; then
- install -d "${ED%/}/${_E_EXEDESTTREE_#/}"
+ if [[ ! -d "${ED%/}/${__E_EXEDESTTREE#/}" ]]; then
+ install -d "${ED%/}/${__E_EXEDESTTREE#/}"
local ret=$?
if [[ ${ret} -ne 0 ]] ; then
@@ -94,14 +94,14 @@ exeinto() {
docinto() {
if [[ "${1}" == "/" ]]; then
- export _E_DOCDESTTREE_=""
+ export __E_DOCDESTTREE=""
else
- export _E_DOCDESTTREE_="${1}"
+ export __E_DOCDESTTREE="${1}"
if ! ___eapi_has_prefix_variables; then
local ED=${D}
fi
- if [[ ! -d "${ED%/}/usr/share/doc/${PF}/${_E_DOCDESTTREE_#/}"
]]; then
- install -d
"${ED%/}/usr/share/doc/${PF}/${_E_DOCDESTTREE_#/}"
+ if [[ ! -d "${ED%/}/usr/share/doc/${PF}/${__E_DOCDESTTREE#/}"
]]; then
+ install -d
"${ED%/}/usr/share/doc/${PF}/${__E_DOCDESTTREE#/}"
local ret=$?
if [[ ${ret} -ne 0 ]] ; then
__helpers_die "${FUNCNAME[0]} failed"
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index 6dc0bf77f..bba468da1 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -13,7 +13,7 @@
__save_ebuild_env() {
(
if has --exclude-init-phases $* ; then
- unset S _E_DESTTREE _E_INSDESTTREE _E_DOCDESTTREE_
_E_EXEDESTTREE_ \
+ unset S __E_DESTTREE __E_INSDESTTREE __E_DOCDESTTREE
__E_EXEDESTTREE \
PORTAGE_DOCOMPRESS_SIZE_LIMIT PORTAGE_DOCOMPRESS \
PORTAGE_DOCOMPRESS_SKIP PORTAGE_DOSTRIP
PORTAGE_DOSTRIP_SKIP
if [[ -n ${PYTHONPATH} &&
