Fixes the headers problem

4 files changed, 761 insertions, 97 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 08f7b38fa6f6..98569bbc8b82 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.163 2004/01/21 18:42:08 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.164 2004/01/27 10:04:46 lu_zero Exp $
+
+  27 Jan 2004; Luca Barbato <lu_zero@gentoo.org> gcc-3.2.3-r4.ebuild:
+  Removes the fixinclude headers, fix backported from the 3.3.2 series
 
 *gcc-3.3.2-r6 (21 Jan 2004)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 527a80b67091..f078ce1afc7e 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,124 +1,126 @@
-MD5 f5ca2186c83a045153d264f0ebdd72c5 gcc-3.3.2.ebuild 17909
-MD5 d25ffc7e82003a26e025471ca8df299c gcc-3.2.1-r7.ebuild 14774
-MD5 c78e026b978b021907cc822156278e78 gcc-3.2.3-r3.ebuild 19842
-MD5 5cc6c650bcfa11ec5d98ccfcc5b37cd8 gcc-3.2.2-r2.ebuild 15851
-MD5 32ea3b396db494ace0fc178a8cbf6f9a gcc-3.3.2-r4.ebuild 20743
-MD5 3cf9b7a85a179e24a75a316df9ef0b85 gcc-3.3.2-r6.ebuild 21274
-MD5 2091041850f831fdef34656fc3308604 gcc-3.3.2-r2.ebuild 18118
-MD5 6d0d6b9214ecb88e26a54b70901c50b4 gcc-2.95.3-r7.ebuild 5436
-MD5 563bc506ad8272f560c5a5d3353efd8c ChangeLog 35420
-MD5 3f796d926d7c63b50910a657cb67a358 gcc-3.1.1-r1.ebuild 9595
-MD5 aa01e0515884df05563094839c31d7d1 gcc-3.3.1-r1.ebuild 16131
-MD5 bd281971d3658dd49f02f647b97c4eeb gcc-3.3.1-r5.ebuild 18002
-MD5 c44c493b629be3a1abbc1eb4d3cb00d1 gcc-3.1-r8.ebuild 9776
-MD5 9520a1995439d7ce1634994944789897 gcc-3.3.2-r3.ebuild 20488
-MD5 459fe070924cbfd485139f84f2dd47ff gcc-3.0.4-r6.ebuild 8738
-MD5 6d77edcd96b4396459aba5edbeb7e83e gcc-3.3.ebuild 16648
-MD5 d4fc7c30e95deaf7c4e19997b49fe9af gcc-3.3.2-r5.ebuild 20502
-MD5 245b532d7263a50f97e66d873ea9033b gcc-3.3-r1.ebuild 16530
-MD5 079abbc45c914fdad6c90540fe82302c gcc-2.95.3-r8.ebuild 9213
-MD5 591e5cb9a9737b7712643eccae1745f0 gcc-3.2-r5.ebuild 12882
-MD5 11d76db446872c46fba9088608a91ffa gcc-3.2.2.ebuild 16083
+MD5 e77e53f78147e6ee040969e42619dff7 gcc-3.3.1-r1.ebuild 16130
+MD5 6b3ccea18aca47e7f6384d24683004cf gcc-2.95.3-r8.ebuild 9212
+MD5 3aa67d06a6cb8fb3959bad5d77a94b2f gcc-3.2.2-r2.ebuild 15850
+MD5 53b827ee8b08b7f8eb2ef55e1f80172a gcc-3.2.2.ebuild 16082
+MD5 2aa3d22940e552ea295e1602a30d4095 gcc-3.1.1-r1.ebuild 9594
+MD5 c8311bdd2d4779dac2d5358e9be9ecc8 ChangeLog 35542
+MD5 9ee2ee4b10003769505ace9dd4589e6f gcc-3.3.2-r6.ebuild 21273
+MD5 34aee8f0efd5964d5bc242f7181173ea gcc-3.2-r5.ebuild 12881
+MD5 bab22778c9808debb319c005d0805072 gcc-3.2.3-r4.ebuild 20098
+MD5 d5b403f4b8ba67b68e1a890fb3a69af9 gcc-3.3-r1.ebuild 16529
 MD5 22d9e3c49111d1b8b8ec1484732087c9 metadata.xml 259
