piessp version 8.6.4 from Peter S. Mazinger. Additional patches added redhat ice-hack updated and more uclibc updates

4 files changed, 855 insertions, 31 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 2791a309ec69..5a6f4608a38e 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.230 2004/05/01 03:51:58 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.231 2004/05/01 05:41:55 solar Exp $
+
+  01 May 2004; <solar@gentoo.org> :
+  piessp version 8.6.4 from Peter S. Mazinger. Additional patches added redhat
+  ice-hack updated and more uclibc updates
 
   30 Apr 2004; Tom Gall <tgall@gentoo.org> gcc-3.3.3_pre20040322.ebuild,
   gcc-3.3.3_pre20040408-r1.ebuild, gcc-3.3.3_pre20040426.ebuild:
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2c8711534a9a..8268a70c3978 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,13 +1,16 @@
-MD5 9e525babd8091900dca7ffe9680b28eb ChangeLog 46972
+MD5 b070a6473b9b6721cecb43e9b76397b7 gcc-3.3.3-r3.ebuild 24259
+MD5 0aa6c1762537ef903f4351cd1bdeb73e ChangeLog 47131
+MD5 d8025ace6a23ccbb2a5b3e2a7d0b6bfc gcc-3.3.3-r4.ebuild 24458
 MD5 4bc0ae0e0e19f54dc1ea7a075745b063 gcc-2.95.3-r7.ebuild 5396
 MD5 c7e55fc7f4bfd637f45786c0c5fbb365 gcc-2.95.3-r8.ebuild 9095
 MD5 b6a375116a668edbe10b2ac2e1f9fc6d gcc-3.0.4-r6.ebuild 8577
 MD5 68da62e17a31058a92822721b553eca9 gcc-3.1.1-r1.ebuild 9424
-MD5 b070a6473b9b6721cecb43e9b76397b7 gcc-3.3.3-r3.ebuild 24259
 MD5 ca6cec20814fc6a27d5b1394ef02c867 gcc-3.2.1-r7.ebuild 14773
 MD5 8a2d0081e6c0f75912849fbb37f3c531 gcc-3.2.2-r2.ebuild 15862
 MD5 8c9407ec40e58c4ebeabe5ee6e93a52a gcc-3.2.2.ebuild 16096
 MD5 095a6bf5cd956fee643eebac0b60c367 gcc-3.4.0.ebuild 23692
+MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 f4b8a28609fe4d914076c91d9840c629 gcc-3.2.3-r4.ebuild 20112
 MD5 3a2e4f5d5f2d94e5ee2a399ab3b0f32e gcc-3.3-r1.ebuild 16506
 MD5 3c0d91ac99e191e0098f14b83f28ed44 gcc-3.3.1-r1.ebuild 16128
@@ -19,58 +22,57 @@ MD5 14cf69f1206d85356781dd2ad63eb7ca gcc-3.3.2-r4.ebuild 20741
 MD5 42871c605b839610632d237b41e38866 gcc-3.3.2-r5.ebuild 21460
 MD5 9fb6a5505f97c736a3f40f84ea9c71da gcc-3.3.2-r6.ebuild 21217
 MD5 1aabd842d43a507ea8d2e988f6f88707 gcc-3.3.2-r7.ebuild 21865
-MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908
 MD5 f0ab7851d2e867c5b30db3261c86261b gcc-3.3.3.ebuild 22027
 MD5 a6dd62d4bac8bd5630f21e56dbe5919c gcc-3.3.3_pre20040130.ebuild 21520
 MD5 7eb36ba5811423e02b4ae4c11d8869c5 gcc-3.3.3_pre20040215.ebuild 22195
 MD5 d8d35a54609911a201727872dc3ffe26 gcc-3.3.3_pre20040322.ebuild 22621
-MD5 dc586211fcb550a333b881432d652b3d gcc-3.3.3_pre20040408-r1.ebuild 22692
 MD5 bdaadd8732e58e8c60242fcddc6cfaa5 gcc-3.3.ebuild 16663
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 3b2fd4637666e71aae9954782cd23016 gcc-3.3.3_pre20040426.ebuild 22633
+MD5 dc586211fcb550a333b881432d652b3d gcc-3.3.3_pre20040408-r1.ebuild 22692
 MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
 MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r7 64
 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
 MD5 4a4be6eb294e00da7fef14ec597dcf13 files/digest-gcc-3.0.4-r6 128
-MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
 MD5 5a9db19cd5ad6ad16b0f838d525d842a files/digest-gcc-3.3.3-r3 522
+MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
+MD5 d17e2c6ba913d1c1d5cb135acf853f02 files/digest-gcc-3.4.0 297
 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 d17e2c6ba913d1c1d5cb135acf853f02 files/digest-gcc-3.4.0 297
-MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
+MD5 e29cf4c303fb62e38358ea0a78b3f9fb files/digest-gcc-3.3.3-r4 620
 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 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 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 e962c23dd4396850f0e36424ec5596d7 files/digest-gcc-3.3.3_pre20040408-r1 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 8f56750ce25ca30ffebcbdb65de95a1f files/digest-gcc-3.3.3_pre20040426 138
 MD5 aa7a1e8bbe618c0d88368e69caeb7653 files/3.1/gcc31-attr-visibility.patch.bz2 3671
 MD5 8b4c6af1c730dcdd843a77e8095d312b files/3.1/gcc31-attr-visibility2.patch.bz2 2341
@@ -117,29 +119,31 @@ 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 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040426-gentoo-branding.patch 820
 MD5 9ba0bd0b103cf9535927ad7c482fe780 files/3.3.3/gcc333-debian-arm-getoff.patch 3501
 MD5 25eda9981106a55c413d1df3d3a87db5 files/3.3.3/gcc333-debian-arm-ldm.patch 3383
