remove bogus patch

23 files changed, 1110 insertions, 824 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 9aabea8d6c41..036d260a84ea 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.9 2002/07/03 19:11:10 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.10 2002/10/20 10:46:22 azarah Exp $
+
+*libtool-1.4.2-r2 (20 Oct 2002)
+
+  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Spiced up version.
+
+*libtool-1.4.1-r10 (20 Oct 2002)
+
+  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Remove the ltmain.sh-hack.patch, as it caused problems with linking
+  dependencies.
 
 *libtool-1.4.1-r9 (3 Jul 2002)
 
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.3.5-mktemp.patch b/sys-devel/libtool/files/1.4.2/libtool-1.3.5-mktemp.patch
new file mode 100644
index 000000000000..181f842321c9
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.3.5-mktemp.patch
@@ -0,0 +1,15 @@
+--- libtool-1.3.5/ltmain.sh.mktemp	Fri Jul  7 18:49:44 2000
++++ libtool-1.3.5/ltmain.sh	Fri May 26 21:53:15 2000
+@@ -3462,7 +3462,11 @@
+ 	    if test "$finalize" = yes && test -z "$run"; then
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+-	      tmpdir="$tmpdir/libtool-$$"
++              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
++              if test $? = 0 ; then :
++              else
++                tmpdir="$tmpdir/libtool-$$"
++              fi
+ 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+ 	      else
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4-nonneg.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4-nonneg.patch
new file mode 100644
index 000000000000..abf687932ea0
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4-nonneg.patch
@@ -0,0 +1,29 @@
+--- libtool-1.4/ltmain.sh.nonneg	Wed May  9 10:29:55 2001
++++ libtool-1.4/ltmain.sh	Wed May  9 10:30:48 2001
+@@ -2191,7 +2191,7 @@
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	[0-9]*) ;;
+ 	*)
+ 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+@@ -2200,7 +2200,7 @@
+ 	esac
+ 
+ 	case $revision in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	[0-9]*) ;;
+ 	*)
+ 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+@@ -2209,7 +2209,7 @@
+ 	esac
+ 
+ 	case $age in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	[0-9]*) ;;
+ 	*)
+ 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch
new file mode 100644
index 000000000000..6fa99486a3f5
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch
@@ -0,0 +1,20 @@
+--- /usr/share/libtool/ltmain.sh	Sat May 12 19:29:42 2001
++++ ./ltmain.sh	Wed May 23 20:02:10 2001
+@@ -1530,6 +1530,8 @@
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
++	    # PKGW 
++	    dependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+ 	      case "$tmp_libs " in
+@@ -1645,6 +1647,8 @@
+ 	  fi
+ 
+ 	  tmp_libs=
++	  #PKGW
++	  dependency_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch
new file mode 100644
index 000000000000..7cfba32afb5c
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch
@@ -0,0 +1,13 @@
+--- ./libtool.m4.gege	Tue Sep 11 05:16:01 2001
++++ ./libtool.m4	Sat Oct 20 00:05:20 2001
+@@ -1932,8 +1932,8 @@
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib"
+ 
+ case $host_os in
+ aix3*)
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.2-archive-shared.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-archive-shared.patch
new file mode 100644
index 000000000000..52183b2f0f12
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-archive-shared.patch
@@ -0,0 +1,16 @@
+--- libtool-1.4.2/ltmain.sh.archive-shared	2002-07-15 09:12:03.000000000 -0400
++++ libtool-1.4.2/ltmain.sh	2002-07-15 09:13:04.000000000 -0400
+@@ -2644,6 +2644,13 @@ EOF
+ 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ 			esac
+ 		      done
++		      # It is ok to link against an archive when
++		      # building a shared library.
++		      if $AR -t $potlib > /dev/null 2>&1; then
++		        newdeplibs="$newdeplibs $a_deplib"
++		        a_deplib=""
++		        break 2
++		      fi
+ 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ 			 | sed 10q \
+ 			 | egrep "$file_magic_regex" > /dev/null; then
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.2-duplicate-dependency.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-duplicate-dependency.patch
new file mode 100644
index 000000000000..e54c96fdb67b
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-duplicate-dependency.patch
@@ -0,0 +1,92 @@
+--- libtool-1.4.2/ltmain.sh.duplicatedep	Tue Sep 11 07:40:18 2001
++++ libtool-1.4.2/ltmain.sh	Tue Jan  1 08:06:36 2002
+@@ -177,6 +177,8 @@
+   --mode) prevopt="--mode" prev=mode ;;
+   --mode=*) mode="$optarg" ;;
+ 
++  --preserve-dup-deps) duplicate_deps="yes" ;;
++
+   --quiet | --silent)
+     show=:
+     ;;
+@@ -1330,11 +1332,32 @@
+     # Find all interdependent deplibs by searching for libraries
+     # that are linked more than once (e.g. -la -lb -la)
+     for deplib in $deplibs; do
+-      case "$libs " in
+-      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-      esac
++      if test "X$duplicate_deps" = "Xyes" ; then
++	case "$libs " in
++	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	esac
++      fi
+       libs="$libs $deplib"
+     done
++
++    if test "$linkmode" = lib; then
++      libs="$predeps $libs $compiler_lib_search_path $postdeps"
++
++      # Compute libraries that are listed more than once in $predeps
++      # $postdeps and mark them as special (i.e., whose duplicates are
++      # not to be eliminated).
++      pre_post_deps=
++      if test "X$duplicate_deps" = "Xyes" ; then
++	for pre_post_dep in $predeps $postdeps; do
++	  case "$pre_post_deps " in
++	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
++	  esac
++	  pre_post_deps="$pre_post_deps $pre_post_dep"
++	done
++      fi
++      pre_post_deps=
++    fi
++
+     deplibs=
+     newdependency_libs=
+     newlib_search_path=
+@@ -1555,9 +1578,11 @@
+ 	    tmp_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
++              if test "X$duplicate_deps" = "Xyes" ; then
++	        case "$tmp_libs " in
++	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	        esac
++              fi
+ 	      tmp_libs="$tmp_libs $deplib"
+ 	    done
+ 	  elif test $linkmode != prog && test $linkmode != lib; then
+@@ -1680,9 +1705,11 @@
+ 	      # or/and link against static libraries
+ 	      newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+-	    case "$tmp_libs " in
+-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	    esac
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done # for deplib
+ 	  continue
+@@ -1981,9 +2008,11 @@
+ 	  tmp_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    newdependency_libs="$deplib $newdependency_libs"
+-	    case "$tmp_libs " in
+-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	    esac
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done
+ 
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
new file mode 100644
index 000000000000..7e5b69c74681
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
@@ -0,0 +1,40 @@
+--- ./ltmain.in.gege	2001-09-11 01:40:18.000000000 +0200
++++ ./ltmain.in	2002-05-15 13:32:16.000000000 +0200
+@@ -205,6 +205,17 @@
+   exit 1
+ fi
+ 
++# Mandrake: (gc) It's bad to link C++ code with GCC, so we need to use the compiler name if provided
++if test "$mode" = link && test -n "$archive_cmds" && test -x "/usr/bin/perl"; then
++    case $nonopt in
++    *cc | *++ | gcc* | *-gcc* | egcs*)
++	    archive_cmds=`echo $archive_cmds | perl -pe 's/^\S+\s+//'`
++	    archive_cmds="$nonopt $archive_cmds"
++	    archive_expsym_cmds=`echo $archive_expsym_cmds | perl -pe 's/^\S+\s+//'`
++	    archive_expsym_cmds="$nonopt $archive_expsym_cmds"
++    esac
++fi
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+--- ./ltmain.sh.gege	2002-05-15 13:33:49.000000000 +0200
++++ ./ltmain.sh	2002-05-15 13:36:53.000000000 +0200
+@@ -207,6 +207,17 @@
+   exit 1
+ fi
+ 
++# Mandrake: (gc) It's bad to link C++ code with GCC, so we need to use the compiler name if provided
++if test "$mode" = link && test -n "$archive_cmds" && test -x "/usr/bin/perl"; then
++    case $nonopt in
++    *cc | *++ | gcc* | *-gcc* | egcs*)
++	    archive_cmds=`echo $archive_cmds | perl -pe 's/^\S+\s+//'`
++	    archive_cmds="$nonopt $archive_cmds"
++	    archive_expsym_cmds=`echo $archive_expsym_cmds | perl -pe 's/^\S+\s+//'`
++	    archive_expsym_cmds="$nonopt $archive_expsym_cmds"
++    esac
++fi
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.2-lib64.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-lib64.patch
new file mode 100644
index 000000000000..170cfcc5cf26
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-lib64.patch
@@ -0,0 +1,46 @@
+--- libtool-1.4.2/libtool.m4.lib64	2002-07-11 14:13:23.000000000 -0400
++++ libtool-1.4.2/libtool.m4	2002-07-11 14:37:31.000000000 -0400
+@@ -98,6 +98,20 @@ case $host in
+   rm -rf conftest*
+   ;;
+ 
++*-*-linux*)
++  # Test if the compiler is 64bit
++  echo 'int i;' > conftest.$ac_ext
++  lt_cv_cc_64bit_output=no
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *"ELF 64"*)
++      lt_cv_cc_64bit_output=yes
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++  
+ *-*-sco3.2v5*)
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+@@ -2160,6 +2174,13 @@ linux-gnu*)
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  case $host_cpu:$lt_cv_cc_64bit_output in
++  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
++    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
++    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
++    ;;
++  esac
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -3372,7 +3393,7 @@ irix5* | irix6*)
+ # This must be Linux ELF.
+ linux-gnu*)
+   case $host_cpu in
+-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
++  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | x86_64* )
+     lt_cv_deplibs_check_method=pass_all ;;
+   *)
+     # glibc up to 2.1.1 does not perform some relocations on ARM
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.2-portage.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-portage.patch
new file mode 100644
index 000000000000..2d15d2e05676
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-portage.patch
@@ -0,0 +1,62 @@
+--- ltmain.sh.orig	Wed Apr  3 01:19:37 2002
++++ ltmain.sh	Sun May 26 19:50:52 2002
+@@ -3940,9 +3940,46 @@
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		  exit 1
+ 		fi
+-		newdependency_libs="$newdependency_libs $libdir/$name"
++		# We do not want portage's install root ($D) present.  Check only for
++		# this if the .la is being installed.
++		if test "$installed" = yes && test "$D"; then
++		  eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
++		else
++		  mynewdependency_lib="$libdir/$name"
++		fi
++		# Do not add duplicates
++		if test "$mynewdependency_lib"; then
++		  if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
++		    newdependency_libs="$newdependency_libs $mynewdependency_lib"
++		  fi
++		fi
++		;;
++		  *)
++		if test "$installed" = yes; then
++   	  # Rather use S=WORKDIR if our version of portage supports it.
++   	  # This is because some ebuild (gcc) do not use $S as buildroot.
++		  if test "$PWORKDIR"; then
++		    S="$PWORKDIR"
++		  fi
++		  # We do not want portage's build root ($S) present.
++		  if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
++		    mynewdependency_lib=""
++		  # We do not want portage's install root ($D) present.
++		  elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
++		    eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
++		  else
++		    mynewdependency_lib="$deplib"
++		  fi
++		else
++		  mynewdependency_lib="$deplib"
++		fi
++		# Do not add duplicates
++		if test "$mynewdependency_lib"; then
++		  if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
++			newdependency_libs="$newdependency_libs $mynewdependency_lib"
++		  fi
++		fi
+ 		;;
+-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$newdependency_libs"
+@@ -3975,6 +4005,10 @@
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
++	  # Do not add duplicates
++	  if test "$installed" = yes && test "$D"; then
++	    install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
++	  fi
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.2-relink.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-relink.patch
new file mode 100644
index 000000000000..8fe511ca0e98
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-relink.patch
@@ -0,0 +1,99 @@
+--- libtool-1.4.1/ltmain.sh.relink	Wed Oct  3 02:05:35 2001
++++ libtool-1.4.1/ltmain.sh	Wed Oct  3 05:16:14 2001
+@@ -754,6 +754,7 @@
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+@@ -884,6 +885,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -985,6 +991,11 @@
+ 	continue
+ 	;;
+ 
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
++
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+@@ -1866,6 +1877,7 @@
+ 
+ 	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
++	    add_prefix_dir=
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+@@ -1886,10 +1898,22 @@
+ 	      add="-l$name"
+ 	    fi
+ 
++	    if test -n "$inst_prefix_dir"; then
++	      case "$libdir" in
++	      [\\/]*)
++		add_prefix_dir="-L$inst_prefix_dir$libdir"
++		;;
++	      esac
++	    fi
++
++	    # add_prefix_dir must be appended instead, otherwise it can
++	    # possibly be overrided by any hardcoded -L/... path in deplibs
+ 	    if test "$linkmode" = prog; then
++	      test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
++	      test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
+ 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+@@ -3856,7 +3880,7 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
++      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -4157,6 +4181,24 @@
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit 1
++	  fi
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++	  fi
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
diff --git a/sys-devel/libtool/files/1.4.2/libtool-1.4.2-test.patch b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-test.patch
new file mode 100644
index 000000000000..08ba7cc98e33
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.2/libtool-1.4.2-test.patch
@@ -0,0 +1,578 @@
+--- libtool-1.4.2/ltmain.sh.test	2001-09-10 19:40:18.000000000 -0400
++++ libtool-1.4.2/ltmain.sh	2002-07-11 14:49:35.000000000 -0400
+@@ -467,7 +467,7 @@ if test -z "$show_help"; then
+       pic_mode=default
+       ;;
+     esac
+-    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
++    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+       # non-PIC code in shared libraries is not supported
+       pic_mode=default
+     fi
+@@ -1303,11 +1303,11 @@ compiler."
+       output_objdir="$output_objdir/$objdir"
+     fi
+     # Create the object directory.
+-    if test ! -d $output_objdir; then
++    if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+       status=$?
+-      if test $status -ne 0 && test ! -d $output_objdir; then
++      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ 	exit $status
+       fi
+     fi
+@@ -1366,7 +1366,7 @@ compiler."
+ 	;;
+     esac
+     for pass in $passes; do
+-      if test $linkmode = prog; then
++      if test "$linkmode" = prog; then
+ 	# Determine which files to process
+ 	case $pass in
+ 	dlopen)
+@@ -1383,11 +1383,11 @@ compiler."
+ 	found=no
+ 	case $deplib in
+ 	-l*)
+-	  if test $linkmode = oldlib && test $linkmode = obj; then
++	  if test "$linkmode" = oldlib && test "$linkmode" = obj; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
+ 	    continue
+ 	  fi
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1407,7 +1407,7 @@ compiler."
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      deplibs="$deplib $deplibs"
+-	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    continue
+ 	  fi
+@@ -1416,16 +1416,16 @@ compiler."
+ 	  case $linkmode in
+ 	  lib)
+ 	    deplibs="$deplib $deplibs"
+-	    test $pass = conv && continue
++	    test "$pass" = conv && continue
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  prog)
+-	    if test $pass = conv; then
++	    if test "$pass" = conv; then
+ 	      deplibs="$deplib $deplibs"
+ 	      continue
+ 	    fi
+-	    if test $pass = scan; then
++	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+ 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+@@ -1440,7 +1440,7 @@ compiler."
+ 	  continue
+ 	  ;; # -L
+ 	-R*)
+-	  if test $pass = link; then
++	  if test "$pass" = link; then
+ 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ 	    # Make sure the xrpath contains only unique directories.
+ 	    case "$xrpath " in
+@@ -1453,7 +1453,7 @@ compiler."
+ 	  ;;
+ 	*.la) lib="$deplib" ;;
+ 	*.$libext)
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1474,7 +1474,7 @@ compiler."
+ 	    continue
+ 	    ;;
+ 	  prog)
+-	    if test $pass != link; then
++	    if test "$pass" != link; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+@@ -1485,7 +1485,7 @@ compiler."
+ 	  esac # linkmode
+ 	  ;; # *.$libext
+ 	*.lo | *.$objext)
+-	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ 	    # If there is no dlopen support or we're linking statically,
+ 	    # we need to preload.
+ 	    newdlprefiles="$newdlprefiles $deplib"
+@@ -1501,7 +1501,7 @@ compiler."
+ 	  continue
+ 	  ;;
+ 	esac # case $deplib
+-	if test $found = yes || test -f "$lib"; then :
++	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+ 	  exit 1
+@@ -1535,13 +1535,13 @@ compiler."
+ 
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test $linkmode = oldlib && test $linkmode = obj; }; then
++	   { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
+ 	   # Add dl[pre]opened files of deplib
+ 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ 	fi
+ 
+-	if test $pass = conv; then
++	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+ 	  if test -z "$libdir"; then
+@@ -1560,7 +1560,7 @@ compiler."
+ 	      esac
+ 	      tmp_libs="$tmp_libs $deplib"
+ 	    done
+-	  elif test $linkmode != prog && test $linkmode != lib; then
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ 	    exit 1
+ 	  fi
+@@ -1578,7 +1578,7 @@ compiler."
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+-	if test $pass = dlopen; then
++	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+@@ -1627,7 +1627,7 @@ compiler."
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+ 	# This library was specified with -dlpreopen.
+-	if test $pass = dlpreopen; then
++	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+@@ -1646,7 +1646,7 @@ compiler."
+ 
+ 	if test -z "$libdir"; then
+ 	  # Link the convenience library
+-	  if test $linkmode = lib; then
++	  if test "$linkmode" = lib; then
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	  elif test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$dir/$old_library $compile_deplibs"
+@@ -1657,7 +1657,7 @@ compiler."
+ 	  continue
+ 	fi
+ 
+-	if test $linkmode = prog && test $pass != link; then
++	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+ 
+@@ -1673,7 +1673,7 @@ compiler."
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ 	    esac
+ 	    # Need to link against all dependency_libs?
+-	    if test $linkalldeplibs = yes; then
++	    if test "$linkalldeplibs" = yes; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      # Need to hardcode shared library paths
+@@ -1694,7 +1694,7 @@ compiler."
+ 	  # Link against this shared library
+ 
+ 	  if test "$linkmode,$pass" = "prog,link" ||
+-	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
++	   { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+@@ -1716,7 +1716,7 @@ compiler."
+ 	      esac
+ 	      ;;
+ 	    esac
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      # We need to hardcode the library path
+ 	      if test -n "$shlibpath_var"; then
+ 		# Make sure the rpath contains only unique directories.
+@@ -1798,9 +1798,9 @@ compiler."
+ 	    # make sure the library variables are pointing to the new library
+ 	    dir=$output_objdir
+ 	    linklib=$newlib
+-	  fi # test -n $old_archive_from_expsyms_cmds
++	  fi # test -n "$old_archive_from_expsyms_cmds"
+ 
+-	  if test $linkmode = prog || test "$mode" != relink; then
++	  if test "$linkmode" = prog || test "$mode" != relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1849,7 +1849,7 @@ compiler."
+ 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ 	      esac
+ 	    fi
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ 	    else
+@@ -1866,7 +1866,7 @@ compiler."
+ 	    fi
+ 	  fi
+ 
+-	  if test $linkmode = prog || test "$mode" = relink; then
++	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1888,7 +1888,7 @@ compiler."
+ 	      add="-l$name"
+ 	    fi
+ 
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
+@@ -1896,7 +1896,7 @@ compiler."
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+ 	  fi
+-	elif test $linkmode = prog; then
++	elif test "$linkmode" = prog; then
+ 	  if test "$alldeplibs" = yes &&
+ 	     { test "$deplibs_check_method" = pass_all ||
+ 	       { test "$build_libtool_libs" = yes &&
+@@ -1955,10 +1955,10 @@ compiler."
+ 	  fi
+ 	fi # link shared/static library?
+ 
+-	if test $linkmode = lib; then
++	if test "$linkmode" = lib; then
+ 	  if test -n "$dependency_libs" &&
+-	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+-	       test $link_static = yes; }; then
++	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+@@ -1987,7 +1987,7 @@ compiler."
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done
+ 
+-	  if test $link_all_deplibs != no; then
++	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+@@ -2030,15 +2030,15 @@ compiler."
+ 	  fi # link_all_deplibs != no
+ 	fi # linkmode = lib
+       done # for deplib in $libs
+-      if test $pass = dlpreopen; then
++      if test "$pass" = dlpreopen; then
+ 	# Link the dlpreopened libraries before other libraries
+ 	for deplib in $save_deplibs; do
+ 	  deplibs="$deplib $deplibs"
+ 	done
+       fi
+-      if test $pass != dlopen; then
+-	test $pass != scan && dependency_libs="$newdependency_libs"
+-	if test $pass != conv; then
++      if test "$pass" != dlopen; then
++	test "$pass" != scan && dependency_libs="$newdependency_libs"
++	if test "$pass" != conv; then
+ 	  # Make sure lib_search_path contains only unique directories.
+ 	  lib_search_path=
+ 	  for dir in $newlib_search_path; do
+@@ -2096,7 +2096,7 @@ compiler."
+ 	deplibs=
+       fi
+     done # for pass
+-    if test $linkmode = prog; then
++    if test "$linkmode" = prog; then
+       dlfiles="$newdlfiles"
+       dlprefiles="$newdlprefiles"
+     fi
+@@ -2173,7 +2173,7 @@ compiler."
+       fi
+ 
+       set dummy $rpath
+-      if test $# -gt 2; then
++      if test "$#" -gt 2; then
+ 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+       fi
+       install_libdir="$2"
+@@ -2240,7 +2240,7 @@ compiler."
+ 	  ;;
+ 	esac
+ 
+-	if test $age -gt $current; then
++	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+@@ -2279,7 +2279,7 @@ compiler."
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$revision
+-	  while test $loop != 0; do
++	  while test "$loop" -ne 0; do
+ 	    iface=`expr $revision - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="sgi$major.$iface:$verstring"
+@@ -2302,7 +2302,7 @@ compiler."
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$age
+-	  while test $loop != 0; do
++	  while test "$loop" -ne 0; do
+ 	    iface=`expr $current - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring:${iface}.0"
+@@ -2403,7 +2403,7 @@ compiler."
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+-	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+@@ -2446,7 +2446,7 @@ compiler."
+ 	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+-	    if test $build_libtool_need_lc = "yes"; then
++	    if test "$build_libtool_need_lc" = "yes"; then
+ 	      deplibs="$deplibs -lc"
+ 	    fi
+ 	    ;;
+@@ -2487,7 +2487,7 @@ compiler."
+ EOF
+ 	  $rm conftest
+ 	  $CC -o conftest conftest.c $deplibs
+-	  if test $? -eq 0 ; then
++	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+@@ -2521,7 +2521,7 @@ EOF
+ 		$rm conftest
+ 		$CC -o conftest conftest.c $i
+ 		# Did it work?
+-		if test $? -eq 0 ; then
++		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+ 		  libname=`eval \\$echo \"$libname_spec\"`
+ 		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+@@ -2692,7 +2692,7 @@ EOF
+ 	    echo "*** automatically added whenever a program is linked with this library"
+ 	    echo "*** or is declared to -dlopen it."
+ 
+-	    if test $allow_undefined = no; then
++	    if test "$allow_undefined" = no; then
+ 	      echo
+ 	      echo "*** Since this library must not contain undefined symbols,"
+ 	      echo "*** because either the platform does not support them or"
+@@ -2719,7 +2719,7 @@ EOF
+ 
+       # Test again, we may have decided not to build it any more
+       if test "$build_libtool_libs" = yes; then
+-	if test $hardcode_into_libs = yes; then
++	if test "$hardcode_into_libs" = yes; then
+ 	  # Hardcode the library paths
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+@@ -2850,7 +2850,7 @@ EOF
+ 	    $show "mkdir $gentop"
+ 	    $run mkdir "$gentop"
+ 	    status=$?
+-	    if test $status -ne 0 && test ! -d "$gentop"; then
++	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	      exit $status
+ 	    fi
+ 	    generated="$generated $gentop"
+@@ -2869,7 +2869,7 @@ EOF
+ 	      $show "mkdir $xdir"
+ 	      $run mkdir "$xdir"
+ 	      status=$?
+-	      if test $status -ne 0 && test ! -d "$xdir"; then
++	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 		exit $status
+ 	      fi
+ 	      $show "(cd $xdir && $AR x $xabs)"
+@@ -2989,7 +2989,7 @@ EOF
+ 	  $show "mkdir $gentop"
+ 	  $run mkdir "$gentop"
+ 	  status=$?
+-	  if test $status -ne 0 && test ! -d "$gentop"; then
++	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	    exit $status
+ 	  fi
+ 	  generated="$generated $gentop"
+@@ -3008,7 +3008,7 @@ EOF
+ 	    $show "mkdir $xdir"
+ 	    $run mkdir "$xdir"
+ 	    status=$?
+-	    if test $status -ne 0 && test ! -d "$xdir"; then
++	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	      exit $status
+ 	    fi
+ 	    $show "(cd $xdir && $AR x $xabs)"
+@@ -3403,7 +3403,7 @@ static const void *lt_preloaded_setup() 
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+-      if test $need_relink = no || test "$build_libtool_libs" != yes; then
++      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ 	link_command="$compile_command$compile_rpath"
+@@ -3528,7 +3528,7 @@ static const void *lt_preloaded_setup() 
+ 	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ 	  fi
+ 	done
+-	relink_command="cd `pwd`; $relink_command"
++	relink_command="(cd `pwd`; $relink_command)"
+ 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       fi
+ 
+@@ -3771,7 +3771,7 @@ fi\
+ 	$show "mkdir $gentop"
+ 	$run mkdir "$gentop"
+ 	status=$?
+-	if test $status -ne 0 && test ! -d "$gentop"; then
++	if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	  exit $status
+ 	fi
+ 	generated="$generated $gentop"
+@@ -3791,7 +3791,7 @@ fi\
+ 	  $show "mkdir $xdir"
+ 	  $run mkdir "$xdir"
+ 	  status=$?
+-	  if test $status -ne 0 && test ! -d "$xdir"; then
++	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	    exit $status
+ 	  fi
+ 	  $show "(cd $xdir && $AR x $xabs)"
+@@ -3858,7 +3858,7 @@ fi\
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
++      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -3948,7 +3948,7 @@ dlpreopen='$dlprefiles'
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test "$installed" = no && test $need_relink = yes; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+@@ -4084,7 +4084,7 @@ relink_command=\"$relink_command\""
+ 
+       # Not a directory, so check to see that there is only one file specified.
+       set dummy $files
+-      if test $# -gt 2; then
++      if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+ 	exit 1
+@@ -4186,7 +4186,7 @@ relink_command=\"$relink_command\""
+ 	    $run eval "$striplib $destdir/$realname" || exit $?
+ 	  fi
+ 
+-	  if test $# -gt 0; then
++	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
+ 	    for linkname
+ 	    do
+@@ -4444,7 +4444,7 @@ relink_command=\"$relink_command\""
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    test "$show" = ":" && exit 0
++    test "$show" = : && exit 0
+ 
+     echo "----------------------------------------------------------------------"
+     echo "Libraries have been installed in:"
+@@ -4610,7 +4610,7 @@ relink_command=\"$relink_command\""
+       fi
+ 
+       # Now prepare to actually exec the command.
+-      exec_cmd='"$cmd"$args'
++      exec_cmd="\$cmd$args"
+     else
+       # Display what would be done.
+       if test -n "$shlibpath_var"; then
+@@ -4660,10 +4660,10 @@ relink_command=\"$relink_command\""
+ 	objdir="$dir/$objdir"
+       fi
+       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-      test $mode = uninstall && objdir="$dir"
++      test "$mode" = uninstall && objdir="$dir"
+ 
+       # Remember objdir for removal later, being careful to avoid duplicates
+-      if test $mode = clean; then
++      if test "$mode" = clean; then
+ 	case " $rmdirs " in
+ 	  *" $objdir "*) ;;
+ 	  *) rmdirs="$rmdirs $objdir" ;;
+@@ -4695,9 +4695,9 @@ relink_command=\"$relink_command\""
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test $mode = uninstall; then
++	  if test "$mode" = uninstall; then
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+ 	      eval cmds=\"$postuninstall_cmds\"
+@@ -4706,7 +4706,7 @@ relink_command=\"$relink_command\""
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+-		if test $? != 0 && test "$rmforce" != yes; then
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+@@ -4721,7 +4721,7 @@ relink_command=\"$relink_command\""
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+-		if test $? != 0 && test "$rmforce" != yes; then
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+@@ -4741,7 +4741,7 @@ relink_command=\"$relink_command\""
+ 
+       *)
+ 	# Do a test to see if this is a libtool program.
+-	if test $mode = clean &&
++	if test "$mode" = clean &&
+ 	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  relink_command=
+ 	  . $dir/$file
diff --git a/sys-devel/libtool/files/digest-libtool-1.4-r1 b/sys-devel/libtool/files/digest-libtool-1.4-r1
deleted file mode 100644
index f6852be6dde9..000000000000
--- a/sys-devel/libtool/files/digest-libtool-1.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad40e22c9037dc0e569668c30734bc49 libtool-1.4.tar.gz 1096928
diff --git a/sys-devel/libtool/files/digest-libtool-1.4.1-r8 b/sys-devel/libtool/files/digest-libtool-1.4.1-r10
index ce6a480b1e86..ce6a480b1e86 100644
--- a/sys-devel/libtool/files/digest-libtool-1.4.1-r8
+++ b/sys-devel/libtool/files/digest-libtool-1.4.1-r10
diff --git a/sys-devel/libtool/files/digest-libtool-1.4.1-r9 b/sys-devel/libtool/files/digest-libtool-1.4.1-r9
deleted file mode 100644
index ce6a480b1e86..000000000000
--- a/sys-devel/libtool/files/digest-libtool-1.4.1-r9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 28582af0b96513f223e970db1a9a5cde libtool-1.4.1.tar.gz 1129676
diff --git a/sys-devel/libtool/files/digest-libtool-1.4.2-r1 b/sys-devel/libtool/files/digest-libtool-1.4.2-r2
index 6f5ec430bee7..6f5ec430bee7 100644
--- a/sys-devel/libtool/files/digest-libtool-1.4.2-r1
+++ b/sys-devel/libtool/files/digest-libtool-1.4.2-r2
diff --git a/sys-devel/libtool/files/libtool-1.4.1-relink.patch b/sys-devel/libtool/files/libtool-1.4.1-relink.patch
deleted file mode 100644
index c31772cc9561..000000000000
--- a/sys-devel/libtool/files/libtool-1.4.1-relink.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- ltmain.sh	Sun Aug 12 18:08:05 2001
-+++ ltmain-relinkable.sh	Tue Aug 28 18:55:13 2001
-@@ -827,6 +827,7 @@
-     linker_flags=
-     dllsearchpath=
-     lib_search_path=`pwd`
-+    inst_prefix_dir=
- 
-     avoid_version=no
-     dlfiles=
-@@ -959,6 +960,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	release)
- 	  release="-$arg"
- 	  prev=
-@@ -1167,6 +1173,11 @@
- 	continue
- 	;;
- 
-+      -inst-prefix-dir)
-+	prev=inst_prefix
-+	continue
-+	;;
-+
-       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-       # so, if we see these flags be careful not to treat them like -L
-       -L[A-Z][A-Z]*:*)
-@@ -2231,7 +2242,16 @@
- 	    if test "$hardcode_direct" = yes; then
- 	      add="$libdir/$linklib"
- 	    elif test "$hardcode_minus_L" = yes; then
--	      add_dir="-L$libdir"
-+	      # Try looking first in the location we're being installed to.
-+	      add_dir=
-+	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
-+		[\\/]*)
-+		  add_dir="-L$inst_prefix_dir$libdir"
-+		  ;;
-+		esac
-+	      fi
-+	      add_dir="$add_dir -L$libdir"
- 	      add="-l$name"
- 	    elif test "$hardcode_shlibpath_var" = yes; then
- 	      case :$finalize_shlibpath: in
-@@ -2241,7 +2261,16 @@
- 	      add="-l$name"
- 	    else
- 	      # We cannot seem to hardcode it, guess we'll fake it.
--	      add_dir="-L$libdir"
-+	      # Try looking first in the location we're being installed to.
-+	      add_dir=
-+	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
-+		[\\/]*)
-+		  add_dir="-L$inst_prefix_dir$libdir"
-+		  ;;
-+		esac
-+	      fi
-+	      add_dir="$add_dir -L$libdir"
- 	      add="-l$name"
- 	    fi
- 
-@@ -4321,7 +4350,7 @@
- 	fi
-       done
-       # Quote the link command for shipping.
--      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
-+      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
-       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- 
-       # Only create the output if not a dry run.
-@@ -4622,12 +4651,30 @@
- 	dir="$dir$objdir"
- 
- 	if test -n "$relink_command"; then
-+	  # Determine the prefix the user has applied to our future dir.
-+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-+
-+	  # Don't allow the user to place us outside of our expected
-+	  # location b/c this prevents finding dependent libraries that
-+	  # are installed to the same prefix.
-+	  if test "$inst_prefix_dir" = "$destdir"; then
-+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	    exit 1
-+	  fi
-+
-+	  if test -n "$inst_prefix_dir"; then
-+	    # Stick the inst_prefix_dir data into the link command.
-+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	  else
-+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-+	  fi
-+
- 	  $echo "$modename: warning: relinking \`$file'" 1>&2
- 	  $show "$relink_command"
- 	  if $run eval "$relink_command"; then :
- 	  else
- 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
--	    continue
-+	    exit 1
- 	  fi
- 	fi
- 
-@@ -4782,7 +4829,11 @@
- 	    if test "$finalize" = yes && test -z "$run"; then
- 	      tmpdir="/tmp"
- 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
--	      tmpdir="$tmpdir/libtool-$$"
-+              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
-+              if test $? = 0 ; then :
-+              else
-+                tmpdir="$tmpdir/libtool-$$"
-+              fi
- 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
- 	      else
- 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
diff --git a/sys-devel/libtool/files/libtool-1.4.2-gentoo.patch b/sys-devel/libtool/files/libtool-1.4.2-gentoo.patch
deleted file mode 100644
index a86968f19dc3..000000000000
--- a/sys-devel/libtool/files/libtool-1.4.2-gentoo.patch
+++ /dev/null
@@ -1,539 +0,0 @@
---- libtool-1.3.5/ltmain.sh.mktemp	Fri Jul  7 18:49:44 2000
-+++ libtool-1.3.5/ltmain.sh	Fri May 26 21:53:15 2000
-@@ -3462,7 +3462,11 @@
- 	    if test "$finalize" = yes && test -z "$run"; then
- 	      tmpdir="/tmp"
- 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
--	      tmpdir="$tmpdir/libtool-$$"
-+              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
-+              if test $? = 0 ; then :
-+              else
-+                tmpdir="$tmpdir/libtool-$$"
-+              fi
- 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
- 	      else
- 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
---- libtool-1.4/ltmain.sh.nonneg	Wed May  9 10:29:55 2001
-+++ libtool-1.4/ltmain.sh	Wed May  9 10:30:48 2001
-@@ -2191,7 +2191,7 @@
- 
- 	# Check that each of the things are valid numbers.
- 	case $current in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	[0-9]*) ;;
- 	*)
- 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2200,7 +2200,7 @@
- 	esac
- 
- 	case $revision in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	[0-9]*) ;;
- 	*)
- 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2209,7 +2209,7 @@
- 	esac
- 
- 	case $age in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	[0-9]*) ;;
- 	*)
- 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
---- ./ltmain.sh	Tue May 29 19:16:03 2001
-+++ ./ltmain.sh	Tue May 29 21:26:50 2001
-@@ -459,7 +459,7 @@
-       pic_mode=default
-       ;;
-     esac
--    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
-+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-       # non-PIC code in shared libraries is not supported
-       pic_mode=default
-     fi
-@@ -1343,7 +1343,7 @@
- 	;;
-     esac
-     for pass in $passes; do
--      if test $linkmode = prog; then
-+      if test "$linkmode" = prog; then
- 	# Determine which files to process
- 	case $pass in
- 	dlopen)
-@@ -1360,11 +1360,11 @@
- 	found=no
- 	case $deplib in
- 	-l*)
--	  if test $linkmode = oldlib && test $linkmode = obj; then
-+	  if test "$linkmode" = oldlib && test "$linkmode" = obj; then
- 	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
- 	    continue
- 	  fi
--	  if test $pass = conv; then
-+	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
- 	    continue
- 	  fi
-@@ -1384,7 +1384,7 @@
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
- 	      deplibs="$deplib $deplibs"
--	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
-+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- 	    fi
- 	    continue
- 	  fi
-@@ -1393,16 +1393,16 @@
- 	  case $linkmode in
- 	  lib)
- 	    deplibs="$deplib $deplibs"
--	    test $pass = conv && continue
-+	    test "$pass" = conv && continue
- 	    newdependency_libs="$deplib $newdependency_libs"
- 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    ;;
- 	  prog)
--	    if test $pass = conv; then
-+	    if test "$pass" = conv; then
- 	      deplibs="$deplib $deplibs"
- 	      continue
- 	    fi
--	    if test $pass = scan; then
-+	    if test "$pass" = scan; then
- 	      deplibs="$deplib $deplibs"
- 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    else
-@@ -1417,7 +1417,7 @@
- 	  continue
- 	  ;; # -L
- 	-R*)
--	  if test $pass = link; then
-+	  if test "$pass" = link; then
- 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
- 	    # Make sure the xrpath contains only unique directories.
- 	    case "$xrpath " in
-@@ -1430,7 +1430,7 @@
- 	  ;;
- 	*.la) lib="$deplib" ;;
- 	*.$libext)
--	  if test $pass = conv; then
-+	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
- 	    continue
- 	  fi
-@@ -1451,7 +1451,7 @@
- 	    continue
- 	    ;;
- 	  prog)
--	    if test $pass != link; then
-+	    if test "$pass" != link; then
- 	      deplibs="$deplib $deplibs"
- 	    else
- 	      compile_deplibs="$deplib $compile_deplibs"
-@@ -1462,7 +1462,7 @@
- 	  esac # linkmode
- 	  ;; # *.$libext
- 	*.lo | *.$objext)
--	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- 	    # If there is no dlopen support or we're linking statically,
- 	    # we need to preload.
- 	    newdlprefiles="$newdlprefiles $deplib"
-@@ -1512,13 +1512,13 @@
- 
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
--	   { test $linkmode = oldlib && test $linkmode = obj; }; then
-+	   { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
- 	   # Add dl[pre]opened files of deplib
- 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
- 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
- 	fi
- 
--	if test $pass = conv; then
-+	if test "$pass" = conv; then
- 	  # Only check for convenience libraries
- 	  deplibs="$lib $deplibs"
- 	  if test -z "$libdir"; then
-@@ -1537,7 +1537,7 @@
- 	      esac
- 	      tmp_libs="$tmp_libs $deplib"
- 	    done
--	  elif test $linkmode != prog && test $linkmode != lib; then
-+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
- 	    exit 1
- 	  fi
-@@ -1555,7 +1555,7 @@
- 	fi
- 
- 	# This library was specified with -dlopen.
--	if test $pass = dlopen; then
-+	if test "$pass" = dlopen; then
- 	  if test -z "$libdir"; then
- 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
- 	    exit 1
-@@ -1604,7 +1604,7 @@
- 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- 
- 	# This library was specified with -dlpreopen.
--	if test $pass = dlpreopen; then
-+	if test "$pass" = dlpreopen; then
- 	  if test -z "$libdir"; then
- 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
- 	    exit 1
-@@ -1623,7 +1623,7 @@
- 
- 	if test -z "$libdir"; then
- 	  # Link the convenience library
--	  if test $linkmode = lib; then
-+	  if test "$linkmode" = lib; then
- 	    deplibs="$dir/$old_library $deplibs"
- 	  elif test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$dir/$old_library $compile_deplibs"
-@@ -1634,7 +1634,7 @@
- 	  continue
- 	fi
- 
--	if test $linkmode = prog && test $pass != link; then
-+	if test "$linkmode" = prog && test "$pass" != link; then
- 	  newlib_search_path="$newlib_search_path $ladir"
- 	  deplibs="$lib $deplibs"
- 
-@@ -1671,7 +1671,7 @@
- 	  # Link against this shared library
- 
- 	  if test "$linkmode,$pass" = "prog,link" ||
--	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
-+	   { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
- 	    # Hardcode the library path.
- 	    # Skip directories that are in the system default run-time
- 	    # search path.
-@@ -1693,7 +1693,7 @@
- 	      esac
- 	      ;;
- 	    esac
--	    if test $linkmode = prog; then
-+	    if test "$linkmode" = prog; then
- 	      # We need to hardcode the library path
- 	      if test -n "$shlibpath_var"; then
- 		# Make sure the rpath contains only unique directories.
-@@ -1777,7 +1777,7 @@
- 	    linklib=$newlib
- 	  fi # test -n $old_archive_from_expsyms_cmds
- 
--	  if test $linkmode = prog || test "$mode" != relink; then
-+	  if test "$linkmode" = prog || test "$mode" != relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -1826,7 +1826,7 @@
- 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
- 	      esac
- 	    fi
--	    if test $linkmode = prog; then
-+	    if test "$linkmode" = prog; then
- 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
- 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
- 	    else
-@@ -1843,7 +1843,7 @@
- 	    fi
- 	  fi
- 
--	  if test $linkmode = prog || test "$mode" = relink; then
-+	  if test "$linkmode" = prog || test "$mode" = relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -1865,7 +1865,7 @@
- 	      add="-l$name"
- 	    fi
- 
--	    if test $linkmode = prog; then
-+	    if test "$linkmode" = prog; then
- 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
- 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
- 	    else
-@@ -1873,7 +1873,7 @@
- 	      test -n "$add" && deplibs="$add $deplibs"
- 	    fi
- 	  fi
--	elif test $linkmode = prog; then
-+	elif test "$linkmode" = prog; then
- 	  if test "$alldeplibs" = yes &&
- 	     { test "$deplibs_check_method" = pass_all ||
- 	       { test "$build_libtool_libs" = yes &&
-@@ -1932,9 +1932,9 @@
- 	  fi
- 	fi # link shared/static library?
- 
--	if test $linkmode = lib; then
-+	if test "$linkmode" = lib; then
- 	  if test -n "$dependency_libs" &&
--	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
-+	     { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
- 	       test $link_static = yes; }; then
- 	    # Extract -R from dependency_libs
- 	    temp_deplibs=
-@@ -1964,7 +1964,7 @@
- 	    tmp_libs="$tmp_libs $deplib"
- 	  done
- 
--	  if test $link_all_deplibs != no; then
-+	  if test "$link_all_deplibs" != no; then
- 	    # Add the search paths of all dependency libraries
- 	    for deplib in $dependency_libs; do
- 	      case $deplib in
-@@ -2007,15 +2007,15 @@
- 	  fi # link_all_deplibs != no
- 	fi # linkmode = lib
-       done # for deplib in $libs
--      if test $pass = dlpreopen; then
-+      if test "$pass" = dlpreopen; then
- 	# Link the dlpreopened libraries before other libraries
- 	for deplib in $save_deplibs; do
- 	  deplibs="$deplib $deplibs"
- 	done
-       fi
--      if test $pass != dlopen; then
--	test $pass != scan && dependency_libs="$newdependency_libs"
--	if test $pass != conv; then
-+      if test "$pass" != dlopen; then
-+	test "$pass" != scan && dependency_libs="$newdependency_libs"
-+	if test "$pass" != conv; then
- 	  # Make sure lib_search_path contains only unique directories.
- 	  lib_search_path=
- 	  for dir in $newlib_search_path; do
-@@ -2073,7 +2073,7 @@
- 	deplibs=
-       fi
-     done # for pass
--    if test $linkmode = prog; then
-+    if test "$linkmode" = prog; then
-       dlfiles="$newdlfiles"
-       dlprefiles="$newdlprefiles"
-     fi
-@@ -2410,7 +2410,7 @@
- 	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
--	    if test $build_libtool_need_lc = "yes"; then
-+	    if test "$build_libtool_need_lc" = "yes"; then
- 	      deplibs="$deplibs -lc"
- 	    fi
- 	    ;;
-@@ -2683,7 +2683,7 @@
- 
-       # Test again, we may have decided not to build it any more
-       if test "$build_libtool_libs" = yes; then
--	if test $hardcode_into_libs = yes; then
-+	if test "$hardcode_into_libs" = yes; then
- 	  # Hardcode the library paths
- 	  hardcode_libdirs=
- 	  dep_rpath=
---- libtool-1.4.1/ltmain.sh.relink	Wed Oct  3 02:05:35 2001
-+++ libtool-1.4.1/ltmain.sh	Wed Oct  3 05:16:14 2001
-@@ -754,6 +754,7 @@
-     linker_flags=
-     dllsearchpath=
-     lib_search_path=`pwd`
-+    inst_prefix_dir=
- 
-     avoid_version=no
-     dlfiles=
-@@ -884,6 +885,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	release)
- 	  release="-$arg"
- 	  prev=
-@@ -985,6 +991,11 @@
- 	continue
- 	;;
- 
-+      -inst-prefix-dir)
-+	prev=inst_prefix
-+	continue
-+	;;
-+
-       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-       # so, if we see these flags be careful not to treat them like -L
-       -L[A-Z][A-Z]*:*)
-@@ -1866,6 +1877,7 @@
- 
- 	  if test "$linkmode" = prog || test "$mode" = relink; then
- 	    add_shlibpath=
-+	    add_prefix_dir=
- 	    add_dir=
- 	    add=
- 	    # Finalize command for both is simple: just hardcode it.
-@@ -1886,10 +1898,22 @@
- 	      add="-l$name"
- 	    fi
- 
-+	    if test -n "$inst_prefix_dir"; then
-+	      case "$libdir" in
-+	      [\\/]*)
-+		add_prefix_dir="-L$inst_prefix_dir$libdir"
-+		;;
-+	      esac
-+	    fi
-+
-+	    # add_prefix_dir must be appended instead, otherwise it can
-+	    # possibly be overrided by any hardcoded -L/... path in deplibs
- 	    if test "$linkmode" = prog; then
-+	      test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
- 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
- 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
- 	    else
-+	      test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
- 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
- 	      test -n "$add" && deplibs="$add $deplibs"
- 	    fi
-@@ -3856,7 +3880,7 @@
- 	fi
-       done
-       # Quote the link command for shipping.
--      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
-+      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
-       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- 
-       # Only create the output if not a dry run.
-@@ -4157,6 +4181,24 @@
- 	dir="$dir$objdir"
- 
- 	if test -n "$relink_command"; then
-+	  # Determine the prefix the user has applied to our future dir.
-+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-+
-+	  # Don't allow the user to place us outside of our expected
-+	  # location b/c this prevents finding dependent libraries that
-+	  # are installed to the same prefix.
-+	  if test "$inst_prefix_dir" = "$destdir"; then
-+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	    exit 1
-+	  fi
-+
-+	  if test -n "$inst_prefix_dir"; then
-+	    # Stick the inst_prefix_dir data into the link command.
-+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	  else
-+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-+	  fi
-+
- 	  $echo "$modename: warning: relinking \`$file'" 1>&2
- 	  $show "$relink_command"
- 	  if $run eval "$relink_command"; then :
---- libtool-1.4.1/libtool.m4.gege	Tue Sep 11 05:16:01 2001
-+++ libtool-1.4.1/libtool.m4	Sat Oct 20 00:05:20 2001
-@@ -1932,8 +1932,8 @@
- shlibpath_overrides_runpath=unknown
- version_type=none
- dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib"
- 
- case $host_os in
- aix3*)
---- libtool-1.4.2/ltmain.sh.duplicatedep	Tue Sep 11 07:40:18 2001
-+++ libtool-1.4.2/ltmain.sh	Tue Jan  1 08:06:36 2002
-@@ -177,6 +177,8 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --preserve-dup-deps) duplicate_deps="yes" ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
-@@ -1330,11 +1332,32 @@
-     # Find all interdependent deplibs by searching for libraries
-     # that are linked more than once (e.g. -la -lb -la)
-     for deplib in $deplibs; do
--      case "$libs " in
--      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--      esac
-+      if test "X$duplicate_deps" = "Xyes" ; then
-+	case "$libs " in
-+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	esac
-+      fi
-       libs="$libs $deplib"
-     done
-+
-+    if test "$linkmode" = lib; then
-+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-+
-+      # Compute libraries that are listed more than once in $predeps
-+      # $postdeps and mark them as special (i.e., whose duplicates are
-+      # not to be eliminated).
-+      pre_post_deps=
-+      if test "X$duplicate_deps" = "Xyes" ; then
-+	for pre_post_dep in $predeps $postdeps; do
-+	  case "$pre_post_deps " in
-+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+	  esac
-+	  pre_post_deps="$pre_post_deps $pre_post_dep"
-+	done
-+      fi
-+      pre_post_deps=
-+    fi
-+
-     deplibs=
-     newdependency_libs=
-     newlib_search_path=
-@@ -1555,9 +1578,11 @@
- 	    tmp_libs=
- 	    for deplib in $dependency_libs; do
- 	      deplibs="$deplib $deplibs"
--	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	      esac
-+              if test "X$duplicate_deps" = "Xyes" ; then
-+	        case "$tmp_libs " in
-+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	        esac
-+              fi
- 	      tmp_libs="$tmp_libs $deplib"
- 	    done
- 	  elif test $linkmode != prog && test $linkmode != lib; then
-@@ -1680,9 +1705,11 @@
- 	      # or/and link against static libraries
- 	      newdependency_libs="$deplib $newdependency_libs"
- 	    fi
--	    case "$tmp_libs " in
--	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	    esac
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
- 	    tmp_libs="$tmp_libs $deplib"
- 	  done # for deplib
- 	  continue
-@@ -1981,9 +2008,11 @@
- 	  tmp_libs=
- 	  for deplib in $dependency_libs; do
- 	    newdependency_libs="$deplib $newdependency_libs"
--	    case "$tmp_libs " in
--	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	    esac
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
- 	    tmp_libs="$tmp_libs $deplib"
- 	  done
- 
diff --git a/sys-devel/libtool/libtool-1.4-r1.ebuild b/sys-devel/libtool/libtool-1.4-r1.ebuild
deleted file mode 100644
index aed78e973d5e..000000000000
--- a/sys-devel/libtool/libtool-1.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4-r1.ebuild,v 1.9 2002/10/04 06:34:27 vapier Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A shared library tool for developers"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/libtool/${A}"
-HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND="virtual/glibc"
-
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/1.4/libtool.m4.patch
-}
-
-src_compile() {
-	try ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST}
-	try pmake
-}
-
-src_install() { 
-	try make DESTDIR=${D} install                   
-	dodoc AUTHORS COPYING ChangeLog* NEWS \
-	      README THANKS TODO doc/PLATFORMS	
-}
-
-
-
-
diff --git a/sys-devel/libtool/libtool-1.4.1-r9.ebuild b/sys-devel/libtool/libtool-1.4.1-r10.ebuild
index 5b0e93939842..04123bd355c9 100644
--- a/sys-devel/libtool/libtool-1.4.1-r9.ebuild
+++ b/sys-devel/libtool/libtool-1.4.1-r10.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.1-r9.ebuild,v 1.8 2002/10/04 06:34:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.1-r10.ebuild,v 1.1 2002/10/20 10:46:22 azarah Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
+
+S="${WORKDIR}/${P}"
 DESCRIPTION="A shared library tool for developers"
 SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 
 DEPEND="virtual/glibc"
 
