added s390 gcc-3.3.3 patch from bug 47915, added USE flags for f77, objc

4 files changed, 49 insertions, 45 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 959a55b53a66..11a37859b0c8 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.205 2004/04/19 06:58:36 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.206 2004/04/20 22:41:08 solar Exp $
+
+  20 Apr 2004; <solar@gentoo.org> gcc-3.3.3-r2.ebuild:
+  add s390 gcc-3.3.3 patch from bug 47915, added USE flags for f77, objc from
+  bug 23171
 
 *gcc-3.4.0_pre20040416 (19 Apr 2004)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 8c8790dc18d4..ff810d7294d7 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,5 @@
-MD5 47b80f4f6d8e0255f5b591f1478ea6e5 ChangeLog 43019
+MD5 3cf25364bf81300d74ad79fd926a75a8 gcc-3.4.0_pre20040416.ebuild 17676
+MD5 f4d3fcb012d0d37c3e99c1ca071b7be7 ChangeLog 43165
 MD5 3f93a4e13d7913e457725df427af94ec gcc-2.95.3-r7.ebuild 5433
 MD5 2d45b773ad452bfebfd7c8110b29e28c gcc-2.95.3-r8.ebuild 9207
 MD5 a18ba0e1ee7104324747ea7e48bc3bde gcc-3.0.4-r6.ebuild 8734
@@ -10,6 +11,8 @@ MD5 8a2d0081e6c0f75912849fbb37f3c531 gcc-3.2.2-r2.ebuild 15862
 MD5 8c9407ec40e58c4ebeabe5ee6e93a52a gcc-3.2.2.ebuild 16096
 MD5 66c44b1d25a762f4f6635b464d0ca23d gcc-3.2.3-r2.ebuild 17322
 MD5 f1a540d73bcf0b733f61c635b51df79a gcc-3.2.3-r3.ebuild 19860
+MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 3c7ca40df4ece3b152f88d18cfeb9d7e gcc-3.2.3-r4.ebuild 20116
 MD5 ee4c2af55e5e81b42b0246981cb7ef4d gcc-3.3-r1.ebuild 16529
 MD5 3c0d91ac99e191e0098f14b83f28ed44 gcc-3.3.1-r1.ebuild 16128
@@ -21,16 +24,13 @@ MD5 14cf69f1206d85356781dd2ad63eb7ca gcc-3.3.2-r4.ebuild 20741
 MD5 a4dce7a3b5d15bc0aea1112c6d22d3e1 gcc-3.3.2-r5.ebuild 21476
 MD5 9fb6a5505f97c736a3f40f84ea9c71da gcc-3.3.2-r6.ebuild 21217
 MD5 21164425b8a8b9c2a229e0dc4d90d83c gcc-3.3.2-r7.ebuild 21882
-MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908
+MD5 baab51ccb03f6473137c557cea2a7fff gcc-3.3.3-r2.ebuild 23434
 MD5 649ffa5bd3711a27f3736b88a1656d1e gcc-3.3.3.ebuild 22044
 MD5 a6dd62d4bac8bd5630f21e56dbe5919c gcc-3.3.3_pre20040130.ebuild 21520
 MD5 7eb36ba5811423e02b4ae4c11d8869c5 gcc-3.3.3_pre20040215.ebuild 22195
 MD5 bf7add12719601cde5aa3fd28467e033 gcc-3.3.3_pre20040322.ebuild 22622
 MD5 bdaadd8732e58e8c60242fcddc6cfaa5 gcc-3.3.ebuild 16663
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 68045344fc5221f337337b6d2bfaef48 gcc-3.3.3_pre20040408-r1.ebuild 22693
-MD5 ecaadecb87053437e253d3e56b681253 gcc-3.3.3-r2.ebuild 23284
-MD5 8bb8af5ce35b745844b3cd70b6f7c9af gcc-3.4.0_pre20040416.ebuild 17609
 MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
 MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r7 64
@@ -43,40 +43,40 @@ MD5 3853f5e3fdf34c40e6f45ae35a845c99 files/digest-gcc-3.2.1-r7 223
 MD5 cd99b576d23043d02ee0b47a63c0c95e files/digest-gcc-3.2.2 64
 MD5 a71b08c7e35abe2526586874801de12e files/digest-gcc-3.2.2-r2 226
 MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r2 279
-MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r3 279
-MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
 MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
 MD5 12d4b0c4fc49fad52850ab007c3c7371 files/digest-gcc-3.3-r1 353
