aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-10-01 20:39:56 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-10-01 20:39:56 +0000
commit1ab21b140825a385cdfc12434703ca1da6d89b92 (patch)
tree4722799ed9e4c932112d3fba746920d1e14d6d42
parent444a74810e47c25db514380e1e34dd0307704232 (diff)
downloadpaludis-1ab21b140825a385cdfc12434703ca1da6d89b92.tar.gz
paludis-1ab21b140825a385cdfc12434703ca1da6d89b92.tar.xz
Define PKGMANAGER environment variable and VDB entry
-rw-r--r--ebuild/builtin_merge.bash2
-rw-r--r--paludis/ebuild.cc6
2 files changed, 7 insertions, 1 deletions
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index ee7c1e2..ef3103f 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -38,7 +38,7 @@ builtin_merge()
for v in CATEGORY CBUILD CHOST COUNTER DEPEND DESCRIPTION EAPI \
FEATURES HOMEPAGE INHERITED IUSE KEYWORDS LICENSE PDEPEND PF \
PROVIDE RDEPEND SLOT SRC_URI USE CONFIG_PROTECT CONFIG_PROTECT_MASK \
- VDB_FORMAT ; do
+ VDB_FORMAT PKGMANAGER ; do
echo "${!v}" > "${dbdir}"/${v} || die "pkg db write ${v} failed"
ebuild_notice "debug" "Writing VDB key ${v}=${!v}"
done
diff --git a/paludis/ebuild.cc b/paludis/ebuild.cc
index cc7a348..cfabc99 100644
--- a/paludis/ebuild.cc
+++ b/paludis/ebuild.cc
@@ -17,6 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <paludis/about.hh>
#include <paludis/ebuild.hh>
#include <paludis/util/system.hh>
#include <paludis/util/strip.hh>
@@ -95,6 +96,11 @@ EbuildCommand::operator() ()
params.eclassdirs->end(), " "))
("PORTDIR", stringify(params.portdir))
("DISTDIR", stringify(params.distdir))
+ ("PKGMANAGER", PALUDIS_PACKAGE "-" + stringify(PALUDIS_VERSION_MAJOR) + "." +
+ stringify(PALUDIS_VERSION_MINOR) + "." +
+ stringify(PALUDIS_VERSION_MICRO) +
+ (std::string(PALUDIS_SUBVERSION_REVISION).empty() ?
+ std::string("") : "-r" + std::string(PALUDIS_SUBVERSION_REVISION)))
("PALUDIS_TMPDIR", stringify(params.buildroot))
("PALUDIS_CONFIG_DIR", SYSCONFDIR "/paludis/")
("PALUDIS_BASHRC_FILES", params.environment->bashrc_files())