-MD5 e6ead3ed008a1fe7adc73ddae996ade3 gcc-3.3.2-r1.ebuild 17965
-MD5 3284144f6d0345464cd436bed9c3e77b gcc-3.2.3-r2.ebuild 17306
-MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r7 64
-MD5 523970c128b929fe7c7cf36508ebd1d5 files/gcc-2.95.3-new-atexit.diff 13604
-MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
-MD5 0d86971219ddd6dcb86f032bc2b93691 files/digest-gcc-3.3.2-r1 361
-MD5 73da03a8bd40327709e7850d9e2158e6 files/gcc-2.95.3-destructor-atexit.diff 3890
-MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r3 279
-MD5 cd65d39a64a53d74db2ad18611e18a27 files/digest-gcc-3.2-r5 134
-MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
+MD5 b636e882cd7fd0c83749466749d3bc94 gcc-3.3.2-r4.ebuild 20742
+MD5 fe72c9a5e67b4359d23b8f8671130e5f gcc-3.3.ebuild 16647
+MD5 ef89cf6a18997fb668eea0e361f4e61e gcc-3.3.2-r2.ebuild 18117
+MD5 586fdf6b6da8c4fdad2f4716d47b388f gcc-3.3.1-r5.ebuild 18001
+MD5 3ad3da457dce7eed263693654aad630e gcc-3.3.2-r1.ebuild 17964
+MD5 8e52359dc5064adf95cda67aacc38f95 gcc-3.3.2-r3.ebuild 20487
+MD5 911ae343031ff3a6ed5bcd77942b29bf gcc-3.3.2-r5.ebuild 20501
+MD5 e7f0da79e358042fe3d628d570177009 gcc-2.95.3-r7.ebuild 5435
+MD5 99986e497a42ec3efce19f20a4521ad6 gcc-3.2.3-r3.ebuild 19841
+MD5 7af3b5f68ba7a1986837d3c0fd7c6648 gcc-3.2.3-r2.ebuild 17305
+MD5 2f337c89459b21d5a9e41baca1c50bc0 gcc-3.1-r8.ebuild 9775
+MD5 91b61f6cf5d6791f889c07573b8d9a05 gcc-3.0.4-r6.ebuild 8737
+MD5 a0101a85211dab30bcee3ed147a1f0c6 gcc-3.3.2.ebuild 17908
+MD5 450c4b2d511bd901e05acfc5edbe53ef gcc-3.2.1-r7.ebuild 14773
 MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771
-MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
-MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
-MD5 c850f6ba5703712442b90b2c00060a15 files/digest-gcc-3.3.1-r1 361
-MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r3 361
+MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r3 279
 MD5 4a4be6eb294e00da7fef14ec597dcf13 files/digest-gcc-3.0.4-r6 128
-MD5 a84561f46d573c1c835b1c4d2510cc07 files/gcc-3-deopt.patch 588
-MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r2 279
-MD5 385267d11aa8b32522d1585b2d520476 files/gcc-3-deopt-doc.patch 819
+MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
+MD5 d192284727acd002cf658d4c559c2d39 files/digest-gcc-3.3.1-r5 361
+MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r7 64
+MD5 06fb30d8859f76d932768040a43c18e5 files/scan_libgcc_linked_ssp.sh 868
+MD5 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
+MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
+MD5 29b68fb9b347114baf405bf67ebca0cd files/digest-gcc-3.3.2-r4 361
+MD5 41e5a58d926345eb32e6a2ba3ab17031 files/digest-gcc-3.3.2-r6 361
 MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361
-MD5 b1a242694f56184cbcdd40ba25800d50 files/gcc-2.95.3-alpha.diff 14345
 MD5 cd99b576d23043d02ee0b47a63c0c95e files/digest-gcc-3.2.2 64
-MD5 12d4b0c4fc49fad52850ab007c3c7371 files/digest-gcc-3.3-r1 353
+MD5 f0b73e4542862243a43920fd6fd0cb99 files/digest-gcc-3.1-r8 62
+MD5 b1a242694f56184cbcdd40ba25800d50 files/gcc-2.95.3-alpha.diff 14345
+MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
+MD5 73da03a8bd40327709e7850d9e2158e6 files/gcc-2.95.3-destructor-atexit.diff 3890
+MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
 MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
-MD5 41e5a58d926345eb32e6a2ba3ab17031 files/digest-gcc-3.3.2-r6 361
-MD5 29b68fb9b347114baf405bf67ebca0cd files/digest-gcc-3.3.2-r4 361
-MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
-MD5 782ac9b8dbc629fe4fdfaa7744cfc004 files/scan_libgcc_linked_ssp.sh 869
+MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
 MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
