Actually add gcc331-pp-fixup.patch for public use.

4 files changed, 23 insertions, 5 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 0140622e9446..fdfd8a14d1aa 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.133 2003/10/14 00:20:33 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.134 2003/10/14 19:50:37 azarah Exp $
+
+  14 Oct 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.1-r5.ebuild,
+  files/3.3.1/gcc331-pp-fixup.patch:
+  Actually add gcc331-pp-fixup.patch for public use.
 
 *gcc-3.3.1-r5 (14 Oct 2003)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 5fa1a7feb127..4335a0ac663a 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -3,11 +3,11 @@ MD5 77dabd76c2610078ebdb9566f8b54503 gcc-3.2.2-r2.ebuild 15843
 MD5 2d93c1b5cbf13ca71798ca2b3cfda29b gcc-3.3.1-r3.ebuild 16096
 MD5 6d0d6b9214ecb88e26a54b70901c50b4 gcc-2.95.3-r7.ebuild 5436
 MD5 3acd503347422782700e912a8188aaf1 gcc-3.3.1-r2.ebuild 16418
-MD5 a6a270b8eef623f859547e8aed0fc766 ChangeLog 29677
+MD5 11895b2913c94e9e336d7f86b14b360e ChangeLog 29841
 MD5 66ea7917242ace41e447948c31e86601 gcc-3.3.1.ebuild 16053
 MD5 3f796d926d7c63b50910a657cb67a358 gcc-3.1.1-r1.ebuild 9595
 MD5 aa01e0515884df05563094839c31d7d1 gcc-3.3.1-r1.ebuild 16131
-MD5 d86d140fbdf730a3848bd8b5fb2f9895 gcc-3.3.1-r5.ebuild 16207
+MD5 699822acaa9f2e5c63442f6e6cc894fc gcc-3.3.1-r5.ebuild 16220
 MD5 c44c493b629be3a1abbc1eb4d3cb00d1 gcc-3.1-r8.ebuild 9776
 MD5 459fe070924cbfd485139f84f2dd47ff gcc-3.0.4-r6.ebuild 8738
 MD5 25a95ad59dc52c9ec23faf193ea4f168 gcc-3.3.ebuild 16642
@@ -64,6 +64,7 @@ MD5 99db7c1a41babe024f0c6859c30a87ee files/3.2.3/gcc323-gentoo-branding.patch 20
 MD5 1f4f8ca52d2dda4a5dc3a9b8f130841c files/3.2.3/gcc-323-propolice-version.patch 700
 MD5 869b9a1ea49bf8b07c8405d2f1d76270 files/3.2.3/gcc323-hppa-default_assemble_visibility.patch 571
 MD5 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874
+MD5 b398b7415b93423ff04952c6e69bdb4d files/3.3.1/gcc331-pp-fixup.patch 407
 MD5 ea61b0ff2db11805fb0778c63b51f43b files/3.1/gcc31-c++-null-pm-init.patch.bz2 4434
 MD5 87f7be372b23072220fbceed8a127474 files/3.1/gcc31-dwarf2-pr6436-test.patch.bz2 336
 MD5 a235188ad8a8ac2bb3dc8fcd51603225 files/3.1/gcc31-fold-const.patch.bz2 1867
diff --git a/sys-devel/gcc/files/3.3.1/gcc331-pp-fixup.patch b/sys-devel/gcc/files/3.3.1/gcc331-pp-fixup.patch
new file mode 100644
index 000000000000..42c4345c8f1c
--- /dev/null
+++ b/sys-devel/gcc/files/3.3.1/gcc331-pp-fixup.patch
@@ -0,0 +1,13 @@
+--- protector.dif	2003-09-22 11:39:22.000000000 +0200
++++ /tmp/protector.dif	2003-10-03 21:21:54.661231248 +0200
+@@ -272,9 +272,9 @@
+ *************** Software Foundation, 59 Temple Place - S
+ *** 45,50 ****
+ --- 45,51 ----
+-  #include "langhooks.h"
+   #include "intl.h"
+   #include "tm_p.h"
++  #include "input.h"
+ + #include "protector.h"
+   
+   /* Decide whether a function's arguments should be processed
diff --git a/sys-devel/gcc/gcc-3.3.1-r5.ebuild b/sys-devel/gcc/gcc-3.3.1-r5.ebuild
index 25b5246e51a7..1992082b8db2 100644
--- a/sys-devel/gcc/gcc-3.3.1-r5.ebuild
+++ b/sys-devel/gcc/gcc-3.3.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.1-r5.ebuild,v 1.1 2003/10/14 00:20:33 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.1-r5.ebuild,v 1.2 2003/10/14 19:50:37 azarah Exp $
 
 IUSE="static nls bootstrap java build X"
 
@@ -213,7 +213,7 @@ src_unpack() {
 	then
 		# ProPolice Stack Smashing protection
 		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch /tmp/gcc331-pp-fixup.patch
+		epatch ${FILESDIR}/3.3.1/gcc331-pp-fixup.patch
 		epatch ${WORKDIR}/protector.dif
 		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
 		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"