| 1 |
commit: 5ae3d067f511d6af6c2bc97d6a2cd4092fd85cd1 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 23 09:51:01 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 23 09:51:01 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5ae3d067 |
| 7 |
|
| 8 |
Use @PORTAGE_BASE@ iso hardcoded /usr/lib/portage |
| 9 |
|
| 10 |
--- |
| 11 |
bin/ebuild-helpers/doconfd | 2 +- |
| 12 |
bin/ebuild-helpers/doinfo | 2 +- |
| 13 |
bin/ebuild-helpers/doinitd | 2 +- |
| 14 |
bin/ebuild-helpers/dolib | 2 +- |
| 15 |
bin/ebuild-helpers/domo | 2 +- |
| 16 |
bin/ebuild-helpers/newbin | 2 +- |
| 17 |
bin/ebuild-helpers/newconfd | 2 +- |
| 18 |
bin/ebuild-helpers/newdoc | 2 +- |
| 19 |
bin/ebuild-helpers/newenvd | 2 +- |
| 20 |
bin/ebuild-helpers/newexe | 2 +- |
| 21 |
bin/ebuild-helpers/newinitd | 2 +- |
| 22 |
bin/ebuild-helpers/newins | 2 +- |
| 23 |
bin/ebuild-helpers/newlib.a | 2 +- |
| 24 |
bin/ebuild-helpers/newlib.so | 2 +- |
| 25 |
bin/ebuild-helpers/newman | 2 +- |
| 26 |
bin/ebuild-helpers/newsbin | 2 +- |
| 27 |
16 files changed, 16 insertions(+), 16 deletions(-) |
| 28 |
|
| 29 |
diff --git a/bin/ebuild-helpers/doconfd b/bin/ebuild-helpers/doconfd |
| 30 |
index 7fe8648..42f3e42 100755 |
| 31 |
--- a/bin/ebuild-helpers/doconfd |
| 32 |
+++ b/bin/ebuild-helpers/doconfd |
| 33 |
@@ -3,7 +3,7 @@ |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
if [[ $# -lt 1 ]] ; then |
| 37 |
- source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 38 |
+ source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 39 |
helpers_die "${0##*/}: at least one argument needed" |
| 40 |
exit 1 |
| 41 |
fi |
| 42 |
|
| 43 |
diff --git a/bin/ebuild-helpers/doinfo b/bin/ebuild-helpers/doinfo |
| 44 |
index 549c2cd..4597b2e 100755 |
| 45 |
--- a/bin/ebuild-helpers/doinfo |
| 46 |
+++ b/bin/ebuild-helpers/doinfo |
| 47 |
@@ -2,7 +2,7 @@ |
| 48 |
# Copyright 1999-2011 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
|
| 51 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 52 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 53 |
|
| 54 |
if [[ -z $1 ]] ; then |
| 55 |
helpers_die "${0##*/}: at least one argument needed" |
| 56 |
|
| 57 |
diff --git a/bin/ebuild-helpers/doinitd b/bin/ebuild-helpers/doinitd |
| 58 |
index ff5255a..9eefa52 100755 |
| 59 |
--- a/bin/ebuild-helpers/doinitd |
| 60 |
+++ b/bin/ebuild-helpers/doinitd |
| 61 |
@@ -3,7 +3,7 @@ |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
if [[ $# -lt 1 ]] ; then |
| 65 |
- source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 66 |
+ source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 67 |
helpers_die "${0##*/}: at least one argument needed" |
| 68 |
exit 1 |
| 69 |
fi |
| 70 |
|
| 71 |
diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib |
| 72 |
index 19caf15..2dadb79 100755 |
| 73 |
--- a/bin/ebuild-helpers/dolib |
| 74 |
+++ b/bin/ebuild-helpers/dolib |
| 75 |
@@ -2,7 +2,7 @@ |
| 76 |
# Copyright 1999-2011 Gentoo Foundation |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 80 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 81 |
|
| 82 |
[[ " ${FEATURES} " == *" force-prefix "* ]] || \ |
| 83 |
case "$EAPI" in 0|1|2) ED=${D} ;; esac |
| 84 |
|
| 85 |
diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo |
| 86 |
index aeff102..706279d 100755 |
| 87 |
--- a/bin/ebuild-helpers/domo |
| 88 |
+++ b/bin/ebuild-helpers/domo |
| 89 |
@@ -2,7 +2,7 @@ |
| 90 |
# Copyright 1999-2011 Gentoo Foundation |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 94 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 95 |
|
| 96 |
mynum=${#} |
| 97 |
if [ ${mynum} -lt 1 ] ; then |
| 98 |
|
| 99 |
diff --git a/bin/ebuild-helpers/newbin b/bin/ebuild-helpers/newbin |
| 100 |
index f3deef1..77b6dd5 100755 |
| 101 |
--- a/bin/ebuild-helpers/newbin |
| 102 |
+++ b/bin/ebuild-helpers/newbin |
| 103 |
@@ -2,7 +2,7 @@ |
| 104 |
# Copyright 1999-2011 Gentoo Foundation |
| 105 |
# Distributed under the terms of the GNU General Public License v2 |
| 106 |
|
| 107 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 108 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 109 |
|
| 110 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 111 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 112 |
|
| 113 |
diff --git a/bin/ebuild-helpers/newconfd b/bin/ebuild-helpers/newconfd |
| 114 |
index d9462f6..c1b614e 100755 |
| 115 |
--- a/bin/ebuild-helpers/newconfd |
| 116 |
+++ b/bin/ebuild-helpers/newconfd |
| 117 |
@@ -2,7 +2,7 @@ |
| 118 |
# Copyright 1999-2011 Gentoo Foundation |
| 119 |
# Distributed under the terms of the GNU General Public License v2 |
| 120 |
|
| 121 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 122 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 123 |
|
| 124 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 125 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 126 |
|
| 127 |
diff --git a/bin/ebuild-helpers/newdoc b/bin/ebuild-helpers/newdoc |
| 128 |
index d26aec9..7226280 100755 |
| 129 |
--- a/bin/ebuild-helpers/newdoc |
| 130 |
+++ b/bin/ebuild-helpers/newdoc |
| 131 |
@@ -2,7 +2,7 @@ |
| 132 |
# Copyright 1999-2011 Gentoo Foundation |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
|
| 135 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 136 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 137 |
|
| 138 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 139 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 140 |
|
| 141 |
diff --git a/bin/ebuild-helpers/newenvd b/bin/ebuild-helpers/newenvd |
| 142 |
index 0688425..559b694 100755 |
| 143 |
--- a/bin/ebuild-helpers/newenvd |
| 144 |
+++ b/bin/ebuild-helpers/newenvd |
| 145 |
@@ -2,7 +2,7 @@ |
| 146 |
# Copyright 1999-2011 Gentoo Foundation |
| 147 |
# Distributed under the terms of the GNU General Public License v2 |
| 148 |
|
| 149 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 150 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 151 |
|
| 152 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 153 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 154 |
|
| 155 |
diff --git a/bin/ebuild-helpers/newexe b/bin/ebuild-helpers/newexe |
| 156 |
index 334096c..103343d 100755 |
| 157 |
--- a/bin/ebuild-helpers/newexe |
| 158 |
+++ b/bin/ebuild-helpers/newexe |
| 159 |
@@ -2,7 +2,7 @@ |
| 160 |
# Copyright 1999-2011 Gentoo Foundation |
| 161 |
# Distributed under the terms of the GNU General Public License v2 |
| 162 |
|
| 163 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 164 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 165 |
|
| 166 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 167 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 168 |
|
| 169 |
diff --git a/bin/ebuild-helpers/newinitd b/bin/ebuild-helpers/newinitd |
| 170 |
index ad6d773..b023a63 100755 |
| 171 |
--- a/bin/ebuild-helpers/newinitd |
| 172 |
+++ b/bin/ebuild-helpers/newinitd |
| 173 |
@@ -2,7 +2,7 @@ |
| 174 |
# Copyright 1999-2011 Gentoo Foundation |
| 175 |
# Distributed under the terms of the GNU General Public License v2 |
| 176 |
|
| 177 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 178 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 179 |
|
| 180 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 181 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 182 |
|
| 183 |
diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins |
| 184 |
index 611f6d2..45c3e18 100755 |
| 185 |
--- a/bin/ebuild-helpers/newins |
| 186 |
+++ b/bin/ebuild-helpers/newins |
| 187 |
@@ -2,7 +2,7 @@ |
| 188 |
# Copyright 1999-2011 Gentoo Foundation |
| 189 |
# Distributed under the terms of the GNU General Public License v2 |
| 190 |
|
| 191 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 192 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 193 |
|
| 194 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 195 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 196 |
|
| 197 |
diff --git a/bin/ebuild-helpers/newlib.a b/bin/ebuild-helpers/newlib.a |
| 198 |
index 699c2c6..f7afa4c 100755 |
| 199 |
--- a/bin/ebuild-helpers/newlib.a |
| 200 |
+++ b/bin/ebuild-helpers/newlib.a |
| 201 |
@@ -2,7 +2,7 @@ |
| 202 |
# Copyright 1999-2011 Gentoo Foundation |
| 203 |
# Distributed under the terms of the GNU General Public License v2 |
| 204 |
|
| 205 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 206 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 207 |
|
| 208 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 209 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 210 |
|
| 211 |
diff --git a/bin/ebuild-helpers/newlib.so b/bin/ebuild-helpers/newlib.so |
| 212 |
index 7e6e7cd..d273be1 100755 |
| 213 |
--- a/bin/ebuild-helpers/newlib.so |
| 214 |
+++ b/bin/ebuild-helpers/newlib.so |
| 215 |
@@ -2,7 +2,7 @@ |
| 216 |
# Copyright 1999-2011 Gentoo Foundation |
| 217 |
# Distributed under the terms of the GNU General Public License v2 |
| 218 |
|
| 219 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 220 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 221 |
|
| 222 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 223 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 224 |
|
| 225 |
diff --git a/bin/ebuild-helpers/newman b/bin/ebuild-helpers/newman |
| 226 |
index dc4962e..4e3cf49 100755 |
| 227 |
--- a/bin/ebuild-helpers/newman |
| 228 |
+++ b/bin/ebuild-helpers/newman |
| 229 |
@@ -2,7 +2,7 @@ |
| 230 |
# Copyright 1999-2011 Gentoo Foundation |
| 231 |
# Distributed under the terms of the GNU General Public License v2 |
| 232 |
|
| 233 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 234 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 235 |
|
| 236 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 237 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
| 238 |
|
| 239 |
diff --git a/bin/ebuild-helpers/newsbin b/bin/ebuild-helpers/newsbin |
| 240 |
index c02124b..7a98578 100755 |
| 241 |
--- a/bin/ebuild-helpers/newsbin |
| 242 |
+++ b/bin/ebuild-helpers/newsbin |
| 243 |
@@ -2,7 +2,7 @@ |
| 244 |
# Copyright 1999-2011 Gentoo Foundation |
| 245 |
# Distributed under the terms of the GNU General Public License v2 |
| 246 |
|
| 247 |
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 248 |
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh |
| 249 |
|
| 250 |
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then |
| 251 |
helpers_die "${0##*/}: Need two arguments, old file and new file" |
Archives