USE="static-libs" and stop installing unrequired libtool archive.

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

3 files changed, 15 insertions, 15 deletions

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index 08395e9fb0ce..40053f09d681 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/popt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.92 2010/12/24 22:41:58 mattst88 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.93 2011/03/17 16:06:07 ssuominen Exp $
+
+  17 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> popt-1.16-r1.ebuild:
+  USE="static-libs" and stop installing unrequired libtool archive.
 
 *popt-1.16-r1 (24 Dec 2010)
 
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index d10e17898646..91d96b6e0e3a 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,6 +1,6 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 RMD160 78b186488f18816ecd0f16acb23bf4034f17bb8e SHA1 fc3b84b13c171d124558ce62a3ec8a63f9edbb0f SHA256 c73def3602304ff38f383981621ba294497d69bf8ae54da5c6172d459ddadc08
 DIST popt-1.16.tar.gz 702769 RMD160 9c52bff97259de4010499f69c76d2a6396920342 SHA1 cfe94a15a2404db85858a81ff8de27c8ff3e235e SHA256 e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8
-EBUILD popt-1.16-r1.ebuild 928 RMD160 657f96ba0cb436da9d71c499fb15c757d82e79a7 SHA1 a531a2df8a852a233d8c51c58fabea896c416680 SHA256 46b1a5e9644965ebd25c973486a339bcbbe4f23e0edc6f97649189079f99e3eb
+EBUILD popt-1.16-r1.ebuild 978 RMD160 851d886a0fbd42d70ebd75d338d465c633e63257 SHA1 99056e82fae3a1973bd681157b19645ec28a6e37 SHA256 1d9ca0d07a6189ce78b6bbde90c55f3802c3ee3e1a88a597038b7057856aee0b
 EBUILD popt-1.16.ebuild 799 RMD160 4366482ff72445c6ef93db4340560f2ef0a745d0 SHA1 d09c0b182481ebf580c7737ea7e7e2c6f03f4267 SHA256 8930133d67f650da80e4ffb55d97a6731e4796a989ddcad6a94be4a5cd5dffb0
-MISC ChangeLog 12378 RMD160 8a50ed4d92a3470ea00e7a85f810f3b1f025990f SHA1 34d14f85ddc1bb6d272a9984e8e6927ef5a65064 SHA256 f30ace01c536fec9aa17f4334e22b454fd32a917d7abcbd3b8d065e59df3dcdd
+MISC ChangeLog 12523 RMD160 2e874fd59c633c4840b1219081ea1f7df47b0fe0 SHA1 44c56a501f36247b01c83d0e9b9aea2b1adf7c64 SHA256 dd63db6b74d118c18f1b9c11c628e9c638d1dd87de4f465aff67e7c132e890bc
 MISC metadata.xml 166 RMD160 cad049d379f0491ad73203692753b958a751fee9 SHA1 343e18a48dcf2e55a624893f52016a81d63eec97 SHA256 a33d3505ea834e19cd196ef8af9d438f1e476abb2aca27b0ea9f1219e93b8b26
diff --git a/dev-libs/popt/popt-1.16-r1.ebuild b/dev-libs/popt/popt-1.16-r1.ebuild
index 9799e339949a..1e331a751c03 100644
--- a/dev-libs/popt/popt-1.16-r1.ebuild
+++ b/dev-libs/popt/popt-1.16-r1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.16-r1.ebuild,v 1.1 2010/12/24 22:41:58 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.16-r1.ebuild,v 1.2 2011/03/17 16:06:07 ssuominen Exp $
 
 EAPI=3
-
-# For bug 349558, epatch
 inherit eutils
 
 DESCRIPTION="Parse Options - Command line parser"
@@ -14,27 +12,26 @@ SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="nls"
+IUSE="nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
 DEPEND="nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	# For bug 349558
-	epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch
-
-	sed -i \
-		-e 's:lt-test1:test1:' \
-		testit.sh || die
+	epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558
+	sed -i -e 's:lt-test1:test1:' testit.sh || die
 }
 
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
 		$(use_enable nls)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc CHANGES README || die
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }