Fix_libtool_files.sh did not catch a user changing CHOST (bug #23466).

11 files changed, 524 insertions, 162 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 04ad80bba635..2854667cb41e 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.117 2003/08/10 19:20:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.118 2003/08/24 08:40:43 azarah Exp $
+
+  24 Aug 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.2.2-r2.ebuild,
+  gcc-3.2.2.ebuild, gcc-3.2.3-r1.ebuild, gcc-3.2.3-r2.ebuild,
+  gcc-3.3-r1.ebuild, gcc-3.3.1.ebuild, gcc-3.3.ebuild,
+  files/fix_libtool_files.sh, files/awk/fixlafiles.awk:
+  Fix_libtool_files.sh did not catch a user changing CHOST. Updated
+  fixlafiles.awk and the latest ebuilds to support a fix for this, bug #23466.
 
 *gcc-3.3.1 (10 Aug 2003)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 377e4657952f..6a6d2081ee1d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,103 +1,100 @@
-MD5 0787583d58426645c758b1f6e2cf81aa ChangeLog 26404
+MD5 857d79065f68cdc820201acbeb5c10ac gcc-3.2.1-r7.ebuild 14840
+MD5 7aa7239d769e91ef64b34820192afc69 gcc-3.2.2-r2.ebuild 15873
 MD5 63530786ea42df2b5ca6e52999f586f2 gcc-2.95.3-r7.ebuild 5464
-MD5 b47190af0648ab5deee8d2fdf337bd4e gcc-2.95.3-r8.ebuild 9250
-MD5 feb010a6cb97e65c1d201a5796e92942 gcc-3.0.4-r6.ebuild 8766
-MD5 c9341a692858ea720a1341fa43030ec6 gcc-3.3.1-r1.ebuild 15016
-MD5 789ae0db671f886a9d355cfcc6c561ec gcc-3.1-r8.ebuild 9814
+MD5 f85eeaaad2d7fb2cbd449215c1e61a51 ChangeLog 26798
+MD5 f890c963415838034322cf4f21267a53 gcc-3.3.1.ebuild 15756
 MD5 85e2366f675b5b808daf3a709d08a101 gcc-3.1.1-r1.ebuild 9642
+MD5 789ae0db671f886a9d355cfcc6c561ec gcc-3.1-r8.ebuild 9814
+MD5 feb010a6cb97e65c1d201a5796e92942 gcc-3.0.4-r6.ebuild 8766
+MD5 c617901aca7cf6a82cfe5deacd077b01 gcc-3.3.ebuild 16495
+MD5 b64cdca55fa99ed6136fc975c9bf24eb gcc-3.3-r1.ebuild 16321
+MD5 b47190af0648ab5deee8d2fdf337bd4e gcc-2.95.3-r8.ebuild 9250
 MD5 b6b3fc753a05897175f5edad1708929f gcc-3.2-r5.ebuild 12933
-MD5 f254a08e868c87604a9c3221d15c0d40 gcc-3.3.ebuild 15740
-MD5 6272c663ada2c1dd3d4d4e0fce571ea7 gcc-3.3-r1.ebuild 15566
-MD5 970b5de85d1bf43e857025188081f5cf .gcc-3.3.1-r1.ebuild.swp 32768
-MD5 3d13dcdb8ae4a92e1809b031504feb59 gcc-3.2.2.ebuild 15327
-MD5 793cdd7196f60e05ba34a4be5b989f54 gcc-3.2.3-r2.ebuild 16413
-MD5 9eed364ceb2d9f68216ee0b851a2a795 gcc-3.2.3-r1.ebuild 16419
-MD5 857d79065f68cdc820201acbeb5c10ac gcc-3.2.1-r7.ebuild 14840
-MD5 07db0a8a6800725ddeacf2f2a665a07c gcc-3.3.1.ebuild 15006
-MD5 25e5edcce8f471a375b397ccbd52a761 gcc-3.2.2-r2.ebuild 15119
+MD5 3f91b3c313269ba11e2bf2d48a549ea6 gcc-3.2.2.ebuild 16082
+MD5 ea7c423f8a0fe4877882f5e783dd1701 gcc-3.2.3-r1.ebuild 17174
+MD5 3ffc651d9efb71867c10559d4fe0f99c gcc-3.2.3-r2.ebuild 17168
 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 78c80e5a08e73cf4a5bdd79791e81f0a files/digest-gcc-3.3.1-r1 361
-MD5 f0b73e4542862243a43920fd6fd0cb99 files/digest-gcc-3.1-r8 62
-MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
-MD5 b1a242694f56184cbcdd40ba25800d50 files/gcc-2.95.3-alpha.diff 14345
-MD5 3e18bebbec7685b3d968a9674e4eb8f8 files/digest-gcc-3.3.1 274
-MD5 cd65d39a64a53d74db2ad18611e18a27 files/digest-gcc-3.2-r5 134
-MD5 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
-MD5 3e97b31c58d4169716d984c23cb37913 files/fix_libtool_files.sh 1052
-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 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
+MD5 73da03a8bd40327709e7850d9e2158e6 files/gcc-2.95.3-destructor-atexit.diff 3890
+MD5 cd65d39a64a53d74db2ad18611e18a27 files/digest-gcc-3.2-r5 134
 MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
+MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771
+MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
 MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
+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 6d14c0e8546cb9f8e18e24ddb71cdc2b files/digest-gcc-3.2.3-r1 278
+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 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
+MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
+MD5 f0b73e4542862243a43920fd6fd0cb99 files/digest-gcc-3.1-r8 62
+MD5 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
+MD5 2d5af6fe0b03d39a94cb4c4d4b03e226 files/gcc-2.95.3-atexit.diff 1731
 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 6d14c0e8546cb9f8e18e24ddb71cdc2b files/digest-gcc-3.2.3-r1 278
-MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
-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
-MD5 9495fab2aa4388693856b2c52f5ac363 files/3.1/gcc31-c++-diagnostic-no-line-wrapping.patch.bz2 562
+MD5 3e18bebbec7685b3d968a9674e4eb8f8 files/digest-gcc-3.3.1 274
+MD5 8e1f9b62901fac8d4c06705eb2db995c files/fix_libtool_files.sh 1743
+MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
+MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
+MD5 bbf2dfd80e3656467fb1fff1094f4c03 files/awk/fixlafiles.awk 6117
+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 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 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874
 MD5 ea61b0ff2db11805fb0778c63b51f43b files/3.1/gcc31-c++-null-pm-init.patch.bz2 4434
-MD5 24642b902b9937cdebeb14063859135f files/3.1/gcc31-c++-tsubst-asm.patch.bz2 703
-MD5 f7274feec78a2dc4ce9233880804ed0f files/3.1/gcc31-dwarf2-pr6381.patch.bz2 1059
 MD5 87f7be372b23072220fbceed8a127474 files/3.1/gcc31-dwarf2-pr6436-test.patch.bz2 336
-MD5 9ea8c34a980997a0d89744cb2ddf941a files/3.1/gcc31-fdata-sections.patch.bz2 2676
-MD5 d3250673494682fa71cb3760e6de257b files/3.1/gcc31-fde-merge-compat.patch.bz2 634
 MD5 a235188ad8a8ac2bb3dc8fcd51603225 files/3.1/gcc31-fold-const.patch.bz2 1867
-MD5 637b53059fa127746952cbffe1e8d403 files/3.1/gcc31-fold-const2.patch.bz2 368
-MD5 734e98009983615eff4814f671d83679 files/3.1/gcc31-i386-expand-clrstr.patch.bz2 527
+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 981171de6a3f8d53741f77c12c221469 files/3.1/gcc31-libstdc++-pr6648.patch.bz2 770
-MD5 2f1d2c02b99aa182f1fd9b6328c8b77a files/3.1/gcc31-libstdc++-setrlim.patch.bz2 584
-MD5 df404bbcc95193a2591895758915e74e files/3.1/gcc31-pr6643.patch.bz2 421
+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 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
-MD5 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874
-MD5 f0261a99a420d6b533014b95c0a7d00c files/3.2.1/gcc32-ada-make.patch 957
+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 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 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 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 f0261a99a420d6b533014b95c0a7d00c files/3.2.1/gcc32-ada-make.patch 957
+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 c113c3352ad365b8a35d2b0c21e69256 files/3.2.1/gcc32-testsuite.patch 650
 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 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
-MD5 38131a537835873acb08c415d27a013e files/3.2.1/gcc32-athlon-alignment.patch 509
 MD5 2c18cb2004c626adf634823713582738 files/3.2.1/gcc32-fix-sixtrack.patch 2001
-MD5 43442dbe4412f751605f1597815b5671 files/3.2.1/gcc32-libjava-x86_64-biarch-sigaction.patch 445
-MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.1/gcc32-pr8213.patch 2036
-MD5 62e1cc1d310d74e97080b10802263791 files/3.2.1/gcc32-pr8988.patch 2070
-MD5 51719a174883702ef1851fac4cc79398 files/3.2.1/gcc32-strip-dotdot.patch 2071
 MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
-MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
-MD5 024be708f930f58eea99c548009b9a86 files/awk/fixlafiles.awk 2634
-MD5 17f15202b98a8dd84d0f4b67eff2d868 files/3.2.2/gcc32-pr7768.patch 1789
-MD5 f055e4ef28077477e8d64c6a985b1ad4 files/3.2.2/gcc322-pr9888.patch 9771
-MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.2/gcc32-pr8213.patch 2036
-MD5 0760a0992d24384d13b7e160614c54ac files/3.2.2/gcc32-pr9732.patch 5534
-MD5 ccb007933a794eb661ee3b742189f285 files/3.2.2/gcc322-pr8746.patch 2816
-MD5 465eeaf6008c25dc69ff502dc2a9d8e0 files/3.2.2/gcc322-ggc_page-speedup.patch 872
-MD5 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570
-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 99db7c1a41babe024f0c6859c30a87ee files/3.2.3/gcc323-gentoo-branding.patch 2058
-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 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 62e1cc1d310d74e97080b10802263791 files/3.2.1/gcc32-pr8988.patch 2070
+MD5 c113c3352ad365b8a35d2b0c21e69256 files/3.2.1/gcc32-testsuite.patch 650
+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/awk/fixlafiles.awk b/sys-devel/gcc/files/awk/fixlafiles.awk
index c191bddf5589..25ea4084679d 100644
--- a/sys-devel/gcc/files/awk/fixlafiles.awk
+++ b/sys-devel/gcc/files/awk/fixlafiles.awk
@@ -1,18 +1,33 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/fixlafiles.awk,v 1.7 2003/04/28 02:40:34 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/fixlafiles.awk,v 1.8 2003/08/24 08:40:43 azarah Exp $
+
+function printn(string)
+{
+	system("echo -n \"" string "\"")
+}
 
 function einfo(string)
 {
 	system("echo -e \" \\e[32;01m*\\e[0m " string "\"")
 }
 
+function einfon(string)
+{
+	system("echo -ne \" \\e[32;01m*\\e[0m " string "\"")
+}
+
 function ewarn(string)
 {
 	system("echo -e \" \\e[33;01m*\\e[0m " string "\"")
 }
 
+function ewarnn(string)
+{
+	system("echo -ne \" \\e[33;01m*\\e[0m " string "\"")
+}
+	
 function eerror(string)
 {
 	system("echo -e \" \\e[31;01m*\\e[0m " string "\"")
@@ -30,54 +45,126 @@ function assert(condition, string)
 	}
 }
 
