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 cc42e8581cfaad0624c14e630e096a8bd7b4308a..93dc1feea0cc06a403efb00867d154ebdbf8d6c5 100755 (executable)
--- 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