-MD5 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040426-gentoo-branding.patch 820
-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 c89b605fe512439cf492c1c378226c7c files/3.4.0/gcc-3.4.0-fno-for-scope.patch 1604
+MD5 fbab4a9c4c8a8b2f329b02ee9b97fa6f files/3.4.0/gcc-3.4.0-gentoo-branding.patch 759
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.3-r4 b/sys-devel/gcc/files/digest-gcc-3.3.3-r4
new file mode 100644
index 000000000000..92620a6d1293
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.3.3-r4
@@ -0,0 +1,8 @@
+MD5 3c6cfd9fcd180481063b4058cf6faff2 gcc-3.3.3.tar.bz2 23279245
+MD5 a5e5f8c88d29e2af3ed0ff52623e28d9 gcc-3.3.3-patches-1.3.tar.bz2 77276
+MD5 2d2cb065ecd3aa0acf4aabc646068723 gcc-3.3.3-branch-update-20040412.patch.bz2 224699
+MD5 b62b5856753294821c4cea8bd28ffe1d protector-3.3-7.tar.gz 25068
+MD5 7bfc29747dfc5fa614b5ac366bf38224 gcc-3.3.3-manpages.tar.bz2 137822
+MD5 6e0207a73a7c3acf518c377b41e028f6 gcc-3.3.3-v8.6.4-nodefault-pie-ssp.patch.bz2 2679
+MD5 b43d71e66f5137d5f1664a1a61920ee4 gcc-3.3.3-v8.6.4-gcc-pie-exclusion.patch.bz2 293
+MD5 c529fa3775a169a4781a2f373b284f67 gcc-3.3.3-v8.6.4-gcc-ssp-exclusion.patch.bz2 303
diff --git a/sys-devel/gcc/gcc-3.3.3-r4.ebuild b/sys-devel/gcc/gcc-3.3.3-r4.ebuild
new file mode 100644
index 000000000000..423061a0cebd
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.3.3-r4.ebuild
@@ -0,0 +1,808 @@
+# 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-r4.ebuild,v 1.1 2004/05/01 05:41:55 solar Exp $
+
+IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc debug"
+
+inherit eutils flag-o-matic libtool
+
+# Compile problems with these (bug #6641 among others)...
+#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
+
+# Recently there has been a lot of stability problem 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 }'`"
+
+LIBPATH="${LOC}/lib/gcc-lib/${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/\.*/}"
+
+# PIE support
+PIE_VER="8.6.4"
+
+# ProPolice version
+PP_VER="3_3"
+PP_FVER="${PP_VER//_/.}-7"
+
+# Patch tarball support ...
+#PATCH_VER="1.0"
+PATCH_VER="1.3"
+
+# Snapshot support ...
+#SNAPSHOT="2002-08-12"
+SNAPSHOT=
+
+# Branch update support ...
+MAIN_BRANCH="${PV}"  # Tarball, etc used ...
+
+#BRANCH_UPDATE="20021208"
+BRANCH_UPDATE="20040412"
+
+if [ -z "${SNAPSHOT}" ]
+then
+	S="${WORKDIR}/${PN}-${MAIN_BRANCH}"
+	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2"
+
+	if [ -n "${PATCH_VER}" ]
+	then
+		SRC_URI="${SRC_URI}
+		         mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+	fi
+
+	if [ -n "${BRANCH_UPDATE}" ]
+	then
+		SRC_URI="${SRC_URI}
+		         mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+	fi
+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.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
+fi
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-manpages.tar.bz2"
+
+# bug #6148 - the bounds checking patch interferes with gcc.c
+# PaX Team, Peter S. Mazinger, pappy, solar, swtaylor, tseng.
+PIE_BASE_URI="mirror://gentoo/"
+PIE_SSP_PATCH="gcc-3.3.3-v${PIE_VER}-nodefault-pie-ssp.patch.bz2"
+PIE_EXCLUSION_PATCH="gcc-3.3.3-v${PIE_VER}-gcc-pie-exclusion.patch.bz2"
+SSP_EXCLUSION_PATCH="gcc-3.3.3-v${PIE_VER}-gcc-ssp-exclusion.patch.bz2"
+SRC_URI="${SRC_URI} ${PIE_BASE_URI}${PIE_SSP_PATCH} ${PIE_BASE_URI}${PIE_EXCLUSION_PATCH} ${PIE_BASE_URI}${SSP_EXCLUSION_PATCH}"
+
+DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie and ssp extentions"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+
+LICENSE="GPL-2 LGPL-2.1"
+
+#KEYWORDS="~x86 ~mips ~sparc ~amd64 -hppa ~alpha ~ia64 ~ppc64 ~s390"
+KEYWORDS="-*"
+
+# 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
+# their old gcc unmerged ...
+if [ "${CHOST}" == "${CCHOST}" ]
+then
+# GCC-3.3 is supposed to be binary compatible with 3.2..
+#	SLOT="${MY_PV}"
+	SLOT="3.2"
+else
+# GCC-3.3 is supposed to be binary compatible with 3.2..
+#	SLOT="${CCHOST}-${MY_PV}"
+	SLOT="${CCHOST}-3.2"
+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.
+# This one depends on glibc-2.3.2-r3 containing the __guard in glibc
+# we scan for Guard@@libgcc and then apply the function moving patch.
+# If using NPTL, we currently cannot however depend on glibc-2.3.2-r3,
+# else bootstap will break.
+
+# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
+DEPEND="virtual/glibc
+	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
+	!amd64? ( hardened? ( >=sys-libs/glibc-2.3.3_pre20040207 ) )
+	( !sys-devel/hardened-gcc )
+	>=sys-devel/binutils-2.14.90.0.6-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 )
+	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
+	!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##*/}
+}
+
+glibc_have_ssp() {
+	local my_libc="${ROOT}/lib/libc.so.6"
+
+# Not necessary. lib64 is a symlink to /lib. -- avenj@gentoo.org  3 Apr 04
+#	case "${ARCH}" in
+#		"amd64")
+#			my_libc="${ROOT}/lib64/libc.so.?"
+#			;;
+#	esac
+
+	# Check for the glibc to have the __guard symbols
+	if  [ "$(readelf -s "${my_libc}" 2>/dev/null | \
+	         grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
+	    [ "$(readelf -s "${my_libc}" 2>/dev/null | \
+	         grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
+check_glibc_ssp() {
+	if glibc_have_ssp
+	then
+		if [ -n "${GLIBC_SSP_CHECKED}" ] && \
+		   [ -z "$(readelf -s  "${ROOT}/$(gcc-config -L)/libgcc_s.so" 2>/dev/null | \
+		           grep 'GLOBAL' | grep 'OBJECT' | grep '__guard')" ]
+		then
+			# No need to check again ...
+			return 0
+		fi
+
+		echo
+		ewarn "This sys-libs/glibc has __guard object and __stack_smash_handler functions"
+		ewarn "scanning the system for binaries with __guard - this may take 5-10 minutes"
+		ewarn "Please do not press ctrl-C or ctrl-Z during this period - it will continue"
+		echo
+		if ! bash ${FILESDIR}/scan_libgcc_linked_ssp.sh
+		then
+			echo
+			eerror "Found binaries that are dynamically linked to the libgcc with __guard@@GCC"
+			eerror "You need to compile these binaries without CFLAGS -fstack-protector/hcc -r"
+			echo
+			eerror "Also, you have to make sure that using ccache needs the cache to be flushed"
+			eerror "wipe out /var/tmp/ccache or /root/.ccache.  This will remove possible saved"
+			eerror "-fstack-protector arguments that still may reside in such a compiler cache"
+			echo
+			eerror "When such binaries are found, gcc cannot remove libgcc propolice functions"
+			eerror "leading to gcc -static -fstack-protector breaking, see gentoo bug #25299"
+			echo
+			einfo  "To do a full scan on your system, enter this following command in a shell"
+			einfo  "(Please keep running and remerging broken packages until it do not report"
+			einfo  " any breakage anymore!):"
+			echo
+			einfo  " # ${FILESDIR}/scan_libgcc_linked_ssp.sh"
+			echo
+			die "Binaries with libgcc __guard@GCC dependencies detected!"
+		else
+			echo
+			einfo "No binaries with suspicious libgcc __guard@GCC dependencies detected"
+			echo
+		fi
+	fi
+
+	return 0
+}
+
+update_gcc_for_libc_ssp() {
+	if glibc_have_ssp
+	then
+		einfo "Updating gcc to use SSP from glibc..."
+		sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
+			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+	fi
+}
+
+src_unpack() {
+	local release_version="Gentoo Linux ${PVR}"
+
+	if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ]
+	then
+		# the guard check should be very early in the unpack process
+		check_glibc_ssp
+	fi
+
+	if [ -z "${SNAPSHOT}" ]
+	then
+		unpack ${PN}-${MAIN_BRANCH}.tar.bz2
+
+		if [ -n "${PATCH_VER}" ]
+		then
+			unpack ${P}-patches-${PATCH_VER}.tar.bz2
+		fi
+	else
+		unpack gcc-${SNAPSHOT//-}.tar.bz2
+	fi
+
+	if [ -n "${PP_VER}" ]
+	then
+		unpack protector-${PP_FVER}.tar.gz
+	fi
+
+	cd ${S}
+	# Fixup libtool to correctly generate .la files with portage
+	elibtoolize --portage --shallow
+
+	# Branch update ...
+	if [ -n "${BRANCH_UPDATE}" ]
+	then
+		epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
+	fi
+
+	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
+	if [ -n "${PATCH_VER}" ]
+	then
+		mkdir -p ${WORKDIR}/patch/exclude
+#		mv -f ${WORKDIR}/patch/{40,41}* ${WORKDIR}/patch/exclude/
+		mv -f ${WORKDIR}/patch/41* ${WORKDIR}/patch/exclude/
+
+		#use uclibc || mv -f ${WORKDIR}/patch/8?_* ${WORKDIR}/patch/exclude/
+
+		if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
+		then
+			mv -f ${WORKDIR}/patch/06* ${WORKDIR}/patch/exclude/
+			bzip2 -c ${FILESDIR}/gcc331_use_multilib.amd64.patch > \
+				${WORKDIR}/patch/06_amd64_gcc331-use-multilib.patch.bz2
+		fi
+
+		epatch ${WORKDIR}/patch
+	fi
+
+	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
+	then
+		epatch ${FILESDIR}/3.3.2/gcc332-altivec-fix.patch
+	fi
+
+	if [ "${ARCH}" = "arm" ]
+	then
+		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-getoff.patch
+		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-ldm.patch
+	fi
+
+	# non-default SSP and PIE support.
+	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" -a -n "${PP_VER}" ]
+	then
+		# ProPolice Stack Smashing protection
+		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
+		epatch ${FILESDIR}/3.3.1/gcc331-pp-fixup.patch
+
+		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
+		epatch ${FILESDIR}/3.3.3/gcc333-ssp-3.3_7-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"
+
+		release_version="${release_version}, ssp-${PP_FVER}"
+
+		update_gcc_for_libc_ssp
+	fi
+
+	# This patch enables improved PIE and SSP behaviour but does not
+	# enable it by default ...
+
+	cd ${WORKDIR}/${P}
+	epatch ${DISTDIR}/${PIE_SSP_PATCH}
+	use uclibc || epatch ${DISTDIR}/${PIE_EXCLUSION_PATCH}
+	use uclibc || epatch ${DISTDIR}/${SSP_EXCLUSION_PATCH}
+
+	release_version="${release_version}, pie-${PIE_VER}"
+
+	if [ -n "`use hardened`" -a "${ARCH}" != "sparc" ]
+	then
+		einfo "Updating gcc to use automatic PIE + SSP building ..."
+		sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP|' \
+			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+
+		# rebrand to make bug reports easier
+		release_version="${release_version/Gentoo/Gentoo Hardened}"
+	fi
+
+	version_patch ${FILESDIR}/3.3.3/gcc333-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
+
+	# Install our pre generated manpages if we do not have perl ...
+	if [ ! -x /usr/bin/perl ]
+	then
+		cd ${S}; unpack ${P}-manpages.tar.bz2
+	fi
+
+	# 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 ! use build
+	then
+		myconf="${myconf} --enable-shared"
+		gcc_lang="c,c++"
+		use f77 && gcc_lang="${gcc_lang},f77"
+		use objc && gcc_lang="${gcc_lang},objc"
+		use java && use gcj && gcc_lang="${gcc_lang},java"
+		# We do NOT want 'ADA support' in here!
+		# use ada  && gcc_lang="${gcc_lang},ada"
+	else
+		gcc_lang="c"
+	fi
+	if ! use nls || use build
+	then
+		myconf="${myconf} --disable-nls"
+	else
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	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 -n "`use gcj`" -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 not yet supported
+	if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ]
+	then
+		einfo "WARNING: Multilib support enabled. This is still experimental."
+		myconf="${myconf} --enable-multilib"
+	else
+		if [ "${ARCH}" = "amd64" ]
+		then
+			einfo "WARNING: Multilib not enabled. You will not be able to build 32bit binaries."
+		fi
+		myconf="${myconf} --disable-multilib"
+	fi
+
+	# Fix linking problem with c++ apps which where linked
+	# agains a 3.2.2 libgcc
+	[ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions"
+
+	use hardened && append-flags -fPIC
+
+	# --with-gnu-ld needed for cross-compiling
+	# --enable-sjlj-exceptions : currently the unwind stuff seems to work 
+	# for statically linked apps but not dynamic
+	# so use setjmp/longjmp exceptions by default
+	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
+
+	if ! use uclibc
+	then
+		# it's getting close to a time where we are going to need USE=glibc, uclibc, bsdlibc -solar
+		myconf="${myconf} --enable-__cxa_atexit --enable-clocale=generic"
+	else
+		myconf="${myconf} --disable-__cxa_atexit --enable-target-optspace --with-gnu-ld --enable-sjlj-exceptions"
+	fi
+
+	# In general gcc does not like optimization, and add -O2 where
+	export CFLAGS="$(echo "${CFLAGS}" | sed -e 's|-O[0-9s]\?|-O2|g')"
+	einfo "CFLAGS=\"${CFLAGS}\""
+	export CXXFLAGS="$(echo "${CXXFLAGS}" | sed -e 's|-O[0-9s]\?|-O2|g')"
+	einfo "CXXFLAGS=\"${CXXFLAGS}\""
+	export GCJFLAGS="$(echo "${GCJFLAGS}" | sed -e 's|-O[0-9s]\?|-O2|g')"
+	einfo "GCJFLAGS=\"${GCJFLAGS}\""
+
+	# 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 \
+		--disable-libunwind-exceptions \
+		--enable-cstdio=stdio \
+		--enable-version-specific-runtime-libs \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--with-local-prefix=${LOC}/local \
+		${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 bootstrap-lean \
+			LIBPATH="${LIBPATH}" \
+			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
+
+	fi
+}
+
+src_install() {
+	local x=
+
+	# 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}"
+
+	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 do not check glibc for SSP again, as we did already
+	if glibc_have_ssp || \
+	   [ -f "${ROOT}/etc/env.d/99glibc_ssp" ]
+	then
+		echo "GLIBC_SSP_CHECKED=1" > ${D}/etc/env.d/99glibc_ssp
+	fi
+
+	# 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
+		if use f77
+		then
+			cd ${S}/libf2c
+			docinto ${CCHOST}/libf2c
+			dodoc ChangeLog* README TODO *.netlib
+		fi
+		cd ${S}/libffi
+		docinto ${CCHOST}/libffi
+		dodoc ChangeLog* LICENSE README
+		cd ${S}/libiberty
+		docinto ${CCHOST}/libiberty
+		dodoc ChangeLog* COPYING.LIB README
+		if 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
+		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 use java && use gcj
+		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 [ -n "`use multilib`" -a "${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.
+		ln -sf ${LIBPATH}/../lib64/libgcc_s.so ${D}/${LIBPATH}/libgcc_s.so
+		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
+}
+