Fix thinko in USE=static-libs handling #406079 by Andrew John Hughes.

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

4 files changed, 25 insertions, 21 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index bcd1f35149d6..a3dfdcbe60de 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.243 2012/02/24 17:20:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.244 2012/02/27 20:54:27 vapier Exp $
+
+  27 Feb 2012; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.ebuild,
+  e2fsprogs-1.42.1.ebuild:
+  Fix thinko in USE=static-libs handling #406079 by Andrew John Hughes.
 
 *e2fsprogs-1.42.1 (24 Feb 2012)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0e0af3c121a8..240625faa65c 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -26,24 +26,24 @@ EBUILD e2fsprogs-1.41.12-r1.ebuild 4303 RMD160 a1daa7568c42aa832e6feb4dc6193c25d
 EBUILD e2fsprogs-1.41.12.ebuild 3900 RMD160 a275d276a051a0498055b2ee6c4833e7dfa3f79c SHA1 f0bff43ac6e5e1369ab0dbb14fcb798ffa68a7b8 SHA256 2c6fca4ab9cd9d2d8341a470c58d470af0ee82367ddc649b50d9ff4c2a6f94dd
 EBUILD e2fsprogs-1.41.14.ebuild 4297 RMD160 62bbe44b692bfa92251e6cbdf1a03406c60cf2d5 SHA1 a7db3d59afcad75aaf9fa8139a984b4cb5df3aef SHA256 4006e230a2becdc55c2922c96d3b2d6bb474fd5f90389ea5801c7bc5003eb188
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4158 RMD160 13600b8acea0bc70338d6df1eb065a353ec254bc SHA1 bf42c33a7e7a55b2628d69269d140c29cfb66f02 SHA256 24defb5da08763aaf7d239c2b404a75f2182eefcbbc9193d817f77d3e63068d5
-EBUILD e2fsprogs-1.42.1.ebuild 4601 RMD160 6740fd160e2914e58990a05d60d1d109b73fa46e SHA1 edcb50f9e521dec30a002b3b7efe5e44398a2f2e SHA256 08c8e2cadce8928b4376c160fa2a5b229dadd4f6ce14f597a61f45093f851775
-EBUILD e2fsprogs-1.42.ebuild 4454 RMD160 1594757e99585ff68b900e932d91cc6a0478490e SHA1 d36edad6996d69a19eacca82698785241ff8f106 SHA256 fe34f33d19436a12307676104db27b292a82ea8e9e7de8f51da3d07a0c556602
-MISC ChangeLog 36051 RMD160 3963082369dd5c2b2945f25c187bdfb32a20554b SHA1 bbc30bd90f951c9f4283f395b5efdd3bc665a34e SHA256 acc3c7ec809f928246ccdde984a39601d3ddc146cf74224beda0af455c0ac731
+EBUILD e2fsprogs-1.42.1.ebuild 4620 RMD160 fe0e761729c9ddd9949f5f7753d64921f749e908 SHA1 e000ad32de9606cc4c41c5b8c8707d32a2757643 SHA256 97efd739607363df0022d575a86c13b93601af7a35a8dd66c2198181e682cce6
+EBUILD e2fsprogs-1.42.ebuild 4473 RMD160 367e508614bc7a5b542b0cfe2a96601b52067f68 SHA1 dbd701ec317bac2e58623cd2775df69dcf7fb14c SHA256 aa5fd4a4dd7ab663d6462d2555d62a4fa7e910d2d2b91635057fda363d652169
+MISC ChangeLog 36224 RMD160 3c9fccc653ed7e2fc8e9da427046474acd34127f SHA1 7962f8152c4ec3fd19cde94deed5d316035a6ecf SHA256 2b0f073d128264fb6e07a6dcaad00c5d92fa148b2935c5d9c962de30222e6591
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPR8bpAAoJELEHsLL7fEFWOAIP/jQeWVQAO4i2Awj2jzveMoI0
-ZyLR35Dpx27+sGrFfNw5HUlonIznvX4gS+pv8IypJ3JzzOMvPvxlQTznzzGYbYV0
-BKmJ7m6YAzDUSte23TFlb5KwEaiVGnwdHiIuBqzZaux2/5IyAuJ5SeLQ67rBI4Tg
-HQmYNT7iFiqfW8eCyjtkA6VSDbPSI7mOoeCvKso6dTYqqHQttFH0LYMmJOo5Rmlr
-YaN66S6prnmXpiydRXh61kLaOiA3Q8uLclPINyET/nKlY7ZiJaHtRppEhqUy1+6h
-INBJ+95Ntd+9WiMVa+zs+M4ouVi4OE0a1NjNdhpsUPm/+6ZeYpvnEDHXEbdDcxX3
-afm1m1jza8qThbLjWZOcjPgaatplHuLslcVot2eTIGSszryC19sTvEuYHhlPW9OV
-a5d11gCGrldoaCSae8uSrN3PrRt1XI748CTDzCyhcHOULDP9S1sAisnXvzS39tJd
-bYqlHrmVdYwuh6P7irQ0WX3HNENObcg5uLI+WRWQHp5aCNL6hSNvqF5x6l/ws+o2
-dv6pviyL0JIj5ePV4mt616aVartijYDqYbNMuWt6vezIHNHmsRk1P985e1EfRBRx
-JIwwGC7RBlRPUke67Ji7krFY+jIkO1Dx2yw2KXeP/4OrcfEI4D0fR0hauvkmvVl6
-MOLkAMwLb6397LvdJR1D
-=WXLl
+iQIcBAEBAgAGBQJPS+2LAAoJELEHsLL7fEFW0mEQALDrKufSxC20fIjd+huuCtpB
+jUUmNmYmiDCcBH+8nr9adGAQD/B6f/amlrHUIZBPkwLphUBEhgt14gpyiXvfiQfe
+jDSxjfFSYy1sDvY5GarQbmQlB/K19xkci7Bbrwh852egvI+XOO9NC2a+6YBTScKB
+IvQ18oY9/EGmLONbLUEPSoatEk6UqsTwqjcg5HUE4NFFeCxtZlvGULyABBFOdMF7
+Rb4f3UH2+EeSs1fkmFotMgPkNbQhdvWb6IafvGUmGFa4jSJEioidIB/hWilPCcK9
+qY7gmzpFRyKNsDvUinjth/Lgnbuy8lqlvyEUEC/PfbJTUlsfZn09A/1RLNCXvC0M
+2zytswz19m5Bezza+6sDsK57Unz7u7HM2GBlHnu5ASRasZagWO0fsdCvZG7lgiNO
+tL/CgItilCxPP+pk6xFvP0BNgsb69sU9nollM83RnWvosaMkLge6fDe9PsZpET+z
+goBVUXTQiLH0B20WAKVzGnJSu82zZxTr/WhC+FWpZX68w+ZQVTjIt3ywm4vs38Gz
+DrZYqXpokzPh/2GCDChxIWDK574S0lOF5OXeRuxn5fyPWIm9tzVzb/iRUbw8ro94
+WclMSn99Esa19aea5mjcbB3sgIV5EeZ1p6jJ+DyK7on3UV1Ajlg1QEYhYA6DOv08
+o2Z65GAG/clFxszeG+d/
+=Wv7B
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
index d451d7b49962..80ce6ae70b1b 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild,v 1.1 2012/02/24 17:20:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild,v 1.2 2012/02/27 20:54:27 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -141,7 +141,7 @@ src_install() {
 	# /usr/lib/, and install linker scripts to /usr/lib/.
 	gen_usr_ldscript -a e2p ext2fs
 	# configure doesn't have an option to disable static libs :/
-	find "${D}" -name '*.a' -delete
+	use static-libs || find "${D}" -name '*.a' -delete
 
 	if use elibc_FreeBSD ; then
 		# Install helpers for us
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
index 9b1e717f9d4d..c8f8af9fd509 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.5 2012/02/22 18:40:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.6 2012/02/27 20:54:27 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -137,7 +137,7 @@ src_install() {
 	# /usr/lib/, and install linker scripts to /usr/lib/.
 	gen_usr_ldscript -a e2p ext2fs
 	# configure doesn't have an option to disable static libs :/
-	find "${D}" -name '*.a' -delete
+	use static-libs || find "${D}" -name '*.a' -delete
 
 	if use elibc_FreeBSD ; then
 		# Install helpers for us