-MD5 f0b73e4542862243a43920fd6fd0cb99 files/digest-gcc-3.1-r8 62
+MD5 12d4b0c4fc49fad52850ab007c3c7371 files/digest-gcc-3.3-r1 353
 MD5 21848cde4833618f2898e7d17b75633e files/scan_libgcc_linked_ssp.txt 173
-MD5 d192284727acd002cf658d4c559c2d39 files/digest-gcc-3.3.1-r5 361
-MD5 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
+MD5 a71b08c7e35abe2526586874801de12e files/digest-gcc-3.2.2-r2 226
 MD5 2d5af6fe0b03d39a94cb4c4d4b03e226 files/gcc-2.95.3-atexit.diff 1731
-MD5 3853f5e3fdf34c40e6f45ae35a845c99 files/digest-gcc-3.2.1-r7 223
+MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r2 279
+MD5 c850f6ba5703712442b90b2c00060a15 files/digest-gcc-3.3.1-r1 361
+MD5 a84561f46d573c1c835b1c4d2510cc07 files/gcc-3-deopt.patch 588
 MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
-MD5 a71b08c7e35abe2526586874801de12e files/digest-gcc-3.2.2-r2 226
-MD5 eb5503f9c24615da3830ec537bb11ea4 files/fix_libtool_files.sh 1736
+MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
+MD5 523970c128b929fe7c7cf36508ebd1d5 files/gcc-2.95.3-new-atexit.diff 13604
+MD5 b0544e929d674a936fc7cb89810e54b4 files/fix_libtool_files.sh 1735
+MD5 3853f5e3fdf34c40e6f45ae35a845c99 files/digest-gcc-3.2.1-r7 223
+MD5 0d86971219ddd6dcb86f032bc2b93691 files/digest-gcc-3.3.2-r1 361
+MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r3 361
+MD5 385267d11aa8b32522d1585b2d520476 files/gcc-3-deopt-doc.patch 819
+MD5 cd65d39a64a53d74db2ad18611e18a27 files/digest-gcc-3.2-r5 134
+MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
 MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
-MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
-MD5 5f465144ef81f1b7c7f6d6abe6e4c59f files/awk/fixlafiles.awk 6285
-MD5 f4a810fc3b0f565c2e63e43c2dfe46ae files/awk/scanforssp.awk 5248
-MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.2/gcc32-pr8213.patch 2036
-MD5 465eeaf6008c25dc69ff502dc2a9d8e0 files/3.2.2/gcc322-ggc_page-speedup.patch 872
-MD5 f055e4ef28077477e8d64c6a985b1ad4 files/3.2.2/gcc322-pr9888.patch 9771
-MD5 ccb007933a794eb661ee3b742189f285 files/3.2.2/gcc322-pr8746.patch 2816
-MD5 0760a0992d24384d13b7e160614c54ac files/3.2.2/gcc32-pr9732.patch 5534
-MD5 17f15202b98a8dd84d0f4b67eff2d868 files/3.2.2/gcc32-pr7768.patch 1789
-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 494d917cc15c81c9cead4a8c17d4d00d files/3.2.3/gcc32-mklibgcc-serialize-crtfiles.patch 926
-MD5 c9c45dab64bab25e716859626ad7f94f files/3.2.3/gcc32-c++-classfn-member-template.patch 3219
-MD5 99db7c1a41babe024f0c6859c30a87ee files/3.2.3/gcc323-gentoo-branding.patch 2058
-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 7f884a426afe182c10d2a5fad94c73cc files/3.2/gcc-3.2.fix-copy.patch 2185
+MD5 f0d236f86eaa66efd429fdac632e0ae2 files/3.2/gcc-3.2.fix-var.patch 1577
+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 fad8d3a3438525a2bf51ce0d8f7a4d5e files/awk/fixlafiles.awk 6284
+MD5 09edb7984a12c48c0d557f44cc999a4f files/awk/scanforssp.awk 5247
 MD5 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874
 MD5 b398b7415b93423ff04952c6e69bdb4d files/3.3.1/gcc331-pp-fixup.patch 407
