From: Nicholas Jones <carpaski@gentoo.org>
Date: Thu, 25 Nov 2004 07:21:10 +0000 (+0000)
Subject: Do a little sed to yank the prozilla lines.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e001efe9283edeef15d3483b2f5c47faacf6dfb8;p=gentoo.git

Do a little sed to yank the prozilla lines.
---

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2a56d7bbf257..a64d658a8f2e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,12 +1,22 @@
-MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
-MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
-MD5 26f3cd12aa774eca2da45b8c01b5717c portage-2.0.51-r3.ebuild 12496
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8fe266177bb887fa054eb95c296f80bb portage-2.0.51-r3.ebuild 12575
 MD5 0470399965cfb502cde05cb35599b7f9 portage-2.0.51_rc7.ebuild 11795
 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 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70
+MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163
-MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBpYf0BDOEqLMd+jQRAtkvAKDAI1MDrprfAWWq/VGFxYkl6Llg0wCgiXgM
+kHLEzTwjSm086hmelUyEvsc=
+=zyFM
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.0.51-r3.ebuild b/sys-apps/portage/portage-2.0.51-r3.ebuild
index 8ce2b3f66453..c96fcad994ec 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.8 2004/11/12 15:29:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r3.ebuild,v 1.9 2004/11/25 07:21:10 carpaski Exp $
 
 inherit flag-o-matic eutils
 
@@ -53,9 +53,10 @@ check_multilib() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i "s:^CFLAGS =.*:CFLAGS = :" src/sandbox-1.1/Makefile
+	sed -i "s:^CFLAGS =.*:CFLAGS = :"           src/sandbox-1.1/Makefile
 	sed -i "/PORTAGE_RESTRICT.*'')/s:''):' '):" pym/portage.py
-	sed -i "s/self.config/self.options/" bin/dispatch-conf
+	sed -i "s/self.config/self.options/"        bin/dispatch-conf
+	sed -i "/proz /d;/Prozilla/d"               cnf/make.conf*
 	epatch ${FILESDIR}/gcc-2.95-libsandbox.patch
 }