Add patch to link to libintl when not using GLIBC; depend on virtual/libintl when using nls.

Package-Manager: portage-2529-svn

4 files changed, 40 insertions, 9 deletions

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index 01cd82f71b0e..23509a85d3f5 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/popt
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.21 2005/05/10 22:50:15 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.22 2006/01/25 21:07:05 flameeyes Exp $
+
+  25 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/popt-1.7-nls.patch, popt-1.7-r1.ebuild:
+  Add patch to link to libintl when not using GLIBC; depend on virtual/libintl
+  when using nls.
 
   10 May 2005; Mike Frysinger <vapier@gentoo.org>
   +files/popt-1.7-missing-tests.patch, popt-1.7-r1.ebuild:
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index cb0a5dcd9d48..6bb4228420e8 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,15 @@
-MD5 17ae50d624ce3495165629aa1c12e9dd ChangeLog 2550
-MD5 80397a9b5d8c3313bcbdbe99342f779a popt-1.7-r1.ebuild 912
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 21dbf8c66c0da99ae9de3e0397052ae3 ChangeLog 2753
 MD5 0933441e77d0a43c85e3d1471bbc2633 files/digest-popt-1.7-r1 60
 MD5 65e91b3cbc5d3c136d141bae0629fc6a files/popt-1.7-missing-tests.patch 552
+MD5 935450b0eb6e446ec7fff46cfca6cfb7 files/popt-1.7-nls.patch 374
+MD5 8080de8dea5096f625272b6f62efebb8 popt-1.7-r1.ebuild 998
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD1+iFAiZjviIA2XgRAk9eAKDFYZNPKMXB7pN4BWiYBHeLF6svBwCdGRHS
+MXYzL1r3fXj3r+SUJ6dWR0Y=
+=y7oA
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/popt/files/popt-1.7-nls.patch b/dev-libs/popt/files/popt-1.7-nls.patch
new file mode 100644
index 000000000000..cc8b3c45bb6c
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.7-nls.patch
@@ -0,0 +1,12 @@
+Index: popt-1.7/Makefile.am
+===================================================================
+--- popt-1.7.orig/Makefile.am
++++ popt-1.7/Makefile.am
+@@ -34,6 +34,7 @@ TESTS = testit.sh
+ include_HEADERS = popt.h
+ lib_LTLIBRARIES = libpopt.la
+ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
++libpopt_la_LIBADD = $(LTLIBINTL)
+ 
+ man_MANS = popt.3
+ 
diff --git a/dev-libs/popt/popt-1.7-r1.ebuild b/dev-libs/popt/popt-1.7-r1.ebuild
index f47ae7d81f2e..7e2d0958522d 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.21 2005/05/10 22:50:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.22 2006/01/25 21:07:05 flameeyes Exp $
 
-inherit libtool eutils flag-o-matic
+inherit libtool eutils flag-o-matic autotools
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="http://www.rpm.org/"
@@ -13,15 +13,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ppc-macos s390 sh sparc x86"
 IUSE="nls"
 
-RDEPEND=""
+RDEPEND="nls? ( virtual/libintl )"
 DEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	elibtoolize
 	epatch "${FILESDIR}"/${P}-missing-tests.patch
+	epatch "${FILESDIR}"/${P}-nls.patch
 	use nls || touch ../rpm.c
+
+	eautomake
+	elibtoolize
 }
 
 src_compile() {