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-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index 9190c6196815..c8a122be80fb 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.78 2012/02/24 17:19:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.79 2012/02/27 20:53:19 vapier Exp $
+
+  27 Feb 2012; Mike Frysinger <vapier@gentoo.org> e2fsprogs-libs-1.42.ebuild,
+  e2fsprogs-libs-1.42.1.ebuild:
+  Fix thinko in USE=static-libs handling #406079 by Andrew John Hughes.
 
 *e2fsprogs-libs-1.42.1 (24 Feb 2012)
 
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 093a3e29061a..ee8192117eda 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -9,24 +9,24 @@ DIST e2fsprogs-libs-1.42.tar.gz 512745 RMD160 425306efda913b39e2eabb3165808562d3
 EBUILD e2fsprogs-libs-1.41.12.ebuild 1410 RMD160 3127b24da1eaf5b0d4cdcc4e5f76bd8d0df55949 SHA1 65666bbbc045055a2761b8378679e7e44f71a66e SHA256 a49dae7b107f283a2ca86c5ef1c128ef58112df9fd72189f0cb93cf161f7fe48
 EBUILD e2fsprogs-libs-1.41.14.ebuild 1410 RMD160 28006a449062c4211d9dc0d7c7f866cda6b96811 SHA1 a766db989df12701cf87b1911153403d56b610aa SHA256 de464694178f7384f954d415297a12363d42fbda511a3a70023feb3c6b70b004
 EBUILD e2fsprogs-libs-1.41.7.ebuild 1367 RMD160 919be438bd5bb058a9c2e92126bfea159a79083c SHA1 b7b1ee88ebdb32220d590a2eafc0459630468bf3 SHA256 3597db10756cc4c74e2674f2be773c907f6afbe86aed96221dad9f3ebfde937a
