Revbump, USE=static-libs (bug 447376, thanks ago), fix multilib test (bug 467808, thanks Alphat-PC). Drop old.

Package-Manager: portage-2.2.0_alpha183/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 54 insertions, 95 deletions

diff --git a/dev-libs/yajl/ChangeLog b/dev-libs/yajl/ChangeLog
index d990644a22c3..dc09a8e31a88 100644
--- a/dev-libs/yajl/ChangeLog
+++ b/dev-libs/yajl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/yajl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.35 2013/04/25 19:38:48 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.36 2013/06/23 22:19:25 xmw Exp $
+
+*yajl-2.0.4-r2 (23 Jun 2013)
+
+  23 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/yajl-2.0.4-remove_static_lib.patch, +yajl-2.0.4-r2.ebuild,
+  -yajl-1.0.11-r1.ebuild, -yajl-2.0.2.ebuild, -yajl-2.0.4.ebuild:
+  Revbump, USE=static-libs (bug 447376, thanks ago), fix multilib test (bug
+  467808, thanks Alphat-PC). Drop old.
 
 *yajl-2.0.4-r1 (25 Apr 2013)
 
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 9ea89a345adc..c07ca7391e3c 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX yajl-2.0.4-remove_static_lib.patch 1056 SHA256 85cd99af74c3a06fae47325b94ca3115ea3328e57a65f8bd936685687b3e516b SHA512 0473a362cd4e434614c210e72d17d8109ba1f656239093531cfde66122594db55827545b6be11f1515cc26c3b116b959cdc2646389e0849aff9d9378dd3e1a80 WHIRLPOOL 5a1a293ea1003f0ad2cff7f0bd0e17698e1723d2f5454fffaab2b7f490e045057fef3d065ca672423834fcbc754273ce6f547dbccccc5a6b6195c7b41e44d367
 AUX yajl-fix_static_linking.patch 1019 SHA256 0a32becf97f2ac4cf14f977dfe0301411583cbb74570a7682632a2e11af99f72 SHA512 14e2708d979b59dd5764757f26ad4008a6229fa571c8b40e1fb2b5a4a6a68c5308d97aa78e1e06b274672cbbf6d07195d2d8291d78452c61738585af8142e32b WHIRLPOOL a3bebd09d5b1257d29008f0b30f43d9093a3194f08d9ca32cb290e530e70504dc43afbde91529e7dee97f1d7877ee57c966274acbf05fa9c2498899c86e7a27b
 AUX yajl-fix_tests.patch 696 SHA256 90a5239c9fc5424ca2837c4d7c1cf83e6d7de589daef80f2431fe35758045429 SHA512 13234c6aa089e09083e15c5be9d2f854a3449373e90c452bd8d39308def000aeabb0e844c345ec4871ec39b1b7f96e962d623ce425bec3354614f10c63d0f6ff WHIRLPOOL 5bbd5b303ebf1f5447cabcee2f7ee07aa4a091d837f542d5fcd2929d47d9239c4fc17fe64553a98ac773c406a32ab0401f11b21a7028f07e715bb0cc8c8f504f
 DIST yajl-1.0.11.tar.gz 53705 SHA256 1e98e03b927a8ec466baea527647f5e243f56f71bdec48cdab1c875f0f8b96a9 SHA512 6ab0e5052da45be327f1987818037b89b37b382c095a9e64043422425759c4819e46eb6c43919677b6020d10c042d077655ad50809d13733f781bee7db8babf0 WHIRLPOOL 28cf0723b65cbdea8d177d4326322fe24d335fc9ff84482b363f797e622ca9f683b1d21c50e1cb8289ac4895906da833e6229a903431c04691c5fd50aa926f57
