small cleanups

4 files changed, 16 insertions, 12 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index f945bfdd81f7..b6bc512d86c7 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -2,11 +2,10 @@ MD5 39ccbf321193edf57160011a8eb2bb59 ChangeLog 22237
 MD5 63530786ea42df2b5ca6e52999f586f2 gcc-2.95.3-r7.ebuild 5464
 MD5 5a4475fa7fe0b65b070ad173457878d5 gcc-2.95.3-r8.ebuild 9170
 MD5 feb010a6cb97e65c1d201a5796e92942 gcc-3.0.4-r6.ebuild 8766
-MD5 3a42a2b550645af63908072f3e6806ca .gcc-3.3.ebuild.swp 32768
 MD5 396808683bbe6fe294fe6f803ec4e7a2 gcc-3.1-r8.ebuild 9803
 MD5 b8162a884971199cc4a538d2e484cdfe gcc-3.1.1-r1.ebuild 9636
 MD5 8b116192168fec85477e59d68d24ac44 gcc-3.2-r5.ebuild 12936
-MD5 763f0a45d567edd07fa1c2095c905815 gcc-3.3.ebuild 15691
+MD5 02a102b3242e813309f7c2687cb60682 gcc-3.3.ebuild 15625
 MD5 b4bab75d7a8ceb7b8b9ce9e245733a2c gcc-3.2.2.ebuild 15271
 MD5 feed532ddfb47b382cd79f924d8578db manifest 7147
 MD5 857d79065f68cdc820201acbeb5c10ac gcc-3.2.1-r7.ebuild 14840
diff --git a/sys-devel/gcc/files/3.3/gcc33-propolice-version.patch b/sys-devel/gcc/files/3.3/gcc33-propolice-version.patch
index 919d859a0be3..5dc85b50a51f 100644
--- a/sys-devel/gcc/files/3.3/gcc33-propolice-version.patch
+++ b/sys-devel/gcc/files/3.3/gcc33-propolice-version.patch
@@ -5,8 +5,8 @@ diff -Narup gcc-3.3.orig/gcc/version.c gcc-3.3/gcc/version.c
     please modify this string to indicate that, e.g. by putting your
     organization's name in parentheses at the end of the string.  */
  
--const char version_string[] = "3.3 (Gentoo Linux 1.4 @PV@)";
-+const char version_string[] = "3.3 (Gentoo Linux 1.4 @PV@, propolice)";
+-const char version_string[] = "3.3 (Gentoo Linux 1.4, PVR @PV@)";
++const char version_string[] = "3.3 (Gentoo Linux 1.4, PVR @PV@, propolice)";
  
  /* This is the location of the online document giving instructions for
     reporting bugs.  If you distribute a modified version of GCC,
diff --git a/sys-devel/gcc/files/digest-gcc-3.3 b/sys-devel/gcc/files/digest-gcc-3.3
index 02e12d7e21fc..7220fbe008d6 100644
--- a/sys-devel/gcc/files/digest-gcc-3.3
+++ b/sys-devel/gcc/files/digest-gcc-3.3
@@ -1,4 +1,5 @@
 MD5 39147717455d8dba4d43d1b058ea46e2 gcc-3.3.tar.bz2 23447616
 MD5 ad23b671345a197cca3d4685e3a97d17 gcc-3.3-patches-1.1.tar.bz2 39336
+MD5 1110bc0bb3196bc37c0cc347e43e4f83 protector-3.2.2-7.tar.gz 24190
 MD5 f838ebcbd0b599c0a0e8a6b6770bba75 gcc-3.3-athlon-hammer-branch-20030515.patch.bz2 227731
 MD5 d9ffc20ae7c26008b7f66fdcdce07f0f gcc-3.3-manpages.tar.bz2 136727
diff --git a/sys-devel/gcc/gcc-3.3.ebuild b/sys-devel/gcc/gcc-3.3.ebuild
index a8e82e3daef3..de14fe83ea7e 100644
--- a/sys-devel/gcc/gcc-3.3.ebuild
+++ b/sys-devel/gcc/gcc-3.3.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.ebuild,v 1.1 2003/05/18 07:41:29 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.ebuild,v 1.2 2003/05/18 13:50:06 azarah Exp $
 
 IUSE="static nls bootstrap java build X"
 
@@ -47,7 +47,9 @@ STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
 
 # ProPolice version
 #PP_VER="3_2_2"
-#PP_FVER="${PP_VER//_/.}-6"
+PP_VER=
+#PP_FVER="${PP_VER//_/.}-7"
+PP_FVER=
 
 # Patch tarball support ...
 #PATCH_VER="1.0"
@@ -55,13 +57,13 @@ PATCH_VER="1.1"
 
 # Snapshot support ...
 #SNAPSHOT="2002-08-12"
-SNAPSHOT=""
+SNAPSHOT=
 
 # Branch update support ...
 MAIN_BRANCH="${PV}"  # Tarball, etc used ...
 
 #BRANCH_UPDATE="20021208"
-BRANCH_UPDATE=""
+BRANCH_UPDATE=
 
 if [ -z "${SNAPSHOT}" ]
 then
@@ -83,6 +85,11 @@ else
 	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
 	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
 fi
+if [ -n "${PP_VER}" ]
+then
+	SRC_URI="${SRC_URI}
+		http://www.trl.ibm.com/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
+fi
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${P}-athlon-hammer-branch-20030515.patch.bz2
 	mirror://gentoo/${P}-manpages.tar.bz2"
@@ -194,10 +201,7 @@ src_unpack() {
 
 	if [ -n "${PP_VER}" ]
 	then
-		# ProPolice Stack Smashing protection - protector-3.2.2-6
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/3.2.3/protector-3.2.2-6-PPC.patch
-		cd ${S}
+		# ProPolice Stack Smashing protection - protector-3.2.2-7
 		epatch ${WORKDIR}/protector.dif
 		epatch ${FILESDIR}/3.2.2/protector_parallel_make.patch
 		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"