Apparently the combination of SVN and me messed up some changes that

should have been properly propagated.

svn path=/main/branches/prefix/; revision=6391

diff --git a/bin/doexe b/bin/doexe
index 2bd8406148a69d02e16d42d1c5cd173f17d67a9d..16916e21398b5bcdd1784aa9f7726530e75c1d47 100755 (executable)
--- a/bin/doexe
+++ b/bin/doexe
@@ -1,23 +1,25 @@
 #!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # 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 $
+# $Id: $
+
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2
        exit 1
 fi
 
-if [[ ! -d ${ED}${EXEDESTTREE} ]] ; then
+if [[ ! -d ${ED}${_E_EXEDESTTREE_} ]] ; then
        install -d "${ED}${_E_EXEDESTTREE_}"
 fi
 
 for x in "$@" ; do
        if [ -L "${x}" ] ; then
                cp "${x}" "${T}"
-               mysrc="${T}"/`basename "${x}"`
+               mysrc="${T}"/$(basename "${x}")
        elif [ -d "${x}" ] ; then
-               echo "doexe: warning, skipping directory ${x}"
+               vecho "doexe: warning, skipping directory ${x}"
                continue
        else
                mysrc="${x}"

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index cc19d62c40c9a26c09a87e672ea32caf34acee6c..b00ccd5551ea63ef8259946ebcea59bba06f3598 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -767,7 +767,7 @@ exeinto() {
        if [ "$1" == "/" ]; then
                export _E_EXEDESTTREE_=""
        else
-               export EXEDESTTREE="$1"
+               export _E_EXEDESTTREE_="$1"
                if [ ! -d "${ED}${_E_EXEDESTTREE_}" ]; then
                        install -d "${ED}${_E_EXEDESTTREE_}"
                fi
@@ -778,7 +778,7 @@ docinto() {
        if [ "$1" == "/" ]; then
                export _E_DOCDESTTREE_=""
        else
-               export DOCDESTTREE="$1"
+               export _E_DOCDESTTREE_="$1"
                if [ ! -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then
                        install -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
                fi

diff --git a/bin/newexe b/bin/newexe
index aef2d81450047061de64318cc86c21ed20f0b1cd..5bb535f5eaadd2e367869af7f1f69dedd08afc25 100755 (executable)
--- a/bin/newexe
+++ b/bin/newexe
@@ -1,7 +1,7 @@
 #!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: $
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
        echo "$0: Need two arguments, old file and new file" 1>&2