fix USE=-static-libs (patch did not work, just remove .a after build/install, bug 474814 by patrick), fix src_test.

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

4 files changed, 26 insertions, 40 deletions

diff --git a/dev-libs/yajl/ChangeLog b/dev-libs/yajl/ChangeLog
index dc09a8e31a88..82a8505b985e 100644
--- a/dev-libs/yajl/ChangeLog
+++ b/dev-libs/yajl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2013/06/23 22:19:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.37 2013/06/26 10:28:11 xmw Exp $
+
+  26 Jun 2013; Michael Weber <xmw@gentoo.org>
+  -files/yajl-2.0.4-remove_static_lib.patch, yajl-2.0.4-r2.ebuild:
+  fix USE=-static-libs (patch did not work, just remove .a after build/install,
+  bug 474814 by patrick), fix src_test.
 
 *yajl-2.0.4-r2 (23 Jun 2013)
 
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index c07ca7391e3c..1c3559f27d76 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,7 +1,6 @@
 -----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
@@ -10,13 +9,13 @@ DIST yajl-2.0.4.tar.gz 82814 SHA256 c19b9691cf15f22e74d903cd06ac9ba5e1e216e6a1b8
 EBUILD yajl-1.0.11.ebuild 647 SHA256 fa17720bf216f7c3e330f707907152ecb13b85bfb8f83332ff09e1dddbd7c985 SHA512 0ea2f92eae9e94542e3d0975061c95a4c8863131118d982270413d5ea75a94d40118cef1fa7ff2bd68296eebff838f168be149581da6287f3569c1366513eb7b WHIRLPOOL d305d75bf513bb4d7ee4d6f38d24e5816569966eaf37a0d0b47fef2603d8ffb7aab53dd7a34c9c2abd9428edd0bb7a8831e9562573fa9812d4f899f49ddf7cb3
 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-r2.ebuild 901 SHA256 064121de939fbee033f170ad724df65f50a425514f129d850fb68405605e826a SHA512 3ef942975f51bf72ba3b1a9dc390063efdd20d1d4d144fa44d69d0bbb820d514eb5a7907f9dd0388570c6e7253c5c36133103fc7686ae65f0dc30b0179b158ca WHIRLPOOL c4da6fc4f2d3387943bfd3a0b420b923a1bbd7a9d07b83b6d3c49e99698b9cbbc27292c04e9ee0a70c42ebb671e4acdcfb1c98e91a895e2202f1962cf7720f44
-MISC ChangeLog 5374 SHA256 b02c1e6b0fec98c6fb14a9e6be1d8a3b99a95447558521b0b4a0457ee1db2198 SHA512 74351d969a824e1ed9b2afb65335ba8f91024b1bd06968a0a432d65e2a8bce6092a12f9c5871547855cd184ce4fde1c4f432150f7acfb77d47ec5dd54c6254fa WHIRLPOOL 73cb2d4b05318763c124a318d4b67f1307b4c3608b397320802c800f61070f3d4bd7d172b93780f2f9d02054ee3fd5b74bb569f65149bcf2da3e37af49433e40
+EBUILD yajl-2.0.4-r2.ebuild 1018 SHA256 71d8264d7c4b857df0f042f31911d39edae5221a1be314f765427a69ce670afa SHA512 c55bea6b737fd89729aa938ab4c8f44a41e7e8549e1e848d5e0e872c8e1e5bbe78d50109323a49de6dd7f07cc5ae3f2701d9b2563047e97849e2b240b0516427 WHIRLPOOL 16cab42cd1b42ebd959fc6feef50cfaf190ef8598119317f31b8a2317e083cd1e55d84cfd313239ef0862cc0c7cc4f824679eca2a2328dc7b54269f3f6cfb87e
+MISC ChangeLog 5608 SHA256 f2b04fe88816d6d39a03895c1d348bf66c472a46ca80c925890085de5166c463 SHA512 265bdd1ad3b19e1b343b90e42bddd5391abc47c55c8689d57a7b602966f4bea1697611fe66e95c03dc26f560d4e3affed479dd8977871301147ec363a9672ce8 WHIRLPOOL b0e03f2798cb337457d9873c2ee93f4edafe6de6fad3709a2716d9538a7ba797996c9057d7777427839bf742798485a5eb27e423fa3fef360d994ecc44f4c85c
 MISC metadata.xml 243 SHA256 c6a73a4f1467a2fb881fe3bf391e72dc518cfa52863fc71f9e4d2c8fb9923e5d SHA512 e4c766d1ba677f2aa37e86ac1016cf3bf36a4aabb432594f103bf57ca36b2db273be18ec09d38982251452d748512ca00ea652a6335e2f2ac775b5a7d5a5eac7 WHIRLPOOL c5dd222916a26d80b068f132d9358e65abac7585c3ecce0f9c4de0f795dee831be73b6c9a2d8d62313b3c9454d557f88a2881575db58d65d165cea550960786b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHHdHAACgkQknrdDGLu8JBRSQEAm2nbKbFC4Aq2ja/d2CG9XBd5
-wD7sKte2c+i4E5I4sdQA/0Lxwvw+FJYN5yniI62V/63fRLBCldpoZUR//H9Ae6hk
-=pfzC
+iF4EAREIAAYFAlHKwjYACgkQknrdDGLu8JCPJwD/fW/Fpfj/jV87QqhKeCGt+62D
+WHrmc2pdS2SJXHcx5bcA/RUfLtJbgMqG1CCQgdoShSQkXI4UKeSMUkqovrKkcvMI
+=TCbB
 -----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
deleted file mode 100644
index 4309e5a2ee40..000000000000
--- a/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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-2.0.4-r2.ebuild b/dev-libs/yajl/yajl-2.0.4-r2.ebuild
index 8e8db9a3bf4c..52d163f0f3af 100644
--- a/dev-libs/yajl/yajl-2.0.4-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2013/06/23 22:19:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.4-r2.ebuild,v 1.2 2013/06/26 10:28:11 xmw Exp $
 
 EAPI=5
 
@@ -17,11 +17,21 @@ IUSE="static-libs"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-fix_static_linking.patch
-	if ! use static-libs ; then
-		epatch "${FILESDIR}"/${P}-remove_static_lib.patch
-	fi
+
+	multilib_copy_sources
 }
 
 src_test() {
-	multilib_foreach_abi run_in_build_dir emake test
+	run_test() {
+		cd "${BUILD_DIR}"/test
+		./run_tests.sh ./yajl_test || die
+	}
+	multilib_parallel_foreach_abi run_test
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	use static-libs || \
+		find "${D}" -name libyajl_s.a -delete
 }