+# system() wrapper that normalize return codes ...
+function dosystem(command,		ret)
+{
+	ret = 0
+ 
+	ret = system(command)
+	if (ret == 0)
+		return 1
+	else
+		return 0
+}
+
 
 BEGIN {
 
-	while((getline ldsoconf_data < ("/etc/ld.so.conf")) > 0) {
+	LIBCOUNT = 0
+	# Add the two default library paths
+	DIRLIST[1] = "/lib"
+	DIRLIST[2] = "/usr/lib"
 
-		if (ldsoconf_data !~ /[[:space:]]*#/) {
+	# Walk /etc/ld.so.conf line for line and get any library paths
+	pipe = "cat /etc/ld.so.conf | sort 2>/dev/null"
+	while(((pipe) | getline ldsoconf_data) > 0) {
+
+		if (ldsoconf_data !~ /^[[:space:]]*#/) {
 
 			if (ldsoconf_data == "") continue
+
+			# Remove any trailing comments
+			sub(/#.*$/, "", ldsoconf_data)
+			# Remove any trailing spaces
+			sub(/[[:space:]]+$/, "", ldsoconf_data)
 	
 			split(ldsoconf_data, nodes, /[:,[:space:]]/)
 
-			DIRLIST[1] = "/lib"
-			DIRLIST[2] = "/usr/lib"
-
+			# Now add the rest from ld.so.conf
 			for (x in nodes) {
 
 				sub(/=.*/, "", nodes[x])
 				sub(/\/$/, "", nodes[x])
 
 				if (nodes[x] == "") continue
+
+				CHILD = 0
+
+				# Drop the directory if its a child directory of
+				# one that was already added ...
+				for (y in DIRLIST) {
+
+					if (nodes[x] ~ "^" DIRLIST[y]) {
+					
+						CHILD = 1
+						break
+					}
+				}
+
+				if (CHILD) continue
 		
-				DIRLIST[++i + 2] = nodes[x]
+				DIRLIST[++LIBCOUNT + 2] = nodes[x]
 			}
 		}
 	}
-	
-	if (i == 0) {
-		eerror("Could not read from /etc/ld.so.conf!")
-		exit 1
-	}
 
-	close("/etc/ld.so.conf")
+	close(pipe)
+
+# We have no guarantee that ld.so.conf have more library paths than
+# the default, and its better to fix .la files only in /lib and
+# /usr/lib than not at all ...
+#	if (LIBCOUNT == 0) {
+#		eerror("Could not read from /etc/ld.so.conf!")
+#		exit 1
+#	}
+
+	LIBCOUNT += 2
+
+	# Get current gcc's CHOST
+	pipe = "gcc -v 2>&1 | egrep '^Reading specs' \
+	        | sed -e 's:^.*/gcc-lib/\\([^/]*\\)/[0-9]\\+.*$:\\1:' 2>/dev/null"
+
+	# If we fail to get the CHOST, see if we can get the CHOST
+	# portage thinks we are using ...
+	if ((!((pipe) | getline CHOST)) || (CHOST == "")) {
+		close(pipe)
+		pipe = "/usr/bin/portageq envvar 'CHOST'"
+		assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
+	}
 
-	pipe = "/usr/bin/python -c 'import portage; print portage.settings[\"CHOST\"];'"
-	assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
 	close(pipe)
 
+	if (CHOST == "") {
+		eerror("Could not get gcc's CHOST!")
+		exit 1
+	}
+
+	if (OLDCHOST != "")
+		if (OLDCHOST == CHOST)
+			OLDCHOST = ""
+
 	GCCLIBPREFIX = "/usr/lib/gcc-lib/"
 	GCCLIB = GCCLIBPREFIX CHOST
+	if (OLDCHOST != "")
+		OLDGCCLIB = GCCLIBPREFIX OLDCHOST
 
-	sub(/\/$/, "",  GCCLIB)
-
+	# Get current gcc's version
 	pipe = "gcc -dumpversion"
 	assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)")
 	close(pipe)
+
+	if (NEWVER == "") {
+		eerror("Could not get gcc's version!")
+		exit 1
+	}
+
+	# Nothing to do ?
+	if ((OLDVER == NEWVER) && (OLDCHOST == ""))
+		exit 0
 	
-	for (x in DIRLIST) {
+	for (x = 1;x <= LIBCOUNT;x++) {
 
+		# Do nothing if the target dir is gcc's internal library path
 		if (DIRLIST[x] ~ GCCLIBPREFIX) continue
 
 		einfo("  Scanning " DIRLIST[x] "...")
@@ -85,37 +172,103 @@ BEGIN {
 		pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null"
 		while (((pipe) | getline la_files) > 0) {
 
+			# Do nothing if the .la file is located in gcc's internal lib path
 			if (la_files ~ GCCLIBPREFIX) continue
 
 			CHANGED = 0
+			CHOST_CHANGED = 0
 
+			# See if we need to fix the .la file
 			while ((getline la_data < (la_files)) > 0) {
 
-				if ((gsub(GCCLIB "/" OLDVER "/", GCCLIB "/" NEWVER "/", la_data) > 0) ||
-				    (gsub(GCCLIB "/" OLDVER "[[:space:]]", GCCLIB "/" NEWVER " ", la_data) > 0)) {
+				if (OLDCHOST != "") {
+				
+					if (gsub(OLDGCCLIB "[/[:space:]]+",
+					         GCCLIB, la_data) > 0) {
 					
-					CHANGED = 1
-					break
+						CHANGED = 1
+						CHOST_CHANGED = 1
+					}
+				}
+
+				if (OLDVER != NEWVER) {
+				
+					if (gsub(GCCLIB "/" OLDVER "[/[:space:]]+",
+					         GCCLIB "/" NEWVER, la_data) > 0)
+						CHANGED = 1
 				}
 			}
 
 			close(la_files)
 
+			# Do the actual changes in a second loop, as we can then
+			# verify that CHOST_CHANGED among things is correct ...
 			if (CHANGED) {
 
-				ewarn("    FIXING: " la_files)
+				ewarnn("    FIXING: " la_files " ... ")
+
+				if (CHANGED)
+					printn("[")
+
+				# Clear the temp file (removing rather than '>foo' is better
+				# out of a security point of view?)
+				dosystem("rm -f " la_files ".new")
 
 				while ((getline la_data < (la_files)) > 0) {
 
-					gsub(GCCLIB "/" OLDVER "/", GCCLIB "/" NEWVER "/", la_data)
-					gsub(GCCLIB "/" OLDVER "[[:space:]]", GCCLIB "/" NEWVER " ", la_data)
+					if (OLDCHOST != "") {
+					
+						tmpstr = gensub(OLDGCCLIB "([/[:space:]]+)",
+						                GCCLIB "\\1", "g", la_data)
+						
+						if (la_data != tmpstr) {
+							printn("c")
+							la_data = tmpstr
+						}
+
+						if (CHOST_CHANGED > 0) {
+						
+							# We try to be careful about CHOST changes outside
+							# the gcc library path (meaning we cannot match it
+							# via /GCCLIBPREFIX CHOST/) ...
+
+							# Catch:
+							#
+							#  dependency_libs=' -L/usr/CHOST/{bin,lib}'
+							#
+							gsub("-L/usr/" OLDCHOST "/",
+							     "-L/usr/" CHOST "/", la_data)
+							# Catch:
+							#
+							#  dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib'
+							#
+							la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/",
+							              "\\1/" CHOST "/", "g", la_data)
+						}
+					}
+
+					if (OLDVER != NEWVER) {
+					
+						tmpstr = gensub(GCCLIB "/" OLDVER "([/[:space:]]+)",
+						                GCCLIB "/" NEWVER "\\1", "g", la_data)
+						
+						if (la_data != tmpstr) {
+							printn("v")
+							la_data = tmpstr
+						}
+					}
 
 					print la_data >> (la_files ".new")
 				}
 
+				if (CHANGED)
+					print "]"
+
+				close(la_files)
 				close(la_files ".new")
 
-				system("mv -f " la_files ".new " la_files)
+				assert(dosystem("mv -f " la_files ".new " la_files),
+				       "dosystem(\"mv -f " la_files ".new " la_files "\")")
 			}
 		}
 
diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh
index b2d504fa19af..ac1e79a1dbfe 100644
--- a/sys-devel/gcc/files/fix_libtool_files.sh
+++ b/sys-devel/gcc/files/fix_libtool_files.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.6 2003/07/24 18:00:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.7 2003/08/24 08:40:43 azarah Exp $
 
 usage() {
 cat << "USAGE_END"
-Usage: fix_libtool_files.sh <old-gcc-version>
+Usage: fix_libtool_files.sh <old-gcc-version> [--oldarch <old-CHOST>]
 
     Where <old-gcc-version> is the version number of the
     previous gcc version.  For example, if you updated to
@@ -14,17 +14,32 @@ Usage: fix_libtool_files.sh <old-gcc-version>
 
       # fix_libtool_files.sh 3.2
 
+    If you updated to gcc-3.2.3, and the old CHOST was i586-pc-linux-gnu
+    but you now have CHOST as i686-pc-linux-gnu, run:
+
+      # fix_libtool_files.sh 3.2 --oldarch i586-pc-linux-gnu
+
+    Note that if only the CHOST and not the version changed, you can run
+    it with the current version and the '--oldarch <old-CHOST>' arguments,
+    and it will do the expected:
+
+      # fix_libtool_files.sh `gcc -dumpversion` --oldarch i586-pc-linux-gnu
+
+
 USAGE_END
 
         exit 1
 }
 
-if [ "$#" -ne 1 ]
+if [ "$2" != "--oldarch" -a "$#" -ne 1 ] || \
+   [ "$2" = "--oldarch" -a "$#" -ne 3 ]
 then
 	usage
 fi
 
 ARGV1="$1"
+ARGV2="$2"
+ARGV3="$3"
 
 source /etc/profile
 source /sbin/functions.sh
@@ -35,6 +50,13 @@ then
 	exit 1
 fi
 
+if [ "${ARGV2}" = "--oldarch" -a "x${ARGV3}" != "x" ]
+then
+	OLDCHOST="${ARGV3}"
+else
+	OLDCHOST=
+fi
+
 AWKDIR="/lib/rcscripts/awk"
 
 if [ ! -r "${AWKDIR}/fixlafiles.awk" ]
@@ -43,8 +65,9 @@ then
 	exit 1
 fi
 
-einfo "Scannig libtool files for hardcoded gcc $1 library path..."
-/bin/gawk -v OLDVER="${ARGV1}" -f "${AWKDIR}/fixlafiles.awk"
+einfo "Scannig libtool files for hardcoded gcc library paths..."
+/bin/gawk -v OLDVER="${ARGV1}" -v OLDCHOST="${OLDCHOST}" \
+	-f "${AWKDIR}/fixlafiles.awk"
 
 
 # vim:ts=4
diff --git a/sys-devel/gcc/gcc-3.2.2-r2.ebuild b/sys-devel/gcc/gcc-3.2.2-r2.ebuild
index c28a278f69e5..61472e2d3c1c 100644
--- a/sys-devel/gcc/gcc-3.2.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2-r2.ebuild,v 1.5 2003/04/28 03:06:00 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2-r2.ebuild,v 1.6 2003/08/24 08:40:43 azarah Exp $
 
 IUSE="static nls bootstrap java build"
 
@@ -118,15 +118,25 @@ FAKE_ROOT=""
 
 chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
-	OLD_GCC_VERSION="`gcc -dumpversion`"
+	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
+		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
+	touch "${WORKDIR}/.chkgccversion"
 }
 
 src_unpack() {
@@ -517,11 +527,27 @@ pkg_postinst() {
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
-	if [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
 	then 
-		OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`"
+		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}
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
 	fi
 	
 	# Fix ncurses b0rking (if r5 isn't unmerged)
diff --git a/sys-devel/gcc/gcc-3.2.2.ebuild b/sys-devel/gcc/gcc-3.2.2.ebuild
index b5ec63f73c72..7966a6ee1bb9 100644
--- a/sys-devel/gcc/gcc-3.2.2.ebuild
+++ b/sys-devel/gcc/gcc-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.17 2003/05/27 23:41:45 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.18 2003/08/24 08:40:43 azarah Exp $
 
 IUSE="static nls bootstrap java build"
 
@@ -118,15 +118,25 @@ FAKE_ROOT=""
 
 chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
-	OLD_GCC_VERSION="`gcc -dumpversion`"
+	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
+		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
+	touch "${WORKDIR}/.chkgccversion"
 }
 
 src_unpack() {
@@ -520,11 +530,27 @@ pkg_postinst() {
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
-	if [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
 	then 
-		OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`"
+		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}
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
 	fi
 	
 	# Fix ncurses b0rking (if r5 isn't unmerged)
diff --git a/sys-devel/gcc/gcc-3.2.3-r1.ebuild b/sys-devel/gcc/gcc-3.2.3-r1.ebuild
index d14f51a58839..e0bb2f0204a4 100644
--- a/sys-devel/gcc/gcc-3.2.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r1.ebuild,v 1.14 2003/08/10 01:18:41 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r1.ebuild,v 1.15 2003/08/24 08:40:43 azarah Exp $
 
 IUSE="static nls bootstrap java build"
 
@@ -126,15 +126,25 @@ FAKE_ROOT=""
 
 chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
-	OLD_GCC_VERSION="`gcc -dumpversion`"
+	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
+		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
+	touch "${WORKDIR}/.chkgccversion"
 }
 
 version_patch() {
@@ -561,11 +571,27 @@ pkg_postinst() {
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
-	if [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
 	then 
-		OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`"
+		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}
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
 	fi
 	
 	# Fix ncurses b0rking (if r5 isn't unmerged)
diff --git a/sys-devel/gcc/gcc-3.2.3-r2.ebuild b/sys-devel/gcc/gcc-3.2.3-r2.ebuild
index bd71b9247500..f297b09b50e1 100644
--- a/sys-devel/gcc/gcc-3.2.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r2.ebuild,v 1.2 2003/08/10 01:18:41 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r2.ebuild,v 1.3 2003/08/24 08:40:43 azarah Exp $
 
 IUSE="static nls bootstrap java build"
 
@@ -126,15 +126,25 @@ FAKE_ROOT=""
 
 chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
-	OLD_GCC_VERSION="`gcc -dumpversion`"
+	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
+		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
+	touch "${WORKDIR}/.chkgccversion"
 }
 
 version_patch() {
@@ -561,11 +571,27 @@ pkg_postinst() {
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
-	if [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
 	then 
-		OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`"
+		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}
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
 	fi
 	
 	# Fix ncurses b0rking (if r5 isn't unmerged)
diff --git a/sys-devel/gcc/gcc-3.3-r1.ebuild b/sys-devel/gcc/gcc-3.3-r1.ebuild
index a1f9ed6e3fa0..50d8f9f6f4cb 100644
--- a/sys-devel/gcc/gcc-3.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3-r1.ebuild,v 1.3 2003/08/10 01:18:41 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3-r1.ebuild,v 1.4 2003/08/24 08:40:43 azarah Exp $
 
 IUSE="static nls bootstrap java build X"
 
@@ -130,15 +130,25 @@ PDEPEND="sys-devel/gcc-config"
 
 chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
-	OLD_GCC_VERSION="`gcc -dumpversion`"
+	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
+		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
+	touch "${WORKDIR}/.chkgccversion"
 }
 
 version_patch() {
@@ -551,11 +561,27 @@ pkg_postinst() {
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
-	if [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
 	then 
-		OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`"
+		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}
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
 	fi
 	
 	# Fix ncurses b0rking (if r5 isn't unmerged)
diff --git a/sys-devel/gcc/gcc-3.3.1.ebuild b/sys-devel/gcc/gcc-3.3.1.ebuild
index ec475e566a83..9d616de05a1d 100644
--- a/sys-devel/gcc/gcc-3.3.1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.1.ebuild,v 1.2 2003/08/10 19:32:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.1.ebuild,v 1.3 2003/08/24 08:40:43 azarah Exp $
 
 IUSE="static nls bootstrap java build X"
 
@@ -130,15 +130,25 @@ PDEPEND="sys-devel/gcc-config"
 
 chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
-	OLD_GCC_VERSION="`gcc -dumpversion`"
+	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
+		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
+	touch "${WORKDIR}/.chkgccversion"
 }
 
 version_patch() {
@@ -527,11 +537,27 @@ pkg_postinst() {
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
-	if [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
 	then 
-		OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`"
+		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}
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
 	fi
 	
 	# Fix ncurses b0rking (if r5 isn't unmerged)
diff --git a/sys-devel/gcc/gcc-3.3.ebuild b/sys-devel/gcc/gcc-3.3.ebuild
index d7d505390153..bd1945e7986d 100644
--- a/sys-devel/gcc/gcc-3.3.ebuild
+++ b/sys-devel/gcc/gcc-3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.ebuild,v 1.7 2003/08/10 01:18:41 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.ebuild,v 1.8 2003/08/24 08:40:43 azarah Exp $
 
 IUSE="static nls bootstrap java build X"
 
@@ -132,15 +132,25 @@ PDEPEND="sys-devel/gcc-config"
 
 chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
-	OLD_GCC_VERSION="`gcc -dumpversion`"
+	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
+		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
+	touch "${WORKDIR}/.chkgccversion"
 }
 
 version_patch() {
@@ -549,11 +559,27 @@ pkg_postinst() {
 	fi
 
 	# Update libtool linker scripts to reference new gcc version ...
-	if [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
 	then 
-		OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`"
+		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}
+		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
 	fi
 	
 	# Fix ncurses b0rking (if r5 isn't unmerged)