Fix static linking and tests per Diego's request.

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

5 files changed, 68 insertions, 6 deletions

diff --git a/dev-libs/yajl/ChangeLog b/dev-libs/yajl/ChangeLog
index 4a00e7583793..75869d76c102 100644
--- a/dev-libs/yajl/ChangeLog
+++ b/dev-libs/yajl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2011/02/03 17:50:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.8 2011/02/11 18:41:01 scarabeus Exp $
+
+*yajl-1.0.11-r1 (11 Feb 2011)
+
+  11 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> yajl-1.0.11.ebuild,
+  +yajl-1.0.11-r1.ebuild, +files/yajl-fix_static_linking.patch:
+  Fix static linking and tests per Diego's request.
 
   03 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> yajl-1.0.11.ebuild:
   Added ~ppc/~ppc64 wrt #341149
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 5b1f169d3a84..41f1eebc75b1 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,5 +1,7 @@
+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
 DIST yajl-1.0.11.tar.gz 53705 RMD160 a560894c9c7ad113e4551a77cdbae4e4ffd89b3d SHA1 1ee2a5edc12d234c08d748cdfc13337ff1ab5237 SHA256 1e98e03b927a8ec466baea527647f5e243f56f71bdec48cdab1c875f0f8b96a9
-EBUILD yajl-1.0.11.ebuild 660 RMD160 1f0a5f068f3cd419f7772d8e8d3bb3da7cdca161 SHA1 f6f8b4785c68712f7e62f45c021ebd1f196f6561 SHA256 6aaeff2158084c304265107562b94d5c67106075dde019bb620e2e681fbcd553
-MISC ChangeLog 1671 RMD160 32af22108dbb21b91e76bd5eb5593bb6b5042b3a SHA1 884d761b919f88f7783d92c0fa0ea9a3e9f5d47c SHA256 60e616902834285e3bf27cafe78ea658bfe8312843714934a52df66a40700cb7
+EBUILD yajl-1.0.11-r1.ebuild 695 RMD160 9da427a81482657f423542516f64968b45b292a3 SHA1 949ce464af8ed36fd2187aba422e7962fb8688ce SHA256 9402bad3d4a2a60a6bb4ba806d53f223c74e8b803e1f4582cb6efb2509a742a6
+EBUILD yajl-1.0.11.ebuild 650 RMD160 469836dde3071b853a8c02a5a5fd2a7a949e6ce8 SHA1 86e93ccd3b68a15b027b6c5665e27dd25d192248 SHA256 0a16e38b331508e29e64dc852fd4f28ed9b705fb911e927bac8409fb8db1ab0f
+MISC ChangeLog 1893 RMD160 0ac5c4f51cff943cf98ec23c09c6a3b779fd7f60 SHA1 0b221dc9632b7f8e8d4dd5388841c0998261179f SHA256 186ef6ae2ee80661534b80ef2f0c7371e55b46d4fd51f0a5b67fda879a1c6117
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
diff --git a/dev-libs/yajl/files/yajl-fix_static_linking.patch b/dev-libs/yajl/files/yajl-fix_static_linking.patch
new file mode 100644
index 000000000000..56bf0e737319
--- /dev/null
+++ b/dev-libs/yajl/files/yajl-fix_static_linking.patch
@@ -0,0 +1,24 @@
+diff -urN lloyd-yajl-f4baae0.old//reformatter/CMakeLists.txt lloyd-yajl-f4baae0//reformatter/CMakeLists.txt
+--- lloyd-yajl-f4baae0.old//reformatter/CMakeLists.txt	2010-07-22 00:12:15.000000000 +0200
++++ lloyd-yajl-f4baae0//reformatter/CMakeLists.txt	2011-02-11 19:28:40.006756997 +0100
+@@ -42,7 +42,7 @@
+ 
+ ADD_EXECUTABLE(json_reformat ${SRCS})
+ 
+-TARGET_LINK_LIBRARIES(json_reformat yajl_s)
++TARGET_LINK_LIBRARIES(json_reformat yajl)
+ 
+ # copy the binary into the output directory
+ GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
+diff -urN lloyd-yajl-f4baae0.old//verify/CMakeLists.txt lloyd-yajl-f4baae0//verify/CMakeLists.txt
+--- lloyd-yajl-f4baae0.old//verify/CMakeLists.txt	2010-07-22 00:12:15.000000000 +0200
++++ lloyd-yajl-f4baae0//verify/CMakeLists.txt	2011-02-11 19:28:58.296756998 +0100
+@@ -42,7 +42,7 @@
+ 
+ ADD_EXECUTABLE(json_verify ${SRCS})
+ 
+-TARGET_LINK_LIBRARIES(json_verify yajl_s)
++TARGET_LINK_LIBRARIES(json_verify yajl)
+ 
+ # copy in the binary
+ GET_TARGET_PROPERTY(binPath json_verify LOCATION)
diff --git a/dev-libs/yajl/yajl-1.0.11-r1.ebuild b/dev-libs/yajl/yajl-1.0.11-r1.ebuild
new file mode 100644
index 000000000000..cf53b7068311
--- /dev/null
+++ b/dev-libs/yajl/yajl-1.0.11-r1.ebuild
@@ -0,0 +1,30 @@
+# 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-1.0.11.ebuild b/dev-libs/yajl/yajl-1.0.11.ebuild
index a2b1a2017bc2..7b0439cb7d00 100644
--- a/dev-libs/yajl/yajl-1.0.11.ebuild
+++ b/dev-libs/yajl/yajl-1.0.11.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.6 2011/02/03 17:50:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-1.0.11.ebuild,v 1.7 2011/02/11 18:41:01 scarabeus Exp $
 
-EAPI="2"
+EAPI=2
 
 inherit cmake-utils
 
@@ -26,5 +26,5 @@ src_prepare() {
 }
 
 src_test() {
-	emake test || die
+	emake test
 }