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 6e5d483e3a3b7d43927580d01f22d3451758cba6..7fe8f56494f422cd425e34ceaefddd20c1cce813 100755 (executable)
--- 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