-SLOT="0"
-
 src_unpack() {
 	unpack ${A}
 
@@ -27,17 +29,19 @@ src_unpack() {
 	#
 
 	cd ${S}
-	patch -p1 <${FILESDIR}/${PV}/${P}-nonneg.patch || die
-	patch -p0 <${FILESDIR}/${PV}/${P}-relink.patch || die
-	#fixes quoting for test's .. *VERY* important!
-	patch -p0 <${FILESDIR}/${PV}/${P}-test.patch || die
-	patch -p1 <${FILESDIR}/${PV}/${P}-duplicate-dependency.patch || die
-	patch -p0 <${FILESDIR}/${PV}/${P}-ltmain.sh-hack.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-nonneg.patch || die
+	patch -p0 < ${FILESDIR}/${PV}/${P}-relink.patch || die
+	# Fixes quoting for test's .. *VERY* important!
+	patch -p0 < ${FILESDIR}/${PV}/${P}-test.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-duplicate-dependency.patch || die
+	# This breaks dependancies it seems
+	# <azarah@gentoo.org> (20 Oct 2002)
+	#patch -p0 < ${FILESDIR}/${PV}/${P}-ltmain.sh-hack.patch || die
 	# Do not create bogus entries in $dependency_libs or $libdir
 	# with ${D} or ${S} in them.
 	#
 	# Azarah - 07 April 2002
-	patch -p0 <${FILESDIR}/${PV}/${P}-portage.patch-v6 || die
+	patch -p0 < ${FILESDIR}/${PV}/${P}-portage.patch-v6 || die
 }
 
 src_compile() {
diff --git a/sys-devel/libtool/libtool-1.4.1-r8.ebuild b/sys-devel/libtool/libtool-1.4.1-r8.ebuild
deleted file mode 100644
index de3d35b781fb..000000000000
--- a/sys-devel/libtool/libtool-1.4.1-r8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.1-r8.ebuild,v 1.8 2002/10/04 06:34:29 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A shared library tool for developers"
-SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-DEPEND="virtual/glibc"
-
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix the relink problem where the relinked libs do not get
-	# installed.  It is *VERY* important that you get a updated
-	# 'libtool-${PV}-relink.patch' if you update this, as it
-	# fixes a very serious bug.  Please not that this patch is
-	# included in 'libtool-${PV}-gentoo.patch' for this ebuild.
-	#
-	# NOTE: all affected apps should get a 'libtoolize --copy --force'
-	#      added to upate libtool
-	#
-
-	cd ${S}
-	patch -p1 <${FILESDIR}/${PV}/${P}-nonneg.patch || die
-	patch -p0 <${FILESDIR}/${PV}/${P}-relink.patch || die
-	#fixes quoting for test's .. *VERY* important!
-	patch -p0 <${FILESDIR}/${PV}/${P}-test.patch || die
-	patch -p1 <${FILESDIR}/${PV}/${P}-duplicate-dependency.patch || die
-	patch -p0 <${FILESDIR}/${PV}/${P}-ltmain.sh-hack.patch || die
-	# Do not create bogus entries in $dependency_libs or $libdir
-	# with ${D} or ${S} in them.
-	#
-	# Azarah - 07 April 2002
-	patch -p0 <${FILESDIR}/${PV}/${P}-portage.patch-v5 || die
-}
-
-src_compile() {
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--infodir=/usr/share/info || die
-
-	emake || die
-}
-
-src_install() { 
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog* NEWS \
-	      README THANKS TODO doc/PLATFORMS	
-}
-
diff --git a/sys-devel/libtool/libtool-1.4.2-r1.ebuild b/sys-devel/libtool/libtool-1.4.2-r1.ebuild
deleted file mode 100644
index 8188a6d6c46c..000000000000
--- a/sys-devel/libtool/libtool-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.2-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A shared library tool for developers"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND="virtual/glibc"
-
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix the relink problem where the relinked libs do not get
-	# installed.  It is *VERY* important that you get a updated
-	# 'libtool-${PV}-relink.patch' if you update this, as it
-	# fixes a very serious bug.  Please not that this patch is
-	# included in 'libtool-${PV}-gentoo.patch' for this ebuild.
-	#
-	# NOTE: all affected apps should get a 'libtoolize --copy --force'
-	#      added to upate libtool
-	#
-	cd ${S}
-	patch -p1 <${FILESDIR}/libtool-${PV}-gentoo.patch || die
-	automake --gnu --add-missing
-	aclocal
-	autoconf
-	( cd libltdl ; autoheader ; automake --gnu --add-missing ; \
-	  aclocal ; autoconf )
-}
-
-src_compile() {
-	#we do not wat to libtoolize this build.
-	alias __libtoolize="/bin/true"
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--infodir=/usr/share/info || die
-	unalias __libtoolize
-
-	emake || die
-}
-
-src_install() { 
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog* NEWS \
-	      README THANKS TODO doc/PLATFORMS	
-}
-
diff --git a/sys-devel/libtool/libtool-1.4.2-r2.ebuild b/sys-devel/libtool/libtool-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..e7690abce2f0
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.4.2-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.2-r2.ebuild,v 1.1 2002/10/20 10:46:22 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
+
+IUSE=""
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="A shared library tool for developers"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+
+DEPEND="virtual/glibc"
+
+
+pkg_setup() {
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_5=1
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix the relink problem where the relinked libs do not get
+	# installed.  It is *VERY* important that you get a updated
+	# 'libtool-${PV}-relink.patch' if you update this, as it
+	# fixes a very serious bug.  Please not that this patch is
+	# included in 'libtool-${PV}-gentoo.patch' for this ebuild.
+	#
+	# NOTE: all affected apps should get a 'libtoolize --copy --force'
+	#      added to upate libtool
+	#
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${PN}-1.4-nonneg.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-test.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-relink.patch || die
+	patch -p0 < ${FILESDIR}/${PV}/${P}-add-x11r6-lib-in-ignores-for-rpath.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-duplicate-dependency.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-fix-linkage-of-cxx-code-with-gcc.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-lib64.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-archive-shared.patch || die
+	# This breaks dependancies it seems
+	# <azarah@gentoo.org> (20 Oct 2002)
+    #patch -p0 <${FILESDIR}/${PV}/${PN}-1.4.1-ltmain.sh-hack.patch || die
+    # Do not create bogus entries in $dependency_libs or $libdir
+    # with ${D} or ${S} in them.
+    #
+    # Azarah - 07 April 2002
+    patch -p0 < ${FILESDIR}/${PV}/${P}-portage.patch || die
+}
+
+src_compile() {
+	#we do not wat to libtoolize this build.
+	./configure --host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info || die
+
+	emake || die
+}
+
+src_install() { 
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog* NEWS \
+	      README THANKS TODO doc/PLATFORMS	
+}
+