old

Package-Manager: portage-2.2_pre5

13 files changed, 5 insertions, 599 deletions

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 03e75b902602..b8d80d582a5a 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,40 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.4.3/libtool-1.4.2-archive-shared.patch 633 RMD160 42dc6dd457e612398148a38f398e41f3d75e21a8 SHA1 9a8e0100eb353bf563eec8b4011531e59cd4738d SHA256 01a07f68a2793546af304f3fc7dcc90a044e94334b37d089c8c3152d45943c52
-AUX 1.4.3/libtool-1.4.2-expsym-linux.patch 1678 RMD160 6af9408ece51c61bf76e91ecfb500f8c8bd673c9 SHA1 ffc7b9f94a0b84044b43bd27de73bed01cfe9389 SHA256 99cf0ab52a76fa183a2e6460a71ec88ff2e05b24e91838f367e409c1c9dc5c33
 AUX 1.5.10/libtool-1.5.10-locking.patch 629 RMD160 922b2d8cba8e869afc9a1cde9ec0065e1ccaadcf SHA1 6d6b77b42b4729b48c7bf0ad6f8a4b962bc97298 SHA256 14b54a1c2c01e7e0f2399b253a5e9603c5f8f59ac655489bd74ee9e8cf8a3774
-AUX 1.5.10/libtool-1.5.10-portage.patch 3020 RMD160 5fbb11fd632a1163ea70426bcd41f7d573b30bf4 SHA1 cabc235e011e68127fdc690f92722844eca0e3d9 SHA256 9d828621f1e86a21d0d4b927ecee1cb8267c7d14cf36ba0998eb44c7121bb663
-AUX 1.5.14/libtool-1.5.14-egrep.patch 404 RMD160 f1d4b5a034c6529d75aaf521e8d498a30532dec2 SHA1 bcf2c70d62399fc06d0a1f28619985a81fb1e14e SHA256 c0822c562f487db39118812f4f7b5666710dbdaab6cd1620ac275077005dcf11
-AUX 1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch 1073 RMD160 284ef9f90f95535bd6cd092872759f7a49da5f64 SHA1 213624930bba0f7157fa6ac31204310b497bb10a SHA256 12858073634f3434fa88b18bdcec7bc76c02d6a6d66c1b3d6d795aee82febb20
 AUX 1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637 RMD160 f46d46cdd9e568b020eddeae48e9f84a763fee2f SHA1 924d9a8b23d3d138287bef4596a93bb2608849a1 SHA256 08422e5d6dd2f01b4bd2f065c910724772cbe6ad2632be2cf8279e4b50b61a47
 AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5fd1ea9ffd403f5641f620791d833db SHA1 8d5784695682e3e8a271a9ed635d9d1566c4e99b SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326
 AUX 1.5.20/libtool-1.5.20-version-checking.patch 1857 RMD160 25b981402a038a2c4c5ad64066c5f8a5b1416b36 SHA1 c5000fa6da0ffec1d7c48d871db94d8237c949ca SHA256 0d1af5e7024949dcf95bef0d5a47387d0b04b7905d0a55d3349576733783bb6d
 AUX 1.5.6/libtool-1.5-filter-host-tags.patch 1608 RMD160 af10d3d3459d07f77ccbdef6080e931e3387af38 SHA1 5d27c058f803cdc1953e82b71f747c2028b78ea0 SHA256 a50cba1c4b799717b21355cc908993c5cdf913b66881992b74b79001f8feb891
