aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-21 18:03:39 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-23 15:27:48 +0100
commit215ad970b4f7dd877902e4fba327a4aee34a53b1 (patch)
treef0136bc71633222dff9246bf9cb5fbe3680d9343
parentb886ad6f7fc5c386df98de14dcb2b58809ac00bb (diff)
downloadpaludis-215ad970b4f7dd877902e4fba327a4aee34a53b1.tar.gz
paludis-215ad970b4f7dd877902e4fba327a4aee34a53b1.tar.xz
WORKDIR -> WORKBASE in exheres.
-rw-r--r--paludis/repositories/e/eapis/pbin-1+exheres-0.conf2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/build_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_init.bash8
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_compile.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_configure.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_install.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_prepare.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_test.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_unpack.bash2
9 files changed, 17 insertions, 17 deletions
diff --git a/paludis/repositories/e/eapis/pbin-1+exheres-0.conf b/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
index 99272bb..b080f92 100644
--- a/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
+++ b/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
@@ -8,7 +8,7 @@ ebuild_module_suffixes = pbin-1 ${ebuild_module_suffixes}
merge_rewrite_symlinks = true
ignore_pivot_env_variables = \
- A S D WORKDIR IMAGE
+ A S D WORKBASE IMAGE
ignore_pivot_env_functions = \
src_unpack src_compile src_test src_install
diff --git a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
index 741e335..7d25e52 100644
--- a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
@@ -107,7 +107,7 @@ econf()
if [[ -x "${ECONF_SOURCE}/configure" ]] ; then
if [[ -d /usr/share/gnuconfig ]] ; then
local f
- find "${WORKDIR}" -type f -name config.guess -or -name config.sub | while read f; do
+ find "${WORKBASE}" -type f -name config.guess -or -name config.sub | while read f; do
echo "econf: updating ${f} with /usr/share/gnuconfig/${f##*/}"
cp -f "/usr/share/gnuconfig/${f##*/}" "${f}"
done
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
index 3265415..25ff23e 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
@@ -59,9 +59,9 @@ builtin_init()
rm -fr "${PALUDIS_TMPDIR}/${CATEGORY}-${PF}" || die "Couldn't remove previous work"
fi
- export WORKDIR="${PALUDIS_TMPDIR}/${CATEGORY}-${PF}/work"
- mkdir -p "${WORKDIR}" || die "Couldn't create \$WORKDIR (\"${WORKDIR}\")"
- declare -r WORKDIR="${WORKDIR}"
+ export WORKBASE="${PALUDIS_TMPDIR}/${CATEGORY}-${PF}/work"
+ mkdir -p "${WORKBASE}" || die "Couldn't create \$WORKBASE (\"${WORKBASE}\")"
+ declare -r WORKBASE="${WORKBASE}"
export T="${PALUDIS_TMPDIR}/${CATEGORY}-${PF}/temp/"
mkdir -p "${T}" || die "Couldn't create \$T (\"${T}\")"
@@ -77,7 +77,7 @@ builtin_init()
export IMAGE="${D}"
declare -r IMAGE="${IMAGE}"
- export S="${WORKDIR}/${P}"
+ export S="${WORKBASE}/${P}"
if [[ "${EBUILD}" != "-" ]] ; then
ebuild_load_ebuild "${EBUILD}"
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_compile.bash b/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
index e9d8b63..373558b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
@@ -36,8 +36,8 @@ exheres_internal_compile()
{
if [[ -d "${S}" ]] ; then
cd "${S}" || die "cd to \${S} (\"${S}\") failed"
- elif [[ -d "${WORKDIR}" ]] ; then
- cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
+ elif [[ -d "${WORKBASE}" ]] ; then
+ cd "${WORKBASE}" || die "cd to \${WORKBASE} (\"${WORKBASE}\") failed"
fi
if hasq "compile" ${SKIP_FUNCTIONS} ; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_configure.bash b/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
index 4b44765..448f719 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
@@ -43,8 +43,8 @@ exheres_internal_configure()
{
if [[ -d "${S}" ]] ; then
cd "${S}" || die "cd to \${S} (\"${S}\") failed"
- elif [[ -d "${WORKDIR}" ]] ; then
- cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
+ elif [[ -d "${WORKBASE}" ]] ; then
+ cd "${WORKBASE}" || die "cd to \${WORKBASE} (\"${WORKBASE}\") failed"
fi
if hasq "configure" ${SKIP_FUNCTIONS} ; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_install.bash b/paludis/repositories/e/ebuild/exheres-0/src_install.bash
index a6d51ea..0902406 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_install.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_install.bash
@@ -80,8 +80,8 @@ exheres_internal_install()
{
if [[ -d "${S}" ]] ; then
cd "${S}" || die "cd to \${S} (\"${S}\") failed"
- elif [[ -d "${WORKDIR}" ]] ; then
- cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
+ elif [[ -d "${WORKBASE}" ]] ; then
+ cd "${WORKBASE}" || die "cd to \${WORKBASE} (\"${WORKBASE}\") failed"
fi
if hasq "install" ${SKIP_FUNCTIONS} ; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_prepare.bash b/paludis/repositories/e/ebuild/exheres-0/src_prepare.bash
index 8d6bc44..b2057f9 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_prepare.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_prepare.bash
@@ -36,8 +36,8 @@ exheres_internal_prepare()
{
if [[ -d "${S}" ]] ; then
cd "${S}" || die "cd to \${S} (\"${S}\") failed"
- elif [[ -d "${WORKDIR}" ]] ; then
- cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
+ elif [[ -d "${WORKBASE}" ]] ; then
+ cd "${WORKBASE}" || die "cd to \${WORKBASE} (\"${WORKBASE}\") failed"
fi
if hasq "prepare" ${SKIP_FUNCTIONS} ; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_test.bash b/paludis/repositories/e/ebuild/exheres-0/src_test.bash
index 0ecbe48..961441e 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_test.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_test.bash
@@ -52,8 +52,8 @@ exheres_internal_test()
if [[ -d "${S}" ]] ; then
cd "${S}" || die "cd to \${S} (\"${S}\") failed"
- elif [[ -d "${WORKDIR}" ]] ; then
- cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
+ elif [[ -d "${WORKBASE}" ]] ; then
+ cd "${WORKBASE}" || die "cd to \${WORKBASE} (\"${WORKBASE}\") failed"
fi
if hasq "test" ${SKIP_FUNCTIONS} ; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash b/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
index 05475fd..9bfcdb7 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
@@ -32,7 +32,7 @@ src_unpack()
exheres_internal_unpack()
{
- cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
+ cd "${WORKBASE}" || die "cd to \${WORKBASE} (\"${WORKBASE}\") failed"
if hasq "unpack" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping src_unpack (SKIP_FUNCTIONS)"