Bug #277537 - Synchronize order of PATH elements with the order defined by

/etc/profile (promote paths under /usr to the front). Thanks to Michał Górny
<gentoo@mgorny.alt.pl>.

svn path=/main/trunk/; revision=13935

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3ee9be0a652d7c26b804fd2501e5de5ba3487961..0483046fa6ffec0a1bbd2e39c0f03b016a7ce401 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -22,7 +22,7 @@ ROOTPATH=${ROOTPATH##:}
 ROOTPATH=${ROOTPATH%%:}
 PREROOTPATH=${PREROOTPATH##:}
 PREROOTPATH=${PREROOTPATH%%:}
-PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH
+PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
 export PATH
 
 # These two functions wrap sourcing and calling respectively.  At present they
@@ -1891,7 +1891,7 @@ ebuild_main() {
                        ;;
        esac
 
-       PATH=$ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH
+       PATH=$ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
        unset ebuild_helpers_path
 
        if ! hasq $EBUILD_SH_ARGS clean depend help info nofetch ; then