Use @PORTAGE_BASE@ iso hardcoded /usr/lib/portage

diff --git a/bin/ebuild-helpers/doconfd b/bin/ebuild-helpers/doconfd
index 7fe864822af3766dc9779d2d90f19733fcdf6df8..42f3e429f422f5f10e39f48c8e6d2ba8acf90337 100755 (executable)
--- a/bin/ebuild-helpers/doconfd
+++ b/bin/ebuild-helpers/doconfd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ $# -lt 1 ]] ; then
-       source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+       source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
        helpers_die "${0##*/}: at least one argument needed"
        exit 1
 fi

diff --git a/bin/ebuild-helpers/doinfo b/bin/ebuild-helpers/doinfo
index 549c2cd5d1c3f7ff5badd5984a67dd5b59437b10..4597b2ef01c64a6054d4c25a246e4117700aae5e 100755 (executable)
--- a/bin/ebuild-helpers/doinfo
+++ b/bin/ebuild-helpers/doinfo
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z $1 ]] ; then
        helpers_die "${0##*/}: at least one argument needed"

diff --git a/bin/ebuild-helpers/doinitd b/bin/ebuild-helpers/doinitd
index ff5255aa25ba4b9cfc02ef10478b305951cb0279..9eefa52094f2dc67f5ebc9351bdb2b563c76e2a4 100755 (executable)
--- a/bin/ebuild-helpers/doinitd
+++ b/bin/ebuild-helpers/doinitd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ $# -lt 1 ]] ; then
-       source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+       source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
        helpers_die "${0##*/}: at least one argument needed"
        exit 1
 fi

diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib
index 19caf15c6164ec780c07124715804705a43f655c..2dadb79315da779516ca7b368895eb0548cf1d29 100755 (executable)
--- a/bin/ebuild-helpers/dolib
+++ b/bin/ebuild-helpers/dolib
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 [[ " ${FEATURES} " == *" force-prefix "* ]] || \
        case "$EAPI" in 0|1|2) ED=${D} ;; esac

diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo
index aeff10293de626edeb14d519e7562bcbc23d44b8..706279db5f5f6bbfffc5f1493674f852fad4a4a8 100755 (executable)
--- a/bin/ebuild-helpers/domo
+++ b/bin/ebuild-helpers/domo
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 mynum=${#}
 if [ ${mynum} -lt 1 ] ; then

diff --git a/bin/ebuild-helpers/newbin b/bin/ebuild-helpers/newbin
index f3deef11e85dec50a93af430720321806fa70d87..77b6dd5020f8dd30d2dc6d62e8d7c6612921fe02 100755 (executable)
--- a/bin/ebuild-helpers/newbin
+++ b/bin/ebuild-helpers/newbin
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newconfd b/bin/ebuild-helpers/newconfd
index d9462f64b62e04d8d915ea424dc457265b9e21a1..c1b614e2ee757b2ce550e40d63b644e518f4bcbb 100755 (executable)
--- a/bin/ebuild-helpers/newconfd
+++ b/bin/ebuild-helpers/newconfd
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newdoc b/bin/ebuild-helpers/newdoc
index d26aec97535355a7088240fb3669474a004c5868..7226280a8ac25970256bd7834eddba3fa0aa63b1 100755 (executable)
--- a/bin/ebuild-helpers/newdoc
+++ b/bin/ebuild-helpers/newdoc
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newenvd b/bin/ebuild-helpers/newenvd
index 06884252402f50fda1f6dd8112074972c8868f06..559b6940bcaf02cc4630de7c1495dc390579efc7 100755 (executable)
--- a/bin/ebuild-helpers/newenvd
+++ b/bin/ebuild-helpers/newenvd
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newexe b/bin/ebuild-helpers/newexe
index 334096c5af1c7e8d581b8442bc53c92ca6169c8d..103343d47caa30c9a22cb753627481dc89808c2c 100755 (executable)
--- a/bin/ebuild-helpers/newexe
+++ b/bin/ebuild-helpers/newexe
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newinitd b/bin/ebuild-helpers/newinitd
index ad6d773c6df6b8e071de4386f29cb3628801a7ff..b023a63b663fc1404dcd95d1fe1084420ec32b67 100755 (executable)
--- a/bin/ebuild-helpers/newinitd
+++ b/bin/ebuild-helpers/newinitd
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins
index 611f6d2437566b1996001a08ffcfa7c67750c772..45c3e1871b26ea535331fd84d94111e20b606390 100755 (executable)
--- a/bin/ebuild-helpers/newins
+++ b/bin/ebuild-helpers/newins
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newlib.a b/bin/ebuild-helpers/newlib.a
index 699c2c68fc7a9f6286c8986e3f50718ad3d8eb23..f7afa4c0babca6fbe81e31170b34a77622c67826 100755 (executable)
--- a/bin/ebuild-helpers/newlib.a
+++ b/bin/ebuild-helpers/newlib.a
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newlib.so b/bin/ebuild-helpers/newlib.so
index 7e6e7cd25d7a23bd06183c3f4f615a23baabfb97..d273be107986150ca0039c39e2d9e26b16a27560 100755 (executable)
--- a/bin/ebuild-helpers/newlib.so
+++ b/bin/ebuild-helpers/newlib.so
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newman b/bin/ebuild-helpers/newman
index dc4962eca0d4333e1e545fe36a15a0dbd3efa67f..4e3cf496cc56bee592f0168278c17ec356cea082 100755 (executable)
--- a/bin/ebuild-helpers/newman
+++ b/bin/ebuild-helpers/newman
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newsbin b/bin/ebuild-helpers/newsbin
index c02124b35568653b66d00ad468621ba727c9dadc..7a9857887bb1a15410b15501c193bfc576839741 100755 (executable)
--- a/bin/ebuild-helpers/newsbin
+++ b/bin/ebuild-helpers/newsbin
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        helpers_die "${0##*/}: Need two arguments, old file and new file"