From ef73cc3a1f0a27b1d31a1b664cd155556998abbd Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 8 Apr 2009 20:08:14 +0000
Subject: Call _ebuild_phase_funcs() from ebuild_main() since it needs to be
 called for every phase (for EAPI 2 default() phase function setup).

svn path=/main/trunk/; revision=13301
---
 bin/ebuild.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8d1c8a0e7..c086e6d31 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1861,11 +1861,6 @@ _source_ebuild() {
 	done
 	[[ -n $DEFINED_PHASES ]] || DEFINED_PHASES=-
 
-	if [[ -n $EBUILD_PHASE && $EBUILD_PHASE != depend ]] ; then
-		local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE")
-		[[ -n $phase_func ]] && _ebuild_phase_funcs "$EAPI" "$phase_func"
-	fi
-
 	# This needs to be exported since prepstrip is a separate shell script.
 	[[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED
 }
@@ -1933,6 +1928,11 @@ ebuild_main() {
 		fi
 	fi
 
+	if [[ $EBUILD_PHASE != depend ]] ; then
+		local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE")
+		[[ -n $phase_func ]] && _ebuild_phase_funcs "$EAPI" "$phase_func"
+	fi
+
 	source_all_bashrcs
 
 	case ${EBUILD_SH_ARGS} in
-- 
cgit v1.2.3-1-g7c22