aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-06-15 11:42:41 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-06-15 11:42:41 +0000
commit9508e36cdf9c9471af93566b0806607ddd21c1ec (patch)
tree7fca3d29b4326b867cb8efe9c40b0f878ee194ae
parent49b127e8b30936c6af5ee1d402f7c12d95e1db1e (diff)
downloadpaludis-9508e36cdf9c9471af93566b0806607ddd21c1ec.tar.gz
paludis-9508e36cdf9c9471af93566b0806607ddd21c1ec.tar.xz
Do inherit EAPI and SLOT, because they're set from C++.
-rw-r--r--paludis/repositories/gentoo/ebuild.cc1
-rwxr-xr-xpaludis/repositories/gentoo/ebuild/ebuild.bash6
2 files changed, 5 insertions, 2 deletions
diff --git a/paludis/repositories/gentoo/ebuild.cc b/paludis/repositories/gentoo/ebuild.cc
index b013a51..ef28c00 100644
--- a/paludis/repositories/gentoo/ebuild.cc
+++ b/paludis/repositories/gentoo/ebuild.cc
@@ -98,6 +98,7 @@ EbuildCommand::operator() ()
.with_setenv("PORTDIR", stringify(params.portdir))
.with_setenv("DISTDIR", stringify(params.distdir))
.with_setenv("EAPI", stringify(params.eapi->name))
+ .with_setenv("SLOT", "")
.with_setenv("PKGMANAGER", PALUDIS_PACKAGE "-" + stringify(PALUDIS_VERSION_MAJOR) + "." +
stringify(PALUDIS_VERSION_MINOR) + "." +
stringify(PALUDIS_VERSION_MICRO) +
diff --git a/paludis/repositories/gentoo/ebuild/ebuild.bash b/paludis/repositories/gentoo/ebuild/ebuild.bash
index ae1fb2e..723740e 100755
--- a/paludis/repositories/gentoo/ebuild/ebuild.bash
+++ b/paludis/repositories/gentoo/ebuild/ebuild.bash
@@ -26,10 +26,12 @@ unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE
eval unset LANG ${!LC_*}
# The list below should include all variables from all EAPIs
-EBUILD_METADATA_VARIABLES="DEPEND RDEPEND PDEPEND IUSE SLOT SRC_URI RESTRICT \
- LICENSE KEYWORDS INHERITED PROVIDE EAPI HOMEPAGE DESCRIPTION DEPENDENCIES \
+EBUILD_METADATA_VARIABLES="DEPEND RDEPEND PDEPEND IUSE SRC_URI RESTRICT \
+ LICENSE KEYWORDS INHERITED PROVIDE HOMEPAGE DESCRIPTION DEPENDENCIES \
E_IUSE E_DEPEND E_RDEPEND E_PDEPEND E_KEYWORDS"
unset -v ${EBUILD_METADATA_VARIABLES}
+# These can be set by C++
+EBUILD_METADATA_VARIABLES="${EBUILD_METADATA_VARIABLES} SLOT EAPI"
if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] ; then
export SANDBOX_PREDICT="${SANDBOX_PREDICT+${SANDBOX_PREDICT}:}"