+MD5 b56b1fa94f82e5c569de7677b8a485e0 files/fix_libtool_files.sh 1738
+MD5 b1a242694f56184cbcdd40ba25800d50 files/gcc-2.95.3-alpha.diff 14345
+MD5 2d5af6fe0b03d39a94cb4c4d4b03e226 files/gcc-2.95.3-atexit.diff 1731
+MD5 73da03a8bd40327709e7850d9e2158e6 files/gcc-2.95.3-destructor-atexit.diff 3890
+MD5 523970c128b929fe7c7cf36508ebd1d5 files/gcc-2.95.3-new-atexit.diff 13604
+MD5 385267d11aa8b32522d1585b2d520476 files/gcc-3-deopt-doc.patch 819
+MD5 a84561f46d573c1c835b1c4d2510cc07 files/gcc-3-deopt.patch 588
+MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771
+MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
+MD5 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
+MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
+MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
 MD5 c850f6ba5703712442b90b2c00060a15 files/digest-gcc-3.3.1-r1 361
 MD5 d192284727acd002cf658d4c559c2d39 files/digest-gcc-3.3.1-r5 361
-MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
 MD5 0d86971219ddd6dcb86f032bc2b93691 files/digest-gcc-3.3.2-r1 361
 MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361
+MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r3 279
 MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r3 361
+MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
 MD5 29b68fb9b347114baf405bf67ebca0cd files/digest-gcc-3.3.2-r4 361
 MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
+MD5 782ac9b8dbc629fe4fdfaa7744cfc004 files/scan_libgcc_linked_ssp.sh 869
+MD5 21848cde4833618f2898e7d17b75633e files/scan_libgcc_linked_ssp.txt 173
 MD5 41e5a58d926345eb32e6a2ba3ab17031 files/digest-gcc-3.3.2-r6 361
+MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
 MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
-MD5 35f63854b7b4d5ab1ed1489e517f8e24 files/digest-gcc-3.3.3 361
-MD5 904ce8632d6dfbe0cc44ff5c5e03b4d3 files/digest-gcc-3.3.3-r2 522
 MD5 ac529391146ca1021405f8ec7a4b0579 files/digest-gcc-3.3.3_pre20040130 138
+MD5 35f63854b7b4d5ab1ed1489e517f8e24 files/digest-gcc-3.3.3 361
 MD5 9996ea8d65888808363832ea1571fe0a files/digest-gcc-3.3.3_pre20040215 138
 MD5 9996ea8d65888808363832ea1571fe0a files/digest-gcc-3.3.3_pre20040322 138
-MD5 b56b1fa94f82e5c569de7677b8a485e0 files/fix_libtool_files.sh 1738
-MD5 b1a242694f56184cbcdd40ba25800d50 files/gcc-2.95.3-alpha.diff 14345
-MD5 2d5af6fe0b03d39a94cb4c4d4b03e226 files/gcc-2.95.3-atexit.diff 1731
-MD5 73da03a8bd40327709e7850d9e2158e6 files/gcc-2.95.3-destructor-atexit.diff 3890
-MD5 523970c128b929fe7c7cf36508ebd1d5 files/gcc-2.95.3-new-atexit.diff 13604
-MD5 385267d11aa8b32522d1585b2d520476 files/gcc-3-deopt-doc.patch 819
-MD5 a84561f46d573c1c835b1c4d2510cc07 files/gcc-3-deopt.patch 588
-MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771
-MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
-MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
-MD5 782ac9b8dbc629fe4fdfaa7744cfc004 files/scan_libgcc_linked_ssp.sh 869
-MD5 21848cde4833618f2898e7d17b75633e files/scan_libgcc_linked_ssp.txt 173
-MD5 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
-MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
 MD5 e962c23dd4396850f0e36424ec5596d7 files/digest-gcc-3.3.3_pre20040408-r1 138
+MD5 a8f9d9a5494636938f6b592a18b1d3f4 files/digest-gcc-3.3.3-r2 522
 MD5 950b9eff1a400f711b78c8406d43f357 files/digest-gcc-3.4.0_pre20040416 235
 MD5 aa7a1e8bbe618c0d88368e69caeb7653 files/3.1/gcc31-attr-visibility.patch.bz2 3671
 MD5 8b4c6af1c730dcdd843a77e8095d312b files/3.1/gcc31-attr-visibility2.patch.bz2 2341
@@ -98,7 +98,6 @@ MD5 2f1d2c02b99aa182f1fd9b6328c8b77a files/3.1/gcc31-libstdc++-setrlim.patch.bz2
 MD5 df404bbcc95193a2591895758915e74e files/3.1/gcc31-pr6643.patch.bz2 421
 MD5 386ffd7fc3ca4a8af55155fe57871dc4 files/3.1/gcc31-test-rotate.patch.bz2 1060
 MD5 7f4bc242692c8e5a2ea0e3e865433d94 files/3.1/gcc31-trunc_int_for_mode.patch.bz2 826