-DIST yajl-2.0.2.tar.gz 82210 SHA256 4917049b7700e289d38e0ac82f63b7182a5dfc6cf21c5eb9a26d70b6d2e7b68b SHA512 40907b01bde8926d787eee8d7aabf46936e1baeb18a1e712378cf96381404425fbd1d1db2fe083f3e202fda743192e5559fa25d7b241c812b6f6caf4fc9dc835 WHIRLPOOL 4be1122b7f51d1c84a815c2fbdc1c6f392ac2ad98ba3ed8548e47a95724cd87725e878da7adf834e1a635c28f66e4417916ec2efab36f92b88a524010d99b7cb
 DIST yajl-2.0.3.tar.gz 82544 SHA256 606ee384f288b6ad4f17c9c57b8868f8db525d542790fd1071139c9636e71952 SHA512 cef6e895ad169aac9e729f8bde006367d39456c6c1a62e1984d097f2f237cc5e317ddfef4d90c36242f772c867cee220082313f6d324a57e58a56d3e51ae0f85 WHIRLPOOL e9f3b37358d904f3e0aadad256fa7829b97170af5f9c3c3605c54f216cd1ac7958a281eb39f7e5cf5a0af2dce6120f900c3489ac50eeaef154b7ee4c50dd2d8b
 DIST yajl-2.0.4.tar.gz 82814 SHA256 c19b9691cf15f22e74d903cd06ac9ba5e1e216e6a1b82bfe787c3b48a25bc118 SHA512 ab99fdd6b7e6f7add5530fff2d3ac6171ed3698267016d6cd23449742d36c9d848f065ba920dc2abb934488239e11e4ceda571c05fa472ab5d3f0480e9033a13 WHIRLPOOL ed821d07f5c06e4722d9de9648d4929fe6a5bcc13d2bd3bb6bcddce60a9817612d59f14963cc46b43b002345fc56813230194d997098de77f4d9075cf64dd85b
-EBUILD yajl-1.0.11-r1.ebuild 695 SHA256 9402bad3d4a2a60a6bb4ba806d53f223c74e8b803e1f4582cb6efb2509a742a6 SHA512 f47afc3bfae96d2a0d4c1cd8492a9eae83b86ce85dc6ab565c1915c7a2fb267b3eb9c3a5a44f4b24fabc03b68e3e6cf28813eaee4a6944265173ffb95f9a3798 WHIRLPOOL 54440b3d549d1bf2b3a8a0494f95bd85c47ba0152829f361e910bfb52d69dae4897afe2df928ba951bf7490a10139b392afb5f1eae0190f31b84b9fd181e7790
 EBUILD yajl-1.0.11.ebuild 647 SHA256 fa17720bf216f7c3e330f707907152ecb13b85bfb8f83332ff09e1dddbd7c985 SHA512 0ea2f92eae9e94542e3d0975061c95a4c8863131118d982270413d5ea75a94d40118cef1fa7ff2bd68296eebff838f168be149581da6287f3569c1366513eb7b WHIRLPOOL d305d75bf513bb4d7ee4d6f38d24e5816569966eaf37a0d0b47fef2603d8ffb7aab53dd7a34c9c2abd9428edd0bb7a8831e9562573fa9812d4f899f49ddf7cb3
-EBUILD yajl-2.0.2.ebuild 831 SHA256 7dbf88c1816e1b89c5a2d8463cc84dd7bb2f9c78ed697f67d01e8d01b38f7d27 SHA512 db211a1ae383635b533d0099d6e3cca0cad473a78beff531ba22bafbd3319784a48c7ba46396b606302a69206403a258a37f3d19e9f65fac30e14bc476b3ddb2 WHIRLPOOL a7a0454faebf7fee8613c11f35fc4bf664e1e90bad6955defd4a31ca913c90e79c897653e792c070fad6f0158de02431f786eefc2dfcc1630941e611cb2cd79b
 EBUILD yajl-2.0.3.ebuild 850 SHA256 6aea8216158656515441be45691ea09341f6435006a83ad45a11ab2e6f89a9ac SHA512 8f3476212aef836f03e4c0d20f4391f71d5d110dab2182462820292fdb879f487ef8b3d284b964d8669a3e730536e658f50c3b3289a4fa3da24b0098a5ef5e1d WHIRLPOOL cc181ceb1d237d983b80c002225004f40664fb94236c849343c4b22223a3275216afb85eeedb325b99d005c4310cbef1d0bcfb08711e3398ba4f7e790c61e1cb
 EBUILD yajl-2.0.4-r1.ebuild 830 SHA256 eb1ee93825dc6be03394c61af637fd62fc1f45938a4d3e7ec5652724102888e8 SHA512 3f6459c5f357c840fbf6c5c58eb6c388161b932be1ac408791ee379e45afdcb69a78d17577052d475f841ae39de6fad6a647339d4e3dbcdf8386be514017eb7d WHIRLPOOL 784fcf9793027462ddbc2d17133ea6fc31c8e57b944a39cf94c700877c6c83dacdf3bdfdead7b3871593e5e6923b565212ac86398fac4b18ce73338c20f1e27e
