--- /usr/portage/sys-devel/gcc/files/fix_libtool_files.sh	2005-01-30 13:18:49.000000000 -0600
+++ /sbin/fix_libtool_files.sh	2005-05-07 20:34:57.000000000 -0600
@@ -1,42 +1,38 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.12 2005/01/30 18:45:22 vapier Exp $
+# $Header: $
 
 usage() {
 cat << "USAGE_END"
-Usage: fix_libtool_files.sh <old-gcc-version> [--oldarch <old-CHOST>]
+Usage: fix_libtool_files.sh [--oldarch <old-CHOST>]
 
-    Where <old-gcc-version> is the version number of the
-    previous gcc version.  For example, if you updated to
-    gcc-3.2.1, and you had gcc-3.2 installed, run:
+    This program will update all the references to a version of
+    gcc to the curently used one.
+    For example, if you updated to gcc-3.2.1, and you had gcc-3.2 installed, run:
+
+      # fix_libtool_files.sh
 
-      # 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
+      # fix_libtool_files.sh --oldarch i586-pc-linux-gnu
 
 USAGE_END
 	exit 1
 }
 
-if [[ $2 != "--oldarch" && $# -ne 1 ]] || \
-   [[ $2 == "--oldarch" && $# -ne 3 ]]
+if [[ "$1" == "--help" ]] || \
+   [[ "$1" == "--oldarch" ]] && [[ "$#" -ne 2 ]]
 then
 	usage
+else
+	:
 fi
 
 ARGV1=$1
 ARGV2=$2
-ARGV3=$3
 
 source /etc/profile
 source /sbin/functions.sh
@@ -49,24 +45,22 @@
 # make sure the files come out sane
 umask 0022
 
-if [[ ${ARGV2} == "--oldarch" ]] && [[ -n ${ARGV3} ]] ; then
-	OLDCHOST=${ARGV3}
+if [[ ${ARGV1} == "--oldarch" ]] && [[ -n "${ARGV2}" ]] ; then
+	OLDCHOST=${ARGV2}
 else
 	OLDCHOST=
 fi
 
-AWKDIR="/lib/rcscripts/awk"
+PORTAGEBINDIR="/usr/lib/portage/bin"
 
-if [[ ! -r ${AWKDIR}/fixlafiles.awk ]] ; then
-	eerror "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!"
+if [[ ! -r "${PORTAGEBINDIR}/fixlafiles.py" ]] ; then
+	eerror "${0##*/}: ${PORTAGEBINDIR}/fixlafiles.py does not exist!"
 	exit 1
 fi
 
-OLDVER=${ARGV1}
-
-export OLDVER OLDCHOST
+export OLDCHOST
 
 einfo "Scanning libtool files for hardcoded gcc library paths..."
-/bin/gawk -f "${AWKDIR}/fixlafiles.awk"
+${PORTAGEBINDIR}/fixlafiles.py
 
 # vim:ts=4