From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/
Date: Fri, 23 Dec 2011 09:51:21 +0000 (UTC) [thread overview]
Message-ID: <5ae3d067f511d6af6c2bc97d6a2cd4092fd85cd1.grobian@gentoo> (raw)
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"
next reply other threads:[~2011-12-23 9:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-23 9:51 Fabian Groffen [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-25 15:04 [gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/ Fabian Groffen
2022-07-24 19:40 Fabian Groffen
2013-08-12 19:31 Fabian Groffen
2013-06-11 20:14 Fabian Groffen
2012-12-26 14:48 Fabian Groffen
2011-12-19 18:11 Fabian Groffen
2011-12-04 9:23 Fabian Groffen
2011-12-04 9:23 Fabian Groffen
2011-12-02 17:58 Fabian Groffen
2011-08-30 18:52 Fabian Groffen
2011-05-29 9:03 Fabian Groffen
2011-05-29 8:12 Fabian Groffen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5ae3d067f511d6af6c2bc97d6a2cd4092fd85cd1.grobian@gentoo \
--to=grobian@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox