From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 9 Oct 2008 19:46:07 +0000 (-0000)
Subject: Fix code from previous commit so it properly checks $eapi to verify that
X-Git-Tag: v2.2_rc12~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=445daffe9b37122bd37a67e90156f75f4cfe03ae;p=portage.git

Fix code from previous commit so it properly checks $eapi to verify that
src_prepare is really a supported phase function.

svn path=/main/trunk/; revision=11665
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 7cca4f272..b501e94a2 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1396,7 +1396,8 @@ _ebuild_arg_to_phase() {
 			phase_func=src_unpack
 			;;
 		prepare)
-			phase_func=src_prepare
+			! hasq $eapi 0 1 2_pre1 2_pre2 && \
+				phase_func=src_prepare
 			;;
 		configure)
 			! hasq $eapi 0 1 2_pre1 && \