Drop BPREFIX and EPREFIX override, bug #395633

The code is regardless non-functional and outdated.  Remove remains from
old cross-Prefix support.

diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index b3f7f7b51873ea050b04ff7ff6ca876b6d76be07..9b9147254f0d4efa5aa6b919452efbcfd1f4da4d 100644 (file)
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -92,7 +92,7 @@ save_ebuild_env() {
        unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK
 
        # Prefix additions
-       unset BPREFIX DEFAULT_PATH EXTRA_PATH PORTAGE_GROUP PORTAGE_USER
+       unset DEFAULT_PATH EXTRA_PATH PORTAGE_GROUP PORTAGE_USER
 
        declare -p
        declare -fp

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 77a54df3e1b6c2701066c1c690742db798337c05..87039eaa28de7228e62b0fefcb497c58087c62ee 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -28,7 +28,7 @@ import portage.elog
 import portage.util
 import portage.locks
 import portage.exception
-from portage.const import EPREFIX, BPREFIX, EPREFIX_LSTRIP
+from portage.const import EPREFIX, EPREFIX_LSTRIP
 from portage.data import secpass
 from portage.dbapi.dep_expand import dep_expand
 from portage.util import normalize_path as normpath

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index e7a49349eb733bb320b40f436edd42ec2b1b3e53..a538f7dd2e926e07b12804cb43a548d2afdbbe9f 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -132,7 +132,7 @@ try:
                DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \
                INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\
                INCREMENTALS, EAPI, MISC_SH_BINARY, REPO_NAME_LOC, REPO_NAME_FILE, \
-               EPREFIX, EPREFIX_LSTRIP, BPREFIX, rootuid
+               EPREFIX, EPREFIX_LSTRIP, rootuid
 
 except ImportError as e:
        sys.stderr.write("\n\n")

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 244e3ad28ca4e5e0bc612e68d5ce5f506233a982..c6a9005bc685453050a7b377c8b9d1a230cea78a 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -9,15 +9,6 @@ from portage.const_autotool import *
 
 import os
 
-# save the original prefix
-BPREFIX = EPREFIX
-# pick up EPREFIX from the environment if set
-if "EPREFIX" in os.environ:
-       if os.environ["EPREFIX"] != "":
-               EPREFIX = os.path.normpath(os.environ["EPREFIX"])
-       else:
-               EPREFIX = os.environ["EPREFIX"]
-
 # ===========================================================================
 # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
 # ===========================================================================
@@ -78,8 +69,8 @@ PORTAGE_PYM_PATH         = PORTAGE_BASE_PATH + "/pym"
 LOCALE_DATA_PATH         = PORTAGE_BASE_PATH + "/locale"  # FIXME: not used
 EBUILD_SH_BINARY         = PORTAGE_BIN_PATH + "/ebuild.sh"
 MISC_SH_BINARY           = PORTAGE_BIN_PATH + "/misc-functions.sh"
-SANDBOX_BINARY           = BPREFIX + "/usr/bin/sandbox"
-FAKEROOT_BINARY          = BPREFIX + "/usr/bin/fakeroot"
+SANDBOX_BINARY           = EPREFIX + "/usr/bin/sandbox"
+FAKEROOT_BINARY          = EPREFIX + "/usr/bin/fakeroot"
 BASH_BINARY              = PORTAGE_BASH
 MOVE_BINARY              = PORTAGE_MV
 PRELINK_BINARY           = "/usr/sbin/prelink"

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index a7c10336b276f7a601a7fec40d44cf3fe6403e28..967b21d4fc7c0133560a717d277e13a0e77018e2 100644 (file)
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -67,7 +67,7 @@ environ_whitelist += [
        "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR",
        "USE_EXPAND", "USE_ORDER", "WORKDIR",
        "XARGS", "__PORTAGE_TEST_HARDLINK_LOCKS",
-       "BPREFIX", "DEFAULT_PATH", "EXTRA_PATH",
+       "DEFAULT_PATH", "EXTRA_PATH",
        "PORTAGE_GROUP", "PORTAGE_USER",
 ]