uclibc support added

7 files changed, 462 insertions, 55 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 4116ac2be80b..0965c855a9e7 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.43 2004/06/11 18:48:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.44 2004/06/24 07:40:58 solar Exp $
+
+  24 Jun 2004; <solar@gentoo.org> libtool-1.4.3-r4.ebuild,
+  libtool-1.5.2-r5.ebuild, files/libltdl-uclibc.patch,
+  files/ltconfig-uclibc.patch, files/1.4.3/libtool-1.4.3-uclibc.patch:
+  uclibc support added
 
   11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> libtool-1.5.2-r5.ebuild:
   Stable on alpha.
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 433dac85ea71..5fcf49dae5be 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,59 +1,62 @@
-MD5 18fe3297d047851edb9bfd27350057af libtool-1.4.3-r4.ebuild 4800
-MD5 a24190eaea1f0b5085988c1b953a6bc2 libtool-1.5.2-r4.ebuild 5581
-MD5 d48b00452dbc1ab5f32c1312a0c440ac libtool-1.4.3-r3.ebuild 4784
-MD5 614e0b3cdb7b2d84017bc210858fc4c7 libtool-1.4.1-r10.ebuild 1776
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 87dd0167953632e525b66f620f094760 libtool-1.5.2-r3.ebuild 5564
-MD5 73355788abd7abaae41be28d73d1d61f libtool-1.5.2-r5.ebuild 5777
+MD5 8da9330f42b55f238a9092002c28551e libtool-1.5.2-r3.ebuild 5563
+MD5 de05d130d5c1e02b2e72ae1c7bdcef1f libtool-1.4.3-r4.ebuild 5205
+MD5 0658d7c0357e6a5393cc05129398f292 libtool-1.5.2-r5.ebuild 6243
+MD5 0b1d4066518344d92b2e6ba06ae5e8e3 libtool-1.4.3-r3.ebuild 4783
+MD5 4694f6ece42dc6c9464f9b3aa9a356f3 libtool-1.4.1-r10.ebuild 1775
+MD5 4e3d8a8dd2d19b949272635b9d29859a libtool-1.5.2-r4.ebuild 5580
 MD5 d9884fadb00f1cca5ed8e9ab43c99dbd ChangeLog 7719
-MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r5 131
-MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r3 131
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r3 131
+MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r4 131
+MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r3 131
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r4 131
+MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r5 131
+MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
 MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
-MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r4 131
+MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.1/libtool-1.4.1-nonneg.patch 935
+MD5 66866531be8e6be80d0ab249fd73f113 files/1.4.1/libtool-1.4.1-relink.patch 3722
+MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.1/libtool-1.4.1-duplicate-dependency.patch 2895
+MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.1/libtool-1.4.1-ltmain.sh-hack.patch 680
+MD5 dafd6bf5aafdd8c745d32d7a51f9bf5b files/1.4.1/libtool-1.4.1-portage.patch 495
+MD5 b85e2a6a099df7dd263d76899dda1f5a files/1.4.1/libtool-1.4.1-portage.patch-v2 890
+MD5 99bae50822db0d21d6fa358f17ebae72 files/1.4.1/libtool-1.4.1-portage.patch-v3 1444
+MD5 964e7d53d1ee51d78d20bd2beb0c859c files/1.4.1/libtool-1.4.1-portage.patch-v4 1941
+MD5 2356918d96b0760ab4e5b662fc2bd81b files/1.4.1/libtool-1.4.1-portage.patch-v5 2112
+MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.1/libtool-1.4.1-portage.patch-v6 2307
+MD5 3b6fe1afd09f09efd36d9f9f5225a207 files/1.4.1/libtool-1.4.1-test.patch 9320
+MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.2/libtool-1.4-nonneg.patch 935
+MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.2/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
+MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch 680
 MD5 7b1baabe9b60c5cd21d203e51dc4f005 files/1.4.2/libtool-1.4.2-archive-shared.patch 633