-EBUILD yajl-2.0.4.ebuild 870 SHA256 37a3a6a5e436147794da445de013da3a33455d1007b4d994ace7e75c467df146 SHA512 23825392529af72d37d4dd0eaf121a0526c658d9c9032e57673b1bd25d384b20d1a21bf8be0844e27dc89f6f2a638d4612e15f2933f2613edd779c7952a666fd WHIRLPOOL df06d5daf8ca79ef14dd75055eda805d38c193e1032fd8f9bc79efe6034df60c0846284aea3528926a88b2d3d575968e5789a74bbd5da2dc5f610d84cca06d85
-MISC ChangeLog 5048 SHA256 72bddb67f8cd10e2b869889a9b6029d760ae92fa1305cab745cd0e5a93e9dfcf SHA512 20e864104733b8a1b4c0d0157aedb57363a3f92d354b9f8a6c9b594020138ac0f1f1d184e0d63b77e5e342859d2d29beaeecc4e5224fe561cd7efa7ae8da8ec1 WHIRLPOOL 24ef54134cb677b51a24c7608793cc0faeda7ee4d753fef39afdab1f18897bf22da6ab4c9408570a3722e2f20daef3c6f5aadb3741d696e921cb85050870e493
+EBUILD yajl-2.0.4-r2.ebuild 901 SHA256 064121de939fbee033f170ad724df65f50a425514f129d850fb68405605e826a SHA512 3ef942975f51bf72ba3b1a9dc390063efdd20d1d4d144fa44d69d0bbb820d514eb5a7907f9dd0388570c6e7253c5c36133103fc7686ae65f0dc30b0179b158ca WHIRLPOOL c4da6fc4f2d3387943bfd3a0b420b923a1bbd7a9d07b83b6d3c49e99698b9cbbc27292c04e9ee0a70c42ebb671e4acdcfb1c98e91a895e2202f1962cf7720f44
+MISC ChangeLog 5374 SHA256 b02c1e6b0fec98c6fb14a9e6be1d8a3b99a95447558521b0b4a0457ee1db2198 SHA512 74351d969a824e1ed9b2afb65335ba8f91024b1bd06968a0a432d65e2a8bce6092a12f9c5871547855cd184ce4fde1c4f432150f7acfb77d47ec5dd54c6254fa WHIRLPOOL 73cb2d4b05318763c124a318d4b67f1307b4c3608b397320802c800f61070f3d4bd7d172b93780f2f9d02054ee3fd5b74bb569f65149bcf2da3e37af49433e40
 MISC metadata.xml 243 SHA256 c6a73a4f1467a2fb881fe3bf391e72dc518cfa52863fc71f9e4d2c8fb9923e5d SHA512 e4c766d1ba677f2aa37e86ac1016cf3bf36a4aabb432594f103bf57ca36b2db273be18ec09d38982251452d748512ca00ea652a6335e2f2ac775b5a7d5a5eac7 WHIRLPOOL c5dd222916a26d80b068f132d9358e65abac7585c3ecce0f9c4de0f795dee831be73b6c9a2d8d62313b3c9454d557f88a2881575db58d65d165cea550960786b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlF5hlgACgkQknrdDGLu8JCd6wD/Y9Qt7nYT5RKkmyqk4OQHp++j
