[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     696ac3204469b03291b6e2c051d685ee6d24f5c2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 08:10:22 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 29 08:10:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=696ac320

fowners: disable in Prefix

Make fowners return success and emit a warning for Prefix users, like
enewuser etc. do.

---
 bin/ebuild-helpers/fowners |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/bin/ebuild-helpers/fowners b/bin/ebuild-helpers/fowners
index b949164..0c5295b 100755
--- a/bin/ebuild-helpers/fowners
+++ b/bin/ebuild-helpers/fowners
@@ -4,6 +4,11 @@
 
 source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
+if hasq prefix ${USE} && [[ $EUID != 0 ]] ; then
+	ewarn "fowners ignored in Prefix with non-privileged user"
+	exit 0
+fi
+
 # we can't prefix all arguments because
 # chown takes random options
 slash="/"

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     58beaa6ce65c84bff14a02566e52493d8d4cfec1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 09:00:46 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 29 09:00:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=58beaa6c

prepall: don't operate on ${ED} when it doesn't exist

prepall* funcs operate exclusively on ${ED}, which needs not to exist
when nothing is installed, such as e.g. with virtuals.  Refraining from
operating when ${ED} does not exist avoids error messages from find that
${ED} does not exist, bug #368839

---
 bin/ebuild-helpers/prepall |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index bc3362e..f9164c1 100755
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -4,6 +4,8 @@
 
 source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
+[[ -d ${ED} ]] || exit 0
+
 if hasq chflags $FEATURES ; then
 	# Save all the file flags for restoration at the end of prepall.
 	mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree"

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     d066f01a88012838931b5a8483a5391bb876dc50
Author:     Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 18:51:16 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 18:51:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d066f01a

dodoc: fix installation in EAPI=4

Look in the offset with ED.

https://bugs.gentoo.org/show_bug.cgi?id=381125

---
 bin/ebuild-helpers/doins |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index b3a6a38..c91883b 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -70,8 +70,8 @@ _doins() {
 		# $PORTAGE_ACTUAL_DISTDIR/.
 		if [ $PRESERVE_SYMLINKS = y ] && \
 			! [[ $(readlink "$mysrc") == "$PORTAGE_ACTUAL_DISTDIR"/* ]] ; then
-			rm -rf "$D$INSDESTTREE/$mydir/${mysrc##*/}" || return $?
-			cp -P "$mysrc" "$D$INSDESTTREE/$mydir/${mysrc##*/}"
+			rm -rf "$ED$INSDESTTREE/$mydir/${mysrc##*/}" || return $?
+			cp -P "$mysrc" "$ED$INSDESTTREE/$mydir/${mysrc##*/}"
 			return $?
 		else
 			cp "$mysrc" "$TMP/2/${mysrc##*/}" || return $?

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     521d0f4a535c98867a8ed88f174cb2c74f57bb93
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 17:57:15 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 17:57:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=521d0f4a

save_elf_debug: take offset into account

For bug #392609, use ED in more places not to get out of prefix links.

---
 bin/ebuild-helpers/prepstrip |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 077656f..0305f0a 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -108,7 +108,7 @@ save_elf_debug() {
 
 	local inode=$(inode_var_name "$x")
 	if [[ -n ${!inode} ]] ; then
-		ln "${D}usr/lib/debug/${!inode:${#D}}.debug" "$y"
+		ln "${ED}usr/lib/debug/${!inode:${#D}}.debug" "$y"
 	else
 		eval $inode=\$x
 		if [[ -e ${T}/prepstrip.split.debug ]] ; then
@@ -129,7 +129,7 @@ save_elf_debug() {
 			| awk '$NF ~ /GNU/ { getline; printf $2$3$4$5; getline; print $2 }')
 	fi
 	if [[ -n ${buildid} ]] ; then
-		local buildid_dir="${D}usr/lib/debug/.build-id/${buildid:0:2}"
+		local buildid_dir="${ED}usr/lib/debug/.build-id/${buildid:0:2}"
 		local buildid_file="${buildid_dir}/${buildid:2}"
 		mkdir -p "${buildid_dir}"
 		ln -s "../../${x:${#D}}.debug" "${buildid_file}.debug"

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     6cabf0222e55f9d038c52a807d71d004c62cd56c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 09:22:50 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 09:22:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6cabf022

doins: don't set ED (rely on Prefix)

---
 bin/ebuild-helpers/doins |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 46796cb..0eafced 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -27,7 +27,9 @@ else
 	DOINSRECUR=n
 fi
 
-case "$EAPI" in 0|1|2) export ED="${D}" ;; esac
+# PREFIX LOCAL: always support ED
+#case "$EAPI" in 0|1|2) export ED="${D}" ;; esac
+# END PREFIX LOCAL
 
 if [[ ${INSDESTTREE#${ED}} != "${INSDESTTREE}" ]]; then
 	vecho "-------------------------------------------------------" 1>&2

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     aa7665d8f40398e6cb4e930a9fb2a7ca9c982ca1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 09:19:03 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 09:19:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aa7665d8

doenvd: use @PORTAGE_BASE@ iso /usr/lib/portage

---
 bin/ebuild-helpers/doenvd |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bin/ebuild-helpers/doenvd b/bin/ebuild-helpers/doenvd
index 561e67d..31c57d5 100755
--- a/bin/ebuild-helpers/doenvd
+++ b/bin/ebuild-helpers/doenvd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ $# -lt 1 ]] ; then
-	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+	source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     f81adbe69b1fb4e01bf1cd4470b143f098204fc7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 18:11:10 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:11:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f81adbe6

prepstrip: fix for Prefix, bug #395241

---
 bin/ebuild-helpers/prepstrip |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 84e2edc..137a415 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -263,10 +263,10 @@ if [[ -s ${T}/debug.sources ]] && \
    ${debugedit_found}
 then
 	vecho "installsources: rsyncing source files"
-	[[ -d ${ED}${prepstrip_sources_dir} ]] || mkdir -p "${ED}${prepstrip_sources_dir}"
+	[[ -d ${D}${prepstrip_sources_dir} ]] || mkdir -p "${D}${prepstrip_sources_dir}"
 	grep -zv '/<[^/>]*>$' "${T}"/debug.sources | \
 		(cd "${WORKDIR}"; LANG=C sort -z -u | \
-		rsync -tL0 --files-from=- "${WORKDIR}/" "${ED}${prepstrip_sources_dir}/" )
+		rsync -tL0 --files-from=- "${WORKDIR}/" "${D}${prepstrip_sources_dir}/" )
 
 	# Preserve directory structure.
 	# Needed after running save_elf_sources.
@@ -274,5 +274,5 @@ then
 	while read -r -d $'\0' emptydir
 	do
 		>> "$emptydir"/.keepdir
-	done < <(find "${ED}${prepstrip_sources_dir}/" -type d -empty -print0)
+	done < <(find "${D}${prepstrip_sources_dir}/" -type d -empty -print0)
 fi

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     5ae3d067f511d6af6c2bc97d6a2cd4092fd85cd1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 09:51:01 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 09:51:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5ae3d067

Use @PORTAGE_BASE@ iso hardcoded /usr/lib/portage

---
 bin/ebuild-helpers/doconfd   |    2 +-
 bin/ebuild-helpers/doinfo    |    2 +-
 bin/ebuild-helpers/doinitd   |    2 +-
 bin/ebuild-helpers/dolib     |    2 +-
 bin/ebuild-helpers/domo      |    2 +-
 bin/ebuild-helpers/newbin    |    2 +-
 bin/ebuild-helpers/newconfd  |    2 +-
 bin/ebuild-helpers/newdoc    |    2 +-
 bin/ebuild-helpers/newenvd   |    2 +-
 bin/ebuild-helpers/newexe    |    2 +-
 bin/ebuild-helpers/newinitd  |    2 +-
 bin/ebuild-helpers/newins    |    2 +-
 bin/ebuild-helpers/newlib.a  |    2 +-
 bin/ebuild-helpers/newlib.so |    2 +-
 bin/ebuild-helpers/newman    |    2 +-
 bin/ebuild-helpers/newsbin   |    2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bin/ebuild-helpers/doconfd b/bin/ebuild-helpers/doconfd
index 7fe8648..42f3e42 100755
--- a/bin/ebuild-helpers/doconfd
+++ b/bin/ebuild-helpers/doconfd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ $# -lt 1 ]] ; then
-	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+	source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi

diff --git a/bin/ebuild-helpers/doinfo b/bin/ebuild-helpers/doinfo
index 549c2cd..4597b2e 100755
--- a/bin/ebuild-helpers/doinfo
+++ b/bin/ebuild-helpers/doinfo
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z $1 ]] ; then
 	helpers_die "${0##*/}: at least one argument needed"

diff --git a/bin/ebuild-helpers/doinitd b/bin/ebuild-helpers/doinitd
index ff5255a..9eefa52 100755
--- a/bin/ebuild-helpers/doinitd
+++ b/bin/ebuild-helpers/doinitd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ $# -lt 1 ]] ; then
-	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+	source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 	helpers_die "${0##*/}: at least one argument needed"
 	exit 1
 fi

diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib
index 19caf15..2dadb79 100755
--- a/bin/ebuild-helpers/dolib
+++ b/bin/ebuild-helpers/dolib
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 [[ " ${FEATURES} " == *" force-prefix "* ]] || \
 	case "$EAPI" in 0|1|2) ED=${D} ;; esac

diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo
index aeff102..706279d 100755
--- a/bin/ebuild-helpers/domo
+++ b/bin/ebuild-helpers/domo
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 mynum=${#}
 if [ ${mynum} -lt 1 ] ; then

diff --git a/bin/ebuild-helpers/newbin b/bin/ebuild-helpers/newbin
index f3deef1..77b6dd5 100755
--- a/bin/ebuild-helpers/newbin
+++ b/bin/ebuild-helpers/newbin
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newconfd b/bin/ebuild-helpers/newconfd
index d9462f6..c1b614e 100755
--- a/bin/ebuild-helpers/newconfd
+++ b/bin/ebuild-helpers/newconfd
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newdoc b/bin/ebuild-helpers/newdoc
index d26aec9..7226280 100755
--- a/bin/ebuild-helpers/newdoc
+++ b/bin/ebuild-helpers/newdoc
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newenvd b/bin/ebuild-helpers/newenvd
index 0688425..559b694 100755
--- a/bin/ebuild-helpers/newenvd
+++ b/bin/ebuild-helpers/newenvd
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newexe b/bin/ebuild-helpers/newexe
index 334096c..103343d 100755
--- a/bin/ebuild-helpers/newexe
+++ b/bin/ebuild-helpers/newexe
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newinitd b/bin/ebuild-helpers/newinitd
index ad6d773..b023a63 100755
--- a/bin/ebuild-helpers/newinitd
+++ b/bin/ebuild-helpers/newinitd
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins
index 611f6d2..45c3e18 100755
--- a/bin/ebuild-helpers/newins
+++ b/bin/ebuild-helpers/newins
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newlib.a b/bin/ebuild-helpers/newlib.a
index 699c2c6..f7afa4c 100755
--- a/bin/ebuild-helpers/newlib.a
+++ b/bin/ebuild-helpers/newlib.a
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newlib.so b/bin/ebuild-helpers/newlib.so
index 7e6e7cd..d273be1 100755
--- a/bin/ebuild-helpers/newlib.so
+++ b/bin/ebuild-helpers/newlib.so
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newman b/bin/ebuild-helpers/newman
index dc4962e..4e3cf49 100755
--- a/bin/ebuild-helpers/newman
+++ b/bin/ebuild-helpers/newman
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

diff --git a/bin/ebuild-helpers/newsbin b/bin/ebuild-helpers/newsbin
index c02124b..7a98578 100755
--- a/bin/ebuild-helpers/newsbin
+++ b/bin/ebuild-helpers/newsbin
@@ -2,7 +2,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
 if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
 	helpers_die "${0##*/}: Need two arguments, old file and new file"

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     2f6b7c03b21d9513940ebc3b749cdd317c1ba214
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 26 14:46:15 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 26 14:46:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2f6b7c03

doins: fix breakage due to (no longer existing) vecho

doins in Prefix would always fail because vecho has been renamed to
__vecho some time ago.

---
 bin/ebuild-helpers/doins |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 1fdc1d9..cf0af16 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -43,10 +43,10 @@ if [[ ${INSDESTTREE#${ED}} != "${INSDESTTREE}" ]]; then
 fi
 # PREFIX LOCAL: check for usage with EPREFIX
 if [[ ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
-	vecho "-------------------------------------------------------" 1>&2
-	vecho "You should not use \${EPREFIX} with helpers." 1>&2
-	vecho "  --> ${INSDESTTREE}" 1>&2
-	vecho "-------------------------------------------------------" 1>&2
+	__vecho "-------------------------------------------------------" 1>&2
+	__vecho "You should not use \${EPREFIX} with helpers." 1>&2
+	__vecho "  --> ${INSDESTTREE}" 1>&2
+	__vecho "-------------------------------------------------------" 1>&2
 	exit 1
 fi
 # END PREFIX LOCAL

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     4ca1f5f714ab12d8e3cdff8a6570cf533d353749
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 20:14:04 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 20:14:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4ca1f5f7

dohtml: fix accidentially committed conflict, bug #472984

---
 bin/ebuild-helpers/dohtml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml
index e22062d..b31d45f 100755
--- a/bin/ebuild-helpers/dohtml
+++ b/bin/ebuild-helpers/dohtml
@@ -4,16 +4,11 @@
 
 source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 
-<<<<<<< HEAD
 PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}
 PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}
-=======
-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.
 export __PORTAGE_HELPER_CWD=${PWD}
 cd "${PORTAGE_PYM_PATH}"
->>>>>>> overlays-gentoo-org/master
 PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
 	"${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/dohtml.py" "$@"
 

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     ca3d811724b031efab9549fb900bfec4bb786a91
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 19:30:23 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 19:30:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ca3d8117

prepstrip: remove stray conflict marker

---
 bin/ebuild-helpers/prepstrip | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 35c84d5..8222492 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #!@PORTAGE_BASH@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     e98bcb964643ab772831856c6024216e2a43ab61
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 19:39:41 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 19:39:41 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e98bcb96

bin/ebuild-helpers/doins: ensure Prefix check only runs on Prefix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 bin/ebuild-helpers/doins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 8dbbe774a..c9c218396 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -51,7 +51,7 @@ if [[ ${_E_INSDESTTREE_#${ED}} != "${_E_INSDESTTREE_}" ]]; then
 	exit 1
 fi
 # PREFIX LOCAL: check for usage with EPREFIX
-if [[ ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
+if [[ -n ${EPREFIX} && ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
 	__vecho "-------------------------------------------------------" 1>&2
 	__vecho "You should not use \${EPREFIX} with helpers." 1>&2
 	__vecho "  --> ${INSDESTTREE}" 1>&2

[gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/

[Fabian Groffen]

commit:     1e33abbce732b549dca680682ec7b911d5cede3d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 15:03:27 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 15:03:27 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=1e33abbc

bin/ebuild-helpers/doins: fix D, ED, EPREFIX checks

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 bin/ebuild-helpers/doins | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index c9c218396..4315a038f 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -42,7 +42,8 @@ if ! ___eapi_has_prefix_variables; then
 	export ED="${D}"
 fi
 
-if [[ ${_E_INSDESTTREE_#${ED}} != "${_E_INSDESTTREE_}" ]]; then
+# PREFIX LOCAL: check D *AND* ED
+if [[ ${_E_INSDESTTREE_#${D}} != "${_E_INSDESTTREE_}" ]]; then
 	__vecho "-------------------------------------------------------" 1>&2
 	__vecho "You should not use \${D} or \${ED} with helpers." 1>&2
 	__vecho "  --> ${_E_INSDESTTREE_}" 1>&2
@@ -50,12 +51,15 @@ if [[ ${_E_INSDESTTREE_#${ED}} != "${_E_INSDESTTREE_}" ]]; then
 	__helpers_die "${helper} used with \${D} or \${ED}"
 	exit 1
 fi
-# PREFIX LOCAL: check for usage with EPREFIX
-if [[ -n ${EPREFIX} && ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
+# BEGIN PREFIX LOCAL: check for usage with EPREFIX
+if [[ -n ${EPREFIX} && \
+		${_E_INSDESTTREE_#${EPREFIX}} != "${_E_INSDESTTREE_}" ]];
+then
 	__vecho "-------------------------------------------------------" 1>&2
 	__vecho "You should not use \${EPREFIX} with helpers." 1>&2
-	__vecho "  --> ${INSDESTTREE}" 1>&2
+	__vecho "  --> ${_E_INSDESTTREE_}" 1>&2
 	__vecho "-------------------------------------------------------" 1>&2
+	__helpers_die "${helper} used with \${EPREFIX}"
 	exit 1
 fi
 # END PREFIX LOCAL