-AUX 1.5.6/libtool-1.5.6-ltmain-SED.patch 431 RMD160 0029b0911d92494115c1eb6bdc63b8196ec0cac5 SHA1 803d17d14083e302a6b8763c930188db4249db6e SHA256 a903c26b5e7d3fa1c22f9104648adac5e7065403b286bc1147a3b1ab77a8cf9d
-AUX libltdl-uclibc.patch 4590 RMD160 fea7fd22d6c2412041bea4f6dc992a73c3e7d453 SHA1 714d56807d5dbb2bd38d258fce20386d11c82b6a SHA256 07d027870c528f1514dbd8f07e7b8cb703b95166361d45b3ee0ce180ae790913
-AUX libtool-2.2.2-AC_ENABLE_SHARED.patch 1932 RMD160 4a16f7537fd65734ebcb222b6fa7380f57d925cc SHA1 9482577a2e88c72aa031da54d435abb782236a5e SHA256 4cfb7ead73b31d40f1fad5d1535a4a63579ff6e0660e750961048fe220f94983
 AUX libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch 2150 RMD160 7b9173d367a3a9168b0f0db368e85941a18ec82e SHA1 50c150e11b10c707a8c98293e795c95e3edf6f41 SHA256 19b614022a4aa6336879974c551bbd094b8412b095a372595de2c5c1b73f9a9a
 AUX libtool-2.2.2-flag-order.patch 2129 RMD160 72778ece0f72449a2ce0de556cc47019654dfe25 SHA1 fe765726f1a3f4e1b2ee7286e631ba359fb5225f SHA256 a6f4f896fdfd53ee08d27e3757b9a50884b48bbb7aa720be282c8c0e998ed554
-AUX ltconfig-uclibc.patch 1167 RMD160 67684826cd75f91660ad0d51ccf9fb0dc250dda9 SHA1 521950ed7e504a0c37b50da78672c2f296ada038 SHA256 67586fb81951ff86619387538c56e996412a7ad3afff9767c598792f0a31ad5d
 DIST libtool-1.3.5.tar.gz 538884 RMD160 0bb20b6802bc790dcbdaecde4058ed06ec77b429 SHA1 0e0a57bcdd4942a872d6b24ff666cfa0dd721452 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f
-DIST libtool-1.5.24.tar.gz 2919557 RMD160 e682fe6570c71d93ad65e0c6c77cb6558846f27d SHA1 b4c994f1bf4a76d2b0c1d0a6f54d16598c15f3db SHA256 1e54016a76e9704f11eccf9bb73e2faa0699f002b00b6630df82b8882ff2e5b2
 DIST libtool-1.5.26.tar.gz 2961939 RMD160 4d1d7dd0308b98e8f590723ae5daddb8da49ac11 SHA1 4c1738351736562a951a345e24f233d00953ec0a SHA256 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09
 DIST libtool-2.2.2.tar.bz2 1447913 RMD160 0c8848f3cb0da548629c36c5f69dfd44a71c4250 SHA1 a7ce88fc92411380081fd47d3197e7d539755365 SHA256 906dcb99ac02eb921b77881b2778f60188219b74fd01ae85f56a23da2da9742b
-DIST libtool-2.2.tar.bz2 1446665 RMD160 b04729ea15f08786e42c1557b9c332793f245d38 SHA1 c257134336130d741182c8443683d6f89b391801 SHA256 cead9df5ba15c85c5e553e2f8e4273025c0e0ee8af9558f205b3c9b0861e602d
 EBUILD libtool-1.3.5.ebuild 1157 RMD160 1655d7000af5869115b006ac1095195a140433d7 SHA1 4c93b4520b02380aa6ce153dbb6f5b6ee628073e SHA256 3479e6bf816003ff706850f6720a3f20f30a02b8db670624044970bae313944d
-EBUILD libtool-1.5.24.ebuild 2768 RMD160 e7c5d56039c019d45d73b8567fc955b49c03ceca SHA1 c059a3ecfbf61cfa5094afef324692d8a8071983 SHA256 162c21d6ebf7c138ef12718eef25f78c205efe5bfb4bb4ea26d3871e37a1d9ca
 EBUILD libtool-1.5.26.ebuild 2767 RMD160 4925000b25774e4e53dda375dc6fff7038f6944c SHA1 c6faa58ee70d0712f2c3179ee74dd7d9189422bc SHA256 9fc50159f1d7828a16d159c643ac2b012a92be181aa96656d799b2a450125e1d