-vnlyHlL1bu0C37e1PvgA/3ZJT538R746hxFDLeFCZ6VmyDZ0vH858FJkr6ictjhN
-=9BGO
+iF4EAREIAAYFAlHHdHAACgkQknrdDGLu8JBRSQEAm2nbKbFC4Aq2ja/d2CG9XBd5
+wD7sKte2c+i4E5I4sdQA/0Lxwvw+FJYN5yniI62V/63fRLBCldpoZUR//H9Ae6hk
+=pfzC
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch b/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch
new file mode 100644
index 000000000000..4309e5a2ee40
--- /dev/null
+++ b/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch
@@ -0,0 +1,28 @@
+--- yajl-2.0.4/src/CMakeLists.txt
++++ yajl-2.0.4/src/CMakeLists.txt
+@@ -35,8 +35,6 @@
+ # set the output path for libraries
+ SET(LIBRARY_OUTPUT_PATH ${libDir})
+ 
+-ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS})
+-
+ ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS})
+ 
+ #### setup shared library version number
+@@ -69,8 +67,6 @@
+ 
+   EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir})
+ 
+-  ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD
+-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir})
+ ENDFOREACH (header ${PUB_HDRS})
+ 
+ INCLUDE_DIRECTORIES(${incDir}/..)
+@@ -79,7 +75,6 @@
+   # at build time you may specify the cmake variable LIB_SUFFIX to handle
+   # 64-bit systems which use 'lib64'
+   INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX})
+-  INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
+   INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
+   INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
+   INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
diff --git a/dev-libs/yajl/yajl-1.0.11-r1.ebuild b/dev-libs/yajl/yajl-1.0.11-r1.ebuild
deleted file mode 100644
index cf53b7068311..000000000000
--- a/dev-libs/yajl/yajl-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-1.0.11-r1.ebuild,v 1.1 2011/02/11 18:41:01 scarabeus Exp $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="Small event-driven (SAX-style) JSON parser"
-HOMEPAGE="http://lloyd.github.com/yajl/"
-SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-src_prepare() {
-	cd "${WORKDIR}"/lloyd-${PN}-*
-	S=$(pwd)
-
-	epatch "${FILESDIR}"/${PN}-fix_static_linking.patch
-}
-
-src_test() {
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	emake test
-	popd > /dev/null
-}
diff --git a/dev-libs/yajl/yajl-2.0.2.ebuild b/dev-libs/yajl/yajl-2.0.2.ebuild
deleted file mode 100644
index 7a66ee9eae07..000000000000
--- a/dev-libs/yajl/yajl-2.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.6 2011/10/23 12:03:00 scarabeus Exp $
-
-EAPI=4
-
-inherit base cmake-utils
-
-DESCRIPTION="Small event-driven (SAX-style) JSON parser"
-HOMEPAGE="http://lloyd.github.com/yajl/"
-SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix_static_linking.patch
-)
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}"/lloyd-${PN}-*
-	S=$(pwd)
-}
-
-src_test() {
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	emake test
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
-}
diff --git a/dev-libs/yajl/yajl-2.0.4.ebuild b/dev-libs/yajl/yajl-2.0.4-r2.ebuild
index 045feeded388..8e8db9a3bf4c 100644
--- a/dev-libs/yajl/yajl-2.0.4.ebuild
+++ b/dev-libs/yajl/yajl-2.0.4-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.4.ebuild,v 1.5 2013/01/06 09:28:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.4-r2.ebuild,v 1.1 2013/06/23 22:19:25 xmw Exp $
 
-EAPI=4
+EAPI=5
 
-inherit base cmake-utils
+inherit eutils cmake-multilib vcs-snapshot
 
 DESCRIPTION="Small event-driven (SAX-style) JSON parser"
 HOMEPAGE="http://lloyd.github.com/yajl/"
@@ -13,21 +13,15 @@ SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+IUSE="static-libs"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix_static_linking.patch
-)
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}"/lloyd-${PN}-* "${S}"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-fix_static_linking.patch
+	if ! use static-libs ; then
+		epatch "${FILESDIR}"/${P}-remove_static_lib.patch
+	fi
 }
 
 src_test() {
-	emake -C "${CMAKE_BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
+	multilib_foreach_abi run_in_build_dir emake test
 }