USE="static-libs" and remove useless libtool archive.

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

3 files changed, 35 insertions, 13 deletions

diff --git a/sys-libs/libcap-ng/ChangeLog b/sys-libs/libcap-ng/ChangeLog
index bf02a868a555..301896ef1e6f 100644
--- a/sys-libs/libcap-ng/ChangeLog
+++ b/sys-libs/libcap-ng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/libcap-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/ChangeLog,v 1.34 2012/02/20 15:26:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/ChangeLog,v 1.35 2012/03/10 17:15:24 ssuominen Exp $
+
+  10 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> libcap-ng-0.6.6.ebuild:
+  USE="static-libs" and remove useless libtool archive.
 
   20 Feb 2012; Patrick Lauer <patrick@gentoo.org> libcap-ng-0.6.4.ebuild,
   libcap-ng-0.6.5.ebuild, libcap-ng-0.6.6.ebuild:
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 731d44e05bfc..b33941b1a088 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libcap-ng-0.6.4-fix_tests_building.patch 671 RMD160 d31281293849d2232892168fe9fc14018e01478e SHA1 13806a44b9b25ee0f6ef1b33b6edfb5fe5d60ac9 SHA256 fe7b2f8a64def178c0641b4b66f94e00cb8f96b0bc6e47f1e1c60b6f891def5a
 AUX libcap-ng-0.6.4-python.patch 3060 RMD160 a72a20753c53f52a824272ae91674b375fcbf4f3 SHA1 1182a780dda839e6d6c49e196dc7be7bf9708b47 SHA256 73cdea90d2d79b0a57532aed6867c9beabb2a5e9b8b91a40e6fed6ab7788c295
 AUX libcap-ng-gentoo.patch 1070 RMD160 23d69ecd9671243c91825af067f72468d6c4a6c1 SHA1 3feea7db14c639aeb61226f20094c8b2ab95613e SHA256 b556f6ed4e8192271e0d8d97d6685fcd9cb1f9200bb4119974e94436417ae4d3
@@ -8,6 +11,17 @@ DIST libcap-ng-0.6.6.tar.gz 367231 RMD160 499c005eba372e6b554cc60fcfb2705871eed4
 EBUILD libcap-ng-0.6.2.ebuild 957 RMD160 aba94b15b627c11e4e00c3253fabed07b8f7a2aa SHA1 73a2258df79b3de4ab8460abb04881e0c9e576f5 SHA256 09cb68dad3c9e45396b5c4153284eb6eea8e0dfc53f1cc62f28413812dcd1da1
 EBUILD libcap-ng-0.6.4.ebuild 2594 RMD160 047a546b39989a8603737454de08538d0bc920db SHA1 63f6e38f4cf307a0650932cac41003497e0c15ad SHA256 841bae62c7e20ef94084d6f22099c9febe3ea7f4a93d50fb0988c24386eb9493
 EBUILD libcap-ng-0.6.5.ebuild 2454 RMD160 7cc31d08ba0092bc235216fc2dbd391bd0004b4c SHA1 6047e4399e7c3b5eba38bb2d3db29c064a58588d SHA256 222d087c42041eb1a1d915e3efd352d928d63ad2a3cc095dcaed20140f9ecd8b
-EBUILD libcap-ng-0.6.6.ebuild 2464 RMD160 9d9ad2e57e46af2a7c51500a73308aca1987c6f0 SHA1 e23996e42c69efe076ba5e51dc7c5ae24412ae04 SHA256 27254d75d53f5259c801182085856789fe98d0da9e2f6cd2efd5e018afa89f04
-MISC ChangeLog 4717 RMD160 a5ce026ea89f9e164f84c5e2a5749d63d7f7c295 SHA1 d63ef9ca73805111fb645a6de92e040e9a7048e2 SHA256 ca32f73e320168ecf751837dff0345211d2ce3c46a4cebb05e1b6dc9500e7260
+EBUILD libcap-ng-0.6.6.ebuild 2515 RMD160 c4208232a13657ac12fb0262d9e4944fe23618a6 SHA1 fd645ef90729afca23101825aec286414d11bfc0 SHA256 28b650daf33ff1444506f5eb85b8860df05dbf1ec007165b7fb115e60e3ce672
+MISC ChangeLog 4854 RMD160 8e53db420235b0894155de7342690a513e261c93 SHA1 413384848254aa354caf19b004f1f65cbaf6a917 SHA256 c513c2c5c16581314cf003b72fcfa736593c94657639b5c378bf29d4c56b549f
 MISC metadata.xml 598 RMD160 4a0562ce9e5fab2b4d7310962390815b518a18a5 SHA1 2b87404da773bdf8e2dfb41844fc6c8c23c4bce4 SHA256 340a9c3dd4c0fe6edafe6685af1c8d9b8d2c668fe0b29c6809cc81dda5d06e9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPW4szAAoJEEdUh39IaPFNl3oIAIVTOPzJGu5qYyDUbbNpSwMa
+Nh7+X/Q69VUAaluF0hRxhdAbOSOd2GGOSWwFoI5Chuy1gVFXb4yw1tzUCGC5EpES
+cFlGZAhZLWQE8OV/RwyqMU0+dTPe89s41zsbczM8NUHKt5VhhhSlsnjY82/UCFu2
+iAjLka5nsr3GzTA4PB1XZTJaxSWM4QImxO9i621AeMA/h0wmi7NVo0xKmhLtQnz1
+zNAu6uMDurSSTmQPrR7pVBe5OTcrdnFu9RjiP80QTRPclAH/uLhGgK5uRS6L/Pke
+1VZ7sI7DB+gYCuoqvz8ipmvIZsAzudod15Q+nHtzFWOTKTWqG9NNO7N9XTsQBto=
+=AnwU
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild b/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
index 777531c75875..13cd963f318c 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild,v 1.2 2012/02/20 15:26:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild,v 1.3 2012/03/10 17:15:24 ssuominen Exp $
+
+EAPI=4
 
-EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.7-pypy-*"
 
-inherit eutils autotools flag-o-matic python
+inherit autotools eutils flag-o-matic python
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="http://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="http://people.redhat.com/sgrubb/libcap-ng/${P}.tar.gz"
+SRC_URI="http://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="python"
+IUSE="python static-libs"
 
 RDEPEND="sys-apps/attr
 	python? ( dev-lang/python )"
@@ -31,10 +32,10 @@ pkg_setup() {
 
 src_prepare() {
 	# Disable byte-compilation of Python modules.
-	echo "#!/bin/sh" > py-compile
+	>py-compile
 
 	# Python bindings are built/tested/installed manually.
-	sed -e "/^SUBDIRS/s/ python//" -i bindings/Makefile.am
+	sed -i -e "/^SUBDIRS/s/ python//" bindings/Makefile.am || die
 
 	eautoreconf
 
@@ -42,7 +43,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with python)
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with python)
 }
 
 src_compile() {
@@ -84,7 +87,7 @@ src_test() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	if use python; then
 		installation() {
@@ -100,7 +103,9 @@ src_install() {
 		python_clean_installation_image
 	fi
 
-	dodoc ChangeLog README
+	dodoc AUTHORS ChangeLog README
+
+	rm -f "${ED}"/usr/lib*/${PN}.la
 }
 
 pkg_postinst() {