summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Jones <carpaski@gentoo.org>2005-01-21 08:26:10 +0000
committerNicholas Jones <carpaski@gentoo.org>2005-01-21 08:26:10 +0000
commit3071aa9e5b113dbaa669f29fdbfd790d7f8af0af (patch)
treed77aee9c983fe5e00513bcb3e3d69fe9915eea46 /sys-apps
parentThis was supposed to be ~amd64... ugg. (diff)
downloadgentoo-2-3071aa9e5b113dbaa669f29fdbfd790d7f8af0af.tar.gz
gentoo-2-3071aa9e5b113dbaa669f29fdbfd790d7f8af0af.tar.bz2
gentoo-2-3071aa9e5b113dbaa669f29fdbfd790d7f8af0af.zip
Added another patch to cut out overlay considerations in repoman. It's important that ALL DEVS MERGE AGAIN.
(Portage version: 1.524.2.33-cvs)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/portage-2.0.51-r14.ebuild13
1 files changed, 12 insertions, 1 deletions
diff --git a/sys-apps/portage/portage-2.0.51-r14.ebuild b/sys-apps/portage/portage-2.0.51-r14.ebuild
index 3e4d28f2f538..a66172bddc88 100644
--- a/sys-apps/portage/portage-2.0.51-r14.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r14.ebuild,v 1.2 2005/01/21 05:26:17 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r14.ebuild,v 1.3 2005/01/21 08:26:10 carpaski Exp $
inherit flag-o-matic eutils toolchain-funcs
@@ -57,6 +57,17 @@ src_unpack() {
patch pym/portage.py <<END_OF_PATCH_END_OF_PATCH_END_OF_PATCH
--- portage.py 17 Jan 2005 16:38:22 -0000 1.524.2.33
+++ portage.py 21 Jan 2005 05:19:30 -0000
+@@ -1156,6 +1156,10 @@
+ self["PORTDIR_OVERLAY"] = string.join(new_ov)
+ self.backup_changes("PORTDIR_OVERLAY")
+
++ if os.environ.get("PORTAGE_CALLER", "") == "repoman":
++ self["PORTDIR_OVERLAY"] = ""
++ self.backup_changes("PORTDIR_OVERLAY")
++
+ self.regenerate()
+
+
@@ -1170,9 +1170,11 @@
self["FEATURES"] = string.join(self.features, " ")
self.backup_changes("FEATURES")