If we build static libraries, we should also install them.

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

3 files changed, 16 insertions, 21 deletions

diff --git a/dev-libs/yajl/ChangeLog b/dev-libs/yajl/ChangeLog
index c794c051d713..94f6343c0656 100644
--- a/dev-libs/yajl/ChangeLog
+++ b/dev-libs/yajl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/yajl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.19 2012/03/07 14:12:53 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.20 2012/03/12 19:22:20 ssuominen Exp $
+
+  12 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> yajl-2.0.3.ebuild:
+  If we build static libraries, we should also install them.
 
   07 Mar 2012; Naohiro Aota <naota@gentoo.org> yajl-2.0.3.ebuild:
   Add ~x86-fbsd.
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index f47c19e1f08b..1e0145b747fe 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX yajl-fix_static_linking.patch 1019 RMD160 8331b22773b5df1902b18195556e86a3345528ad SHA1 0311dde1b6ceb47825d19e201bd5fbddbb76f9b3 SHA256 0a32becf97f2ac4cf14f977dfe0301411583cbb74570a7682632a2e11af99f72
 AUX yajl-fix_tests.patch 696 RMD160 924578fd3beba63e90e64fac0599a98928add5dc SHA1 a6ca752e0a8a09faddc73e6f8a8b47dd8f5ec279 SHA256 90a5239c9fc5424ca2837c4d7c1cf83e6d7de589daef80f2431fe35758045429
@@ -9,23 +9,17 @@ DIST yajl-2.0.3.tar.gz 82544 RMD160 5786251eb1c9efd0d16392b06935973bc684755c SHA
 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 831 RMD160 7a19c9376e80c9692d3171d7eff606d77e2ee4d2 SHA1 43bbec4017758cbc5696561e2941a818cb7aaac4 SHA256 7dbf88c1816e1b89c5a2d8463cc84dd7bb2f9c78ed697f67d01e8d01b38f7d27
-EBUILD yajl-2.0.3.ebuild 914 RMD160 57bfc1ce738caa2cb2f52403d6af810503ae1326 SHA1 2269c280f1a1442af047367b7d75809d46eb4206 SHA256 fc69ad52cc463a56688d64af3126d0abf42b9ee9eb3a8a2021cfbcff71bf2d03
-MISC ChangeLog 3265 RMD160 5ec6d0c2bc450c9d2b1b1adb3960c97093029202 SHA1 71b14a00c13a106f206861195f14d95b09fa9a98 SHA256 11d93e04ad572cb3d193fac12c87ed2560bfa0e4d5faeb1534c51bc44900170e
+EBUILD yajl-2.0.3.ebuild 844 RMD160 3683012a0da08b9000d50f1bdfa84f2d79e5514f SHA1 88c7e743059f62a6bfd30047cb7fbc242ff452c7 SHA256 b215b38c2f611afb328ccbd6d196913485d9cf2481196417c1881658cbea500c
+MISC ChangeLog 3404 RMD160 e8ec765e6668d4fcad4226a5cf320ae2a9d79a42 SHA1 3ee2568559d46bd6f47f1445435a4a2519cb6b52 SHA256 5ba9cef649b6818dfc7c7b29c525234f0c0014960eca028752ca386e99104be7
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPV2zdAAoJEDYO1FT4VRUUoDYP/2qW7raXocN3yaAGWZiGhYi8
-5DkVvcGzMGpMoigJfUmFvxnxRZ9jhCV7+nbumFZeNdQS39YW23Pao7xUH4sEIPGe
-vqjcky/sr8KhrO/5s1EdX0pQbOp5ancRDdwqhz70dfDOpY0hLWZePY5A+h7d/4KA
-oT7n0gbicXTpw94MZxfO+8HtsSzG89a7dqNeSMOgFOw0tOnqm6/ix56O+5HrX05w
-wCztHGsKJD5EiNikgrZBuD30MlJHBdJtt/arzpQmo9uam/OXgdrL46yllSZco/hK
-7aAR4qB9iC9RVIQMJdUcHK8E9A0SNrfh3B7nQndCDa/8Pqw5yVAaW5sTeli5wO2n
-VYN9TqM0Jhn1PfdOAmxxirnRpku1hrnCT3HQsAl4tXm8mFVA7ydM3rtpeJnNjNCQ
-QJtioa++MFGuy8vYbm6K/SJfV/QC5A69OQjUJgYUIAaYNz1UTokg8tsmIXLsHYPe
-ydnSZuOCbNKMsidXwBCcekZKO9zd21VHOEjnlyGUBE5aE3mLRdGDT0rb1y8D7jhL
-qpt+ADmVU+wgxX0V9Xib/Vhk0efeleXHigzI6d3WXPfqd4tb972KYsqJrHSnHwGy
-Q3/q0PQ3hDZZkBaezEyF/+EH36HsECxi17oX+ZepaTITEOilujAuY41F93PAUzGb
-Iy4D/v0HH1z64cKJYjHJ
-=wv/A
+iQEcBAEBAgAGBQJPXkvpAAoJEEdUh39IaPFNMd0H/2uOPuQEkL78hporgxxHviVm
+p3icWAOO3+oDXTNzSKA6ZCFN8KjRUh5OJ5Jil46XkPzC/Ucjp/S/gQ2TwdYn5a4t
+rwm1MwhBkkP7Ec5jTpfIOe2cTta/emF5Dld2mYFufXaL4FCe0HpoySaUg0MZ9eHN
+SBaaKpxlxUD/Iwn9cWrjy4oKs0dqKcTSBQ3tViijz7CkbiWCRhtUrSMTpN/FV+a+
+yw653jDLc3HUw9IIatvbQOYgupA+mqhJol5MCTQpD8JVqxe7uxVuyJzagpJE/h80
+HeSasT61+ltp5wDlJHPkyohlF+GYq1vSW1xGGnkYPBtzIIGrjkLxkdQVliYkd/E=
+=GIkw
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/yajl/yajl-2.0.3.ebuild b/dev-libs/yajl/yajl-2.0.3.ebuild
index f720a508282f..82747bac2f47 100644
--- a/dev-libs/yajl/yajl-2.0.3.ebuild
+++ b/dev-libs/yajl/yajl-2.0.3.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/dev-libs/yajl/yajl-2.0.3.ebuild,v 1.3 2012/03/07 14:12:53 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.3.ebuild,v 1.4 2012/03/12 19:22:20 ssuominen Exp $
 
 EAPI=4
 
@@ -13,8 +13,7 @@ SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="static-libs"
+IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-fix_static_linking.patch
@@ -31,5 +30,4 @@ src_test() {
 
 src_install() {
 	cmake-utils_src_install
-	use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
 }