diff options
| author |   Alexander Bersenev <bay@hackerdom.ru> | 2014-02-17 17:55:51 +0600 |
|---|---|---|
| committer | Alexander Bersenev <bay@hackerdom.ru> | 2014-02-17 17:55:51 +0600 |
| commit | 5a3f506c9ef1cfd78940b0509f10ef94b4434e29 (patch) | |
| tree | 147c35a17a8bcd8ff467bb3063adab623da51fac /portage_with_autodep/bin/ebuild-helpers/preplib | |
| parent | fixed a deadlock (diff) | |
| download | autodep-5a3f506c9ef1cfd78940b0509f10ef94b4434e29.tar.gz autodep-5a3f506c9ef1cfd78940b0509f10ef94b4434e29.tar.bz2 autodep-5a3f506c9ef1cfd78940b0509f10ef94b4434e29.zip | |
updated portage to 2.2.8-r1
Diffstat (limited to 'portage_with_autodep/bin/ebuild-helpers/preplib')
| -rwxr-xr-x | portage_with_autodep/bin/ebuild-helpers/preplib | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/portage_with_autodep/bin/ebuild-helpers/preplib b/portage_with_autodep/bin/ebuild-helpers/preplib index 76aabe6..6e91cf3 100755 --- a/portage_with_autodep/bin/ebuild-helpers/preplib +++ b/portage_with_autodep/bin/ebuild-helpers/preplib @@ -1,11 +1,14 @@ #!/bin/bash -# Copyright 1999-2006 Gentoo Foundation +# 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 eqawarn "QA Notice: Deprecated call to 'preplib'" +[[ " ${FEATURES} " == *" force-prefix "* ]] || \ + case "$EAPI" in 0|1|2) ED=${D} ;; esac + LIBDIR_VAR="LIBDIR_${ABI}" if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then CONF_LIBDIR="${!LIBDIR_VAR}" @@ -18,9 +21,9 @@ if [ -z "${CONF_LIBDIR}" ]; then fi if [ -z "$1" ] ; then - z="${D}usr/${CONF_LIBDIR}" + z="${ED}usr/${CONF_LIBDIR}" else - z="${D}$1/${CONF_LIBDIR}" + z="${ED}$1/${CONF_LIBDIR}" fi if [ -d "${z}" ] ; then |