summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-21 07:08:44 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-21 07:08:44 +0000
commitfb538535551e3018d55fb9fde68518fc6a880842 (patch)
tree43dbe0bfca10eb2ea83cfba14600b636045ecf34
parent0c4d85c13dae7e8f83c10fa0ebfc51bfb48d0782 (diff)
downloadportage-fb538535551e3018d55fb9fde68518fc6a880842.tar.gz
portage-fb538535551e3018d55fb9fde68518fc6a880842.tar.bz2
portage-fb538535551e3018d55fb9fde68518fc6a880842.zip
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
-rwxr-xr-xbin/ebuild.sh13
1 files changed, 13 insertions, 0 deletions
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