+MD5 a0dbdd9927749761d77ffd7bf2f7dfaa files/1.4.2/libtool-1.4.2-lib64.patch 1527
+MD5 e3285eea22373db2a63c309d00cbe041 files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 1632
+MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.2/libtool-1.4.2-portage.patch 2307
 MD5 cbfa90e559159a2197fc19df16bddf77 files/1.4.2/libtool-1.3.5-mktemp.patch 642
-MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.2/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
-MD5 78aba04ebd4ec67b49228a470360878a files/1.4.2/libtool-1.4.2-test.patch 19511
 MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.2/libtool-1.4.2-duplicate-dependency.patch 2895
-MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.2/libtool-1.4.2-portage.patch 2307
+MD5 78aba04ebd4ec67b49228a470360878a files/1.4.2/libtool-1.4.2-test.patch 19511
 MD5 aa0eb2966d772751eac3bccb6be508b4 files/1.4.2/libtool-1.4.2-relink.patch 3110
-MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.2/libtool-1.4-nonneg.patch 935
-MD5 e3285eea22373db2a63c309d00cbe041 files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 1632
-MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch 680
-MD5 a0dbdd9927749761d77ffd7bf2f7dfaa files/1.4.2/libtool-1.4.2-lib64.patch 1527
-MD5 7c11e213296b02b7e4583d7c94e9c9e0 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
+MD5 ff5cf09ccda7f9a34f8c3c69e0c5047c files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch 1288
 MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
-MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
+MD5 c7e04f642029498cc1652407b1ea74bf files/1.4.3/libtool-1.4-nonneg.patch 935
+MD5 c4fd959743953818fe6ab06c7d84e795 files/1.4.3/libtool-1.4.3-quotes.patch 12951
 MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
-MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
-MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
-MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
+MD5 7c11e213296b02b7e4583d7c94e9c9e0 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
+MD5 5fc838faf61964397b525e579783c190 files/1.4.3/libtool-1.4.3-uclibc.patch 5911
+MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
 MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
+MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
+MD5 8d3d48eebb6f73bb5973d9e92e832cf9 files/1.4.3/libtool-1.4.3-amd64-alias.patch 362
+MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
+MD5 94591cd9fb847704a323c0faf31fdbf2 files/1.4.3/libtool-1.4.3-ltmain-SED.patch 363
 MD5 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
-MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
 MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
+MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
 MD5 73a7adc6c9b86c77affeeebccad0eedf files/1.4.3/libtool-1.4.2-portage.patch 2307
-MD5 ff5cf09ccda7f9a34f8c3c69e0c5047c files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch 1288
-MD5 8d3d48eebb6f73bb5973d9e92e832cf9 files/1.4.3/libtool-1.4.3-amd64-alias.patch 362
-MD5 c7e04f642029498cc1652407b1ea74bf files/1.4.3/libtool-1.4-nonneg.patch 935
-MD5 94591cd9fb847704a323c0faf31fdbf2 files/1.4.3/libtool-1.4.3-ltmain-SED.patch 363
-MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
-MD5 c4fd959743953818fe6ab06c7d84e795 files/1.4.3/libtool-1.4.3-quotes.patch 12951
-MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
+MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
+MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
+MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
+MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
 MD5 8ccfbb70def73753ae1b2750c6e4e83c files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 880
-MD5 d2313fcf3c18603f201627ca94850786 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1153
 MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
-MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
-MD5 dafd6bf5aafdd8c745d32d7a51f9bf5b files/1.4.1/libtool-1.4.1-portage.patch 495
-MD5 66866531be8e6be80d0ab249fd73f113 files/1.4.1/libtool-1.4.1-relink.patch 3722
-MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.1/libtool-1.4.1-nonneg.patch 935
-MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.1/libtool-1.4.1-portage.patch-v6 2307
-MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.1/libtool-1.4.1-duplicate-dependency.patch 2895
-MD5 964e7d53d1ee51d78d20bd2beb0c859c files/1.4.1/libtool-1.4.1-portage.patch-v4 1941
-MD5 2356918d96b0760ab4e5b662fc2bd81b files/1.4.1/libtool-1.4.1-portage.patch-v5 2112
-MD5 b85e2a6a099df7dd263d76899dda1f5a files/1.4.1/libtool-1.4.1-portage.patch-v2 890
-MD5 99bae50822db0d21d6fa358f17ebae72 files/1.4.1/libtool-1.4.1-portage.patch-v3 1444
-MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.1/libtool-1.4.1-ltmain.sh-hack.patch 680
-MD5 3b6fe1afd09f09efd36d9f9f5225a207 files/1.4.1/libtool-1.4.1-test.patch 9320
+MD5 d2313fcf3c18603f201627ca94850786 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1153
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-uclibc.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-uclibc.patch
new file mode 100644
index 000000000000..c0f23f51b4a8
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-uclibc.patch
@@ -0,0 +1,192 @@
+--- ./configure.ltconfig~	Wed Oct 23 04:26:05 2002
++++ ./configure	Fri Jun 11 08:50:54 2004
+@@ -1832,6 +1832,11 @@
+   esac
+   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
+@@ -2885,7 +2890,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
+ 
+@@ -4359,6 +4364,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
+--- ./aclocal.m4.ltconfig~	Wed Oct 23 04:26:04 2002
++++ ./aclocal.m4	Fri Jun 11 08:51:37 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
+@@ -3343,6 +3361,11 @@
+   esac
+   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
+--- ./acinclude.m4.ltconfig~	Fri Jun 11 08:44:11 2004
++++ ./acinclude.m4	Fri Jun 11 08:52:10 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
+ 
+@@ -2192,6 +2192,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
+@@ -3414,6 +3432,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]]+$'
+--- ./libtool.m4.ltconfig~	Fri Jun 11 08:48:53 2004
++++ ./libtool.m4	Fri Jun 11 08:50:06 2004
+@@ -791,7 +791,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
+ 
+@@ -2257,6 +2257,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
+@@ -3479,6 +3497,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]]+$'
diff --git a/sys-devel/libtool/files/libltdl-uclibc.patch b/sys-devel/libtool/files/libltdl-uclibc.patch
new file mode 100644
index 000000000000..db964e7d3c92
--- /dev/null
+++ b/sys-devel/libtool/files/libltdl-uclibc.patch
@@ -0,0 +1,144 @@
+--- 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/ltconfig-uclibc.patch b/sys-devel/libtool/files/ltconfig-uclibc.patch
new file mode 100644
index 000000000000..d56a2893fa84
--- /dev/null
+++ b/sys-devel/libtool/files/ltconfig-uclibc.patch
@@ -0,0 +1,35 @@
+--- 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.4.3-r4.ebuild b/sys-devel/libtool/libtool-1.4.3-r4.ebuild
index 71e199bba082..85c0a5f0a33f 100644
--- a/sys-devel/libtool/libtool-1.4.3-r4.ebuild
+++ b/sys-devel/libtool/libtool-1.4.3-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 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-r4.ebuild,v 1.2 2004/03/01 21:02:39 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
-
-IUSE=
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.3-r4.ebuild,v 1.3 2004/06/24 07:40:58 solar Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
 
 inherit eutils gnuconfig
 
+IUSE="uclibc"
+
 # NOTE:  We install libltdl of libtool-1.3x for compat reasons ...
 
 OLD_PV="1.3.5"
@@ -22,7 +22,6 @@ KEYWORDS="amd64 x86 ppc sparc alpha mips hppa ia64 ppc64"
 
 DEPEND="virtual/glibc"
 
