Disable static libraries, since they would get removed anyway.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 20 insertions, 6 deletions

diff --git a/sys-libs/libxcrypt/ChangeLog b/sys-libs/libxcrypt/ChangeLog
index c1f1fdcaf2e3..29a950e4a752 100644
--- a/sys-libs/libxcrypt/ChangeLog
+++ b/sys-libs/libxcrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libxcrypt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/ChangeLog,v 1.8 2010/01/12 11:42:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/ChangeLog,v 1.9 2010/04/26 11:25:53 flameeyes Exp $
+
+  26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  libxcrypt-2.4.ebuild:
+  Disable static libraries, since they would get removed anyway.
 
 *libxcrypt-2.4 (12 Jan 2010)
 
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 027b18bfb277..32460ff967f9 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libxcrypt-2.0.tar.bz2 255228 RMD160 8aa759fa698c8e086fce3fb854ff6f8f1de03328 SHA1 8325fcb3c0e784d3c9ea8a04a4b1e1cc8d3b67d3 SHA256 176ed37cfdd3b1fe6f9e01cb75c5f864287906bb5741d22fa586d6239ad672a8
 DIST libxcrypt_2.4.orig.tar.gz 361503 RMD160 930e4f7fab248ef973d16ffcdbae325559e65acf SHA1 397f4dc3f092cd19b8145e3905d3e85e7469dd53 SHA256 4207aee39c4454c1955b26a3d77f33e730eae94c20406976b6de80c3a3cfb1cd
 EBUILD libxcrypt-2.0.ebuild 553 RMD160 d703d4c7e1d8f366733eaf6cedf093e5d1912ff6 SHA1 ecd2ef5487b095fd12ea74b8b2b40a64c5031725 SHA256 38d78e78bafbe3d016614c806d44e22d7ef4a282a9e15d8b6f8f9f42a42412d7
-EBUILD libxcrypt-2.4.ebuild 788 RMD160 2a86ff57e46e66090a3e0ef7275210137b8db366 SHA1 77a1b4df04a6ff5c8451d165a8fcaf5558939e48 SHA256 dcc3b1151c38d783c9f594d91ee9c1e142a31d0d8a8bfd4b60462916d1ab34b8
-MISC ChangeLog 1096 RMD160 ac972b71986516048d2990595a885569da8186a8 SHA1 7fdff616911bebdd14cad93116e838cd9786cd6f SHA256 1065aeee16594da4319e6408bb9852f5f65ae963d01cd549feffc568cff7647a
+EBUILD libxcrypt-2.4.ebuild 800 RMD160 122972897f62e7cde298672e9ed5af6c192b1a71 SHA1 946ab513b2c6dfe55a69f2ad53b55ae92df054e2 SHA256 9b6134b5490db9f4093c18ba8b9b14f0097f633c99d081ff444f3b5ffebd4eaa
+MISC ChangeLog 1241 RMD160 7c1ebb16e6aaff45c452afcce1dc878f03032a25 SHA1 3762bcac8ba9ebb88d4dc629d8dd9582c0a3f10d SHA256 cc1eb8deacc2c7f8479cb44937026417b2dc7fe112ca3496aea870c78f11fe9e
 MISC metadata.xml 394 RMD160 cb419578f639b8f677b9f551eb18c57287d9ca38 SHA1 d751ff8b3c893f8884dc74ce762692149725f256 SHA256 2811fce43c6930f68c07ad316c789ca848cc6086725801dd9230c5848ac663f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvVeE0ACgkQAiZjviIA2Xi79ACgmY9ldjWULQLxKlbtyEggI4E/
+JfwAoNTRG0WkiJhm4szNfsKwIu3eOUgp
+=CmMJ
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild b/sys-libs/libxcrypt/libxcrypt-2.4.ebuild
index 5a106bc3acaa..8308b9c7835d 100644
--- a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/libxcrypt-2.4.ebuild,v 1.1 2010/01/12 11:42:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/libxcrypt-2.4.ebuild,v 1.2 2010/04/26 11:25:53 flameeyes Exp $
 
 EAPI=2
 
@@ -17,12 +17,12 @@ IUSE=""
 
 src_configure() {
 	# Do not install into /usr so that tcb and pam can use us.
-	econf --libdir=/$(get_libdir)
+	econf --libdir=/$(get_libdir) --disable-static
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake failed"
 
 	# Remove unneeded files from /
-	rm -f "${D}"/$(get_libdir)/"${PN}".{a,la} || die "rm failed"
+	rm -f "${D}"/$(get_libdir)/"${PN}".la || die "rm failed"
 }