PORTAGE_OVERRIDE_EPREFIX: alphabetize vars

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index bd8708c73813842f6fcf65f54eb16088859c4824..6dcf2b6b55e24af75672215a6b0bbc573b23d3c7 100644 (file)
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -21,14 +21,14 @@ PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \
        PORTAGE_DEBUG PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE \
        PORTAGE_GID PORTAGE_GRPNAME PORTAGE_INST_GID PORTAGE_INST_UID \
        PORTAGE_IPC_DAEMON PORTAGE_IUSE PORTAGE_LOG_FILE \
-       PORTAGE_MUTABLE_FILTERED_VARS PORTAGE_PYM_PATH PORTAGE_PYTHON \
+       PORTAGE_MUTABLE_FILTERED_VARS PORTAGE_OVERRIDE_EPREFIX \
+       PORTAGE_PYM_PATH PORTAGE_PYTHON \
        PORTAGE_READONLY_METADATA PORTAGE_READONLY_VARS \
        PORTAGE_REPO_NAME PORTAGE_RESTRICT \
        PORTAGE_SAVED_READONLY_VARS PORTAGE_SIGPIPE_STATUS \
        PORTAGE_TMPDIR PORTAGE_UPDATE_ENV PORTAGE_USERNAME \
        PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR PORTDIR_OVERLAY \
-       PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR \
-       PORTAGE_OVERRIDE_EPREFIX"
+       PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR"
 
 PORTAGE_SAVED_READONLY_VARS="A CATEGORY P PF PN PR PV PVR"
 

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index fd0bf2d62f3a93f6b0f116e7528cd8093098f291..6b378b3db73297d5f5d50748144574bfc86d6b4d 100644 (file)
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -56,7 +56,7 @@ environ_whitelist += [
        "PORTAGE_GID", "PORTAGE_GRPNAME",
        "PORTAGE_INST_GID", "PORTAGE_INST_UID",
        "PORTAGE_IPC_DAEMON", "PORTAGE_IUSE",
-       "PORTAGE_LOG_FILE",
+       "PORTAGE_LOG_FILE", "PORTAGE_OVERRIDE_EPREFIX",
        "PORTAGE_PYM_PATH", "PORTAGE_PYTHON", "PORTAGE_QUIET",
        "PORTAGE_REPO_NAME", "PORTAGE_RESTRICT",
        "PORTAGE_SIGPIPE_STATUS",
@@ -66,7 +66,7 @@ environ_whitelist += [
        "REPLACING_VERSIONS", "REPLACED_BY_VERSION",
        "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR",
        "USE_EXPAND", "USE_ORDER", "WORKDIR",
-       "XARGS", "PORTAGE_OVERRIDE_EPREFIX",
+       "XARGS",
 ]
 
 # user config variables