replace hardcoded /usr/lib/portage/bin with PORTAGE_BIN_PATH, defaulting to the hardc...

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

diff --git a/bin/doexe b/bin/doexe
index 257bfea8e115b19649a332d044fd47a0c6957d01..818c8a5b30fca4783948e21e84cafb3911b90a4c 100755 (executable)
--- a/bin/doexe
+++ b/bin/doexe
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2

diff --git a/bin/doins b/bin/doins
index aab6e991637ef99ebb3cc8cc6fed3a09a829abcb..f35cbc63a5976cf611c86e53381be27fd5851c9b 100755 (executable)
--- a/bin/doins
+++ b/bin/doins
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/doins,v 1.7.2.2 2004/12/17 22:25:13 carpaski Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [ $# -lt 1 ] ; then
        echo "${0}: at least one argument needed"

diff --git a/bin/doman b/bin/doman
index a04339d524ea0dd2fbbb07b88e6594298a554530..2ed65ffc7b3f2a92af695edf449dd761ae4ed1e0 100755 (executable)
--- a/bin/doman
+++ b/bin/doman
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/doman,v 1.13.2.2 2005/07/29 05:55:34 vapier Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2

diff --git a/bin/prepall b/bin/prepall
index 74570e6e24240edc3ee535ed2244a9b70f03197b..4772574a77e212465df7be31d8f4ded4a792d01e 100755 (executable)
--- a/bin/prepall
+++ b/bin/prepall
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: prepall 2230 2005-11-01 01:35:59Z vapier $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 prepallman
 prepallinfo

diff --git a/bin/prepalldocs b/bin/prepalldocs
index a2c4e76e5739a9e9d970858af6f8312168ec7aae..d8b8b747328bd2e6e0b64ef66b74d7c92843f271 100755 (executable)
--- a/bin/prepalldocs
+++ b/bin/prepalldocs
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepalldocs,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 z="$(find "${D}"usr/share/doc \( -type f -or -type l \) -not -name "*.gz" -not -name "*.js" 2>/dev/null)"
 

diff --git a/bin/prepallinfo b/bin/prepallinfo
index 268d090df29ccb8ce52b59c1d5541eb7b6414ffa..205316ab1ded4a2ffe8fb3fedfcd8ae983bfef93 100755 (executable)
--- a/bin/prepallinfo
+++ b/bin/prepallinfo
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepallinfo,v 1.6 2004/10/04 13:56:50 vapier Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 [[ ! -d ${D}usr/share/info ]] && exit 0
 

diff --git a/bin/prepallman b/bin/prepallman
index 582f4003f0dd44885bdcf6692f05f9b7cf8b0391..85a7277d32791904ccc465f8091d24b8047a9147 100755 (executable)
--- a/bin/prepallman
+++ b/bin/prepallman
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepallman,v 1.10 2004/10/04 13:56:50 vapier Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 ret=0
 

diff --git a/bin/prepinfo b/bin/prepinfo
index 5863ffd3f780eb2ee32b9e4314513df5afee66c7..dac4b6accc0961f51ae39f033beab96d9b98a74d 100755 (executable)
--- a/bin/prepinfo
+++ b/bin/prepinfo
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.6.2.1 2005/05/29 12:40:08 jstubbs Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [ -z "$1" ] ; then
        z="${D}usr/share/info"

diff --git a/bin/preplib b/bin/preplib
index b42fb9baeb3408f5918e89f01796c50cf901beae..ab784d2c5e6bbe82dcbceec8091e3c67ef686ca5 100755 (executable)
--- a/bin/preplib
+++ b/bin/preplib
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/preplib,v 1.7.2.1 2005/01/02 09:36:02 jstubbs Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 vecho "QA Notice: Please stop using me, fix your package instead" 1>&2
 

diff --git a/bin/prepman b/bin/prepman
index ba70a4b8a26ffb8a1701de574f86375c184afe45..9e5e41984698018cb7913ad380783cb893c81b49 100755 (executable)
--- a/bin/prepman
+++ b/bin/prepman
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepman,v 1.10.2.3 2005/05/29 12:40:08 jstubbs Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ -z $1 ]] ; then 
        z="${D}usr/share/man"

diff --git a/bin/prepstrip b/bin/prepstrip
index 44b6b519e5d74d5eae4e577ca1dcc7bd0be4b9bf..cd28ec1116af3b6e911db551880334ab09deeb09 100755 (executable)
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.23.2.3 2005/08/15 02:58:20 vapier Exp $
 
-source /usr/lib/portage/bin/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ " ${FEATURES} " == *" nostrip "* ]] || \
    [[ " ${RESTRICT} " == *" nostrip "* ]] || \