From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 21 Apr 2009 07:08:44 +0000 (-0000)
Subject: Add ${PORTAGE_BIN_PATH}/ebuild-helpers/3 directory to PATH for EAPI 3. Thanks
X-Git-Tag: v2.2_rc32~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb538535551e3018d55fb9fde68518fc6a880842;p=portage.git

Add ${PORTAGE_BIN_PATH}/ebuild-helpers/3 directory to PATH for EAPI 3. Thanks
to Tiziano Müller <dev-zero@g.o> for this patch.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 6e5d483e3..7fe8f5649 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1902,6 +1902,19 @@ fi
 ebuild_main() {
 	local f x
 
+	# we may want to make this configurable somewhere else
+	local ebuild_helpers_path
+	case ${EAPI} in
+		3|3_pre1)
+			ebuild_helpers_path="${PORTAGE_BIN_PATH}/ebuild-helpers/3:${PORTAGE_BIN_PATH}/ebuild-helpers"
+			;;
+		*)
+			ebuild_helpers_path="${PORTAGE_BIN_PATH}/ebuild-helpers"
+			;;
+	esac
+
+	export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
+
 	if ! hasq $EBUILD_SH_ARGS clean depend help info nofetch ; then
 
 		if hasq distcc $FEATURES ; then