-EBUILD libtool-2.2.2-r1.ebuild 1381 RMD160 68bd047789b568477ee4a958891ca692b7cfb1dc SHA1 f73a40254f8bdc6ac5589aa45959ab07b0532f45 SHA256 e83db3787f1597af126802b552bf40153c6c2ab5a27cabdf07351244b0ba129a
+EBUILD libtool-2.2.2-r1.ebuild 1331 RMD160 865472ddc2a3fc532face844dd2da3efa9e1f703 SHA1 cf9b0f3ad88befa2a1ff93709fc71d6ebfdfba52 SHA256 d923952d54ee8df09ef85bf6d33ac8273c1c0d7fcae7d64afd397320a6df44b9
 EBUILD libtool-2.2.2.ebuild 1186 RMD160 5496e4abac055746fd7450b3a19b544b7a75f7a0 SHA1 3709e56d226f2f86d807bbb56f84054bd213712d SHA256 400a6ed5c08327560c4bc44b9ca60669dc5eedb0d50d47171b67cf5d37ada0d3
-EBUILD libtool-2.2.ebuild 1184 RMD160 7615b946064816072542716561103a426c16d931 SHA1 5d04b67ed32d403bccd21299276bfddc118b4f01 SHA256 32925e767a3ec309fa515470c327861a2a25f1bbdca3515523b52f82c1806679
 EBUILD libtool-9999.ebuild 1336 RMD160 3bc7d744987752c512ec6ad248905519574113a1 SHA1 48e00f0b8c9ddee8f660a4d0f06b4942565e1674 SHA256 0916b94107c4de2e6c54ac4ce4b3f7521d37fd3e988c0922840c591976aecc0c
 MISC ChangeLog 20846 RMD160 17f5ca60d97b5a1562eef0a953858c40fe8869df SHA1 d1cc64dac7421657ec94500e78a1a19e2636314c SHA256 32c01062924673c00a0446a1ff1386a1aee230274da31df6445254efcbde4955
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIDmonj9hvisErhMIRApsIAJ9J8pJ0OnlF0/26RII/gAmb4vkHlgCfafgv
-xbD4Cjc4qKW/U2P23whnTcE=
-=HFC/
+iD8DBQFIDmxTj9hvisErhMIRAmzHAKDqwc/d83fDWdn1aPQ6EvVRhYZ/RQCgqj3E
+C4m57VzPBJK/PkIb9M4MGGM=
+=85mk
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
deleted file mode 100644
index 52183aff1e12..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libtool-1.4.2/ltmain.in.archive-shared	2002-07-15 09:12:03.000000000 -0400
-+++ libtool-1.4.2/ltmain.in	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.3/libtool-1.4.2-expsym-linux.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-expsym-linux.patch
deleted file mode 100644
index 4449e3d4e21e..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-expsym-linux.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-  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.5.10/libtool-1.5.10-portage.patch b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
deleted file mode 100644
index 38b44d0c1cd8..000000000000
--- a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Do not create bogus entries in $dependency_libs or $libdir
-with ${D} or ${S} in them.
-<azarah@gentoo.org> - (07 April 2002)
-
-Note that if you update this patch, please update this one as well:
-
-  eclass/ELT-patches/portage/1.4.1
-
-The file name can stay 1.4.1, as it will still apply to all versions.  Only
-when a new version of libtool comes out that it do not apply to, then the
-name should be bumped, but the patch content should stay fairly the same.
-
---- ltmain.in.orig	Wed Apr  3 01:19:37 2002
-+++ ltmain.in	Sun May 26 19:50:52 2002
-@@ -3940,9 +3940,53 @@
- 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- 		  exit 1
- 		fi
--		newdependency_libs="$newdependency_libs $libdir/$name"
-+		if test "X$EGREP" = X ; then
-+			EGREP=egrep
-+		fi
-+		# 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
-+		  my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
-+		  if test -z "$my_little_ninja_foo_1"; 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.
-+		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-+		  # We do not want portage's install root ($D) present.
-+		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
-+		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
-+		    mynewdependency_lib=""
-+		  elif test -n "$my_little_ninja_foo_3" && 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
-+		  my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
-+		  if test -z "$my_little_ninja_foo_4"; 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.5.14/libtool-1.5.14-egrep.patch b/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch
deleted file mode 100644
index 175a492554db..000000000000
--- a/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 1/ltmain.in	2005-04-16 16:50:02.000000000 +0200
-+++ 2/ltmain.in	2005-04-16 16:46:46.000000000 +0200
-@@ -39,6 +39,13 @@
- if [ "x$SED" = x ] ; then
-     SED=sed
- fi
-+# Same for EGREP, and just to be sure, do LTCC as well
-+if test "X$EGREP" = X ; then
-+    EGREP=egrep
-+fi
-+if test "X$LTCC" = X ; then
-+    LTCC=${CC-gcc}
-+fi
- 
- # The name of this program:
- progname=`echo "$progpath" | $SED $basename`
diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch
deleted file mode 100644
index d676c2b8defb..000000000000
--- a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libtool-1.5.20/ltmain.in
-+++ libtool-1.5.20/ltmain.in
-@@ -136,6 +136,30 @@
- execute_dlfiles=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
-+
-+if test -z "$max_cmd_len"; then
-+  i=0
-+  testring="ABCD"
-+  new_result=
-+  
-+  # If test is not a shell built-in, we'll probably end up computing a
-+  # maximum length that is only half of the actual maximum length, but
-+  # we can't tell.
-+  while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-+             = "XX$testring") >/dev/null 2>&1 &&
-+          new_result=`expr "X$testring" : ".*" 2>&1` &&
-+          max_cmd_len="$new_result" &&
-+          test "$i" != 17 # 1/2 MB should be enough
-+  do
-+    i=`expr $i + 1`
-+    testring="$testring$testring"
-+  done
-+  testring=
-+  # Add a significant safety factor because C++ compilers can tack on massive
-+  # amounts of additional arguments before passing them to the linker.
-+  # It appears as though 1/2 is a usable value.
-+  max_cmd_len=`expr $max_cmd_len \/ 2`
-+fi
- 
- #####################################
- # Shell function definitions:
diff --git a/sys-devel/libtool/files/1.5.6/libtool-1.5.6-ltmain-SED.patch b/sys-devel/libtool/files/1.5.6/libtool-1.5.6-ltmain-SED.patch
deleted file mode 100644
index 5cd9251479be..000000000000
--- a/sys-devel/libtool/files/1.5.6/libtool-1.5.6-ltmain-SED.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru libtool-1.5.6.old/ltmain.in libtool-1.5.6/ltmain.in
---- libtool-1.5.6.old/ltmain.in	2004-07-08 19:36:35.533628176 -0400
-+++ libtool-1.5.6/ltmain.in	2004-07-08 19:37:50.504230912 -0400
-@@ -33,6 +33,9 @@
- # function.
- progpath="$0"
- 
-+# define SED for historic ltconfig's generated by Libtool 1.3
-+test -z "$SED" && SED=sed
-+
- # The name of this program:
- progname=`echo "$progpath" | $SED $basename`
- modename="$progname"
diff --git a/sys-devel/libtool/files/libltdl-uclibc.patch b/sys-devel/libtool/files/libltdl-uclibc.patch
deleted file mode 100644
index db964e7d3c92..000000000000
--- a/sys-devel/libtool/files/libltdl-uclibc.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- libltdl/acinclude.m4.libltdl~	Fri Jun 11 08:53:40 2004
-+++ libltdl/acinclude.m4	Fri Jun 11 08:54:58 2004
-@@ -777,7 +777,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -2212,6 +2212,24 @@
-   sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-   ;;
- 
-+linux-uclibc*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  # Note: copied from linux-gnu, and may not be appropriate.
-+  hardcode_into_libs=yes
-+  # Assume using the uClibc dynamic linker.
-+  dynamic_linker="uClibc ld.so"
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -3434,6 +3452,11 @@
-   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
-+  ;;
-+
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
---- libltdl/aclocal.m4.libltdl~	Fri Jun 11 08:53:50 2004
-+++ libltdl/aclocal.m4	Fri Jun 11 08:55:33 2004
-@@ -767,7 +767,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -2144,6 +2144,24 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+linux-uclibc*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  # Note: copied from linux-gnu, and may not be appropriate.
-+  hardcode_into_libs=yes
-+  # Assume using the uClibc dynamic linker.
-+  dynamic_linker="uClibc ld.so"
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -3344,6 +3362,11 @@
-   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
-+  ;;
-+
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
---- libltdl/configure.libltdl~	Fri Jun 11 08:54:04 2004
-+++ libltdl/configure	Fri Jun 11 08:56:33 2004
-@@ -1978,6 +1978,11 @@
-   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
-+  ;;
-+
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -3030,7 +3035,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -4504,6 +4509,24 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+linux-uclibc*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  # Note: copied from linux-gnu, and may not be appropriate.
-+  hardcode_into_libs=yes
-+  # Assume using the uClibc dynamic linker.
-+  dynamic_linker="uClibc ld.so"
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
diff --git a/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch b/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch
deleted file mode 100644
index 6b13eb94ae38..000000000000
--- a/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-commit 1006ccc48c14d3715c569cca68dab54742207273
-Author: Andreas Schwab <schwab@suse.de>
-Date:   Fri Apr 18 23:43:19 2008 +0200
-
-    Properly emulate AC_ENABLE_SHARED([no]) and others.
-    
-    * libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Check optional
-    argument.
-    (AC_ENABLE_STATIC): Likewise.
-    (AC_ENABLE_FAST_INSTALL): Likewise.
-    
-    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
-diff --git a/ChangeLog b/ChangeLog
-index 268e369..e593406 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2008-04-18  Andreas Schwab  <schwab@suse.de>
-+
-+	* libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Check optional
-+	argument.
-+	(AC_ENABLE_STATIC): Likewise.
-+	(AC_ENABLE_FAST_INSTALL): Likewise.
-+
- 2008-04-16  Eric Blake  <ebb9@byu.net>
- 
- 	Make ChangeLog merges easier.
-diff --git a/libltdl/m4/ltoptions.m4 b/libltdl/m4/ltoptions.m4
-index a1c3aba..339d6f5 100644
---- a/libltdl/m4/ltoptions.m4
-+++ b/libltdl/m4/ltoptions.m4
-@@ -192,7 +192,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
- 
- # Old names:
- AC_DEFUN([AC_ENABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], [shared])
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
- ])
- 
- AC_DEFUN([AC_DISABLE_SHARED],
-@@ -246,7 +246,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
- 
- # Old names:
- AC_DEFUN([AC_ENABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], [static])
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
- ])
- 
- AC_DEFUN([AC_DISABLE_STATIC],
-@@ -300,7 +300,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no
- 
- # Old names:
- AU_DEFUN([AC_ENABLE_FAST_INSTALL],
--[_LT_SET_OPTION([LT_INIT], [fast-install])
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
- AC_DIAGNOSE([obsolete],
- [$0: Remove this warning and the call to _LT_SET_OPTION when you put
- the `fast-install' option into LT_INIT's first parameter.])
diff --git a/sys-devel/libtool/files/ltconfig-uclibc.patch b/sys-devel/libtool/files/ltconfig-uclibc.patch
deleted file mode 100644
index d56a2893fa84..000000000000
--- a/sys-devel/libtool/files/ltconfig-uclibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- binutils-2.15.90.0.1.1/ltconfig.uclibc	2004-01-14 22:07:42.000000000 +0100
-+++ binutils-2.15.90.0.1.1/ltconfig	2004-03-10 15:43:37.000000000 +0100
-@@ -603,6 +603,7 @@
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
- linux-gnu*) ;;
-+linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1259,6 +1260,24 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+linux-uclibc*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  # Note: copied from linux-gnu, and may not be appropriate.
-+  hardcode_into_libs=yes
-+  # Assume using the uClibc dynamic linker.
-+  dynamic_linker="uClibc ld.so"
-+  ;;
-+
- netbsd*)
-   need_lib_prefix=no
-   need_version=no
diff --git a/sys-devel/libtool/libtool-1.5.24.ebuild b/sys-devel/libtool/libtool-1.5.24.ebuild
deleted file mode 100644
index 29ff2cf7e158..000000000000
--- a/sys-devel/libtool/libtool-1.5.24.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.24.ebuild,v 1.13 2007/10/06 05:05:26 tgall Exp $
-
-inherit eutils
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="http://www.gnu.org/software/libtool/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="vanilla"
-
-RDEPEND="sys-devel/gnuconfig
-	>=sys-devel/autoconf-2.60
-	>=sys-devel/automake-1.10"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-gen_ltmain_sh() {
-	local date=
-	local PACKAGE=
-	local VERSION=
-
-	rm -f ltmain.shT
-	date=`./mkstamp < ./ChangeLog` && \
-	eval `egrep '^[[:space:]]*PACKAGE.*=' configure` && \
-	eval `egrep '^[[:space:]]*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() {
-	unpack ${A}
-	cd "${S}"
-
-	use vanilla && return 0
-
-	# Make sure non of the patches touch ltmain.sh, but rather ltmain.in
-	rm -f ltmain.sh*
-
-	epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
-	epatch "${FILESDIR}"/1.5.10/${PN}-1.5.10-portage.patch
-	epatch "${FILESDIR}"/1.5.10/libtool-1.5.10-locking.patch #40992
-
-	# Note: The following patches should be dropped with libtool-2+
-	epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-version-checking.patch #73140
-	sed -i "s:@_LT_VERSION@:${PV}:" libtool.m4 || die "sed libtool.m4"
-	epatch "${FILESDIR}"/1.5.6/libtool-1.5-filter-host-tags.patch
-	epatch "${FILESDIR}"/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch
-
-	ebegin "Generating ltmain.sh"
-	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
-	eend 0
-
-	# Now let's run all our autotool stuff so that files we patch
-	# below don't get regenerated on us later
-	cp libtool.m4 acinclude.m4
-	local d p
-	for d in . libltdl ; do
-		ebegin "Running autotools in '${d}'"
-		cd "${S}"/${d}
-		touch acinclude.m4
-		for p in aclocal "automake -c -a" autoconf ; do
-			${p} || die "${p}"
-		done
-		eend 0
-	done
-	cd "${S}"
-
-	epunt_cxx
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
-
-	local x
-	for x in libtool libtoolize ; do
-		help2man ${x} > ${x}.1
-		doman ${x}.1 || die
-	done
-
-	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
-		rm -f "${x}" ; ln -sf ../gnuconfig/$(basename "${x}") "${x}"
-	done
-	cd "${D}"/usr/share/libtool/libltdl
-	for x in config.guess config.sub ; do
-		rm -f ${x} ; ln -sfn ../${x} ${x}
-	done
-}
diff --git a/sys-devel/libtool/libtool-2.2.2-r1.ebuild b/sys-devel/libtool/libtool-2.2.2-r1.ebuild
index a7e0b66e453b..5cbe276e5746 100644
--- a/sys-devel/libtool/libtool-2.2.2-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.2-r1.ebuild,v 1.1 2008/04/22 22:43:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.2-r1.ebuild,v 1.2 2008/04/22 22:53:02 vapier Exp $
 
 inherit eutils autotools
 
@@ -25,7 +25,6 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-flag-order.patch
 	epatch "${FILESDIR}"/${P}-AC_LIBLTDL_CONVENIENCE.patch
-	epatch "${FILESDIR}"/${P}-AC_ENABLE_SHARED.patch
 	if ! use vanilla ; then
 		epunt_cxx
 		cd libltdl/m4
diff --git a/sys-devel/libtool/libtool-2.2.ebuild b/sys-devel/libtool/libtool-2.2.ebuild
deleted file mode 100644
index 4b8ea49651f7..000000000000
--- a/sys-devel/libtool/libtool-2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.ebuild,v 1.1 2008/03/08 12:02:57 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="http://www.gnu.org/software/libtool/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="vanilla"
-
-RDEPEND="sys-devel/gnuconfig
-	>=sys-devel/autoconf-2.60
-	>=sys-devel/automake-1.10"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use vanilla && return 0
-
-	epunt_cxx
-	cd libltdl/m4
-	epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
-
-	local x
-	for x in libtool libtoolize ; do
-		help2man ${x} > ${x}.1
-		doman ${x}.1 || die
-	done
-
-	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
-		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
-	done
-}