From cdbe8af09d8d3c38eb903b6703b6eb82cec9c1e4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 14 Oct 2006 02:45:36 +0000 Subject: [PATCH] Always `unset DEPEND RDEPEND PDEPEND IUSE` prior to sourcing the ebuild in order to ensure correct interaction during the process of sourcing. Thanks to exg for reporting this issue. svn path=/main/trunk/; revision=4677 --- bin/ebuild.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b43485130..e3935e593 100755 --- 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}" -- 2.26.2