Make static libs optional

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

diff --git a/dev-libs/yajl/ChangeLog b/dev-libs/yajl/ChangeLog
index cb817e4e593218c2d75c36001f214ec283830dc7..84151f4fdaa1c2a852ea7daf56835eef59d8645e 100644 (file)
--- a/dev-libs/yajl/ChangeLog
+++ b/dev-libs/yajl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/yajl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.15 2011/10/18 16:51:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.16 2011/10/23 12:03:00 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> yajl-2.0.2.ebuild:
+  Make static libs optional
 
   18 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> yajl-1.0.11.ebuild:
   ppc/ppc64 stable wrt #382641

diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 82b36c919080fd85c8b61c806cf183437b5b8bbc..125f6647c67e3ddfdebaa18ff5b42e5846a5166b 100644 (file)
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -7,17 +7,23 @@ DIST yajl-1.0.11.tar.gz 53705 RMD160 a560894c9c7ad113e4551a77cdbae4e4ffd89b3d SH
 DIST yajl-2.0.2.tar.gz 82210 RMD160 413bb5454e89c053bab1c4bd50272cdf79bbf8e8 SHA1 6e2e5848b09046c42a10bb839dcb8742b1f2f2a2 SHA256 4917049b7700e289d38e0ac82f63b7182a5dfc6cf21c5eb9a26d70b6d2e7b68b
 EBUILD yajl-1.0.11-r1.ebuild 695 RMD160 9da427a81482657f423542516f64968b45b292a3 SHA1 949ce464af8ed36fd2187aba422e7962fb8688ce SHA256 9402bad3d4a2a60a6bb4ba806d53f223c74e8b803e1f4582cb6efb2509a742a6
 EBUILD yajl-1.0.11.ebuild 647 RMD160 f5deee4139eb193f274bd51d6f4c966b67ff893c SHA1 a4c20b5e534566f9198c9b6145e415e5fb198fc7 SHA256 fa17720bf216f7c3e330f707907152ecb13b85bfb8f83332ff09e1dddbd7c985
-EBUILD yajl-2.0.2.ebuild 711 RMD160 66451b106065b6d30dc5072d9b035803bfb3e8f9 SHA1 d1744346d65121fff72e1e6fa057492a37846027 SHA256 52e001c4e16f5469664021fbaae248f7db0985dfc126fb8155c69cf9c00069ea
-MISC ChangeLog 2706 RMD160 8b889701318d7636050b887be3001cbb5e5b4496 SHA1 489ed630bc3130d928cfe6fd8573d08434d87cc6 SHA256 046f957eaeaeaaa42db1d938d7e5a168bee6ab8f4901bc29f276223cb2262fea
+EBUILD yajl-2.0.2.ebuild 831 RMD160 7a19c9376e80c9692d3171d7eff606d77e2ee4d2 SHA1 43bbec4017758cbc5696561e2941a818cb7aaac4 SHA256 7dbf88c1816e1b89c5a2d8463cc84dd7bb2f9c78ed697f67d01e8d01b38f7d27
+MISC ChangeLog 2809 RMD160 ffcf421ba2e8429830b3897b297a4c1a8b9c27e1 SHA1 5b9de6ad0b29be072fd399cb8d67e9828ea7fb89 SHA256 a0a9878e1e70f2a32e08b913fac936db0778f388f14f8762f936b262510dac0f
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOna58AAoJEEdUh39IaPFNt04H/iQ+lqMwVDWTOjJjgqTrSgBn
-+qyGzAWFrGl5SExWJV7lSs0dyt0ebRbzK10AwxYvXOWcmDkoqb6Wr5WDwtTqaWgy
-pZAsv3BPqe3bMNr9vi8i6nIqjJZSpOj/Nvo4UcIVg+SeZcf8Xkn4NtiJn7cM7RZu
-I7VHHnlM068rqlALGndQaPHtpwYJs8Pr1nvnGYbNzkHHB/iCY5tWmlTlPtq3Zl2k
-eiiPnoYYNtu88NExgnMd5i57b0HUG1pe/X7LUy9I9OMty8tZO4+r97IhwbfF6m+T
-qQi9vYxjlrLbKqjA86Mcev0ZXygamg0ZtNHS2nnYdAQts/yBtoTDeoAYxNN1WFM=
-=JNC1
+iQIcBAEBAgAGBQJOpAIlAAoJEOSiRoyO7jvoEs4QAI6w61QNVz8q67DZOIr+zTf1
+X5ZMbVV+XNOF7fpmWYLocFQXJzMNiXbIIpAz1ihe7gAk5fxChs+41VMMNUjb0mIK
+G8tUSpqTaF0LErJmIVWAgYAuUX4mgEN6WpkvFmPyx2pX7k+divRDbd37l21vkVei
+4pUVEDJZ57T7LvPZ8TgfvQ8++JvFBAs1+ErF1HCcRaJULnpEDTe8NpUynaWcp65+
+8DMjbNjlQikpVjuWFMjh4nZ1ZeXhHqu8EKVXprCYtm9lzwASzcNhbLLGoyT63idA
+jrPcFA0EmmCwX5rO+yWFKkCTo4aq1egcUkeCMTi/w958rb53GvtW/iHR9GEcSx79
+c4ETslOdKv9OYQVR6Y3R/VBN3zZoX0hdPi2iADVXjMSrUt6wmRtFxnF1dt6Rxux6
+N46McmIXCTAkm0lljGElCe2lgX4+mrNnrN0pKv4amPqHd5xo1LZARSxpbQGYxrUJ
+7aXEHvMr4gnpV0l0DKcSblrqetDeVmJRVbnz7B7hGTf53P5SL/gs+yc5XY+7mJ7M
+d1LxbK9BfzwCIB483Z7K7TlFtpz9zar05xHetIGAuGzQMl7ItEoWmXreAt2ziLt2
++90guPSEmQHcfXF2e+Duq2sQ2W/tYf5TVyxkC3U14Ini3RrdT9D6QT+nJ6vB9lg8
+vuX37rjImQKBLJSTdG4u
+=+qfi
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/yajl/yajl-2.0.2.ebuild b/dev-libs/yajl/yajl-2.0.2.ebuild
index 0fcaa71e7e2b96476fbb4c691e52e32b2e0aa460..7a66ee9eae0774eb9951ad317d13eb8d8816fab3 100644 (file)
--- a/dev-libs/yajl/yajl-2.0.2.ebuild
+++ b/dev-libs/yajl/yajl-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.2.ebuild,v 1.5 2011/10/17 20:19:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.2.ebuild,v 1.6 2011/10/23 12:03:00 scarabeus Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 
-IUSE=""
+IUSE="static-libs"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-fix_static_linking.patch
@@ -32,3 +32,8 @@ src_test() {
        emake test
        popd > /dev/null
 }
+
+src_install() {
+       cmake-utils_src_install
+       use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
+}