-EBUILD e2fsprogs-libs-1.42.1.ebuild 1674 RMD160 47d9aa9f14a7f2a97c448f7040cdddd8c326726f SHA1 fec18fe916e4b27f907c35d15b54d12796819274 SHA256 e1ac10b87dae4d491a8621fbb6ec482c3c6245f1654b327aae9d6d3e523a8247
-EBUILD e2fsprogs-libs-1.42.ebuild 1668 RMD160 7b439778d72b92ad0f301f0545689f447964011f SHA1 64f49c4926752b67da915aad589422c6a41dbaf9 SHA256 d342344362f7d603950b47a17d9b41fb2d76ad8d77ec814aa40ff28c98ff9a3a
-MISC ChangeLog 11035 RMD160 9f9cb5da7ea80bf047c85e7c39d4429fafc676b9 SHA1 4af79b8328fa6e1fd29aa2ed8fc82d8d0d2cc831 SHA256 3b82a6c938b4aaab1ec35fbef7ce0bf2ac8ca233f2b4a394ca2fddb9c927b6e2
+EBUILD e2fsprogs-libs-1.42.1.ebuild 1693 RMD160 5db55a19f6eb06c3d7da28d8376b1fdd74c5eab2 SHA1 dcbb47ca821932766b181659e12eab454712de54 SHA256 6cf623ca5db4b6e9e13236abee56b3c14c910473df1cb2fcada3b5dda32779a3
+EBUILD e2fsprogs-libs-1.42.ebuild 1687 RMD160 7ab787400573821dd397fb65ca21d420f9aeed27 SHA1 d5872fcceb6f83de71e4266b1df00b8c4b577eea SHA256 79ab303496889840637c3436231030383a9871fb2cd8d8ea612c0176805c8630
+MISC ChangeLog 11218 RMD160 31fb5af35024d7a982855b177148b89630d2c5df SHA1 1e7776924deb30e21ae169be8c27241bf1672178 SHA256 7bba9427f425ac41d6521a2d23e013993e5f5f81805f8ef322b546c08217f87e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPR8a4AAoJELEHsLL7fEFWmUwP/1vtZl3q49lWSCije9s7CU85
-igFN6RGMe2Vy/iuuYfXSTSzRgHnQ0WVP8OwxIp6rhrkKGiG0tEbkOULBP/z2P7xX
-wfzEMLuwY9R/MD9f7DzQIBCWREzK6uNxA4/C0Y8VLASBwmGXMqHaR4MqJuMoRhpQ
-DcwjMSA9viiOYOpvLejGolMTMWfVf+3GQdV3XFRrX2y6sIB0FK0JzpavgB3fFBRS
-H1V73QMdUEEtsL0FmwBcfHqRrMangvT7imr4gvyT+Ri7kwDrIdoEn3ZT5q/ua8gR
-0HoBHRO8JX33IZmhA0h5L7TeLjyEx29ABL00IDzo3UPW+sSQ/S37hSAYXJ9+J53C
-JgSybMxOytpfSwNSa3tOn7o27bQgeFXiVWoBaCyPIJ59Pr/nJnz7TDAEUmrc8aTA
-kVPt8ESjD14Eg5664iQ1BHBroiuhkk0h2/ywg16intmM29C8jJAkrV1CJXtDDd/y
-5u850q+mts2cJkVTxGWE2VV7U0c5E2B6JnFT7Khd2biDmNjLtFxbc8eOokvVsT6r
-oB+7VX82GGrtcV66Hrg0wK0GXPYSMyZwFNA4Wg/Cprzt0AK97MuSs1AwJpZN4EHH
-dykO+MHFCsvip3l2//hn6n6IsJnMeZL/0tqNAcmQWZ0Aw5AN1S8BsAlIFjvufV3M
-Fs3AKuyOp6Gu2KD76YsL
-=kk44
+iQIcBAEBAgAGBQJPS+1HAAoJELEHsLL7fEFWQBgP/R5DzTaEkPi/KsAyf21+nHf7
+MZs+6B+A7EXLSQoTzVigsJhNrahpE7V11kKpphUHC3IdZ92uWjct1tzqG731/ybT
+Vij5tXBYjYyA6Ll5KsYyAtzd4rFSrVAziVuBjf5bgYkORde8eNodJ5igAkGvZH69
+zAanrLmyQ9QQQKXKoS9XlYO38VTVsRUVMz1XteB9fcgUOrnsvk2TMC95DGB68/l7
+RrBlYPYhImqfSVSgX5tu7G6NpzYX7R0qSYY7oJc5dvSv14y6OQswdj8lYmoYUBTp
+T9LksSS/qJjUBVXBpjrVAu+0XB4iwv0HKpK8qr3uiRI3/ZyomiYmkfRiz7Kl2acm
+CJZGpadg14gYIvtkqne4NJoe3o8GQC5wToILIChe9nxeLuRRrWlhF9M+BoLTs7Yt
+GILpNxWfrgARQTw1hNodvgZWa62fz0ZqT65i/Q737kdI7T3nvn21KyF+BW3m72lR
+bUa04MCZ8D7X+EpQu6s+I6pAQKhRQ5TT5HZA4BuiBRRlGYaOVL7x0LHxRaK0DBJz
+6wwrMg4vuV70PSRsC/prYGKjb7lZEn1ezS3v0CAusCQ/URztEcRCJFfG9WiRehXJ
+2TAMO6txIIuJRNDvX9SRASCsM8U4YxJSvaHhMunnx7Rtki4C6vGEgzDiaeAfq4zG
+S/Zd7WtL26iKG2V+3/Xu
+=ub3R
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild
index f1c9385738e0..4755a2c6ad54 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-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-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild,v 1.1 2012/02/24 17:19:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild,v 1.2 2012/02/27 20:53:19 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -58,5 +58,5 @@ src_install() {
 	emake STRIP=: DESTDIR="${D}" install || die
 	gen_usr_ldscript -a com_err ss
 	# configure doesn't have an option to disable static libs :/
-	find "${D}" -name '*.a' -delete
+	use static-libs || find "${D}" -name '*.a' -delete
 }
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
index 5c7082f8ac3a..8295d2b38f71 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-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-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.5 2012/02/22 18:40:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.6 2012/02/27 20:53:19 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -58,5 +58,5 @@ src_install() {
 	emake STRIP=: DESTDIR="${D}" install || die
 	gen_usr_ldscript -a com_err ss
 	# configure doesn't have an option to disable static libs :/
-	find "${D}" -name '*.a' -delete
+	use static-libs || find "${D}" -name '*.a' -delete
 }