Initial import in main tree of yajl, needed for yajl-ruby which is in turn optionally used by the new Rails. Assigned to ruby herd for now. Thanks to the Sunrise people for the ebuild.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 99 insertions, 0 deletions

diff --git a/dev-libs/yajl/ChangeLog b/dev-libs/yajl/ChangeLog
new file mode 100644
index 000000000000..856ab961c5fd
--- /dev/null
+++ b/dev-libs/yajl/ChangeLog
@@ -0,0 +1,26 @@
+# ChangeLog for dev-libs/yajl
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.1 2010/05/23 22:31:59 flameeyes Exp $
+
+*yajl-1.0.9-r1 (23 May 2010)
+
+  23 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +yajl-1.0.9-r1.ebuild, +files/yajl-fix_cmakelists.patch,
+  +files/yajl-fix_tests.patch, +metadata.xml:
+  Initial import in main tree of yajl, needed for yajl-ruby which is in turn
+  optionally used by the new Rails. Assigned to ruby herd for now. Thanks to
+  the Sunrise people for the ebuild.
+
+  04 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> yajl-1.0.9.ebuild,
+  +files/yajl-fix_cmakelists.patch, +files/yajl-fix_tests.patch:
+  Fixup yajl cmakelist files.
+
+  26 Mar 2010; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com> +yajl-9999.ebuild:
+  Add live ebuild. Thx chithead
+
+*yajl-1.0.9 (18 Mar 2010)
+
+  18 Mar 2010; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com>
+  +yajl-1.0.9.ebuild, +metadata.xml:
+  initial commit of yajl , thanks to scarabeus and Tommy[D]
+
diff --git a/dev-libs/yajl/files/yajl-fix_cmakelists.patch b/dev-libs/yajl/files/yajl-fix_cmakelists.patch
new file mode 100644
index 000000000000..95e794dfd84f
--- /dev/null
+++ b/dev-libs/yajl/files/yajl-fix_cmakelists.patch
@@ -0,0 +1,23 @@
+diff -urN lloyd-yajl-9c15d72//src/CMakeLists.txt lloyd-yajl-9c15d72.new//src/CMakeLists.txt
+--- lloyd-yajl-9c15d72//src/CMakeLists.txt	2010-01-08 18:05:11.000000000 +0100
++++ lloyd-yajl-9c15d72.new//src/CMakeLists.txt	2010-04-04 23:49:02.000000000 +0200
+@@ -42,7 +42,7 @@
+ ADD_DEFINITIONS(-DYAJL_BUILD)
+ 
+ # set up some paths
+-SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
++SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib${LIB_SUFFIX})
+ SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl)
+ 
+ # set the output path for libraries
+@@ -77,8 +77,8 @@
+ INCLUDE_DIRECTORIES(${incDir}/..)
+ 
+ IF(NOT WIN32)
+-  INSTALL(TARGETS yajl LIBRARY DESTINATION lib)
+-  INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib)
++  INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX})
++  INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
+   INSTALL(DIRECTORY api/ DESTINATION include/yajl
+           FILES_MATCHING PATTERN "*.h")
+ ENDIF()
diff --git a/dev-libs/yajl/files/yajl-fix_tests.patch b/dev-libs/yajl/files/yajl-fix_tests.patch
new file mode 100644
index 000000000000..b4a6498ced4c
--- /dev/null
+++ b/dev-libs/yajl/files/yajl-fix_tests.patch
@@ -0,0 +1,15 @@
+diff -urN lloyd-yajl-9c15d72.old/test/run_tests.sh lloyd-yajl-9c15d72//test/run_tests.sh
+--- lloyd-yajl-9c15d72.old/test/run_tests.sh	2010-04-04 23:59:51.000000000 +0200
++++ lloyd-yajl-9c15d72//test/run_tests.sh	2010-04-05 00:00:26.000000000 +0200
+@@ -8,9 +8,9 @@
+ # find test binary on both platforms.  allow the caller to force a
+ # particular test binary (useful for non-cmake build systems).
+ if [ -z "$testBin" ]; then
+-	testBin="../build/test/Debug/yajl_test.exe"
++	testBin="./yajl_test.exe"
+ 	if [[ ! -x $testBin ]] ; then
+-	  testBin="../build/test/yajl_test"
++	  testBin="./yajl_test"
+ 	  if [[ ! -x $testBin ]] ; then
+ 	    echo "cannot execute test binary: '$testBin'"  
+ 	    exit 1;
diff --git a/dev-libs/yajl/metadata.xml b/dev-libs/yajl/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-libs/yajl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-libs/yajl/yajl-1.0.9-r1.ebuild b/dev-libs/yajl/yajl-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..e7345183c4c6
--- /dev/null
+++ b/dev-libs/yajl/yajl-1.0.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-1.0.9-r1.ebuild,v 1.1 2010/05/23 22:31:59 flameeyes Exp $
+
+EAPI="2"
+
+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 ~x86"
+
+IUSE=""
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+src_prepare() {
+	cd "${WORKDIR}"/lloyd-${PN}-*
+	S=$(pwd)
+
+	epatch "${FILESDIR}"/${PN}-*
+}
+
+src_test() {
+	emake test || die
+}