initial commit for gcc 3.4.0 pre-release. currently only amd64 is tested well with gcc 3.4, gcj is broken, and some things dont compile properly. PIE-by-default support has been added, but propolice has yet to be ported.

5 files changed, 629 insertions, 28 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 62aa84e9af45..959a55b53a66 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,15 @@
 # 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.204 2004/04/18 23:41:31 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.205 2004/04/19 06:58:36 lv Exp $
+
+*gcc-3.4.0_pre20040416 (19 Apr 2004)
+
+  19 Apr 2004; Travis Tilley <lv@gentoo.org>
+  +files/3.4.0/gcc-3.4.0_pre20040416-gentoo-branding.patch,
+  +gcc-3.4.0_pre20040416.ebuild:
+  initial commit for gcc 3.4.0 pre-release. currently only amd64 is tested well
+  with gcc 3.4, gcj is broken, and some things dont compile properly.
+  PIE-by-default support has been added, but propolice has yet to be ported.
 
   18 Apr 2004; <solar@gentoo.org> :
   ChangeLog correction.. instructions on unmasking can be found in
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 025af36b43b4..83b4bb95ce2b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -10,8 +10,6 @@ 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 22d9e3c49111d1b8b8ec1484732087c9 metadata.xml 259
 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
@@ -23,13 +21,16 @@ 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 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 ecaadecb87053437e253d3e56b681253 gcc-3.3.3-r2.ebuild 23284
+MD5 22d9e3c49111d1b8b8ec1484732087c9 metadata.xml 259
 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
@@ -42,40 +43,41 @@ 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 ac529391146ca1021405f8ec7a4b0579 files/digest-gcc-3.3.3_pre20040130 138
 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 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 904ce8632d6dfbe0cc44ff5c5e03b4d3 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
 MD5 98f539e65ab7e21994e5d378537a5506 files/3.1/gcc31-boehm-gc-libs.patch.bz2 1921
