From 5ae3d067f511d6af6c2bc97d6a2cd4092fd85cd1 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 23 Dec 2011 10:51:01 +0100 Subject: [PATCH] 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 7fe864822..42f3e429f 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 549c2cd5d..4597b2ef0 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 ff5255aa2..9eefa5209 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 19caf15c6..2dadb7931 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 aeff10293..706279db5 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 f3deef11e..77b6dd502 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 d9462f64b..c1b614e2e 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 d26aec975..7226280a8 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 068842524..559b6940b 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 334096c5a..103343d47 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 ad6d773c6..b023a63b6 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 611f6d243..45c3e1871 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 699c2c68f..f7afa4c0b 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 7e6e7cd25..d273be107 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 dc4962eca..4e3cf496c 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 c02124b35..7a9857887 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" -- 2.26.2