use uclibctoolize for our uclibc updates

8 files changed, 26 insertions, 126 deletions

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 8eefdd149320..c3bf6fd5d69c 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -3,22 +3,19 @@ Hash: SHA1
 
 MD5 3b270dd3becc3c33454b1c9087409f15 ChangeLog 8638
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 8a8ceae3be87c8404ccb6069256a1d46 file-4.08.ebuild 1557
-MD5 eb4cb2253775db1f898c70dc341e9176 file-4.09.ebuild 2042
-MD5 9775e57ae4d6a366eba2d3de393c5efd file-4.10.ebuild 2039
-MD5 9d321bc2d91b3be3d1625bfa83b59a80 file-4.10-r1.ebuild 2005
+MD5 4706503d14d34c6f02641be81e66a46c file-4.08.ebuild 1441
+MD5 e2d53ae79cd02fc5ddbad4dc8de3f656 file-4.09.ebuild 1903
+MD5 deefcaad96da75f331ac1ab9d9bc23f9 file-4.10.ebuild 1900
+MD5 1ca0193a3a01bf83ee8494e01613ef58 file-4.10-r1.ebuild 1867
 MD5 8cf0ba615168e0a01ddd576d39b19efe files/digest-file-4.10 61
 MD5 8f6cec8c0754678a2817139182637eac files/file-4.xx-mips-gentoo.diff 13035
-MD5 8153e3726c4dad50b53c76eaf32b4833 files/file-4.07-gentoo.diff 648
 MD5 9ab14ea35a2db2864bb6e92d1ca87f17 files/digest-file-4.08 61
 MD5 655e5c463709e244970b23b64aaf8bf7 files/digest-file-4.09 61
-MD5 2b50afc88e81450f52a964b98b7d0ef8 files/file-4.08-uclibc.patch 816
-MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
 MD5 8cf0ba615168e0a01ddd576d39b19efe files/digest-file-4.10-r1 61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBVRCsHTu7gpaalycRAk57AJ4nyuvUkSLKDeFkGBRlAKc2P1Fs5QCglMxx
-zw5zf4r3X5C8kbTsOz3QkSA=
-=9w1p
+iD8DBQFBVRMNHTu7gpaalycRAicwAJ9GOq7Urg8Ln8+WSIsDHCBjMOPRXQCfV+fN
+yTND6HZz1ZP/Zn+Ux1bfSkQ=
+=9auW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-4.08.ebuild b/sys-apps/file/file-4.08.ebuild
index 9fac6e363798..1e8457e8d740 100644
--- a/sys-apps/file/file-4.08.ebuild
+++ b/sys-apps/file/file-4.08.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.08.ebuild,v 1.14 2004/09/16 02:20:38 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.08.ebuild,v 1.15 2004/09/25 06:41:01 vapier Exp $
 