+MD5 f6b6f7c3577eccb694066bb54dd8075a files/3.3/gcc33-gentoo-branding-1.patch 870
+MD5 d047c78a9141b16915d8ec3f54d1e246 files/3.3/gcc33-coreutils-compat.patch.bz2 3462
+MD5 d6ee829d1712436361f5f1daf7b14e83 files/3.3/gcc33-gentoo-branding.patch 890
+MD5 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570
+MD5 088e0807e677010cafe4e590e8711be1 files/3.3/gcc33-no-multilib-amd64.patch 343
+MD5 ccb007933a794eb661ee3b742189f285 files/3.2.2/gcc322-pr8746.patch 2816
+MD5 465eeaf6008c25dc69ff502dc2a9d8e0 files/3.2.2/gcc322-ggc_page-speedup.patch 872
+MD5 17f15202b98a8dd84d0f4b67eff2d868 files/3.2.2/gcc32-pr7768.patch 1789
+MD5 0760a0992d24384d13b7e160614c54ac files/3.2.2/gcc32-pr9732.patch 5534
+MD5 f055e4ef28077477e8d64c6a985b1ad4 files/3.2.2/gcc322-pr9888.patch 9771
+MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.2/gcc32-pr8213.patch 2036
+MD5 24642b902b9937cdebeb14063859135f files/3.1/gcc31-c++-tsubst-asm.patch.bz2 703
+MD5 8b4c6af1c730dcdd843a77e8095d312b files/3.1/gcc31-attr-visibility2.patch.bz2 2341
 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 d3250673494682fa71cb3760e6de257b files/3.1/gcc31-fde-merge-compat.patch.bz2 634
+MD5 9ea8c34a980997a0d89744cb2ddf941a files/3.1/gcc31-fdata-sections.patch.bz2 2676
 MD5 a235188ad8a8ac2bb3dc8fcd51603225 files/3.1/gcc31-fold-const.patch.bz2 1867
-MD5 f7274feec78a2dc4ce9233880804ed0f files/3.1/gcc31-dwarf2-pr6381.patch.bz2 1059
-MD5 2f1d2c02b99aa182f1fd9b6328c8b77a files/3.1/gcc31-libstdc++-setrlim.patch.bz2 584
-MD5 8b4c6af1c730dcdd843a77e8095d312b files/3.1/gcc31-attr-visibility2.patch.bz2 2341
-MD5 2aadf0591cbf8a4e04235f5fb415f974 files/3.1/gcc31-i386-malign-double-doc.patch.bz2 526
-MD5 f3818c997439d173ac11322c08f2f2c8 files/3.1/gcc31-libstdc++-pr6594.patch.bz2 635
 MD5 aa7a1e8bbe618c0d88368e69caeb7653 files/3.1/gcc31-attr-visibility.patch.bz2 3671
-MD5 386ffd7fc3ca4a8af55155fe57871dc4 files/3.1/gcc31-test-rotate.patch.bz2 1060
-MD5 637b53059fa127746952cbffe1e8d403 files/3.1/gcc31-fold-const2.patch.bz2 368
-MD5 7f4bc242692c8e5a2ea0e3e865433d94 files/3.1/gcc31-trunc_int_for_mode.patch.bz2 826
-MD5 9ea8c34a980997a0d89744cb2ddf941a files/3.1/gcc31-fdata-sections.patch.bz2 2676
 MD5 df404bbcc95193a2591895758915e74e files/3.1/gcc31-pr6643.patch.bz2 421
-MD5 d3250673494682fa71cb3760e6de257b files/3.1/gcc31-fde-merge-compat.patch.bz2 634
-MD5 24642b902b9937cdebeb14063859135f files/3.1/gcc31-c++-tsubst-asm.patch.bz2 703
+MD5 98f539e65ab7e21994e5d378537a5506 files/3.1/gcc31-boehm-gc-libs.patch.bz2 1921
 MD5 9495fab2aa4388693856b2c52f5ac363 files/3.1/gcc31-c++-diagnostic-no-line-wrapping.patch.bz2 562
 MD5 981171de6a3f8d53741f77c12c221469 files/3.1/gcc31-libstdc++-pr6648.patch.bz2 770
+MD5 f7274feec78a2dc4ce9233880804ed0f files/3.1/gcc31-dwarf2-pr6381.patch.bz2 1059
+MD5 f3818c997439d173ac11322c08f2f2c8 files/3.1/gcc31-libstdc++-pr6594.patch.bz2 635
+MD5 2f1d2c02b99aa182f1fd9b6328c8b77a files/3.1/gcc31-libstdc++-setrlim.patch.bz2 584
+MD5 637b53059fa127746952cbffe1e8d403 files/3.1/gcc31-fold-const2.patch.bz2 368
+MD5 7f4bc242692c8e5a2ea0e3e865433d94 files/3.1/gcc31-trunc_int_for_mode.patch.bz2 826
 MD5 734e98009983615eff4814f671d83679 files/3.1/gcc31-i386-expand-clrstr.patch.bz2 527
