summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 07:22:35 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 07:22:35 +0000
commit66c6aaefeacfe90112c96ff8adc1b0970e3c5140 (patch)
tree405d8e9630d5ab22c3924a14ac3c38dce0209c72 /bin
parentExit unsuccessfully when in commit mode and nothing is found to commit. Thanks (diff)
downloadportage-multirepo-66c6aaefeacfe90112c96ff8adc1b0970e3c5140.tar.gz
portage-multirepo-66c6aaefeacfe90112c96ff8adc1b0970e3c5140.tar.bz2
portage-multirepo-66c6aaefeacfe90112c96ff8adc1b0970e3c5140.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. (trunk r13380) svn path=/main/branches/2.1.6/; revision=13532
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ebuild.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 6e5d483e..7fe8f564 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