bin/: bring back Prefix changes to new files

diff --git a/bin/bashrc-functions.sh b/bin/bashrc-functions.sh
index 4da55858192e73d0417d3d62852e6c1b03acd70b..8018ae9c8f14d3c3b2fe5056ebc5a2f97d694915 100644 (file)
--- a/bin/bashrc-functions.sh
+++ b/bin/bashrc-functions.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!@PREFIX_PORTAGE_BASH@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 portageq() {
        PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-       "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" "$@"
+       "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}/portageq" "$@"
 }
 
 register_die_hook() {

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 164b309e8381ed3af85b28d74d790674224a0b3b..77bba11e8fd8860f6b9b3a2ce5274b40a497e28a 100644 (file)
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PREFIX_PORTAGE_BASH@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -27,7 +27,8 @@ PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \
        PORTAGE_SAVED_READONLY_VARS PORTAGE_SIGPIPE_STATUS \
        PORTAGE_TMPDIR PORTAGE_UPDATE_ENV PORTAGE_USERNAME \
        PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR PORTDIR_OVERLAY \
-       PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR"
+       PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR \
+       ED EROOT"
 
 PORTAGE_SAVED_READONLY_VARS="A CATEGORY P PF PN PR PV PVR"
 
@@ -98,7 +99,9 @@ filter_readonly_variables() {
                0|1|2)
                        ;;
                *)
-                       filtered_vars+=" ED EPREFIX EROOT"
+                       # PREFIX LOCAL: always respect these
+                       #filtered_vars+=" ED EPREFIX EROOT"
+                       # PREFIX LOCAL
                        ;;
        esac
 
@@ -126,7 +129,7 @@ filter_readonly_variables() {
                "
        fi
 
-       "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
+       "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
 }
 
 # @FUNCTION: preprocess_ebuild_env
