aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-23 13:38:35 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-23 16:16:27 +0100
commit35bedf275b1bea2cad5cb3908d5e67787befbf3b (patch)
treea208d851d1db0219560845888f55a55cd325a660
parent27ac3acc259c6b98a37ca6ae761c341dbfd77497 (diff)
downloadpaludis-35bedf275b1bea2cad5cb3908d5e67787befbf3b.tar.gz
paludis-35bedf275b1bea2cad5cb3908d5e67787befbf3b.tar.xz
A -> ARCHIVES for exheres.
-rw-r--r--paludis/repositories/e/eapi.cc1
-rw-r--r--paludis/repositories/e/eapi.hh2
-rw-r--r--paludis/repositories/e/eapis/0.conf1
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf1
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf1
-rw-r--r--paludis/repositories/e/eapis/pbin-1+exheres-0.conf2
-rw-r--r--paludis/repositories/e/ebuild.cc14
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash6
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_unpack.bash2
-rw-r--r--paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash4
-rw-r--r--paludis/repositories/e/ebuild/pbin-1/builtin_pivotbin.bash4
11 files changed, 26 insertions, 12 deletions
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 85f863c..90b9b37 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -72,6 +72,7 @@ namespace
{
return make_shared_ptr(new EAPIEbuildEnvironmentVariables(make_named_values<EAPIEbuildEnvironmentVariables>(
value_for<n::description_use>(check_get(k, "description_use")),
+ value_for<n::env_a>(check_get(k, "env_a")),
value_for<n::env_aa>(check_get(k, "env_aa")),
value_for<n::env_accept_keywords>(check_get(k, "env_accept_keywords")),
value_for<n::env_arch>(check_get(k, "env_arch")),
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 5764a96..d0b87b2 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -70,6 +70,7 @@ namespace paludis
struct ebuild_variable;
struct ebuild_new_upgrade_phase_order;
struct eclass_must_not_set_variables;
+ struct env_a;
struct env_aa;
struct env_accept_keywords;
struct env_arch;
@@ -228,6 +229,7 @@ namespace paludis
struct EAPIEbuildEnvironmentVariables
{
NamedValue<n::description_use, std::string> description_use;
+ NamedValue<n::env_a, std::string> env_a;
NamedValue<n::env_aa, std::string> env_aa;
NamedValue<n::env_accept_keywords, std::string> env_accept_keywords;
NamedValue<n::env_arch, std::string> env_arch;
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index 34bdc93..f4b9f43 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -212,6 +212,7 @@ env_t = T
env_p = P
env_pf = PF
env_filesdir = FILESDIR
+env_a = A
dependency_labels =
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index a4c2794..bff750e 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -231,6 +231,7 @@ env_t = TEMP
env_p = PNV
env_pf = PNVR
env_filesdir = FILES
+env_a = ARCHIVES
uri_labels = \
default = URIListedThenMirrorsLabel ; \
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 74cfe9a..f37f88c 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -218,6 +218,7 @@ env_t = T
env_p = P
env_pf = PF
env_filesdir = FILESDIR
+env_a = A
uri_labels = \
default = URIListedThenMirrorsLabel ; \
diff --git a/paludis/repositories/e/eapis/pbin-1+exheres-0.conf b/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
index 910615f..a4faf0d 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 WORK WORKBASE IMAGE
+ ARCHIVES WORK WORKBASE IMAGE
ignore_pivot_env_functions = \
src_unpack src_compile src_test src_install
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 6ad23e5..66c92e2 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -594,12 +594,16 @@ Command
EbuildNoFetchCommand::extend_command(const Command & cmd)
{
Command result(Command(cmd)
- .with_setenv("A", fetch_params.a())
.with_setenv("ROOT", fetch_params.root())
.with_setenv("PALUDIS_PROFILE_DIR", stringify(*fetch_params.profiles()->begin()))
.with_setenv("PALUDIS_PROFILE_DIRS", join(fetch_params.profiles()->begin(),
- fetch_params.profiles()->end(), " ")));
+ fetch_params.profiles()->end(), " "))
+ .with_setenv("PALUDIS_ARCHIVES_VAR",
+ params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_a()));
+ if (! params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_a().empty())
+ result.with_setenv(params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_a(),
+ fetch_params.a());
if (! params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_aa().empty())
result.with_setenv(params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_aa(),
fetch_params.aa());
@@ -641,7 +645,6 @@ Command
EbuildInstallCommand::extend_command(const Command & cmd)
{
Command result(Command(cmd)
- .with_setenv("A", install_params.a())
.with_setenv("ROOT", install_params.root())
.with_setenv("PALUDIS_LOADSAVEENV_DIR", stringify(install_params.loadsaveenv_dir()))
.with_setenv("PALUDIS_CONFIG_PROTECT", install_params.config_protect())
@@ -649,8 +652,13 @@ EbuildInstallCommand::extend_command(const Command & cmd)
.with_setenv("PALUDIS_PROFILE_DIR", stringify(*install_params.profiles()->begin()))
.with_setenv("PALUDIS_PROFILE_DIRS", join(install_params.profiles()->begin(),
install_params.profiles()->end(), " "))
+ .with_setenv("PALUDIS_ARCHIVES_VAR",
+ params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_a())
.with_setenv("SLOT", stringify(install_params.slot())));
+ if (! params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_a().empty())
+ result.with_setenv(params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_a(),
+ install_params.a());
if (! params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_aa().empty())
result.with_setenv(params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_aa(),
install_params.aa());
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
index 5091b6b..e8c15eb 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
@@ -22,11 +22,11 @@
default_pkg_nofetch()
{
- [[ -z "${A}" ]] && return
+ [[ -z "${ARCHIVES}" ]] && return
local f g=
- for f in ${A} ; do
- [[ -f "${FETCHEDDIR}/${A}" ]] && continue
+ for f in ${ARCHIVES} ; do
+ [[ -f "${FETCHEDDIR}/${ARCHIVES}" ]] && continue
if [[ -z "${g}" ]] ; then
echo "The following files could not be fetched automatically for ${PN}:"
g=no
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash b/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
index 9bfcdb7..67fd083 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
@@ -22,7 +22,7 @@
default_src_unpack()
{
- [[ -n "${A}" ]] && unpack --if-compressed ${A}
+ [[ -n "${ARCHIVES}" ]] && unpack --if-compressed ${ARCHIVES}
}
src_unpack()
diff --git a/paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash b/paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash
index 37b8ed0..fa759af 100644
--- a/paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash
+++ b/paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash
@@ -18,8 +18,8 @@
builtin_installbin()
{
- echo tar jvxpf ${!PALUDIS_BINARY_DISTDIR_VARIABLE}/${A} -C "${IMAGE}"/ --exclude PBIN 1>&2
- tar jvxpf ${!PALUDIS_BINARY_DISTDIR_VARIABLE}/${A} -C "${IMAGE}"/ --exclude PBIN || die "Couldn't extract image"
+ echo tar jvxpf ${!PALUDIS_BINARY_DISTDIR_VARIABLE}/${!PALUDIS_ARCHIVES_VAR} -C "${IMAGE}"/ --exclude PBIN 1>&2
+ tar jvxpf ${!PALUDIS_BINARY_DISTDIR_VARIABLE}/${!PALUDIS_ARCHIVES_VAR} -C "${IMAGE}"/ --exclude PBIN || die "Couldn't extract image"
}
generic_internal_installbin()
diff --git a/paludis/repositories/e/ebuild/pbin-1/builtin_pivotbin.bash b/paludis/repositories/e/ebuild/pbin-1/builtin_pivotbin.bash
index d3ad7b8..dfc1cde 100644
--- a/paludis/repositories/e/ebuild/pbin-1/builtin_pivotbin.bash
+++ b/paludis/repositories/e/ebuild/pbin-1/builtin_pivotbin.bash
@@ -21,8 +21,8 @@ builtin_pivotbin()
[[ ! -d "${!PALUDIS_TEMP_DIR_VAR}" ]] && die "Can't use \${${PALUDIS_TEMP_DIR_VAR}}=${!PALUDIS_TEMP_DIR_VAR}"
ebuild_section "Extracting package environment"
- echo tar jxvf "${DISTDIR}"/"${A}" -C "${!PALUDIS_TEMP_DIR_VAR}" --strip-components 1 PBIN/environment.bz2 1>&2
- tar jxvf "${DISTDIR}"/"${A}" -C "${!PALUDIS_TEMP_DIR_VAR}" --strip-components 1 PBIN/environment.bz2 || die "Couldn't extract env"
+ echo tar jxvf "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} -C "${!PALUDIS_TEMP_DIR_VAR}" --strip-components 1 PBIN/environment.bz2 1>&2
+ tar jxvf "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} -C "${!PALUDIS_TEMP_DIR_VAR}" --strip-components 1 PBIN/environment.bz2 || die "Couldn't extract env"
ebuild_section "Switching to package environment"
export PALUDIS_LOAD_ENVIRONMENT="${!PALUDIS_TEMP_DIR_VAR}/environment.bz2"