-inherit flag-o-matic gnuconfig eutils
+inherit flag-o-matic gnuconfig eutils libtool
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -26,15 +26,12 @@ src_unpack() {
 	# recognize things.
 	use mips && epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff
 
-	# uclibc support
-	epatch ${FILESDIR}/${P}-uclibc.patch
-	epatch ${FILESDIR}/ltconfig-uclibc.patch
+	# GNU updates
+	uclibctoolize
+	gnuconfig_update
 }
 
 src_compile() {
-	# If running mips64, we need updated configure data
-	gnuconfig_update
-
 	# file command segfaults on hppa -  reported by gustavo@zacarias.com.ar
 	[ ${ARCH} = "hppa" ] && filter-flags "-mschedule=8000"
 
diff --git a/sys-apps/file/file-4.09.ebuild b/sys-apps/file/file-4.09.ebuild
index f4cd7bcd2e30..f70dd5ef1380 100644
--- a/sys-apps/file/file-4.09.ebuild
+++ b/sys-apps/file/file-4.09.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.09.ebuild,v 1.13 2004/08/12 03:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.09.ebuild,v 1.14 2004/09/25 06:41:01 vapier Exp $
 
-inherit flag-o-matic gnuconfig eutils distutils
+inherit flag-o-matic gnuconfig eutils distutils libtool
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -27,11 +27,8 @@ src_unpack() {
 	# recognize things.
 	use mips && epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff
 
-	# uclibc support
-	epatch ${FILESDIR}/${PN}-4.08-uclibc.patch
-	epatch ${FILESDIR}/ltconfig-uclibc.patch
-
-	# gnuconfig_update should run for every arch/libc combo not just mips.
+	# GNU updates
+	uclibctoolize
 	gnuconfig_update
 
 	# make sure python links against the current libmagic #54401
diff --git a/sys-apps/file/file-4.10-r1.ebuild b/sys-apps/file/file-4.10-r1.ebuild
index 177ecf78694c..00cfae20b1bd 100644
--- a/sys-apps/file/file-4.10-r1.ebuild
+++ b/sys-apps/file/file-4.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.10-r1.ebuild,v 1.2 2004/09/25 06:00:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.10-r1.ebuild,v 1.3 2004/09/25 06:41:01 vapier Exp $
 
-inherit flag-o-matic gnuconfig eutils distutils
+inherit flag-o-matic gnuconfig eutils distutils libtool
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="python build"
 
 DEPEND="virtual/libc
@@ -27,11 +27,8 @@ src_unpack() {
 	# recognize things.
 	use mips && epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff
 
-	# uclibc support
-	epatch ${FILESDIR}/${PN}-4.08-uclibc.patch
-	epatch ${FILESDIR}/ltconfig-uclibc.patch
-
-	# gnuconfig_update should run for every arch/libc combo not just mips.
+	# GNU updates
+	uclibctoolize
 	gnuconfig_update
 
 	# make sure python links against the current libmagic #54401
diff --git a/sys-apps/file/file-4.10.ebuild b/sys-apps/file/file-4.10.ebuild
index 8431220a0050..47fecbfcdbbf 100644
--- a/sys-apps/file/file-4.10.ebuild
+++ b/sys-apps/file/file-4.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.10.ebuild,v 1.7 2004/09/25 06:25:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.10.ebuild,v 1.8 2004/09/25 06:41:01 vapier Exp $
 
-inherit flag-o-matic gnuconfig eutils distutils
+inherit flag-o-matic gnuconfig eutils distutils libtool
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="python build"
 
 DEPEND="virtual/libc
@@ -27,11 +27,8 @@ src_unpack() {
 	# recognize things.
 	use mips && epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff
 
-	# uclibc support
-	epatch ${FILESDIR}/${PN}-4.08-uclibc.patch
-	epatch ${FILESDIR}/ltconfig-uclibc.patch
-
-	# gnuconfig_update should run for every arch/libc combo not just mips.
+	# GNU updates
+	uclibctoolize
 	gnuconfig_update
 
 	# make sure python links against the current libmagic #54401
diff --git a/sys-apps/file/files/file-4.07-gentoo.diff b/sys-apps/file/files/file-4.07-gentoo.diff
deleted file mode 100644
index 08d1de001687..000000000000
--- a/sys-apps/file/files/file-4.07-gentoo.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru file-4.07.orig/src/readelf.c file-4.07/src/readelf.c
---- file-4.07.orig/src/readelf.c	2003-11-18 13:42:33.000000000 -0600
-+++ file-4.07/src/readelf.c	2004-01-23 01:47:00.325387536 -0600
-@@ -260,7 +260,8 @@
- 				break;
- 			offset = donote(ms, nbuf, offset, (size_t)bufsize,
- 			    class, swap, 4);
--
-+			if (offset == 0)
-+			  break; /* or loop for ever */
- 		}
- 	}
- 	return 0;
-@@ -633,6 +634,8 @@
- 					break;
- 				offset = donote(ms, nbuf, offset,
- 				    (size_t)bufsize, class, swap, ph_align);
-+				if (offset == 0)
-+				  break; /* or loop for ever */
- 			}
- 			if (lseek(fd, savedoffset + offset, SEEK_SET)
- 			    == (off_t)-1) {
diff --git a/sys-apps/file/files/file-4.08-uclibc.patch b/sys-apps/file/files/file-4.08-uclibc.patch
deleted file mode 100644
index f8c2984bc6ab..000000000000
--- a/sys-apps/file/files/file-4.08-uclibc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./configure.mps	2004-03-30 14:56:35.000000000 +0100
-+++ ./configure	2004-03-30 14:59:39.000000000 +0100
-@@ -3302,6 +3302,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
---- ./aclocal.m4.mps	2004-03-30 14:56:35.000000000 +0100
-+++ ./aclocal.m4	2004-03-30 14:59:39.000000000 +0100
-@@ -3302,6 +3302,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
diff --git a/sys-apps/file/files/ltconfig-uclibc.patch b/sys-apps/file/files/ltconfig-uclibc.patch
deleted file mode 100644
index d56a2893fa84..000000000000
--- a/sys-apps/file/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