From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 1 Apr 2008 22:13:59 +0000 (-0000)
Subject: Bug #215673 - Make ebuild.sh leave IUSE defaults intact instead of filtering
X-Git-Tag: v2.2_pre6~274
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=79769780816727f39a127fac8c5686160e8a0456;p=portage.git

Bug #215673 - Make ebuild.sh leave IUSE defaults intact instead of filtering
them out. The built_with_use() function in eutils.eclass needs to be updated
for compatibility.

svn path=/main/trunk/; revision=9674
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index cc42e8581..93dc1feea 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1707,20 +1707,6 @@ if ! hasq ${EBUILD_PHASE} clean && \
 	PDEPEND="${PDEPEND} ${E_PDEPEND}"
 
 	unset ECLASS E_IUSE E_DEPEND E_RDEPEND E_PDEPEND
-
-	if [ "${EBUILD_PHASE}" != "depend" ] ; then
-		# Make IUSE defaults backward compatible with all the old shell code.
-		iuse_temp=""
-		for x in ${IUSE} ; do
-			if [[ ${x} == +* ]] || [[ ${x} == -* ]] ; then
-				iuse_temp="${iuse_temp} ${x:1}"
-			else
-				iuse_temp="${iuse_temp} ${x}"
-			fi
-		done
-		export IUSE=${iuse_temp}
-		unset x iuse_temp
-	fi
 	set +f
 fi