Add more patches from Mandrake.

9 files changed, 673 insertions, 3 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index c67b44d8f69d..f0780f4b0f1f 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.25 2003/09/25 02:33:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.26 2003/11/17 00:12:03 azarah Exp $
+
+*libtool-1.4.3-r3 (17 Nov 2003)
+
+  17 Nov 2003; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r3.ebuild,
+  files/1.4.3/libtool-1.4.2-expsym-linux.patch,
+  files/1.4.3/libtool-1.4.3-amd64-alias.patch,
+  files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch,
+  files/1.4.3/libtool-1.4.3-pass-thread-flags.patch,
+  files/1.4.3/libtool-1.4.3-quotes.patch:
+  Add more patches from Mandrake.
 
   25 Sep 2003; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r2.ebuild:
   Only reinstall missing script if not bootstrap, else we error out.
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index a1ccd6f57a6c..4ef688bdb850 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,10 +1,10 @@
 MD5 6d26b33bcad84d410dcc4f3a3719fe5b libtool-1.4.3.ebuild 2731
-MD5 13a4f76ee40ef3c514c7e72df6cafaeb ChangeLog 4709
+MD5 546cfa9122d989ba9ceb6bfb6b4a5ee6 ChangeLog 4709
 MD5 fbcf7a29349882a6f6c75491400d1953 libtool-1.4.1-r10.ebuild 1780
 MD5 b95e1ebe01edaa3fce9ffe9b39f99ce2 libtool-1.4.3-r2.ebuild 4387
 MD5 7acf95d7a52c695ccd163defb5facdad libtool-1.4.3-r1.ebuild 3197
 MD5 4d48b4072e8f2a4591a4d80a23f6042f libtool-1.4.2-r2.ebuild 2182
-MD5 b65083e4413350dfe6c160905c6ecbd3 libtool-1.4.3-r3.ebuild 4637
+MD5 a882ebfbd40049ab13ec74c1647a8e2b libtool-1.4.3-r3.ebuild 4637
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r2 131
 MD5 0988730d91b787159d631c37932efef5 files/digest-libtool-1.4.2-r2 66
 MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-expsym-linux.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-expsym-linux.patch