-MD5 5e566b0a0474c48326f3a0904a0e048d files/3.4.0/gcc-3.4.0_pre20040416-gentoo-branding.patch 807
 MD5 2b3b3b8637dc17eedce3b1ca1b68f1f1 files/3.2/gcc-3.2-glibc-2.3-compat.diff 5511
 MD5 a97a78f90c372855823b9facf1ba57b6 files/3.2/gcc-3.2.ctype.patch 3500
 MD5 7f884a426afe182c10d2a5fad94c73cc files/3.2/gcc-3.2.fix-copy.patch 2185
@@ -124,26 +123,27 @@ MD5 465eeaf6008c25dc69ff502dc2a9d8e0 files/3.2.2/gcc322-ggc_page-speedup.patch 8
 MD5 ccb007933a794eb661ee3b742189f285 files/3.2.2/gcc322-pr8746.patch 2816
 MD5 f055e4ef28077477e8d64c6a985b1ad4 files/3.2.2/gcc322-pr9888.patch 9771
 MD5 52ef1426cb70a472182503502b768058 files/3.2.3/gcc-3.2.3-mergel-fix.patch 2749
-MD5 a3315d69ba1be0bc1518a75027896bf3 files/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch 3534
 MD5 1f4f8ca52d2dda4a5dc3a9b8f130841c files/3.2.3/gcc-323-propolice-version.patch 700
 MD5 c9c45dab64bab25e716859626ad7f94f files/3.2.3/gcc32-c++-classfn-member-template.patch 3219
 MD5 494d917cc15c81c9cead4a8c17d4d00d files/3.2.3/gcc32-mklibgcc-serialize-crtfiles.patch 926
 MD5 99db7c1a41babe024f0c6859c30a87ee files/3.2.3/gcc323-gentoo-branding.patch 2058
 MD5 869b9a1ea49bf8b07c8405d2f1d76270 files/3.2.3/gcc323-hppa-default_assemble_visibility.patch 571
+MD5 a3315d69ba1be0bc1518a75027896bf3 files/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch 3534
 MD5 d047c78a9141b16915d8ec3f54d1e246 files/3.3/gcc33-coreutils-compat.patch.bz2 3462
 MD5 f6b6f7c3577eccb694066bb54dd8075a files/3.3/gcc33-gentoo-branding-1.patch 870
 MD5 d6ee829d1712436361f5f1daf7b14e83 files/3.3/gcc33-gentoo-branding.patch 890
 MD5 088e0807e677010cafe4e590e8711be1 files/3.3/gcc33-no-multilib-amd64.patch 343
 MD5 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570
+MD5 5f465144ef81f1b7c7f6d6abe6e4c59f files/awk/fixlafiles.awk 6285
+MD5 71ad2adafb2cc70631244faca2a85c63 files/awk/scanforssp.awk 5837
 MD5 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874
 MD5 b398b7415b93423ff04952c6e69bdb4d files/3.3.1/gcc331-pp-fixup.patch 407
-MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607
-MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
 MD5 cd87c02e4896f47bf6029eef0dc29468 files/3.3.3/gcc333-gentoo-branding.patch 874
 MD5 0e8d94bbc14fbb3fbad1df4f404b39ef files/3.3.3/gcc333-ssp-3.3_7-fixup.patch 2616
 MD5 4b249bff27ab6328436e6289ac9f9cfc files/3.3.3/gcc333_pre20040215-gentoo-branding.patch 839
 MD5 f317331e0b196ca455ca9554479cd8eb files/3.3.3/gcc333_pre20040322-gentoo-branding.patch 817
 MD5 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040408-gentoo-branding.patch 820
 MD5 3210d5fd70806c44d4426c3dceebd480 files/3.3.3/gcc333_pre20040408-stack-size.patch 653
-MD5 5f465144ef81f1b7c7f6d6abe6e4c59f files/awk/fixlafiles.awk 6285
-MD5 71ad2adafb2cc70631244faca2a85c63 files/awk/scanforssp.awk 5837
+MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
+MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607
+MD5 5e566b0a0474c48326f3a0904a0e048d files/3.4.0/gcc-3.4.0_pre20040416-gentoo-branding.patch 807
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.3-r2 b/sys-devel/gcc/files/digest-gcc-3.3.3-r2
index eb32d228c9cb..364d812f0033 100644
--- a/sys-devel/gcc/files/digest-gcc-3.3.3-r2
+++ b/sys-devel/gcc/files/digest-gcc-3.3.3-r2
@@ -1,5 +1,5 @@
 MD5 3c6cfd9fcd180481063b4058cf6faff2 gcc-3.3.3.tar.bz2 23279245