-MD5 98f539e65ab7e21994e5d378537a5506 files/3.1/gcc31-boehm-gc-libs.patch.bz2 1921
-MD5 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570
-MD5 d6ee829d1712436361f5f1daf7b14e83 files/3.3/gcc33-gentoo-branding.patch 890
-MD5 d047c78a9141b16915d8ec3f54d1e246 files/3.3/gcc33-coreutils-compat.patch.bz2 3462
-MD5 f6b6f7c3577eccb694066bb54dd8075a files/3.3/gcc33-gentoo-branding-1.patch 870
-MD5 088e0807e677010cafe4e590e8711be1 files/3.3/gcc33-no-multilib-amd64.patch 343
-MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.1/gcc32-pr8213.patch 2036
+MD5 87f7be372b23072220fbceed8a127474 files/3.1/gcc31-dwarf2-pr6436-test.patch.bz2 336
+MD5 2aadf0591cbf8a4e04235f5fb415f974 files/3.1/gcc31-i386-malign-double-doc.patch.bz2 526
+MD5 386ffd7fc3ca4a8af55155fe57871dc4 files/3.1/gcc31-test-rotate.patch.bz2 1060
+MD5 f8505ae264a0fe9557382b7c96a13461 files/3.2.1/gcc32-shared-pthread.patch 3637
 MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
 MD5 51719a174883702ef1851fac4cc79398 files/3.2.1/gcc32-strip-dotdot.patch 2071
-MD5 f8505ae264a0fe9557382b7c96a13461 files/3.2.1/gcc32-shared-pthread.patch 3637
-MD5 43442dbe4412f751605f1597815b5671 files/3.2.1/gcc32-libjava-x86_64-biarch-sigaction.patch 445
-MD5 38131a537835873acb08c415d27a013e files/3.2.1/gcc32-athlon-alignment.patch 509
-MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
-MD5 7978d1aaf6bae19163e83c110dec1b38 files/3.2.1/gcc32-sparc32-hack.patch 2192
-MD5 444d0885eecc638ed3ca644d96323422 files/3.2.1/gcc32-tls-reload-fix.patch 6660
-MD5 7e8381ddac68428122ee2b186e3e7c5b files/3.2.1/gcc-3.2.1-bug-url.patch 537
 MD5 2c18cb2004c626adf634823713582738 files/3.2.1/gcc32-fix-sixtrack.patch 2001
 MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
 MD5 62e1cc1d310d74e97080b10802263791 files/3.2.1/gcc32-pr8988.patch 2070
+MD5 38131a537835873acb08c415d27a013e files/3.2.1/gcc32-athlon-alignment.patch 509
+MD5 7e8381ddac68428122ee2b186e3e7c5b files/3.2.1/gcc-3.2.1-bug-url.patch 537
+MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
+MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.1/gcc32-pr8213.patch 2036
+MD5 444d0885eecc638ed3ca644d96323422 files/3.2.1/gcc32-tls-reload-fix.patch 6660
+MD5 7978d1aaf6bae19163e83c110dec1b38 files/3.2.1/gcc32-sparc32-hack.patch 2192
 MD5 c113c3352ad365b8a35d2b0c21e69256 files/3.2.1/gcc32-testsuite.patch 650
+MD5 43442dbe4412f751605f1597815b5671 files/3.2.1/gcc32-libjava-x86_64-biarch-sigaction.patch 445
+MD5 a3315d69ba1be0bc1518a75027896bf3 files/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch 3534
+MD5 c9c45dab64bab25e716859626ad7f94f files/3.2.3/gcc32-c++-classfn-member-template.patch 3219
+MD5 52ef1426cb70a472182503502b768058 files/3.2.3/gcc-3.2.3-mergel-fix.patch 2749
+MD5 869b9a1ea49bf8b07c8405d2f1d76270 files/3.2.3/gcc323-hppa-default_assemble_visibility.patch 571
+MD5 1f4f8ca52d2dda4a5dc3a9b8f130841c files/3.2.3/gcc-323-propolice-version.patch 700
+MD5 494d917cc15c81c9cead4a8c17d4d00d files/3.2.3/gcc32-mklibgcc-serialize-crtfiles.patch 926
+MD5 99db7c1a41babe024f0c6859c30a87ee files/3.2.3/gcc323-gentoo-branding.patch 2058
 MD5 0601900b678fb15fb94665e7eaf25608 files/3.3.2/gcc332-altivec-fix.patch 1943
 MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
