From ff6f87572a496c0d7e969e4db16e7f755a954a74 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Nov 2007 07:38:24 +0000
Subject: Clean up some local variables that are needlessly saved in the
 environment.

svn path=/main/trunk/; revision=8573
---
 bin/ebuild.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ea871ee66..467554969 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -318,6 +318,7 @@ keepdir() {
 }
 
 unpack() {
+	local srcdir
 	local x
 	local y
 	local myfail
@@ -909,10 +910,10 @@ dyn_compile() {
 	fi
 	if [ -d "${S}" ]; then
 		srcdir=${S}
-		cd "${S}"
 	else
-		cd "${WORKDIR}"
+		srcdir=${WORKDIR}
 	fi
+	cd "${srcdir}"
 	#our custom version of libtool uses $S and $D to fix
 	#invalid paths in .la files
 	export S D
@@ -928,6 +929,7 @@ dyn_compile() {
 	cd build-info
 
 	set -f
+	local f
 	for f in ASFLAGS CATEGORY CBUILD CC CFLAGS CHOST CTARGET CXX \
 		CXXFLAGS DEPEND EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \
 		FEATURES INHERITED IUSE LDFLAGS LIBCFLAGS LIBCXXFLAGS \
@@ -939,6 +941,8 @@ dyn_compile() {
 	echo "${EAPI:-0}"	> EAPI
 	set +f
 
+	# local variables can leak into the saved environment.
+	unset f srcdir
 	save_ebuild_env > environment
 	bzip2 -f9 environment
 
-- 
cgit v1.2.3-1-g7c22