uclibc fixes are all automatic now

Package-Manager: portage-2.0.51-r15

3 files changed, 5 insertions, 104 deletions

diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 0fa060ed8609..f6e4507e06e3 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,3 @@
 MD5 c22a215cd22ae448ef9af6f546ab1ccb ChangeLog 2381
-MD5 ede949af079c47f3355f4753719dc41b popt-1.7-r1.ebuild 824
+MD5 260995c79e7d35257906d439fae1c44b popt-1.7-r1.ebuild 758
 MD5 0933441e77d0a43c85e3d1471bbc2633 files/digest-popt-1.7-r1 60
-MD5 3cbfe76b0e9e426cb66e203ece971ded files/popt-1.7-uclibc.patch 2974
diff --git a/dev-libs/popt/files/popt-1.7-uclibc.patch b/dev-libs/popt/files/popt-1.7-uclibc.patch
deleted file mode 100644
index f4672ed8d7f1..000000000000
--- a/dev-libs/popt/files/popt-1.7-uclibc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- popt-1.7/configure.uclibc~	2002-08-31 15:22:20.000000000 +0200
-+++ popt-1.7/configure	2004-06-14 20:41:51.000000000 +0200
-@@ -4476,6 +4476,11 @@ linux-gnu*)
-   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
-@@ -5329,7 +5334,7 @@ fi
- 
- # 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
- 
-@@ -6880,6 +6885,24 @@ linux-gnu*)
-   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
---- popt-1.7/aclocal.m4.uclibc~	2002-08-31 15:22:08.000000000 +0200
-+++ popt-1.7/aclocal.m4	2004-06-14 20:41:51.000000000 +0200
-@@ -1758,7 +1758,7 @@ fi
- 
- # 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
- 
-@@ -3117,6 +3117,24 @@ linux-gnu*)
-   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
-@@ -4306,6 +4324,11 @@ linux-gnu*)
-   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/dev-libs/popt/popt-1.7-r1.ebuild b/dev-libs/popt/popt-1.7-r1.ebuild
index ee6035595778..6793dd115f2d 100644
--- a/dev-libs/popt/popt-1.7-r1.ebuild
+++ b/dev-libs/popt/popt-1.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.18 2004/11/12 15:45:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.19 2005/02/21 05:04:30 vapier Exp $
 
-inherit libtool gnuconfig eutils
+inherit libtool eutils
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="http://www.rpm.org/"
@@ -17,9 +17,7 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}/${P}-uclibc.patch"
-	cd ${S}
-	gnuconfig_update
+	cd "${S}"
 	elibtoolize
 	use nls || touch ../rpm.c
 }