From d2eaa94e35e5164e23962b5bb48fc73b4bd6c1d6 Mon Sep 17 00:00:00 2001
From: Nicholas Jones <carpaski@gentoo.org>
Date: Fri, 5 Nov 2004 10:27:54 +0000
Subject: [PATCH] Remove the stackprotector cflags

---
 sys-apps/portage/Manifest                  |  9 ++++-----
 sys-apps/portage/files/RequiredBinary.diff | 11 -----------
 sys-apps/portage/portage-2.0.51-r3.ebuild  |  3 ++-
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 sys-apps/portage/files/RequiredBinary.diff

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 730821fcd432..3df3c5bac61d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d3569a7cc5f558531cf9c7ad109e6df2 portage-2.0.51-r3.ebuild 12260
+MD5 1e3a7dfd3fd0bd0934b668a5a5783d1d portage-2.0.51-r3.ebuild 12320
 MD5 0470399965cfb502cde05cb35599b7f9 portage-2.0.51_rc7.ebuild 11795
 MD5 125f9d5c24c2cad5d72f9ba9144d5962 portage-2.0.51-r2.ebuild 12232
 MD5 63cadb5f6ef798aaa8b95a899fdea82f portage-2.0.50-r11.ebuild 11572
@@ -11,12 +11,11 @@ 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 c87665ae99f2cf65afa22cc82bb67299 files/RequiredBinary.diff 399
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBi1QJBDOEqLMd+jQRAgmAAKCYfJoXYmHebXSAI04W2Ibte8iWUQCg4/SH
-9BEb2iuy30eANZXKIzQE4zY=
-=ZSSJ
+iD8DBQFBi1XBBDOEqLMd+jQRAlVUAJsGDj+Z74X2iFRXcrM9ApSDygto6QCeMwj2
++foErP9wNVtGeEDyCJ6SGY4=
+=4l1z
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/RequiredBinary.diff b/sys-apps/portage/files/RequiredBinary.diff
deleted file mode 100644
index 75c4a05447e4..000000000000
--- a/sys-apps/portage/files/RequiredBinary.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r1.524 portage.py
---- portage.py	20 Oct 2004 01:24:49 -0000	1.524
-+++ portage.py	21 Oct 2004 22:50:09 -0000
-@@ -6379,6 +6379,7 @@
- 		if dircache.has_key(self.dbcatdir):
- 			del dircache[self.dbcatdir]
- 		print ">>>",self.mycpv,"merged."
-+		return 0
- 
- 	def mergeme(self,srcroot,destroot,outfile,secondhand,stufftomerge,cfgfiledict,thismtime):
- 		srcroot=os.path.normpath("///"+srcroot)+"/"
diff --git a/sys-apps/portage/portage-2.0.51-r3.ebuild b/sys-apps/portage/portage-2.0.51-r3.ebuild
index f023671156cc..e88dcfd413d4 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.1 2004/11/05 10:20:24 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r3.ebuild,v 1.2 2004/11/05 10:27:54 carpaski Exp $
 
 IUSE="build selinux"
 inherit flag-o-matic
@@ -52,6 +52,7 @@ check_multilib() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	sed -i "s:^CFLAGS =.*:CFLAGS = :" src/sandbox-1.1/Makefile
 }
 
 src_compile() {
-- 
2.26.2