-MD5 4b757459fb3d0e69031a86de80320ad9 gcc-3.3.3-patches-1.0.tar.bz2 23675
+MD5 c05d23a5be161d14000c91dde14c8689 gcc-3.3.3-patches-1.1.tar.bz2 49688
 MD5 c6f0f4baae3ef904ba8886d7ef99938d gcc-3.3.3-branch-update-20040217.patch.bz2 150987
 MD5 b62b5856753294821c4cea8bd28ffe1d protector-3.3-7.tar.gz 25068
 MD5 7bfc29747dfc5fa614b5ac366bf38224 gcc-3.3.3-manpages.tar.bz2 137822
diff --git a/sys-devel/gcc/gcc-3.3.3-r2.ebuild b/sys-devel/gcc/gcc-3.3.3-r2.ebuild
index 0cf799282d1c..5366211c95c7 100644
--- a/sys-devel/gcc/gcc-3.3.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2004 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.3-r2.ebuild,v 1.2 2004/04/20 20:29:02 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r2.ebuild,v 1.3 2004/04/20 22:41:08 solar Exp $
 
-IUSE="static nls bootstrap java build X multilib nogcj hardened uclibc"
+IUSE="static nls bootstrap java build X multilib nogcj hardened uclibc f77 objc"
+KEYWORDS="~x86 ~mips ~sparc amd64 -hppa ~alpha ~ia64 ~ppc64 s390"
 
 inherit eutils flag-o-matic libtool
 
@@ -57,7 +58,7 @@ PP_FVER="${PP_VER//_/.}-7"
 
 # Patch tarball support ...
 #PATCH_VER="1.0"
-PATCH_VER="1.0"
+PATCH_VER="1.1"
 
 # Snapshot support ...
 #SNAPSHOT="2002-08-12"
@@ -109,8 +110,6 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 
 LICENSE="GPL-2 LGPL-2.1"
 
-KEYWORDS="~x86 ~mips ~sparc amd64 -hppa ~alpha ~ia64 ~ppc64"
-
 # Ok, this is a hairy one again, but lets assume that we
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
@@ -148,7 +147,7 @@ DEPEND="virtual/glibc
 
 RDEPEND="virtual/glibc
 	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-	hardened? ( >=sys-libs/glibc-2.3.3_pre20040207 )
+	hardened? ( !amd64? ( >=sys-libs/glibc-2.3.3_pre20040207 ) )
 	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
@@ -295,8 +294,6 @@ src_unpack() {
 	# Fixup libtool to correctly generate .la files with portage
 	elibtoolize --portage --shallow
 
-	echo
-
 	# Branch update ...
 	if [ -n "${BRANCH_UPDATE}" ]
 	then
@@ -390,7 +387,11 @@ src_compile() {
 	if [ -z "`use build`" ]
 	then
 		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++,f77,objc"
+		gcc_lang="c,c++"
+		use f77  && gcc_lang="${gcc_lang},f77"
+		use objc && gcc_lang="${gcc_lang},objc"
+		[ -n "`use java`" -a -z "`use nogcj`" ] && gcc_lang="${gcc_lang},java"
+		# use ada  && gcc_lang="${gcc_lang},ada"
 	else
 		gcc_lang="c"
 	fi
@@ -400,10 +401,6 @@ src_compile() {
 	else
 		myconf="${myconf} --enable-nls --without-included-gettext"
 	fi
-	if [ -n "`use java`" -a -z "`use nogcj`" -a -z "`use build`" ]
-	then
-		gcc_lang="${gcc_lang},java"
-	fi
 
 	# Enable building of the gcj Java AWT & Swing X11 backend
 	# if we have X as a use flag and are not in a build stage.
@@ -673,9 +670,12 @@ src_install() {
 		cd ${S}/libiberty
 		docinto ${CCHOST}/libiberty
 		dodoc ChangeLog* COPYING.LIB README
+		if [ -z "`use objc`" ]
+		then
 		cd ${S}/libobjc
 		docinto ${CCHOST}/libobjc
 		dodoc ChangeLog* README* THREADS*
+		fi
 		cd ${S}/libstdc++-v3
 		docinto ${CCHOST}/libstdc++-v3
 		dodoc ChangeLog* README