- consistently use @PORTAGE_BASE@ instead of path

- fix for Prefix by not calling /bin/bash
- fix for Prefix by not defaulting to non-Prefixed paths
- fix second export PATH for Prefix, make note on difference with trunk

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

diff --git a/bin/banned-helper b/bin/banned-helper
index aa962a1f6fbc494c43f20d5c5325991cf896a243..80faa1b9eefe6b910a7100992646ca77438c725d 100755 (executable)
--- a/bin/banned-helper
+++ b/bin/banned-helper
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/bin/ebuild-helpers/3/dodoc b/bin/ebuild-helpers/3/dodoc
index 4e7c934abeb478f208a951053b4c0628f24fe5cd..66d9a4367a6451087577c46bbc9264230cbd242d 100755 (executable)
--- a/bin/ebuild-helpers/3/dodoc
+++ b/bin/ebuild-helpers/3/dodoc
@@ -1,16 +1,16 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [ $# -lt 1 ] ; then
        vecho "${0##*/}: at least one argument needed" 1>&2
        exit 1
 fi
 
-dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
+dir="${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
 if [ ! -d "${dir}" ] ; then
        install -d "${dir}"
 fi

diff --git a/bin/ebuild-helpers/die b/bin/ebuild-helpers/die
index e871bd9fec75491db99cc181f90a890437d276e2..51d2ef1a2b7a3d0a70071b96c74c940419578f52 100755 (executable)
--- a/bin/ebuild-helpers/die
+++ b/bin/ebuild-helpers/die
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_BASH@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -7,6 +7,6 @@
 # IPC to guarantee that the ebuild process and all of its children (including
 # this helper) are killed immediately, ensuring that "false success" is
 # impossible.
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 die "$@"
 exit 1

diff --git a/bin/ebuild-helpers/dobin b/bin/ebuild-helpers/dobin
index 7d0455e08fd0584015b7b449d3751a3e82b9f71b..54b0e1a6260cec06853f1beccacd436e861617c2 100755 (executable)
--- a/bin/ebuild-helpers/dobin
+++ b/bin/ebuild-helpers/dobin
@@ -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
 
 if [[ $# -lt 1 ]] ; then
        vecho "$0: at least one argument needed" 1>&2

diff --git a/bin/ebuild-helpers/dodoc b/bin/ebuild-helpers/dodoc
index 8314e1ba1ac3e2b14d8476a4d6a7aa5265984a3a..0aff8a75f5ed2ebc803af0d188f1d5638e9e9960 100755 (executable)
--- a/bin/ebuild-helpers/dodoc
+++ b/bin/ebuild-helpers/dodoc
@@ -4,7 +4,7 @@
 # $Id$
 
 if [ $# -lt 1 ] ; then
-       source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
+       source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
        vecho "${0##*/}: at least one argument needed" 1>&2
        exit 1  
 fi

diff --git a/bin/ebuild-helpers/doexe b/bin/ebuild-helpers/doexe
index 86f145720d1c6ce2cf233c3791d5da704b1beeae..a99653dd10dc8c017fd13d1a0d455e366efb0ffd 100755 (executable)
--- a/bin/ebuild-helpers/doexe
+++ b/bin/ebuild-helpers/doexe
@@ -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
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 48040bdc9c1f4517fffe3f4d4b2df0a52d6462a7..ae91ff5ae55dc246ecab5bed8daab1bb4c10285a 100755 (executable)
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -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
 
 if [ $# -lt 1 ] ; then
        echo "${0##*/}: at least one argument needed" 1>&2

diff --git a/bin/ebuild-helpers/doman b/bin/ebuild-helpers/doman
index dfe1f762c72858d14b743cbbdc99e8732a041eb0..a682199159d87723f8089bb9133c4054a588e6fe 100755 (executable)
--- a/bin/ebuild-helpers/doman
+++ b/bin/ebuild-helpers/doman
@@ -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
 
 if [[ $# -lt 1 ]] ; then
        echo "$0: at least one argument needed" 1>&2

diff --git a/bin/ebuild-helpers/ecompress b/bin/ebuild-helpers/ecompress
index 7158bb9c09aa6553b85b0441518e9a8a2824cd1d..4b269d5011533e217a6915c72e4ec8ad8c9cc588 100755 (executable)
--- a/bin/ebuild-helpers/ecompress
+++ b/bin/ebuild-helpers/ecompress
@@ -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
 
 if [[ -z $1 ]] ; then
        vecho "${0##*/}: at least one argument needed" 1>&2

diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 35534c996a8413ec301796ed69de015bdda2b023..273de957fe160cdf764fde92c75a2f2dea3a5779 100755 (executable)
--- a/bin/ebuild-helpers/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
@@ -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
 
 if [[ -z $1 ]] ; then
        vecho "${0##*/}: at least one argument needed" 1>&2

diff --git a/bin/ebuild-helpers/elog b/bin/ebuild-helpers/elog
index 2e2674b521a53ffa0464566d345e3f4510e70b80..628861579655ca727d7b8613516135a3cf271817 100755 (executable)
--- a/bin/ebuild-helpers/elog
+++ b/bin/ebuild-helpers/elog
@@ -3,6 +3,6 @@
 # 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
 
 ${0##*/} "$@"

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index cee668e06af0b099d5db164eb7e0fe0970d76944..b872b5e5aabe8067cf87b075c57fec54d710186b 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -71,6 +71,8 @@ unalias -a
 # Unset some variables that break things.
 unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE
 
+#export PATH="/usr/local/sbin:/sbin:/usr/sbin:$PORTAGE_BIN_PATH/ebuild-helpers:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
+# PREFIX: we deviate in path order, should we split up DEFAULT_PATH?
 export PATH="${DEFAULT_PATH}:$PORTAGE_BIN_PATH/ebuild-helpers:${ROOTPATH}"
 [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
 
@@ -1923,7 +1925,9 @@ ebuild_main() {
                        ;;
        esac
 
-       export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
+       #export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
+       # PREFIX: same deviation as at the top of this file
+       export PATH="${DEFAULT_PATH}:${ebuild_helpers_path}:${ROOTPATH}"
        [[ -n $PREROOTPATH ]] && export PATH="${PREROOTPATH%%:}:$PATH"
        unset ebuild_helpers_path