Always make sure that the depend phase triggers a source ${EBUILD}

call, even if "${T}"/environment happens to exist for some reason.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ecdcadba14171008cb8d9549e4002070cea09954..62a271752cd188a4b8afa02ec6b9d969702d8c64 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1637,7 +1637,11 @@ if ! hasq ${EBUILD_PHASE} clean depend && \
 fi
 
 if ! hasq ${EBUILD_PHASE} clean && \
-       ( [ ! -f "${T}"/environment ] || hasq noauto ${FEATURES} ) ; then
+       (
+               hasq ${EBUILD_PHASE} depend || \
+               [ ! -f "${T}"/environment ] || \
+               hasq noauto ${FEATURES}
+       ) ; then
        # The bashrcs get an opportunity here to set aliases that will be expanded
        # during sourcing of ebuilds and eclasses.
        source_all_bashrcs