-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
-MD5 f0d236f86eaa66efd429fdac632e0ae2 files/3.2/gcc-3.2.fix-var.patch 1577
diff --git a/sys-devel/gcc/files/digest-gcc-3.2.3-r4 b/sys-devel/gcc/files/digest-gcc-3.2.3-r4
new file mode 100644
index 000000000000..73be0b525d86
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.2.3-r4
@@ -0,0 +1,4 @@
+MD5 23d1146d5efa0e0bfad9968dbb418e1e gcc-3.2.3.tar.bz2 20662887
+MD5 02b813276ff27320c7bc425c47e4795d protector-3.2.2-10.tar.gz 24556
+MD5 85eeabd16338caf87eaf5f97c8df46bd gcc-3.2.3-manpages.tar.bz2 129510
+MD5 5d8493dd3e551344c9d5ac11afdc76e3 gcc-3.2.3-tls-update.patch.bz2 396362
diff --git a/sys-devel/gcc/gcc-3.2.3-r4.ebuild b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
new file mode 100644
index 000000000000..1e9e55be73f6
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
@@ -0,0 +1,655 @@
+# 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.2.3-r4.ebuild,v 1.1 2004/01/27 10:04:46 lu_zero Exp $
+
+IUSE="static nls bootstrap java build"
+
+inherit eutils flag-o-matic libtool
+
+# Compile problems with these (bug #6641 among others)...
+# We don't need these since we strip-flags below -- Joshua
+#filter-flags "-fno-exceptions -fomit-frame-pointer"
+
+# 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 himself) 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 appropriate).
+#
+# 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
+
+# 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}"
+# Don't 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/\.*/}"
+
+# ProPolice version
+PP_VER1="3_2_2"
+PP_VER2="3.2.2-10"
+
+# Patch tarball support ...
+#PATCH_VER="1.0"
+PATCH_VER=""
+
+# Snapshot support ...
+#SNAPSHOT="2002-08-12"
+SNAPSHOT=""
+
+# Branch update support ...
+MAIN_BRANCH="${PV}"  # Tarball, etc used ...
+
+#BRANCH_UPDATE="20021208"
+BRANCH_UPDATE=""
+
+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
+SRC_URI="${SRC_URI}
+	http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER1}/protector-${PP_VER2}.tar.gz
+	mirror://gentoo/${P}-manpages.tar.bz2
+	mirror://gentoo/${P}-tls-update.patch.bz2"
+
+DESCRIPTION="The GNU Compiler Collection.  Includes C/C++ and java compilers"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+
+LICENSE="GPL-2 LGPL-2.1"
+
+# this is a glibc-propolice forced bump to a gcc without guard 
+# when no binary on the system has references to guard@@libgcc
+# hppa has no dependency on propolice for gcc - skip this arch
+KEYWORDS="~ppc" #x86 ppc sparc alpha arm mips -hppa"
+
+# 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
+	SLOT="${MY_PV}"
+else
+	SLOT="${CCHOST}-${MY_PV}"
+fi
+
+DEPEND="!arm? ( >=sys-libs/glibc-2.3.2-r3 )
+	mips? >=sys-devel/binutils-2.13.90.0.16 : >=sys-devel/binutils-2.13.90.0.18
+	>=sys-devel/gcc-config-1.3.1
+	!build? ( !arm? ( >=sys-libs/ncurses-5.2-r2 )
+	          nls? ( sys-devel/gettext ) )"
+
+# this glibc has the glibc guard symbols which are needed for the propolice functions to get moved to glibc
+# out of the libgcc in this gcc release, however, the propolice patch itself is not defused by this removal
+RDEPEND="!arm? ( >=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? ( !arm? ( >=sys-libs/ncurses-5.2-r2 ) )"
+
+PDEPEND="sys-devel/gcc-config"
+
+
+# Hack used to patch Makefiles to install into the build dir
+FAKE_ROOT=""
+
+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
+
+	sed -e "s:@PV@:${PVR}:g" ${1} > ${T}/${1##*/}
+	epatch ${T}/${1##*/}
+}
+
+src_unpack() {
+	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
+
+	unpack protector-${PP_VER2}.tar.gz
+
+	cd ${S}
+	# Fixup libtool to correctly generate .la files with portage
+	elibtoolize --portage --shallow
+
+	echo
+
+	# 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
+		epatch ${WORKDIR}/patch
+	fi
+
+	# Update to support TLS and __thread
+	epatch ${DISTDIR}/${P}-tls-update.patch.bz2
+
+	# Make gcc's version info specific to Gentoo
+	version_patch ${FILESDIR}/3.2.3/gcc323-gentoo-branding.patch
+
+	# ProPolice Stack Smashing protection
+	# ProPolice does not work on archs where the stack grows upward (HPPA)
+	if [ ${ARCH} != "hppa" ]
+	then
+		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"
+		version_patch ${FILESDIR}/3.2.3/gcc-323-propolice-version.patch
+
+		# check for the glibc to have the guard
+		if	[ "$(readelf -s /lib/libc.so.6 | grep GLOBAL | grep OBJECT | grep '__guard')" ] &&
+			[ "$(readelf -s /lib/libc.so.6 | grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
+		then
+			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 crtl-C or crtl-Z during this period - it will continue"
+			SCANPATH="$(for i in $(cat /etc/ld.so.conf | grep -v '/usr/lib/gcc-lib' | grep -v '^\#'); do echo -n $i; echo -n ' '; done) $(echo ${PATH} | sed 's,:, ,g')"
+			if [ "$(find ${SCANPATH} -type f -perm -1 -maxdepth 9 -exec readelf -s {} \; 2>&1 | grep "__guard\@GCC" 2>&1 1>/dev/null; echo $?)" == "0" ]
+			then
+				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 id 25299"
+				einfo  "you can run 'qpkg -f' from the gentoolkit package and reemerge the program"
+				einfo  "to do a full scan on your system, enter this following command in a shell:"
+				echo
+				einfo  "find / -type f -perm -1 -maxdepth 9 -exec echo -n '__guard at GCC check in: {} ' \; -exec qpkg -f {} \; -exec readelf -s {} \; 2>&1 | grep __guard | grep -B1 '__guard\@GCC'"
+				echo
+				exit 1
+			else
+				echo
+				einfo  "no binaries with suspicious libgcc __guard@GCC dependencies in ${SCANPATH}"
+				echo
+				epatch ${FILESDIR}/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch
+			fi
+		fi
+		# end of check for the glibc to have the guard
+	fi
+
+	# Patches from Mandrake/Suse ...
+	epatch ${FILESDIR}/3.2.1/gcc31-loop-load-final-value.patch
+	epatch ${FILESDIR}/3.2.1/gcc32-strip-dotdot.patch
+	epatch ${FILESDIR}/3.2.1/gcc32-athlon-alignment.patch
+	epatch ${FILESDIR}/3.2.3/gcc32-c++-classfn-member-template.patch
+	epatch ${FILESDIR}/3.2.3/gcc32-mklibgcc-serialize-crtfiles.patch
+
+	# GCC bugfixes ...
+	epatch ${FILESDIR}/3.2.2/gcc32-pr7768.patch
+	epatch ${FILESDIR}/3.2.2/gcc32-pr8213.patch
+
+	# Get gcc to decreases the number of times the collector has to be run
+	# by increasing its memory workspace, bug #16548.
+	epatch ${FILESDIR}/3.2.2/gcc322-ggc_page-speedup.patch
+
+	# sparc patches from Redhat ...
+	use sparc && epatch ${FILESDIR}/3.2.1/gcc32-sparc32-hack.patch
+
+	# Patches from debian-arm
+	if use arm
+	then
+		epatch ${FILESDIR}/3.2.1/gcc32-arm-disable-mathf.patch
+		epatch ${FILESDIR}/3.2.1/gcc32-arm-reload1-fix.patch
+	fi
+	#ppc mergel miscompilation workaround
+	if use ppc
+	then
+		epatch ${FILESDIR}/3.2.3/gcc-3.2.3-mergel-fix.patch
+	fi
+	if use hppa
+	then
+		# There exists a bug in the ebuild patched gcc that prevents hppa from
+		# getting build because of default_assemble_visibility is not compiled.
+		# Alexander Gabert <pappy@nikita.ath.cx> (14 Jul 2003).
+		epatch ${FILESDIR}/3.2.3/gcc323-hppa-default_assemble_visibility.patch
+	fi
+
+	# 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
+
+	# Currently if any path is changed via the configure script, it breaks
+	# installing into ${D}.  We should not patch it in src_install() with
+	# absolute paths, as some modules then gets rebuild with the wrong
+	# paths.  Thus we use $FAKE_ROOT.
+	einfo "Fixing Makefiles..."
+	cd ${S}
+	for x in $(find . -name Makefile.in)
+	do
+		# Fix --datadir=
+		cp ${x} ${x}.orig
+		sed -e 's:datadir = @datadir@:datadir = $(FAKE_ROOT)@datadir@:' \
+			${x}.orig > ${x}
+
+		# Fix --bindir=
+		cp ${x} ${x}.orig
+		sed -e 's:bindir = @bindir@:bindir = $(FAKE_ROOT)@bindir@:' \
+			${x}.orig > ${x}
+
+		# Fix --includedir=
+		cp ${x} ${x}.orig
+		sed -e 's:includedir = @includedir@:includedir = $(FAKE_ROOT)@includedir@:' \
+			${x}.orig > ${x}
+
+		# Fix --with-gxx-include-dir=
+		cp ${x} ${x}.orig
+		sed -e 's:gxx_include_dir = @gxx_:gxx_include_dir = $(FAKE_ROOT)@gxx_:' \
+			-e 's:glibcppinstalldir = @gxx_:glibcppinstalldir = $(FAKE_ROOT)@gxx_:' \
+			${x}.orig > ${x}
+
+		# Where java security stuff should be installed
+		cp ${x} ${x}.orig
+		sed -e 's:secdir = $(libdir)/security:secdir = $(FAKE_ROOT)$(LIBPATH)/security:' \
+			${x}.orig > ${x}
+
+		rm -f ${x}.orig
+	done
+}
+
+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`" ] || [ "`use build`" ]
+	then
+		myconf="${myconf} --disable-nls"
+	else
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	fi
+	if [ -n "`use java`" ] && [ -z "`use build`" ]
+	then
+		gcc_lang="${gcc_lang},java"
+	fi
+
+	# In general gcc does not like optimization, and add -O2 where
+	# it is safe.
+	# These aren't needed since we strip-flags above -- Joshua
+	#export CFLAGS="${CFLAGS//-O?}"
+	#export CXXFLAGS="${CXXFLAGS//-O?}"
+
+	# 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 \
+		${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() {
+	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
+	# this can break the build.
+	for x in cd ${WORKDIR}/build/gcc/include/*
+	do
+		if [ -L ${x} ]
+		then
+			rm -f ${x}
+		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=${D}${LOC} \
+		bindir=${D}${BINPATH} \
+		includedir=${D}${LIBPATH}/include \
+		datadir=${D}${DATAPATH} \
+		mandir=${D}${DATAPATH}/man \
+		infodir=${D}${DATAPATH}/info \
+		LIBPATH="${LIBPATH}" \
+		FAKE_ROOT="${D}" \
+		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}
+	echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
+	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}
+
+	# Install wrappers
+# Handled by gcc-config now ...
+#	exeinto /lib
+#	doexe ${FILESDIR}/cpp
+#	exeinto /usr/bin
+#	doexe ${FILESDIR}/cc
+
+	# 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 LA in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
+		do
+			if [ -f ${LA} ]
+			then
+				sed -e "s:/usr/lib:${LIBPATH}:" ${LA} > ${LA}.hacked
+				mv ${LA}.hacked ${LA}
+				mv ${LA} ${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} ] && 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
+
+		# 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}
+		rm -f ${CCHOST}-{gcc,g++,c++,g77}
+		[ -f gcc ] && ln -sf gcc ${CCHOST}-gcc
+		[ -f g++ ] && ln -sf g++ ${CCHOST}-g++
+		[ -f g++ ] && ln -sf g++ ${CCHOST}-c++
+		[ -f g77 ] && ln -sf g77 ${CCHOST}-g77
+	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 GNATS 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`" ]
+		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
+
+	# Fix ncurses b0rking
+	find ${D}/ -name '*curses.h' -exec rm -f {} \;
+}
+
+pkg_preinst() {
+
+	if [ ! -f "${WORKDIR}/.chkgccversion" ]
+	then
+		chk_gcc_version
+	fi
+
+	# Make again sure that the linker "should" be able to locate
+	# libstdc++.so ...
+	export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
+	${ROOT}/sbin/ldconfig
+}
+
+pkg_postinst() {
+
+	export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
+
+	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
+
+	# Fix ncurses b0rking (if r5 isn't unmerged)
+	find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
+
+	# http://dev.gentoo.org/~pappy/hardened-gcc/docs/etdyn-ssp.html
+	if has_version '>=sys-devel/hardened-gcc-1.2'
+	then
+		[ "${ROOT}" = "/" ] && hardened-gcc -A
+	fi
+}
+