@@ -550,6 +553,7 @@ dyn_install() {
        fi
        echo "${USE}"       > USE
        echo "${EAPI:-0}"   > EAPI
+       echo "${EPREFIX}"   > EPREFIX
        set +f
 
        # local variables can leak into the saved environment.
@@ -632,6 +636,7 @@ dyn_help() {
                echo "production (stripped)"
        fi
        echo "  merge to    : ${ROOT}"
+       echo "  offset      : ${EPREFIX}"
        echo
        if [ -n "$USE" ]; then
                echo "Additionally, support for the following optional features will be enabled:"

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index a033fa8374186ee19fde288975e1528155197557..04cc291dedc9640dd9a5be1a3a7b44280c8571ba 100644 (file)
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PREFIX_PORTAGE_BASH@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -19,8 +19,8 @@ into() {
                export DESTTREE=""
        else
                export DESTTREE=$1
-               if [ ! -d "${D}${DESTTREE}" ]; then
-                       install -d "${D}${DESTTREE}"
+               if [ ! -d "${ED}${DESTTREE}" ]; then
+                       install -d "${ED}${DESTTREE}"
                        local ret=$?
                        if [[ $ret -ne 0 ]] ; then
                                helpers_die "${FUNCNAME[0]} failed"
@@ -35,8 +35,8 @@ insinto() {
                export INSDESTTREE=""
        else
                export INSDESTTREE=$1
-               if [ ! -d "${D}${INSDESTTREE}" ]; then
-                       install -d "${D}${INSDESTTREE}"
+               if [ ! -d "${ED}${INSDESTTREE}" ]; then
+                       install -d "${ED}${INSDESTTREE}"
                        local ret=$?
                        if [[ $ret -ne 0 ]] ; then
                                helpers_die "${FUNCNAME[0]} failed"
@@ -51,8 +51,8 @@ exeinto() {
                export _E_EXEDESTTREE_=""
        else
                export _E_EXEDESTTREE_="$1"
-               if [ ! -d "${D}${_E_EXEDESTTREE_}" ]; then
-                       install -d "${D}${_E_EXEDESTTREE_}"
+               if [ ! -d "${ED}${_E_EXEDESTTREE_}" ]; then
+                       install -d "${ED}${_E_EXEDESTTREE_}"
                        local ret=$?
                        if [[ $ret -ne 0 ]] ; then
                                helpers_die "${FUNCNAME[0]} failed"
@@ -67,8 +67,8 @@ docinto() {
                export _E_DOCDESTTREE_=""
        else
                export _E_DOCDESTTREE_="$1"
-               if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then
-                       install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
+               if [ ! -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then
+                       install -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
                        local ret=$?
                        if [[ $ret -ne 0 ]] ; then
                                helpers_die "${FUNCNAME[0]} failed"
@@ -135,7 +135,7 @@ keepdir() {
        local x
        if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then
                shift
-               find "$@" -type d -printf "${D}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \
+               find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \
                        | tr "\n" "\0" | \
                        while read -r -d $'\0' ; do
                                >> "$REPLY" || \
@@ -143,7 +143,7 @@ keepdir() {
                        done
        else
                for x in "$@"; do
-                       >> "${D}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
+                       >> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
                                die "Failed to create .keep in ${D}${x}"
                done
        fi
@@ -398,12 +398,12 @@ econf() {
                        sed -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" -i "$ECONF_SOURCE/configure" || \
                                die "Substition of shebang in '$ECONF_SOURCE/configure' failed"
                fi
-               if [ -e /usr/share/gnuconfig/ ]; then
+               if [ -e "${EPREFIX}"/usr/share/gnuconfig/ ]; then
                        find "${WORKDIR}" -type f '(' \
                        -name config.guess -o -name config.sub ')' -print0 | \
                        while read -r -d $'\0' x ; do
-                               vecho " * econf: updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/}"
-                               cp -f /usr/share/gnuconfig/"${x##*/}" "${x}"
+                               vecho " * econf: updating ${x/${WORKDIR}\/} with ${EPREFIX}/usr/share/gnuconfig/${x##*/}"
+                               cp -f "${EPREFIX}"/usr/share/gnuconfig/"${x##*/}" "${x}"
                        done
                fi
 
@@ -423,7 +423,7 @@ econf() {
                if [[ -n ${CONF_LIBDIR} ]] && ! _hasgq --libdir=\* "$@" ; then
                        export CONF_PREFIX=$(_hasg --exec-prefix=\* "$@")
                        [[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(_hasg --prefix=\* "$@")
-                       : ${CONF_PREFIX:=/usr}
+                       : ${CONF_PREFIX:=${EPREFIX}/usr}
                        CONF_PREFIX=${CONF_PREFIX#*=}
                        [[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}"
                        [[ ${CONF_LIBDIR} != /* ]] && CONF_LIBDIR="/${CONF_LIBDIR}"
@@ -431,15 +431,15 @@ econf() {
                fi
 
                set -- \
-                       --prefix=/usr \
+                       --prefix="${EPREFIX}"/usr \
                        ${CBUILD:+--build=${CBUILD}} \
                        --host=${CHOST} \
                        ${CTARGET:+--target=${CTARGET}} \
-                       --mandir=/usr/share/man \
-                       --infodir=/usr/share/info \
-                       --datadir=/usr/share \
-                       --sysconfdir=/etc \
-                       --localstatedir=/var/lib \
+                       --mandir="${EPREFIX}"/usr/share/man \
+                       --infodir="${EPREFIX}"/usr/share/info \
+                       --datadir="${EPREFIX}"/usr/share \
+                       --sysconfdir="${EPREFIX}"/etc \
+                       --localstatedir="${EPREFIX}"/var/lib \
                        "$@" \
                        ${EXTRA_ECONF}
                vecho "${ECONF_SOURCE}/configure" "$@"
@@ -477,22 +477,22 @@ einstall() {
 
        if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
                if [ "${PORTAGE_DEBUG}" == "1" ]; then
-                       ${MAKE:-make} -n prefix="${D}usr" \
-                               datadir="${D}usr/share" \
-                               infodir="${D}usr/share/info" \
-                               localstatedir="${D}var/lib" \
-                               mandir="${D}usr/share/man" \
-                               sysconfdir="${D}etc" \
+                       ${MAKE:-make} -n prefix="${ED}usr" \
+                               datadir="${ED}usr/share" \
+                               infodir="${ED}usr/share/info" \
+                               localstatedir="${ED}var/lib" \
+                               mandir="${ED}usr/share/man" \
+                               sysconfdir="${ED}etc" \
                                ${LOCAL_EXTRA_EINSTALL} \
                                ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \
                                "$@" install
                fi
-               ${MAKE:-make} prefix="${D}usr" \
-                       datadir="${D}usr/share" \
-                       infodir="${D}usr/share/info" \
-                       localstatedir="${D}var/lib" \
-                       mandir="${D}usr/share/man" \
-                       sysconfdir="${D}etc" \
+               ${MAKE:-make} prefix="${ED}usr" \
+                       datadir="${ED}usr/share" \
+                       infodir="${ED}usr/share/info" \
+                       localstatedir="${ED}var/lib" \
+                       mandir="${ED}usr/share/man" \
+                       sysconfdir="${ED}etc" \
                        ${LOCAL_EXTRA_EINSTALL} \
                        ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \
                        "$@" install || die "einstall failed"
@@ -589,7 +589,7 @@ has_version() {
                "$PORTAGE_BIN_PATH"/ebuild-ipc has_version "$ROOT" "$1"
        else
                PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-               "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" has_version "${ROOT}" "$1"
+               "${PORTAGE_PYTHON:-@PORTAGE_PREFIX_PYTHON@}" "${PORTAGE_BIN_PATH}/portageq" has_version "${ROOT}" "$1"
        fi
        local retval=$?
        case "${retval}" in
@@ -610,7 +610,7 @@ best_version() {
                "$PORTAGE_BIN_PATH"/ebuild-ipc best_version "$ROOT" "$1"
        else
                PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-               "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" best_version "${ROOT}" "$1"
+               "${PORTAGE_PYTHON:-@PORTAGE_PREFIX_PYTHON@}" "${PORTAGE_BIN_PATH}/portageq" best_version "${ROOT}" "$1"
        fi
        local retval=$?
        case "${retval}" in

diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index a84a1258b40e70112f5ccb228604de97c2dda896..935adc460b49ce29e90c1939f722d22d91693cbb 100644 (file)
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_PREFIX_BASH@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -88,6 +88,9 @@ save_ebuild_env() {
        # user config variables
        unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK
 
+       # Prefix additions
+       unset BPREFIX DEFAULT_PATH EPREFIX EXTRA_PATH PORTAGE_GROUP PORTAGE_USER
+
        declare -p
        declare -fp
        if [[ ${BASH_VERSINFO[0]} == 3 ]]; then