From 380375a36ff9931767e8b69622ab0adf33209e7f Mon Sep 17 00:00:00 2001
From: Nicholas Jones <carpaski@gentoo.org>
Date: Sun, 7 Nov 2004 00:42:23 +0000
Subject: [PATCH] Moving -r3 to stable.

---
 sys-apps/portage/Manifest                 | 24 ++++++++++++++++-------
 sys-apps/portage/portage-2.0.51-r2.ebuild |  3 ++-
 sys-apps/portage/portage-2.0.51-r3.ebuild |  7 ++++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f8b4a7ce70b0..6cf7dfe02f8d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,11 +1,21 @@
-MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
-MD5 7336da06bcd1cb742bc5a14534d55725 portage-2.0.51-r3.ebuild 12320
-MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b4876d1ff22198d4a400054b7b529cd portage-2.0.51-r3.ebuild 12379
 MD5 0470399965cfb502cde05cb35599b7f9 portage-2.0.51_rc7.ebuild 11795
-MD5 4071a588d7bb6ade31f0ba075bff7eb8 portage-2.0.51-r2.ebuild 12234
+MD5 2baf8f1a5dcf8f500d4b2888b2fedaa1 portage-2.0.51-r2.ebuild 12293
 MD5 63cadb5f6ef798aaa8b95a899fdea82f portage-2.0.50-r11.ebuild 11572
-MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
-MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70
+MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
+MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
+MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
 MD5 3da3469e2b40b9a6b37fd54b2e6c7b98 files/digest-portage-2.0.51_rc7 71
 MD5 d2608171176cc00a43ead2ed136ed328 files/digest-portage-2.0.51-r2 70
-MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
+MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70
+MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjW+IBDOEqLMd+jQRAq4eAKC7fm6cyYP2YqLbN8tPXgYgqhLZNgCgtuHF
+/hnwQTbZcirBQaOyE69T5Gk=
+=7wSa
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.0.51-r2.ebuild b/sys-apps/portage/portage-2.0.51-r2.ebuild
index 5c242c8859e0..a85ea0efff7b 100644
--- a/sys-apps/portage/portage-2.0.51-r2.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r2.ebuild,v 1.5 2004/11/05 19:44:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r2.ebuild,v 1.6 2004/11/07 00:42:23 carpaski Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -60,6 +60,7 @@ check_multilib() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	sed -i "/PORTAGE_RESTRICT.*'')/s:''):' '):" pym/portage.py
 }
 
 src_compile() {
diff --git a/sys-apps/portage/portage-2.0.51-r3.ebuild b/sys-apps/portage/portage-2.0.51-r3.ebuild
index 927b5572bd78..c30c36adf176 100644
--- a/sys-apps/portage/portage-2.0.51-r3.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r3.ebuild,v 1.3 2004/11/05 19:44:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r3.ebuild,v 1.4 2004/11/07 00:42:23 carpaski Exp $
 
 IUSE="build selinux"
 inherit flag-o-matic
@@ -17,8 +17,8 @@ HOMEPAGE="http://www.gentoo.org"
 RESTRICT="nosandbox sandbox"
 
 # Contact carpaski with a reason before you modify any of these.
-#KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sparc  x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sparc  x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
 
 LICENSE="GPL-2"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( >=dev-python/python-selinux-2.15 )"
@@ -53,6 +53,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i "s:^CFLAGS =.*:CFLAGS = :" src/sandbox-1.1/Makefile
+	sed -i "/PORTAGE_RESTRICT.*'')/s:''):' '):" pym/portage.py
 }
 
 src_compile() {
-- 
2.26.2