From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 20 May 2008 14:20:45 +0000 (-0000)
Subject: When using vecho or eqawarn it comes in handy when isolated-functions have been sourc... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=529d37c9336a74bc7e801eaa1f461e5028d9fb19;p=portage.git

When using vecho or eqawarn it comes in handy when isolated-functions have been sourced.  IMO trunk misses these includes as well.

svn path=/main/branches/prefix/; revision=10380
---

diff --git a/bin/prepalldocs b/bin/prepalldocs
index abf352a81..4da754b92 100755
--- a/bin/prepalldocs
+++ b/bin/prepalldocs
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
+
 if [[ -n $1 ]] ; then
 	vecho "${0##*/}: invalid usage; takes no arguments" 1>&2
 fi
diff --git a/bin/prepinfo b/bin/prepinfo
index df7a0ccfc..cfb8fc799 100755
--- a/bin/prepinfo
+++ b/bin/prepinfo
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
+
 if [[ -z $1 ]] ; then
 	infodir="${EPREFIX}/usr/share/info"
 else
diff --git a/bin/preplib b/bin/preplib
index ede9576e4..3c6e3b0b5 100755
--- a/bin/preplib
+++ b/bin/preplib
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 eqawarn "QA Notice: Deprecated call to 'preplib'"
 
diff --git a/bin/prepman b/bin/prepman
index 2ffa527e8..59abffe6c 100755
--- a/bin/prepman
+++ b/bin/prepman
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
+
 if [[ -z $1 ]] ; then 
 	mandir="${ED}usr/share/man"
 else
diff --git a/bin/prepstrip b/bin/prepstrip
index e89f67f26..5b7a865db 100755
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 banner=false
 SKIP_STRIP=false