@@ -96,6 +98,7 @@ 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
@@ -121,26 +124,26 @@ 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 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
-MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607
+MD5 5f465144ef81f1b7c7f6d6abe6e4c59f files/awk/fixlafiles.awk 6285
+MD5 71ad2adafb2cc70631244faca2a85c63 files/awk/scanforssp.awk 5837
diff --git a/sys-devel/gcc/files/3.4.0/gcc-3.4.0_pre20040416-gentoo-branding.patch b/sys-devel/gcc/files/3.4.0/gcc-3.4.0_pre20040416-gentoo-branding.patch
new file mode 100644
index 000000000000..6b800aa970f0
--- /dev/null
+++ b/sys-devel/gcc/files/3.4.0/gcc-3.4.0_pre20040416-gentoo-branding.patch
@@ -0,0 +1,17 @@
+--- ./gcc/version.c.old	2004-04-14 22:56:56.648777912 -0400
++++ ./gcc/version.c	2004-04-14 22:57:44.311532072 -0400
+@@ -5,7 +5,7 @@
+    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.4.0 20040416 (prerelease)";
++const char version_string[] = "3.4.0 20040416 (prerelease) @GENTOO@";
+ 
+ /* This is the location of the online document giving instructions for
+    reporting bugs.  If you distribute a modified version of GCC,
+@@ -14,4 +14,4 @@
+    forward us bugs reported to you, if you determine that they are
+    not bugs in your modifications.)  */
+ 
+-const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
++const char bug_report_url[] = "<URL:http://bugs.gentoo.org/>";
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.0_pre20040416 b/sys-devel/gcc/files/digest-gcc-3.4.0_pre20040416
new file mode 100644
index 000000000000..25a618251233
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.4.0_pre20040416
@@ -0,0 +1,3 @@
+MD5 d6e215ce39a302c643f3ea8994ef6b68 gcc-3.4.0-20040416.tar.bz2 27919011
+MD5 70ea114bafaf053177e81a6687a14251 gcc-3.4.0-v8.5.3-nodefault-pie-ssp.patch 10847
+MD5 3573dfa5694ca8cc89fd19df3dfdd0ef gcc-3.3.3-v8.5.3-gcc-exclusion.patch 783
diff --git a/sys-devel/gcc/gcc-3.4.0_pre20040416.ebuild b/sys-devel/gcc/gcc-3.4.0_pre20040416.ebuild
new file mode 100644
index 000000000000..bba083703d0d
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.4.0_pre20040416.ebuild
@@ -0,0 +1,569 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+IUSE="static nls bootstrap java build X multilib nogcj hardened"
+
+DESCRIPTION="The GNU Compiler Collection.  Includes C/C++ and java compilers, as well as support for pax PIE"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+
+LICENSE="GPL-2 LGPL-2.1"
+
+# Install this and I cannot be held responsible for system failure, random
+# bugs, or sudden onset of insanity. YOU HAVE BEEN WARNED!! (though, really,
+# 3.4 appears to be safe in general unless you're compiling binutils)
+KEYWORDS="-*"
+#KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~mips ~ia64 ~ppc64 ~hppa ~alpha ~s390"
+
+# PIE support
+PIE_VER="8.5.3"
+# forward port of the gcc 3.3 version, only with SSP disabled until
+# a port of propolice to 3.4 is completed.
+PIE_BASE_DIR="mirror://gentoo/"
+PIE_SSP_PATCH="gcc-3.4.0-v${PIE_VER}-nodefault-pie-ssp.patch"
+PIE_EXCLUSION_PATCH="gcc-3.3.3-v${PIE_VER}-gcc-exclusion.patch"
+
+# Pre-release
+S="${WORKDIR}/gcc-${PV/_pre/-}"
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PV/_pre/-}/gcc-${PV/_pre/-}.tar.bz2
+	${PIE_BASE_URI}${PIE_SSP_PATCH}
+	${PIE_BASE_URI}${PIE_EXCLUSION_PATCH}"
+
+inherit eutils flag-o-matic libtool
+
+# Recently there has been a lot of stability problems in Gentoo-land.  Many
+# things can be the cause to this, but I believe that it is due to gcc3
+# still having issues with optimizations, or with it not filtering bad
+# combinations (protecting the user maybe from himeself) yet.
+#
+# This can clearly be seen in large builds like glibc, where too aggressive
+# CFLAGS cause the tests to fail miserbly.
+#
+# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
+# knows what he is talking about:
+#
+#   People really shouldn't force code-specific options on... It's a
+#   bad idea. The -march options aren't just to look pretty. They enable
+#   options that are sensible (and include sse,mmx,3dnow when apropriate).
+#
+# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
+# you do not like it, comment it, but do not bugreport if you run into
+# problems.
+#
+# <azarah@gentoo.org> (13 Oct 2002)
+strip-flags
+
+# gcc produce unstable binaries if compiled with a different CHOST.
+[ "${ARCH}" = "hppa" ] && export CHOST="hppa-unknown-linux-gnu"
+
+# Theoretical cross compiler support
+[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
+
+LOC="/usr"
+MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
+MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+
+# GCC 3.4 no longer uses gcc-lib. we'll rename this later for compatibility
+# reasons, as a few things would break without gcc-lib.
+LIBPATH="${LOC}/lib/gcc/${CCHOST}/${MY_PV_FULL}"
+BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
+DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
+# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
+# We will handle /usr/include/g++-v3/ with gcc-config ...
+STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
+
+# GCC 3.4 introduces a new version of libstdc++
+if [ "${CHOST}" == "${CCHOST}" ]
+then
+	SLOT="${MY_PV}"
+else
+	SLOT="${CCHOST}-${MY_PV}"
+fi
+
+# We need the later binutils for support of the new cleanup attribute.
+# 'make check' fails for about 10 tests (if I remember correctly) less
+# if we use later bison.
+DEPEND="virtual/glibc
+	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
+	>=sys-devel/binutils-2.14.90.0.8-r1
+	>=sys-devel/bison-1.875
+	>=sys-devel/gcc-config-1.3.1
+	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) )
+	!build? ( >=sys-libs/ncurses-5.2-r2
+	          nls? ( sys-devel/gettext ) )"
+
+RDEPEND="virtual/glibc
+	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
+	>=sys-devel/gcc-config-1.3.1
+	>=sys-libs/zlib-1.1.4
+	>=sys-apps/texinfo-4.2-r4
+	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+
+PDEPEND="sys-devel/gcc-config"
+
+
+chk_gcc_version() {
+	# This next bit is for updating libtool linker scripts ...
+	local OLD_GCC_VERSION="`gcc -dumpversion`"
+	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
+	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
+
+	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
+	then
+		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
+	fi
+
+	if [ -n "${OLD_GCC_CHOST}" ]
+	then
+		if [ "${CHOST}" = "${CCHOST}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
+		then
+			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
+		fi
+	fi
+
+	# Did we check the version ?
+	touch "${WORKDIR}/.chkgccversion"
+}
+
+version_patch() {
+	[ ! -f "$1" ] && return 1
+	[ -z "$2" ] && return 1
+
+	sed -e "s:@GENTOO@:$2:g" ${1} > ${T}/${1##*/}
+	epatch ${T}/${1##*/}
+}
+
+src_unpack() {
+	ewarn "Do not hold me accountable if GCC 3.4 makes things unstable, wont"
+	ewarn "compile your favorite piece of software, breaks anything C++"
+	ewarn "that you compiled with it after uninstalling gcc 3.4, miscompiles"
+	ewarn "binutils at optimisation levels greater than -O2, eats your cat,"
+	ewarn "humps your leg, or pees on your rug. YOU HAVE BEEN WARNED!!!"
+
+	unpack ${A}
+	local release_version="Gentoo Linux ${PVR}"
+
+	cd ${S}
+	# Fixup libtool to correctly generate .la files with portage
+	elibtoolize --portage --shallow
+
+	echo
+
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
+	then
+		epatch ${FILESDIR}/gcc331_use_multilib.amd64.patch
+	fi
+
+	# This patch enables improved PIE and SSP behaviour but does not
+	# enable it by default ...
+	cd ${S} && epatch "${DISTDIR}/${PIE_SSP_PATCH}"
+	use uclibc || epatch ${DISTDIR}/${PIE_EXCLUSION_PATCH}
+	release_version="${release_version}, pie-${PIE_VER}"
+
+	if [ -n "`use hardened`" ]
+	then
+		einfo "Updating gcc to use automatic PIE + SSP building ..."
+		sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP -fPIC|' \
+			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+
+		# will show if default PIE/SSP building was used - make bug reports easier
+		release_version="${release_version/Gentoo/Gentoo Hardened}"
+	fi
+
+	version_patch ${FILESDIR}/3.4.0/gcc-${PV}-gentoo-branding.patch \
+		"${BRANCH_UPDATE} (${release_version})" || die "Failed Branding"
+
+	# TODO: on arches where we lack a Scrt1.o (like parisc) we still need unpack, compile and install logic
+	# TODO: for the crt1Snocsu.o provided by a custom gcc-pie-ssp.tgz which can also be included in SRC_URI
+
+	# Misdesign in libstdc++ (Redhat)
+	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
+
+	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
+}
+
+src_compile() {
+
+	local myconf=
+	local gcc_lang=
+
+	if [ -z "`use build`" ]
+	then
+		myconf="${myconf} --enable-shared"
+		gcc_lang="c,c++,f77,objc"
+	else
+		gcc_lang="c"
+	fi
+	if [ -z "`use nls`" -o "`use build`" ]
+	then
+		myconf="${myconf} --disable-nls"
+	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.
+	# X11 support is still very experimental but enabling it is
+	# quite innocuous...  [No, gcc is *not* linked to X11...]
+	# <dragon@gentoo.org> (15 May 2003)
+	if [ -n "`use java`" -a -z "`use nogcj`" -a \
+	     -n "`use X`" -a -z "`use build`" -a \
+	     -f /usr/X11R6/include/X11/Xlib.h ]
+	then
+		myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
+		myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x"
+	fi
+
+	# Multilib isn't quite working yet...
+	#use amd64 && myconf="${myconf} `use_enable multilib`"
+	myconf="${myconf} --disable-multilib"
+
+	# Default arch support
+	use amd64 && myconf="${myconf} --with-cpu=k8 --with-arch=k8"
+
+	# In general gcc does not like optimization, and add -O2 where
+	# it is safe.  This is especially true for gcc-3.3 ...
+	export CFLAGS="${CFLAGS/-O?/-O2}"
+	export CXXFLAGS="${CXXFLAGS/-O?/-O2}"
+	export GCJFLAGS="${CFLAGS/-O?/-O2}"
+
+	# Build in a separate build tree
+	mkdir -p ${WORKDIR}/build
+	cd ${WORKDIR}/build
+
+	einfo "Configuring GCC..."
+	addwrite "/dev/zero"
+	${S}/configure --prefix=${LOC} \
+		--bindir=${BINPATH} \
+		--includedir=${LIBPATH}/include \
+		--datadir=${DATAPATH} \
+		--mandir=${DATAPATH}/man \
+		--infodir=${DATAPATH}/info \
+		--enable-shared \
+		--host=${CHOST} \
+		--target=${CCHOST} \
+		--with-system-zlib \
+		--enable-languages=${gcc_lang} \
+		--enable-threads=posix \
+		--enable-long-long \
+		--disable-checking \
+		--enable-cstdio=stdio \
+		--enable-clocale=generic \
+		--enable-__cxa_atexit \
+		--enable-version-specific-runtime-libs \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--with-local-prefix=${LOC}/local \
+		--disable-werror \
+		${myconf} || die
+
+	touch ${S}/gcc/c-gperf.h
+
+	# Do not make manpages if we do not have perl ...
+	if [ ! -x /usr/bin/perl ]
+	then
+		find ${S} -name '*.[17]' -exec touch {} \; || :
+	fi
+
+	# Setup -j in MAKEOPTS
+	get_number_of_jobs
+
+	einfo "Building GCC..."
+	# Only build it static if we are just building the C frontend, else
+	# a lot of things break because there are not libstdc++.so ....
+	if [ -n "`use static`" -a "${gcc_lang}" = "c" ]
+	then
+		# Fix for our libtool-portage.patch
+		S="${WORKDIR}/build" \
+		emake LDFLAGS="-static" bootstrap \
+			LIBPATH="${LIBPATH}" \
+			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
+		# Above FLAGS optimize and speedup build, thanks
+		# to Jeff Garzik <jgarzik@mandrakesoft.com>
+	else
+		# Fix for our libtool-portage.patch
+		S="${WORKDIR}/build" \
+		emake profiledbootstrap \
+			LIBPATH="${LIBPATH}" \
+			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
+
+	fi
+}
+
+src_install() {
+	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
+	# this can break the build.
+	for x in ${WORKDIR}/build/gcc/include/*
+	do
+		if [ -L ${x} ]
+		then
+			rm -f ${x}
+			continue
+		fi
+	done
+	# Remove generated headers, as they can cause things to break
+	# (ncurses, openssl, etc).
+	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
+	do
+		if grep -q 'It has been auto-edited by fixincludes from' ${x}
+		then
+			rm -f ${x}
+		fi
+	done
+
+	einfo "Installing GCC..."
+	# Do the 'make install' from the build directory
+	cd ${WORKDIR}/build
+	S="${WORKDIR}/build" \
+	make prefix=${LOC} \
+		bindir=${BINPATH} \
+		includedir=${LIBPATH}/include \
+		datadir=${DATAPATH} \
+		mandir=${DATAPATH}/man \
+		infodir=${DATAPATH}/info \
+		DESTDIR="${D}" \
+		LIBPATH="${LIBPATH}" \
+		install || die
+
+	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
+
+	# Because GCC 3.4 installs into the gcc directory and not the gcc-lib
+	# directory, we will have to rename it in order to keep compatibility
+	# with our current libtool check and gcc-config (which would be a pain
+	# to fix compared to this simple mv and symlink).
+	mv ${D}/${LOC}/lib/gcc ${D}/${LOC}/lib/gcc-lib
+	ln -s gcc-lib ${D}/${LOC}/lib/gcc
+	LIBPATH=${LIBPATH/lib\/gcc/lib\/gcc-lib}
+
+	dodir /lib /usr/bin
+	dodir /etc/env.d/gcc
+	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
+	then
+		# amd64 is a bit unique because of multilib.  Add some other paths
+		echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	else
+		echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	fi
+	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	# Also set CC and CXX
+	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+
+	# Make sure we dont have stuff lying around that
+	# can nuke multiple versions of gcc
+	if [ -z "`use build`" ]
+	then
+		cd ${D}${LIBPATH}
+
+		# Tell libtool files where real libraries are
+		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
+		do
+			if [ -f "${x}" ]
+			then
+				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
+				mv ${x} ${D}${LIBPATH}
+			fi
+		done
+
+		# Move all the libraries to version specific libdir.
+		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
+		do
+			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
+		done
+
+		# Move Java headers to compiler-specific dir
+		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
+		do
+			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
+		done
+		for x in gcj gnu java javax org
+		do
+			if [ -d "${D}${LOC}/include/${x}" ]
+			then
+				dodir /${LIBPATH}/include/${x}
+				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
+				rm -rf ${D}${LOC}/include/${x}
+			fi
+		done
+
+		if [ -d "${D}${LOC}/lib/security" ]
+		then
+			dodir /${LIBPATH}/security
+			mv -f ${D}${LOC}/lib/security/* ${D}${LIBPATH}/security
+			rm -rf ${D}${LOC}/lib/security
+		fi
+
+		# Move libgcj.spec to compiler-specific directories
+		[ -f "${D}${LOC}/lib/libgcj.spec" ] && \
+			mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
+
+		# Rename jar because it could clash with Kaffe's jar if this gcc is
+		# primary compiler (aka don't have the -<version> extension)
+		cd ${D}${LOC}/${CCHOST}/gcc-bin/${MY_PV}
+		[ -f jar ] && mv -f jar gcj-jar
+
+		# Move <cxxabi.h> to compiler-specific directories
+		[ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \
+			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
+
+		# These should be symlinks
+		cd ${D}${BINPATH}
+		for x in gcc g++ c++ g77 gcj
+		do
+			rm -f ${CCHOST}-${x}
+			[ -f "${x}" ] && ln -sf ${x} ${CCHOST}-${x}
+
+			if [ -f "${CCHOST}-${x}-${PV}" ]
+			then
+				rm -f ${CCHOST}-${x}-${PV}
+				ln -sf ${x} ${CCHOST}-${x}-${PV}
+			fi
+		done
+	fi
+
+	# This one comes with binutils
+	if [ -f "${D}${LOC}/lib/libiberty.a" ]
+	then
+		rm -f ${D}${LOC}/lib/libiberty.a
+	fi
+
+	cd ${S}
+	if [ -z "`use build`" ]
+	then
+		cd ${S}
+		docinto /${CCHOST}
+		dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README
+		docinto ${CCHOST}/html
+		dohtml *.html
+		cd ${S}/boehm-gc
+		docinto ${CCHOST}/boehm-gc
+		dodoc ChangeLog doc/{README*,barrett_diagram}
+		docinto ${CCHOST}/boehm-gc/html
+		dohtml doc/*.html
+		cd ${S}/gcc
+		docinto ${CCHOST}/gcc
+		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
+		cd ${S}/libf2c
+		docinto ${CCHOST}/libf2c
+		dodoc ChangeLog* README TODO *.netlib
+		cd ${S}/libffi
+		docinto ${CCHOST}/libffi
+		dodoc ChangeLog* LICENSE README
+		cd ${S}/libiberty
+		docinto ${CCHOST}/libiberty
+		dodoc ChangeLog* COPYING.LIB README
+		cd ${S}/libobjc
+		docinto ${CCHOST}/libobjc
+		dodoc ChangeLog* README* THREADS*
+		cd ${S}/libstdc++-v3
+		docinto ${CCHOST}/libstdc++-v3
+		dodoc ChangeLog* README
+		docinto ${CCHOST}/libstdc++-v3/html
+		dohtml -r -a css,diff,html,txt,xml docs/html/*
+		cp -f docs/html/17_intro/[A-Z]* \
+			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
+
+		if [ -n "`use java`" -a -z "`use nogcj`" ]
+		then
+			cd ${S}/fastjar
+			docinto ${CCHOST}/fastjar
+			dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README
+			cd ${S}/libjava
+			docinto ${CCHOST}/libjava
+			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
+		fi
+
+		prepman ${DATAPATH}
+		prepinfo ${DATAPATH}
+	else
+		rm -rf ${D}/usr/share/{man,info}
+		rm -rf ${D}${DATAPATH}/{man,info}
+	fi
+
+	# Rather install the script, else portage with changing $FILESDIR
+	# between binary and source package borks things ....
+	insinto /lib/rcscripts/awk
+	doins ${FILESDIR}/awk/fixlafiles.awk
+	exeinto /sbin
+	doexe ${FILESDIR}/fix_libtool_files.sh
+
+	if [ "${ARCH}" = "amd64" ]
+	then
+		# If using multilib, GCC has a bug, where it doesn't know where to find
+		# -lgcc_s when linking while compiling with g++ .  ${LIBPATH} is in
+		# it's path though, so ln the 64bit and 32bit versions of -lgcc_s
+		# to that directory.
+		# gcc 3.4 places libgcc_s.so in lib64 regardless of whether or not
+		# multilib is enabled, so we'll symlink this even when multilib
+		# isn't in USE.
+		ln -sf ${LIBPATH}/../lib64/libgcc_s.so ${D}/${LIBPATH}/libgcc_s.so
+		use multilib && \
+		ln -sf ${LIBPATH}/../lib32/libgcc_s_32.so ${D}/${LIBPATH}/libgcc_s_32.so
+	fi
+}
+
+pkg_preinst() {
+
+	if [ ! -f "${WORKDIR}/.chkgccversion" ]
+	then
+		chk_gcc_version
+	fi
+
+	# Make again sure that the linker "should" be able to locate
+	# libstdc++.so ...
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
+	then
+		# Can't always find libgcc_s.so.1, make it find it
+		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
+	else
+		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
+	fi
+	${ROOT}/sbin/ldconfig
+}
+
+pkg_postinst() {
+
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
+	then
+		# Can't always find libgcc_s.so.1, make it find it
+		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
+	else
+		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
+	fi
+	if [ "${ROOT}" = "/" -a "${COMPILER}" = "gcc3" -a "${CHOST}" = "${CCHOST}" ]
+	then
+		gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL}
+	fi
+
+	# Update libtool linker scripts to reference new gcc version ...
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
+	then
+		local OLD_GCC_VERSION=
+		local OLD_GCC_CHOST=
+
+		if [ -f "${WORKDIR}/.oldgccversion" ] && \
+		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
+		then
+			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
+		else
+			OLD_GCC_VERSION="${MY_PV_FULL}"
+		fi
+
+		if [ -f "${WORKDIR}/.oldgccchost" ] && \
+		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
+		then
+			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
+		fi
+
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
+	fi
+}
+