Always `unset DEPEND RDEPEND PDEPEND IUSE` prior to sourcing the ebuild in order...

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b43485130025575e3847e9f7f17877f564db98ab..e3935e5936bef319bef98f411d820e2810c88eea 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1453,6 +1453,11 @@ fi
 # this can be left out of ebd variants, since they're unaffected.
 unset EBUILD_DEATH_HOOKS
 
+# *DEPEND and IUSE will be set during the sourcing of the ebuild.  In order to
+# ensure correct interaction between ebuilds and eclasses, they need to be
+# unset before this process of interaction begins.
+unset DEPEND RDEPEND PDEPEND IUSE
+
 source ${EBUILD} || die "error sourcing ebuild"
 if ! hasq depend $EBUILD_PHASE; then
        RESTRICT="${PORTAGE_RESTRICT}"