-
 lt_setup() {
 	export WANT_AUTOCONF_2_5=1
 	export WANT_AUTOMAKE_1_5=1
@@ -65,9 +64,11 @@ src_unpack() {
 	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
+	epatch ${FILESDIR}/ltconfig-uclibc.patch
 
 	use hppa && S="${OLD_S}" gnuconfig_update
 	use amd64 && S="${OLD_S}" gnuconfig_update
+	use uclibc && S="${OLD_S}" gnuconfig_update
 
 	cd ${S}
 	echo
@@ -115,6 +116,9 @@ src_unpack() {
 	# Azarah - 07 April 2002
 	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-portage.patch
 
+	epatch ${FILESDIR}/${PV}/libtool-1.4.3-uclibc.patch
+	epatch ${FILESDIR}/libltdl-uclibc.patch
+
 	einfo "Generate ltmain.sh ..."
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
 }
@@ -128,8 +132,8 @@ src_compile() {
 
 	cd ${OLD_S}
 
-	# Detect mips/mips64
-	use mips && gnuconfig_update
+	# Detect mips/mips64 and uclibc
+	( use mips || use uclibc ) && gnuconfig_update
 
 	einfo "Configuring ${OLD_S##*/} ..."
 	./configure --host=${CHOST} \
@@ -145,8 +149,8 @@ src_compile() {
 
 	cd ${S}
 
-	# Detect mips/mips64
-	use mips && gnuconfig_update
+	# Detect mips/mips64 and uclibc
+	( use mips || use uclibc ) && gnuconfig_update
 
 	einfo "Configuring ${S##*/} ..."
 	./configure --host=${CHOST} \
@@ -179,6 +183,12 @@ src_install() {
 	einfo "Installing ${S##*/} ..."
 	cd ${S}; make DESTDIR=${D} install || die
 
+	if use uclibc ; then
+		for x in $(find ${D} -name config.guess -o -name config.sub) ; do
+			rm -f ${x}; ln -sf ../gnuconfig/$(basename ${x}) ${x}
+		done
+	fi
+
 	dodoc AUTHORS COPYING ChangeLog* NEWS \
 	      README THANKS TODO doc/PLATFORMS
 }
diff --git a/sys-devel/libtool/libtool-1.5.2-r5.ebuild b/sys-devel/libtool/libtool-1.5.2-r5.ebuild
index 1e4cf8a257b0..619a3f116d5b 100644
--- a/sys-devel/libtool/libtool-1.5.2-r5.ebuild
+++ b/sys-devel/libtool/libtool-1.5.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r5.ebuild,v 1.10 2004/06/11 18:48:37 kloeri Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r5.ebuild,v 1.11 2004/06/24 07:40:58 solar Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils gnuconfig
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ppc64 sparc ~mips alpha arm ~hppa amd64 ~ia64 s390"
-IUSE=""
+IUSE="uclibc"
 
 DEPEND="virtual/glibc
 	>=sys-devel/autoconf-2.58
@@ -67,10 +67,12 @@ src_unpack() {
 	epatch ${FILESDIR}/1.4.3/${PN}-1.2f-cache.patch
 	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-nonneg.patch
 	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
+	epatch ${FILESDIR}/ltconfig-uclibc.patch
 
 	use hppa && S="${OLD_S}" gnuconfig_update
 	use amd64 && S="${OLD_S}" gnuconfig_update
 	use ppc64 && S="${OLD_S}" gnuconfig_update
+	use uclibc && S="${OLD_S}" gnuconfig_update
 
 	cd ${S}
 	echo
@@ -93,7 +95,7 @@ src_unpack() {
 	# included in 'libtool-1.4.3-gentoo.patch' for this ebuild.
 	#
 	# NOTE: all affected apps should get a 'libtoolize --copy --force'
-	#      added to upate libtool
+	#      added to update libtool
 	#
 # Seems to be included in shipped tarball ...
 #	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-relink-58664.patch
@@ -150,6 +152,9 @@ src_compile() {
 	# regen to allow for build,host,target ppc64
 	use ppc64 && gnuconfig_update
 
+	# detect uclibc
+	use uclibc && gnuconfig_update
+
 	einfo "Configuring ${OLD_S##*/} ..."
 	./configure --host=${CHOST} \
 			--prefix=/usr \
@@ -167,6 +172,8 @@ src_compile() {
 	# Detect mips/mips64
 	use mips && gnuconfig_update
 
+	use uclibc && gnuconfig_update
+
 	einfo "Configuring ${S##*/} ..."
 	./configure --host=${CHOST} \
 		--prefix=/usr \
@@ -198,5 +205,16 @@ src_install() {
 	einfo "Installing ${S##*/} ..."
 	cd ${S}; make DESTDIR=${D} install || die
 
+	if use uclibc ; then
+		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
+		cd ${S}
+	fi
+
 	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
 }