Put more variables in PORTAGE_READONLY_VARS instead of using

save_ebuild_env() to unset them.

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c6f1b72ef1a857d462a5d0e34fc57fffe09031ae..3be4d4565dd76af655d0f86eb11b42c0b156caea 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1685,11 +1685,21 @@ PORTAGE_READONLY_METADATA="DEFINED_PHASES DEPEND DESCRIPTION
        PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
 
 PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \
-       EBUILD_SH_ARGS EMERGE_FROM FILESDIR \
-       PORTAGE_BINPKG_FILE PORTAGE_BIN_PATH PORTAGE_BUILDDIR PORTAGE_IUSE \
-       PORTAGE_PYM_PATH PORTAGE_MUTABLE_FILTERED_VARS \
+       EBUILD_SH_ARGS ECLASSDIR EMERGE_FROM FILESDIR PM_EBUILD_HOOK_DIR \
+       PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC  \
+       PORTAGE_BINPKG_FILE PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE \
+       PORTAGE_BIN_PATH PORTAGE_BUILDDIR PORTAGE_BUNZIP2_COMMAND \
+       PORTAGE_BZIP2_COMMAND PORTAGE_COLORMAP PORTAGE_CONFIGROOT \
+       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_READONLY_METADATA PORTAGE_READONLY_VARS \
-       PORTAGE_SAVED_READONLY_VARS PORTAGE_TMPDIR T WORKDIR"
+       PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_SANDBOX_COMPAT_LEVEL \
+       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_SAVED_READONLY_VARS="A CATEGORY P PF PN PR PV PVR"
 

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 3069a08bbb29002d9a45da211f918ce99957ba6a..cf258bef3aa889251c663a442c1b7a7d03f68bd7 100644 (file)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -589,29 +589,15 @@ save_ebuild_env() {
                unset ACCEPT_LICENSE BAD BRACKET BUILD_PREFIX COLS \
                        DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR \
                        EBUILD_FORCE_TEST EBUILD_MASTER_PID \
-                       ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \
+                       ECLASS_DEPTH ENDCOL FAKEROOTKEY \
                        GOOD HILITE HOME \
                        LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
                        NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
-                       PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \
-                       PORTAGE_BASHRC PM_EBUILD_HOOK_DIR PORTAGE_BASHRCS_SOURCED \
-                       PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE \
-                       PORTAGE_BUNZIP2_COMMAND PORTAGE_BZIP2_COMMAND \
-                       PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
-                       PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE PORTAGE_GID \
-                       PORTAGE_GRPNAME PORTAGE_INST_GID \
-                       PORTAGE_INST_UID PORTAGE_IPC_DAEMON \
-                       PORTAGE_LOG_FILE \
-                       PORTAGE_NONFATAL PORTAGE_QUIET PORTAGE_PYTHON \
-                       PORTAGE_REPO_NAME PORTAGE_RESTRICT \
-                       PORTAGE_SANDBOX_COMPAT_LEVEL PORTAGE_SIGPIPE_STATUS \
-                       PORTAGE_UPDATE_ENV \
-                       PORTAGE_USERNAME PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \
-                       PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \
-                       PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \
-                       RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \
-                       RC_INDENTATION \
-                       REPLACING_VERSIONS REPLACED_BY_VERSION \
+                       PORTAGE_BASHRCS_SOURCED PORTAGE_NONFATAL PORTAGE_QUIET \
+                       PORTAGE_SANDBOX_DENY PORTAGE_SANDBOX_PREDICT \
+                       PORTAGE_SANDBOX_READ PORTAGE_SANDBOX_WRITE PREROOTPATH \
+                       PWORKDIR QA_INTERCEPTORS \
+                       RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL RC_INDENTATION  \
                        ROOT ROOTPATH RPMDIR TEMP TMP TMPDIR USE_EXPAND \
                        WARN XARGS _RC_GET_KV_CACHE