diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-11-01 19:17:19 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-01 19:17:19 -0700 |
| commit | 1af0c40b1300651ca03a7509f49f152c1e595736 (patch) | |
| tree | 6d967ae665bf98c9ba8219fb812a9678a127a57e /bin/ebuild-helpers/preplib | |
| parent | 889853171246ab1063bb5015caf41a41761f5424 (diff) | |
| download | portage-1af0c40b1300651ca03a7509f49f152c1e595736.tar.gz portage-1af0c40b1300651ca03a7509f49f152c1e595736.tar.bz2 portage-1af0c40b1300651ca03a7509f49f152c1e595736.zip | |
Add EPREFIX and ED support in all ebuild helpers.
This allows our prefix tests to use helpers like insinto, doins, and dosym.
Diffstat (limited to 'bin/ebuild-helpers/preplib')
| -rwxr-xr-x | bin/ebuild-helpers/preplib | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/ebuild-helpers/preplib b/bin/ebuild-helpers/preplib index 76aabe64c..8c6292101 100755 --- a/bin/ebuild-helpers/preplib +++ b/bin/ebuild-helpers/preplib @@ -1,11 +1,13 @@ #!/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'" +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 +20,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 |