Add changes to files from merge 94ce7d2

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 4ad4a0e9ac48a8d642df34b4d639e95e22561668..4effafddf2860e15c26461c57a7a8aa4edc638f0 100644 (file)
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -60,6 +60,8 @@ environ_whitelist += [
        "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR",
        "USE_EXPAND", "USE_ORDER", "WORKDIR",
        "XARGS",
+       "BPREFIX", "DEFAULT_PATH", "EXTRA_PATH",
+       "PORTAGE_GROUP", "PORTAGE_USER",
 ]
 
 # user config variables
@@ -91,11 +93,13 @@ environ_whitelist += [
 ]
 
 # other variables inherited from the calling environment
+# UNIXMODE is necessary for MiNT
 environ_whitelist += [
        "CVS_RSH", "ECHANGELOG_USER",
        "GPG_AGENT_INFO",
        "SSH_AGENT_PID", "SSH_AUTH_SOCK",
        "STY", "WINDOW", "XAUTHORITY",
+       "UNIXMODE",
 ]
 
 environ_whitelist = frozenset(environ_whitelist)
@@ -116,6 +120,10 @@ environ_filter += [
 # misc variables inherited from the calling environment
 environ_filter += [
        "INFOPATH", "MANPATH", "USER",
+       "HOST", "GROUP", "LOGNAME", "MAIL", "REMOTEHOST",
+       "SECURITYSESSIONID",
+       "TERMINFO", "TERM_PROGRAM", "TERM_PROGRAM_VERSION",
+       "VENDOR", "__CF_USER_TEXT_ENCODING",
 ]
 
 # variables that break bash

diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py
index 8993d93f7c02ab415184cd95d9cbf2f790dbf5ac..cf9cac0334b594400bab078d37f71f47997978e5 100644 (file)
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -17,6 +17,7 @@ from portage.util import getlibpaths
 from portage.util import grabfile
 from portage.util import normalize_path
 from portage.util import writemsg_level
+from portage.const import EPREFIX
 
 class LinkageMapELF(object):
 
@@ -175,7 +176,7 @@ class LinkageMapELF(object):
                # registered in NEEDED.ELF.2 files
                plibs = set()
                if self._dbapi._plib_registry and self._dbapi._plib_registry.getPreservedLibs():
-                       args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
+                       args = [EPREFIX + "/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
                        for items in self._dbapi._plib_registry.getPreservedLibs().values():
                                plibs.update(items)
                                args.extend(os.path.join(root, x.lstrip("." + os.sep)) \