From 82290f6d95c42c5b5d76b3256c55b67edccf99e3 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Mar 2009 00:44:23 +0000
Subject: Make ebuild(1) detect ebuild/eclass changes and automatically source
 the ebuild atain in this case (even though $T/environment may already exist).
 This should help avoid confusion by ensuring that the latest changes to the
 ebuild/eclasses are reflected in the environment.

svn path=/main/trunk/; revision=13148
---
 bin/ebuild.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bin/ebuild.sh')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d426e15a9..f548a8f05 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -714,7 +714,7 @@ dyn_clean() {
 	fi
 
 	if [[ $EMERGE_FROM = binary ]] || ! hasq keepwork $FEATURES; then
-		rm -f "$PORTAGE_BUILDDIR"/.{exit_status,logid,unpacked,prepared} \
+		rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
 			"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged}
 
 		rm -rf "${PORTAGE_BUILDDIR}/build-info"
@@ -1865,7 +1865,7 @@ fi
 if ! hasq "$EBUILD_PHASE" clean cleanrm && \
 	(
 		hasq ${EBUILD_PHASE} depend || \
-		[ ! -f "${T}"/environment ] || \
+		[[ ! -f $T/environment || -f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \
 		hasq noauto ${FEATURES}
 	) ; then
 	# The bashrcs get an opportunity here to set aliases that will be expanded
@@ -1881,6 +1881,8 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm && \
 
 	if [ "${EBUILD_PHASE}" != "depend" ] ; then
 		RESTRICT=${PORTAGE_RESTRICT}
+		[[ -e $PORTAGE_BUILDDIR/.ebuild_changed ]] && \
+			rm "$PORTAGE_BUILDDIR/.ebuild_changed"
 	fi
 
 	# This next line is not the same as export RDEPEND=${RDEPEND:-${DEPEND}}
-- 
cgit v1.2.3-1-g7c22