aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-23 13:24:25 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-23 16:16:27 +0100
commit22316cdcc3e2b36b50ba607a1dcb509dfa0845aa (patch)
treee61e5dd90de8493580e2b42ea6d8f63e043dcf48
parenteba77581621cdd11e890e54cc52456b28e1e7023 (diff)
downloadpaludis-22316cdcc3e2b36b50ba607a1dcb509dfa0845aa.tar.gz
paludis-22316cdcc3e2b36b50ba607a1dcb509dfa0845aa.tar.xz
FILESDIR -> FILES 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.conf5
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf1
-rw-r--r--paludis/repositories/e/ebuild.cc4
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash2
7 files changed, 12 insertions, 4 deletions
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 3065dde..85f863c 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -77,6 +77,7 @@ namespace
value_for<n::env_arch>(check_get(k, "env_arch")),
value_for<n::env_d>(check_get(k, "env_d")),
value_for<n::env_distdir>(check_get(k, "env_distdir")),
+ value_for<n::env_filesdir>(check_get(k, "env_filesdir")),
value_for<n::env_kv>(check_get(k, "env_kv")),
value_for<n::env_p>(check_get(k, "env_p")),
value_for<n::env_pf>(check_get(k, "env_pf")),
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 4fc8f77..5764a96 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -75,6 +75,7 @@ namespace paludis
struct env_arch;
struct env_d;
struct env_distdir;
+ struct env_filesdir;
struct env_kv;
struct env_p;
struct env_pf;
@@ -232,6 +233,7 @@ namespace paludis
NamedValue<n::env_arch, std::string> env_arch;
NamedValue<n::env_d, std::string> env_d;
NamedValue<n::env_distdir, std::string> env_distdir;
+ NamedValue<n::env_filesdir, std::string> env_filesdir;
NamedValue<n::env_kv, std::string> env_kv;
NamedValue<n::env_p, std::string> env_p;
NamedValue<n::env_pf, std::string> env_pf;
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index 2e4ce29..34bdc93 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -211,6 +211,7 @@ env_d = D
env_t = T
env_p = P
env_pf = PF
+env_filesdir = FILESDIR
dependency_labels =
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 478433e..1fc788a 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -45,7 +45,7 @@ binary_from_env_variables = \
SUMMARY BUGS_TO REMOTE_IDS UPSTREAM_CHANGELOG UPSTREAM_RELEASE_NOTES UPSTREAM_DOCUMENTATION
non_empty_variables = \
- PNV PV PR PN PVR PNVR CATEGORY build:FILESDIR build:EXLIBSDIRS build:FETCHEDDIR build:REPODIR \
+ PNV PV PR PN PVR PNVR CATEGORY build:FILES build:EXLIBSDIRS build:FETCHEDDIR build:REPODIR \
PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
PALUDIS_COMMAND ROOT
@@ -53,7 +53,7 @@ directory_variables = \
build:FETCHEDDIR build:REPODIR
directory_if_exists_variables = \
- build:FILESDIR
+ build:FILES
ebuild_must_not_set_variables = \
DEPEND RDEPEND PDEPEND PROVIDE USE IUSE KEYWORDS LICENSE LICENSES LICENCE SRC_URI
@@ -230,6 +230,7 @@ env_d = IMAGE
env_t = TEMP
env_p = PNV
env_pf = PNVR
+env_filesdir = FILES
uri_labels = \
default = URIListedThenMirrorsLabel ; \
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index a2b22b6..74cfe9a 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -217,6 +217,7 @@ env_d = D
env_t = T
env_p = P
env_pf = PF
+env_filesdir = FILESDIR
uri_labels = \
default = URIListedThenMirrorsLabel ; \
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 948b72c..6ad23e5 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -116,7 +116,6 @@ EbuildCommand::operator() ()
.with_setenv("PVR", stringify(params.package_id()->version()))
.with_setenv("CATEGORY", stringify(params.package_id()->name().category))
.with_setenv("REPOSITORY", stringify(params.package_id()->repository()->name()))
- .with_setenv("FILESDIR", stringify(params.files_dir()))
.with_setenv("EAPI", stringify(params.package_id()->eapi()->exported_name()))
.with_setenv("PKGMANAGER", PALUDIS_PACKAGE "-" + stringify(PALUDIS_VERSION_MAJOR) + "." +
stringify(PALUDIS_VERSION_MINOR) + "." +
@@ -214,6 +213,9 @@ EbuildCommand::operator() ()
cmd.with_setenv(params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_pf(),
stringify(params.package_id()->name().package) + "-" +
stringify(params.package_id()->version()));
+ if (! params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_filesdir().empty())
+ cmd.with_setenv(params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_filesdir(),
+ stringify(params.files_dir()));
if (params.package_id()->eapi()->supported()->ebuild_options()->support_eclasses())
cmd
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index d3651be..6e07e44 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -263,7 +263,7 @@ ebuild_scrub_environment()
unset -v ROOTPATH T TEMP HOME TMPDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL
unset -v PORTDIR FILESDIR ECLASSDIR DISTDIR PALUDIS_EBUILD_DIR
unset -v PALUDIS_EXTRA_DIE_MESSAGE PALUDIS_COMMAND SKIP_FUNCTIONS
- unset -v FETCHEDDIR REPODIR EAPI
+ unset -v FETCHEDDIR REPODIR EAPI FILES
unset -v ${!PALUDIS_CMDLINE_*} PALUDIS_OPTIONS
unset -v ${!CONTRARIUS_CMDLINE_*} CONTRARIUS_OPTIONS