commit: d84a12d49b7b1f28e48e8db22e519343c4518f50
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 07:12:21 2015 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 07:12:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d84a12d4
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
bin/ebuild-helpers/die | 2 +-
bin/ebuild-helpers/dobin | 2 +-
bin/ebuild-helpers/doconfd | 2 +-
bin/ebuild-helpers/dodir | 2 +-
bin/ebuild-helpers/dodoc | 2 +-
bin/ebuild-helpers/doenvd | 2 +-
bin/ebuild-helpers/doexe | 2 +-
bin/ebuild-helpers/dohard | 2 +-
bin/ebuild-helpers/doheader | 2 +-
bin/ebuild-helpers/dohtml | 6 ++----
bin/ebuild-helpers/doinfo | 2 +-
bin/ebuild-helpers/doinitd | 2 +-
bin/ebuild-helpers/doins | 2 +-
bin/ebuild-helpers/dolib | 2 +-
bin/ebuild-helpers/doman | 2 +-
bin/ebuild-helpers/domo | 2 +-
bin/ebuild-helpers/dosbin | 2 +-
bin/ebuild-helpers/dosed | 2 +-
bin/ebuild-helpers/dosym | 2 +-
bin/ebuild-helpers/ecompress | 2 +-
bin/ebuild-helpers/ecompressdir | 2 +-
bin/ebuild-helpers/elog | 2 +-
bin/ebuild-helpers/emake | 3 ++-
bin/ebuild-helpers/fowners | 3 +--
bin/ebuild-helpers/fperms | 2 +-
bin/ebuild-helpers/keepdir | 2 +-
bin/ebuild-helpers/newins | 2 +-
bin/ebuild-helpers/portageq | 4 +---
bin/ebuild-helpers/prepall | 2 +-
bin/ebuild-helpers/prepalldocs | 2 +-
bin/ebuild-helpers/prepallinfo | 2 +-
bin/ebuild-helpers/prepallman | 2 +-
bin/ebuild-helpers/prepallstrip | 2 +-
bin/ebuild-helpers/prepinfo | 2 +-
bin/ebuild-helpers/prepman | 2 +-
bin/ebuild-helpers/prepstrip | 2 +-
bin/ebuild-helpers/unprivileged/chown | 4 ++--
bin/ebuild-helpers/xattr/install | 2 --
bin/ebuild-ipc | 4 +---
bin/ebuild.sh | 3 ---
bin/helper-functions.sh | 2 +-
bin/isolated-functions.sh | 2 +-
bin/misc-functions.sh | 2 +-
man/repoman.1 | 4 ++--
pym/_emerge/main.py | 19 +++++++++++++------
45 files changed, 59 insertions(+), 63 deletions(-)
diff --cc bin/ebuild-helpers/dohtml
index bf1f0fe,860d4ab..fe2e97d
--- a/bin/ebuild-helpers/dohtml
+++ b/bin/ebuild-helpers/dohtml
@@@ -8,13 -8,11 +8,11 @@@ if ___eapi_has_dohtml_deprecated; the
eqawarn "'${0##*/}' is deprecated in EAPI '$EAPI'"
fi
- PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}
- PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}
# Use safe cwd, avoiding unsafe import for bug #469338.
export __PORTAGE_HELPER_CWD=${PWD}
- cd "${PORTAGE_PYM_PATH}"
+ cd "${PORTAGE_PYM_PATH}" || die
PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
- "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/dohtml.py" "$@"
+ "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}"
"$PORTAGE_BIN_PATH/dohtml.py" "$@"
ret=$?
# Restore cwd for display by __helpers_die
diff --cc bin/ebuild-helpers/emake
index 4b98aec,60718a2..cca9cb6
--- a/bin/ebuild-helpers/emake
+++ b/bin/ebuild-helpers/emake
@@@ -1,4 -1,5 +1,5 @@@
-#!/bin/bash
+#!@PORTAGE_BASH@
+ # Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
#
# emake: Run make and automatically pass along flags set in the env. We
support
@@@ -8,10 -9,10 +9,10 @@@
#
# With newer EAPIs, we also automatically fail the build if make itself fails.
- source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
+ source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
cmd=(
- ${MAKE:-make} ${MAKEOPTS} "$@" ${EXTRA_EMAKE}
+ ${MAKE:-make} SHELL="${BASH:-/bin/bash}" ${MAKEOPTS} "$@" ${EXTRA_EMAKE}
)
if [[ ${PORTAGE_QUIET} != 1 ]] ; then
diff --cc bin/ebuild-helpers/prepall
index 407392f,44643bb..94f49d2
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@@ -2,10 -2,8 +2,10 @@@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
- source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
+ source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
+[[ -d ${ED} ]] || exit 0
+
if ! ___eapi_has_prefix_variables; then
ED=${D}
fi
diff --cc bin/ebuild-ipc
index 176e6ed,e77b94b..739564d
--- a/bin/ebuild-ipc
+++ b/bin/ebuild-ipc
@@@ -2,9 -2,7 +2,7 @@@
# Copyright 2010-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
- PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
- PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
# Use safe cwd, avoiding unsafe import for bug #469338.
- cd "${PORTAGE_PYM_PATH}"
+ cd "${PORTAGE_PYM_PATH}" || exit 1
PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
- exec "${PORTAGE_PYTHON:-/usr/bin/python}"
"$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@"
+ exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}"
"$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@"
diff --cc bin/misc-functions.sh
index a8a07f4,9b79351..a1d4088
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
