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

(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 21 insertions, 34 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/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
 }