* Make save_ebuild_env() filter some more variables.

* Make dyn_install() filter S when it's no longer needed.

svn path=/main/trunk/; revision=8581

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ee06c2f09d7a6477710da47f395a03a8404233cd..bed1920342ad400bf729e801895f096619e1f323 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1020,6 +1020,11 @@ dyn_install() {
 
        # local variables can leak into the saved environment.
        unset f
+
+       # To avoid environment bloat, cleanse variables that are
+       # are no longer needed after src_install().
+       unset S
+
        save_ebuild_env > environment
        bzip2 -f9 environment
 
@@ -1448,8 +1453,9 @@ save_ebuild_env() {
                        KV LAST_E_CMD LAST_E_LEN LD_PRELOAD MOPREFIX \
                        NORMAL O PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
                        PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \
-                       PORTAGE_BINHOST_CHUNKSIZE PORTAGE_BUILDDIR PORTAGE_CALLER \
-                       PORTAGE_COLORMAP PORTAGE_CONFIGROOT \
+                       PORTAGE_BINHOST_CHUNKSIZE PORTAGE_BINPKG_TMPFILE \
+                       PORTAGE_BUILDDIR PORTAGE_CALLER \
+                       PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
                        PORTAGE_DEPCACHEDIR PORTAGE_ELOG_CLASSES PORTAGE_ELOG_MAILFROM \
                        PORTAGE_ELOG_MAILSUBJECT PORTAGE_ELOG_MAILURI PORTAGE_ELOG_SYSTEM \
                        PORTAGE_GID PORTAGE_GPG_DIR PORTAGE_GPG_KEY PORTAGE_INST_GID \