new file mode 100644
index 000000000000..4449e3d4e21e
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-expsym-linux.patch
@@ -0,0 +1,37 @@
+  This patch makes -export-symbols and -export-symbols-regex work with
+  GNU ld.  It creates a version script rather than using -retain-symbols-file,
+  which just selectively strips the library.
+
+--- libtool-1.4.2/libtool.m4.expsym-linux	Fri Aug 23 19:01:55 2002
++++ libtool-1.4.2/libtool.m4	Sat Aug 24 13:47:10 2002
+@@ -1401,6 +1401,30 @@
+     hardcode_shlibpath_var=no
+     ;;
+ 
++  linux*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        $archive_expsym_cmds="$archive_cmds"
++      fi
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
+   *)
+     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-amd64-alias.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-amd64-alias.patch
new file mode 100644
index 000000000000..b37ce785fd1c
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-amd64-alias.patch
@@ -0,0 +1,12 @@
+--- libtool-1.4.3/config.sub.amd64-alias	2002-10-22 22:24:44.000000000 -0400
++++ libtool-1.4.3/config.sub	2003-07-24 11:10:08.000000000 -0400
+@@ -367,6 +367,9 @@ case $basic_machine in
+ 		basic_machine=a29k-none
+ 		os=-bsd
+ 		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch
new file mode 100644
index 000000000000..69c4e022e8a0
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch
@@ -0,0 +1,48 @@
+--- libtool-1.4.3/libtoolize.in.libtoolize--config-only	2002-10-13 12:21:38.000000000 -0400
++++ libtool-1.4.3/libtoolize.in	2003-07-26 03:23:32.000000000 -0400
+@@ -55,6 +55,7 @@ ltdl=
+ ltdl_tar=
+ configure_ac=
+ status=0
++config_only=
+ 
+ for arg
+ do
+@@ -67,6 +68,7 @@ Prepare a package to use libtool.
+ 
+     --automake        work silently, and assume that Automake is in use
+ -c, --copy            copy files rather than symlinking them
++    --config-only     only update config.* files
+     --debug           enable verbose shell tracing
+ -n, --dry-run         print commands rather than running them
+ -f, --force           replace existing files
+@@ -94,6 +96,10 @@ EOF
+     ln_s=
+     ;;
+ 
++  --config-only)
++    config_only=yes
++    ;;
++
+   --debug)
+     echo "$progname: enabling shell trace mode"
+     set -x
+@@ -151,7 +157,17 @@ if test -z "$files"; then
+   echo "$progname: cannot list files in \`$pkgdatadir'" 1>&2
+   exit 1
+ fi
+-files='config.guess config.sub ltmain.sh'
++files='config.guess config.sub'
++if test -z "$config_only"; then
++  files="$files ltmain.sh"
++fi
++
++# Make sure we only update config.{sub,guess} files
++if test -n "$config_only"; then
++  automake=yes
++  ltdl=
++  ltdl_tar=
++fi
+ 
+ auxdir=.
+ auxdirline=`egrep '^AC_CONFIG_AUX_DIR' $configure_ac 2>/dev/null`
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-pass-thread-flags.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-pass-thread-flags.patch
new file mode 100644
index 000000000000..bb37901dff8a
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-pass-thread-flags.patch
@@ -0,0 +1,14 @@
+--- libtool-1.4.3/ltmain.in.pass-thread-flags	2003-07-08 14:24:03.000000000 +0200
++++ libtool-1.4.3/ltmain.in	2003-07-08 14:52:09.000000000 +0200
+@@ -1225,6 +1225,11 @@ compiler."
+ 	continue
+ 	;;
+ 
++      -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
++        compiler_flags="$compiler_flags $arg"
++        continue
++        ;;
++
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-quotes.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-quotes.patch
new file mode 100644
index 000000000000..4e63b10af008
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-quotes.patch
@@ -0,0 +1,372 @@
+--- libtool-1.4.3/ltmain.in.quotes	2003-07-31 18:08:10.000000000 +0200
++++ libtool-1.4.3/ltmain.in	2003-07-31 18:11:19.000000000 +0200
+@@ -1409,7 +1409,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)
+@@ -1426,11 +1426,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
+@@ -1450,7 +1450,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
+@@ -1459,16 +1459,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
+@@ -1483,7 +1483,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
+@@ -1496,7 +1496,7 @@ compiler."
+ 	  ;;
+ 	*.la) lib="$deplib" ;;
+ 	*.$libext)
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1519,7 +1519,7 @@ compiler."
+ 	    continue
+ 	    ;;
+ 	  prog)
+-	    if test $pass != link; then
++	    if test "$pass" != link; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+@@ -1530,7 +1530,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"
+@@ -1546,7 +1546,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
+@@ -1580,13 +1580,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
+@@ -1607,7 +1607,7 @@ compiler."
+               fi
+ 	      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
+@@ -1625,7 +1625,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
+@@ -1674,7 +1674,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
+@@ -1693,7 +1693,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"
+@@ -1704,7 +1704,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"
+ 
+@@ -1720,7 +1720,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
+@@ -1743,7 +1743,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.
+@@ -1765,7 +1765,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.
+@@ -1849,7 +1849,7 @@ compiler."
+ 	    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=
+@@ -1898,7 +1898,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
+@@ -1915,7 +1915,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=
+@@ -1953,7 +1953,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
+@@ -1961,7 +1961,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 &&
+@@ -2021,10 +2021,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
+@@ -2055,7 +2055,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
+@@ -2098,15 +2098,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
+@@ -2164,7 +2164,7 @@ compiler."
+ 	deplibs=
+       fi
+     done # for pass
+-    if test $linkmode = prog; then
++    if test "$linkmode" = prog; then
+       dlfiles="$newdlfiles"
+       dlprefiles="$newdlprefiles"
+     fi
+@@ -2476,7 +2476,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
+@@ -2519,7 +2519,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
+ 	    ;;
+@@ -2791,7 +2791,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"
+@@ -2818,7 +2818,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=
+@@ -3526,7 +3526,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"
+@@ -4071,7 +4071,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
+@@ -4813,10 +4813,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" ;;
+@@ -4848,9 +4848,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\"
+@@ -4894,7 +4894,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.3-r3 b/sys-devel/libtool/files/digest-libtool-1.4.3-r3
new file mode 100644
index 000000000000..e1f620300ee1
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.4.3-r3
@@ -0,0 +1,2 @@
+MD5 d11a3c835449d7fa50a025dc9c01ad81 libtool-1.4.3.tar.gz 1164463
+MD5 fa26a07c978ad05d1f88ed7a472daa49 libtool-1.3.5.tar.gz 538884
diff --git a/sys-devel/libtool/libtool-1.4.3-r3.ebuild b/sys-devel/libtool/libtool-1.4.3-r3.ebuild
new file mode 100644
index 000000000000..d18d6e128c4f
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.4.3-r3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2003 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.3-r3.ebuild,v 1.1 2003/11/17 00:12:03 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
+
+IUSE=
+
+inherit eutils gnuconfig
+
+# NOTE:  We install libltdl of libtool-1.3x for compat reasons ...
+
+OLD_PV="1.3.5"
+S="${WORKDIR}/${P}"
+OLD_S="${WORKDIR}/${PN}-${OLD_PV}"
+DESCRIPTION="A shared library tool for developers"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	mirror://gnu/${PN}/${PN}-${OLD_PV}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
+
+DEPEND="virtual/glibc"
+
+
+lt_setup() {
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_5=1
+}
+
+gen_ltmain_sh() {
+	local date=
+	local PACKAGE=
+	local VERSION=
+
+	rm -f ltmain.shT
+	date=`./mkstamp < ./ChangeLog` && \
+	eval `grep '^PACKAGE' configure` && \
+	eval `grep '^VERSION' configure` && \
+	sed -e "s/@PACKAGE@/${PACKAGE}/" -e "s/@VERSION@/${VERSION}/" \
+		-e "s%@TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT || return 1
+
+	mv -f ltmain.shT ltmain.sh || {
+		(rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
+		return 1
+	}
+
+	return 0
+}
+
+src_unpack() {
+	lt_setup
+
+	unpack ${A}
+
+	cd ${OLD_S}
+	echo
+	# Install updated missing script
+	portageq has_version / "sys-devel/automake" && {
+		rm -f missing
+		automake --add-missing
+	}
+
+	einfo "Patching ${OLD_S##*/} ..."
+	epatch ${FILESDIR}/${PV}/${PN}-1.2f-cache.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-nonneg.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch
+
+	use hppa && S="${OLD_S}" gnuconfig_update
+
+	cd ${S}
+	echo
+	# Install updated missing script
+	portageq has_version / "sys-devel/automake" && {
+		rm -f missing
+		automake --add-missing
+	}
+
+	# Make sure non of the patches touch ltmain.sh, but rather ltmain.in
+	rm -f ltmain.sh*
+
+	einfo "Patching ${S##*/} ..."
+	# Redhat patches
+	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4-nonneg.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-s390_x86_64.patch
+	# 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
+	#
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-relink-58664.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-multilib.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-demo.patch
+	# Mandrake patches
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-quotes.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-lib64.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-archive-shared.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-ltmain-SED.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-expsym-linux.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-amd64-alias.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-libtoolize--config-only.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-pass-thread-flags.patch
+	# Do not create bogus entries in $dependency_libs or $libdir
+	# with ${D} or ${S} in them.
+	#
+	# Azarah - 07 April 2002
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-portage.patch
+
+	einfo "Generate ltmain.sh ..."
+	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+}
+
+src_compile() {
+	lt_setup
+
+	#
+	# ************ libtool-1.3x ************
+	#
+
+	cd ${OLD_S}
+	einfo "Configuring ${OLD_S##*/} ..."
+	./configure --host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info || die
+
+	einfo "Building ${OLD_S##*/} ..."
+	emake || die
+
+	#
+	# ************ libtool-1.4x ************
+	#
+
+	cd ${S}
+	einfo "Configuring ${S##*/} ..."
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info || die
+
+	einfo "Building ${S##*/} ..."
+	emake || die
+}
+
+src_install() {
+	#
+	# ************ libtool-1.3x ************
+	#
+
+	einfo "Installing ${OLD_S##*/} ..."
+	cd ${OLD_S}/libltdl; make DESTDIR=${D} install || die
+
+	# Remove stuff we are not going to use ...
+	for x in libltdl.a  libltdl.la  libltdl.so
+	do
+		[ -f ${x} ] && rm -f ${D}/usr/lib/${x}
+	done
+	rm -rf ${D}/usr/include
+
+	#
+	# ************ libtool-1.4x ************
+	#
+
+	einfo "Installing ${S##*/} ..."
+	cd ${S}; make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog* NEWS \
+	      README THANKS TODO doc/PLATFORMS
+}
+