diff options
Diffstat (limited to 'bin/ebuild-helpers')
-rwxr-xr-x | bin/ebuild-helpers/dobin | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/dodir | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/dodoc | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/doexe | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/dohard | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/doinfo | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/doins | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/dolib | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/doman | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/domo | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/dosbin | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/dosed | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/dosym | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/ecompressdir | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/fowners | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/fperms | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/prepall | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/prepalldocs | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/prepallinfo | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/prepallman | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/prepallstrip | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/prepinfo | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/preplib | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/prepman | 2 | ||||
-rwxr-xr-x | bin/ebuild-helpers/prepstrip | 2 |
25 files changed, 25 insertions, 25 deletions
diff --git a/bin/ebuild-helpers/dobin b/bin/ebuild-helpers/dobin index 7ea29d4d4..f90d8933c 100755 --- a/bin/ebuild-helpers/dobin +++ b/bin/ebuild-helpers/dobin @@ -9,7 +9,7 @@ if [[ $# -lt 1 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if [[ ! -d ${ED}${DESTTREE}/bin ]] ; then diff --git a/bin/ebuild-helpers/dodir b/bin/ebuild-helpers/dodir index 5bedd05c9..90a3efed4 100755 --- a/bin/ebuild-helpers/dodir +++ b/bin/ebuild-helpers/dodir @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac install -d ${DIROPTIONS} "${@/#/${ED}/}" diff --git a/bin/ebuild-helpers/dodoc b/bin/ebuild-helpers/dodoc index 6280536e5..1f333a615 100755 --- a/bin/ebuild-helpers/dodoc +++ b/bin/ebuild-helpers/dodoc @@ -9,7 +9,7 @@ if [ $# -lt 1 ] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac dir="${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" diff --git a/bin/ebuild-helpers/doexe b/bin/ebuild-helpers/doexe index 65f355af9..fb228f905 100755 --- a/bin/ebuild-helpers/doexe +++ b/bin/ebuild-helpers/doexe @@ -9,7 +9,7 @@ if [[ $# -lt 1 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if [[ ! -d ${ED}${_E_EXEDESTTREE_} ]] ; then diff --git a/bin/ebuild-helpers/dohard b/bin/ebuild-helpers/dohard index 7a6fc7698..b52fd7c00 100755 --- a/bin/ebuild-helpers/dohard +++ b/bin/ebuild-helpers/dohard @@ -7,7 +7,7 @@ if [[ $# -ne 2 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac destdir=${2%/*} diff --git a/bin/ebuild-helpers/doinfo b/bin/ebuild-helpers/doinfo index c4b767e9b..8fd7d45f8 100755 --- a/bin/ebuild-helpers/doinfo +++ b/bin/ebuild-helpers/doinfo @@ -9,7 +9,7 @@ if [[ -z $1 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if [[ ! -d ${ED}usr/share/info ]] ; then diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins index c3af28905..443bfdb21 100755 --- a/bin/ebuild-helpers/doins +++ b/bin/ebuild-helpers/doins @@ -27,7 +27,7 @@ else DOINSRECUR=n fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) export ED="${D}" ;; esac if [[ ${INSDESTTREE#${ED}} != "${INSDESTTREE}" ]]; then diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib index 8357dfaa9..9af541890 100755 --- a/bin/ebuild-helpers/dolib +++ b/bin/ebuild-helpers/dolib @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac # Setup ABI cruft diff --git a/bin/ebuild-helpers/doman b/bin/ebuild-helpers/doman index 817743d7e..b4047ce40 100755 --- a/bin/ebuild-helpers/doman +++ b/bin/ebuild-helpers/doman @@ -9,7 +9,7 @@ if [[ $# -lt 1 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac i18n="" diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo index 551785e76..d994343a9 100755 --- a/bin/ebuild-helpers/domo +++ b/bin/ebuild-helpers/domo @@ -10,7 +10,7 @@ if [ ${mynum} -lt 1 ] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if [ ! -d "${ED}${DESTTREE}/share/locale" ] ; then diff --git a/bin/ebuild-helpers/dosbin b/bin/ebuild-helpers/dosbin index 560607754..d101c8a6d 100755 --- a/bin/ebuild-helpers/dosbin +++ b/bin/ebuild-helpers/dosbin @@ -9,7 +9,7 @@ if [[ $# -lt 1 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if [[ ! -d ${ED}${DESTTREE}/sbin ]] ; then diff --git a/bin/ebuild-helpers/dosed b/bin/ebuild-helpers/dosed index 200b011fb..f202df7a7 100755 --- a/bin/ebuild-helpers/dosed +++ b/bin/ebuild-helpers/dosed @@ -7,7 +7,7 @@ if [[ $# -lt 1 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac ret=0 diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym index 8925001e4..5e41ec456 100755 --- a/bin/ebuild-helpers/dosym +++ b/bin/ebuild-helpers/dosym @@ -9,7 +9,7 @@ if [[ $# -ne 2 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if [[ ${2} == */ ]] || \ diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir index 937ba268b..5ba44d755 100755 --- a/bin/ebuild-helpers/ecompressdir +++ b/bin/ebuild-helpers/ecompressdir @@ -9,7 +9,7 @@ if [[ -z $1 ]] ; then exit 1 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac case $1 in diff --git a/bin/ebuild-helpers/fowners b/bin/ebuild-helpers/fowners index b3e4555cd..a5a28f2fb 100755 --- a/bin/ebuild-helpers/fowners +++ b/bin/ebuild-helpers/fowners @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac # we can't prefix all arguments because diff --git a/bin/ebuild-helpers/fperms b/bin/ebuild-helpers/fperms index 207cf54a5..a2f77ea00 100755 --- a/bin/ebuild-helpers/fperms +++ b/bin/ebuild-helpers/fperms @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac # we can't prefix all arguments because diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall index 512feb33a..49e646cd2 100755 --- a/bin/ebuild-helpers/prepall +++ b/bin/ebuild-helpers/prepall @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if has chflags $FEATURES ; then diff --git a/bin/ebuild-helpers/prepalldocs b/bin/ebuild-helpers/prepalldocs index 1d0224981..560a02bcb 100755 --- a/bin/ebuild-helpers/prepalldocs +++ b/bin/ebuild-helpers/prepalldocs @@ -8,7 +8,7 @@ if [[ -n $1 ]] ; then vecho "${0##*/}: invalid usage; takes no arguments" 1>&2 fi -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac [[ -d ${ED}usr/share/doc ]] || exit 0 diff --git a/bin/ebuild-helpers/prepallinfo b/bin/ebuild-helpers/prepallinfo index 183e1ca62..db9bbfacb 100755 --- a/bin/ebuild-helpers/prepallinfo +++ b/bin/ebuild-helpers/prepallinfo @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac [[ -d ${ED}usr/share/info ]] || exit 0 diff --git a/bin/ebuild-helpers/prepallman b/bin/ebuild-helpers/prepallman index a5699c2f1..dee1c7236 100755 --- a/bin/ebuild-helpers/prepallman +++ b/bin/ebuild-helpers/prepallman @@ -7,7 +7,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh # replaced by controllable compression in EAPI 4 has "${EAPI}" 0 1 2 3 || exit 0 -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac ret=0 diff --git a/bin/ebuild-helpers/prepallstrip b/bin/ebuild-helpers/prepallstrip index 6032b48c9..28320d975 100755 --- a/bin/ebuild-helpers/prepallstrip +++ b/bin/ebuild-helpers/prepallstrip @@ -2,7 +2,7 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac exec prepstrip "${ED}" diff --git a/bin/ebuild-helpers/prepinfo b/bin/ebuild-helpers/prepinfo index 7c60d9b86..ffe2ecec3 100755 --- a/bin/ebuild-helpers/prepinfo +++ b/bin/ebuild-helpers/prepinfo @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if [[ -z $1 ]] ; then diff --git a/bin/ebuild-helpers/preplib b/bin/ebuild-helpers/preplib index cbff76d4c..6e91cf33d 100755 --- a/bin/ebuild-helpers/preplib +++ b/bin/ebuild-helpers/preplib @@ -6,7 +6,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh eqawarn "QA Notice: Deprecated call to 'preplib'" -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac LIBDIR_VAR="LIBDIR_${ABI}" diff --git a/bin/ebuild-helpers/prepman b/bin/ebuild-helpers/prepman index 18c0f992a..f96b64147 100755 --- a/bin/ebuild-helpers/prepman +++ b/bin/ebuild-helpers/prepman @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac if [[ -z $1 ]] ; then diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index 085c93d56..15eed8457 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -18,7 +18,7 @@ exp_tf() { exp_tf FEATURES installsources nostrip splitdebug exp_tf RESTRICT binchecks installsources strip -[[ " ${USE} " == *" prefix "* ]] || \ +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) ED=${D} ;; esac banner=false |