misc fixes to make sure 0 is not changed

3 files changed, 53 insertions, 47 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 20cfa3bfa2e9..5aaee8092442 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,6 @@
 # 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.113 2003/07/23 23:13:41 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.114 2003/07/24 18:00:07 azarah Exp $
 
 *gcc-3.2.3-r2 (23 Jul 2003)
 
@@ -11,6 +11,10 @@
     - Doesn't protect the 1st function argument when
       CFLAGS="-O0".
 
+  24 Jul 2003; Martin Schlemmer <azarah@gentoo.org> files/fix_libtool_files.sh:
+  Fix fix_libtool_files.sh to first get the number of parameters, and $1, else
+  some odd settings in /etc/profile may cause $# to be overwritten.
+
 *gcc-3.3-r1 (20 Jul 2003)
 
   20 Jul 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3-r1.ebuild,
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 880c9f54464b..a468ecec9cb2 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,43 +1,43 @@
-MD5 3dff5a110783b13e4bfe27c39fa6f1d2 ChangeLog 25201
+MD5 c82a9aa0fec0aa72997693024724b003 ChangeLog 25428
 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 789ae0db671f886a9d355cfcc6c561ec gcc-3.1-r8.ebuild 9814
 MD5 2e044311e5c3f623625fde2864df0a81 gcc-3.1.1-r1.ebuild 9648
 MD5 8b116192168fec85477e59d68d24ac44 gcc-3.2-r5.ebuild 12936
-MD5 857d79065f68cdc820201acbeb5c10ac gcc-3.2.1-r7.ebuild 14840
-MD5 25e5edcce8f471a375b397ccbd52a761 gcc-3.2.2-r2.ebuild 15119
-MD5 3d13dcdb8ae4a92e1809b031504feb59 gcc-3.2.2.ebuild 15327
-MD5 e486bcc1f093a11c2cefb3cf83d62e6a gcc-3.2.3-r1.ebuild 16423
-MD5 f142294eb7e78996ae5e217fa7ca31b8 gcc-3.3-r1.ebuild 15543
 MD5 895d66fe483deb33cb19fb734c3181c9 gcc-3.3.ebuild 15744
+MD5 f142294eb7e78996ae5e217fa7ca31b8 gcc-3.3-r1.ebuild 15543
+MD5 3d13dcdb8ae4a92e1809b031504feb59 gcc-3.2.2.ebuild 15327
 MD5 cf1b3fa9edcee29689286dec2b59673b gcc-3.2.3-r2.ebuild 16418
-MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
-MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
+MD5 e486bcc1f093a11c2cefb3cf83d62e6a gcc-3.2.3-r1.ebuild 16423
+MD5 857d79065f68cdc820201acbeb5c10ac gcc-3.2.1-r7.ebuild 14840
+MD5 25e5edcce8f471a375b397ccbd52a761 gcc-3.2.2-r2.ebuild 15119
 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 05618b1d8df0b0a2ddb85fb1fb8d2412 files/digest-gcc-3.3-r1 353
 MD5 f0b73e4542862243a43920fd6fd0cb99 files/digest-gcc-3.1-r8 62
 MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
-MD5 cd65d39a64a53d74db2ad18611e18a27 files/digest-gcc-3.2-r5 134
-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 05618b1d8df0b0a2ddb85fb1fb8d2412 files/digest-gcc-3.3-r1 353
-MD5 7ce23f6fb5adf84f6e8ff293c4e7c4dd files/fix_libtool_files.sh 1048
 MD5 b1a242694f56184cbcdd40ba25800d50 files/gcc-2.95.3-alpha.diff 14345
-MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
+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 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
+MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
 MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
+MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
+MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
 MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r2 279
+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
@@ -62,36 +62,36 @@ MD5 2b3b3b8637dc17eedce3b1ca1b68f1f1 files/3.2/gcc-3.2-glibc-2.3-compat.diff 551
 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 f0261a99a420d6b533014b95c0a7d00c files/3.2.1/gcc32-ada-make.patch 957
+MD5 f8505ae264a0fe9557382b7c96a13461 files/3.2.1/gcc32-shared-pthread.patch 3637
+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 f0261a99a420d6b533014b95c0a7d00c files/3.2.1/gcc32-ada-make.patch 957
-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 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 f8505ae264a0fe9557382b7c96a13461 files/3.2.1/gcc32-shared-pthread.patch 3637
-MD5 7978d1aaf6bae19163e83c110dec1b38 files/3.2.1/gcc32-sparc32-hack.patch 2192
 MD5 51719a174883702ef1851fac4cc79398 files/3.2.1/gcc32-strip-dotdot.patch 2071
-MD5 c113c3352ad365b8a35d2b0c21e69256 files/3.2.1/gcc32-testsuite.patch 650
-MD5 444d0885eecc638ed3ca644d96323422 files/3.2.1/gcc32-tls-reload-fix.patch 6660
+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 465eeaf6008c25dc69ff502dc2a9d8e0 files/3.2.2/gcc322-ggc_page-speedup.patch 872
 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 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 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 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570
-MD5 024be708f930f58eea99c548009b9a86 files/awk/fixlafiles.awk 2634
+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
diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh
index 12f3bcbee9d7..b2d504fa19af 100644
--- a/sys-devel/gcc/files/fix_libtool_files.sh
+++ b/sys-devel/gcc/files/fix_libtool_files.sh
@@ -2,16 +2,7 @@
 # Copyright 1999-2002 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.5 2003/03/09 03:23:08 azarah Exp $
-
-source /etc/profile
-source /sbin/functions.sh
-
-if [ "`id -u`" -ne 0 ]
-then
-        eerror "${0##*/}: Must be root."
-        exit 1
-fi
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.6 2003/07/24 18:00:07 azarah Exp $
 
 usage() {
 cat << "USAGE_END"
@@ -33,6 +24,17 @@ then
 	usage
 fi
 
+ARGV1="$1"
+
+source /etc/profile
+source /sbin/functions.sh
+
+if [ "`id -u`" -ne 0 ]
+then
+	eerror "${0##*/}: Must be root."
+	exit 1
+fi
+
 AWKDIR="/lib/rcscripts/awk"
 
 if [ ! -r "${AWKDIR}/fixlafiles.awk" ]
@@ -42,7 +44,7 @@ then
 fi
 
 einfo "Scannig libtool files for hardcoded gcc $1 library path..."
-/bin/gawk -v OLDVER="$1" -f "${AWKDIR}/fixlafiles.awk"
+/bin/gawk -v OLDVER="${ARGV1}" -f "${AWKDIR}/fixlafiles.awk"
 
 
 # vim:ts=4