dev-libs/json-c: Version Bump, #454372; all patches prepared by radhermit (Tim Harder); moves header out of the way to fix collision with jsoncpp, 452234

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

8 files changed, 109 insertions, 20 deletions

diff --git a/dev-libs/json-c/ChangeLog b/dev-libs/json-c/ChangeLog
index 0f8386f0a032..cefad5782eb5 100644
--- a/dev-libs/json-c/ChangeLog
+++ b/dev-libs/json-c/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/json-c
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.22 2012/09/30 18:14:18 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.23 2013/01/28 07:58:55 jlec Exp $
+
+*json-c-0.10 (28 Jan 2013)
+
+  28 Jan 2013; Justin Lecher <jlec@gentoo.org> json-c-0.9.ebuild,
+  json-c-0.9-r1.ebuild, +json-c-0.10.ebuild, +files/json-c-0.10-flags.patch,
+  +files/json-c-0.10-headers.patch, metadata.xml:
+  Version Bump, #454372; all patches prepared by radhermit (Tim Harder); moves
+  header out of the way to fix collision with jsoncpp, 452234
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org> json-c-0.9-r1.ebuild:
   alpha/ia64/sh/sparc stable wrt #418745
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 7022af398efc..f80b71eff95a 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX json-c-0.10-flags.patch 236 SHA256 2a3390035f8be97bd8492240424274cffc8590bc90ede6ecd769a6ed645fa1bc SHA512 22123c058d78f2019df67c6e41c7413f8d0b40b364e9117bcd4fbdec209f19e894442becd31d163455fc336e8e083d09af031ac81483fdf288c8a1fa0d3b6ec6 WHIRLPOOL 1c5f69a677e6f6d845ce5bd473c3f3624ab9c4f238e59a69721cc0d5330578163bf1140e26274c2bebbbd989d2efa4bee3c8320ddb1679971fd4f531e672db8b
+AUX json-c-0.10-headers.patch 626 SHA256 cf778142123d15bb2ffa4902a4b31a9ffa9fd27e972bedaadd966c6f2d283609 SHA512 342bfbd5f796893f2b333ea75e141eba61e0ac6a963946da208e8d21e757919a0e7c5fca1c58d7d42843a0e80e398d65501c925ef9578344803c98134f6a33ed WHIRLPOOL ce5dd5b84ef7441bb1b9ff25e24c9b1ef0f3ec4b50e9652a51ba78ba51b234978d883b2dedb9cea3697331636131df9e5e8e1ea1425fa9720c5dd58e06f2d0f8
+DIST json-c-0.10.tar.gz 385812 SHA256 274fc9d47c1911fad9caab4db117e4be5d6b68c4547eab0c508d79c4768e170c SHA512 d254eb223ebfb05e828bf039efb280f5e83b9f59116fba3af2892cf1f7732d152f7d0e2d8b77ec32e175b168022c2342f954e97f867c438b349f36b4dfdbd746 WHIRLPOOL 0eab71b6af2bc1ecb54474b69f86eff56fc2c2a756e542f758070dfe52839223b0a90da7af837567d448d1c7c660b003590ec68bff1ffb802cfa44165914b08c
 DIST json-c-0.9.tar.gz 340953 SHA256 702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475 SHA512 40e4f7efd82fac732ff6da439a1ca95944d4ecfa8a673c7466e93134f29f8863f4d86f4e6e859a7be0096a25837047bd167a625cc0c61d6b919b55c5a47a76e8 WHIRLPOOL 7a666bae6c12ce910815d0d0253a88a024c5fe11a7a5e97b571d426f9de00d1a676f98bc8ccc41d948b5c64b1e768c5e5cdfbad98d63b03152b0e7a6ed1c181e
-EBUILD json-c-0.9-r1.ebuild 733 SHA256 15c0ce4d0f2585d4dc799b26a9ac3a7263aa49882352f5546c20a34e60bc5556 SHA512 ac7c24b927225ceedf21757d0b8b6d715dd19991caffe831493e4f058c73cc9c883cf3fe2b696755dbd9b06e09de8d0a9fb61bbe970f73d505c25fb518889f63 WHIRLPOOL 86f94c9b27f05076284e4d31e396151cf046b4b3dcbf4d60b087653c83a8d973df5dde92f78843033ae6095edd048c44d7e7376662b5977f6fe485b65c461b0f
-EBUILD json-c-0.9.ebuild 652 SHA256 a2b326397f8691b0a96d1bd35e5b6a800feb94560801f4740c3bccd3511f6879 SHA512 7de19e9009f47cc54e1c259a687371c70ec968430a2c5401894d197af86097c3946bf3c6c785dc50491891aa3fb9b742e26e364306b7f42ed8fb12142f7f81ba WHIRLPOOL e6ae16f38b69a808491ff6001f31317715ef826d3192d9c2866c795bcf38aa70e3ac6f63d80cfa12e378b679d4c9035df5b589cff550db154fa67389bc90cf8d
-MISC ChangeLog 2655 SHA256 02ee6d01be92558020b302e061a311e2b23cbb11eeff7e983b9977100f45a856 SHA512 8a31f94d5faaaa30c63f4f74a73e8e8d64eb6a877bd155dea0d787e4bf7bb9d424f0a6dc98a87e68fe57c90afc6a243e97401ee95e591729893e6ebed56b331a WHIRLPOOL a60137cb01b0a12e21638ecc5dbd5746c0a6a29e6faff818a20c8ae0e650ed7072e9b4c9b022bb2c0d3da1ccf29b4b9494b13f53f5cee6a3ae3cc7248152a5a3
-MISC metadata.xml 582 SHA256 eb5150849b4184c842a4cd7103f07d629d856cb06518178deba7e834cac4d0d4 SHA512 7fc0b9e0ad7406af2f85052bbf09e2dce518e7a993bb48d92fad9473b90fad0609b7769a79d630f75cd59c99cd3f5e0c2c87f94e6bdd04e2dcda70d467e66bf5 WHIRLPOOL 193d61d498bf70db789e0ee3aca41f00bc58d3111867b76579f36106c7602b93e0a0124d34084992a2d25b3f77f8d25ad68b71352b779906a290a6d05c977bfb
+EBUILD json-c-0.10.ebuild 882 SHA256 acf7f119f12b8b14eb3c3b1c62395d7725e943ce11b4098255ff0cc6b0302928 SHA512 7e1fe831841f647bb84d93d50160d7a240e19cb6a05254c18baa992f19b32b3f413de28c0f4c92e5824c2e59e2d5f35eff9541d3cf147f9836cdbe38403105a1 WHIRLPOOL 2ab2bac1685dce6cd06839d0b682f21bbd99d55999026731595e00f3f90402b8a5873a828e1c5eda4b55b17eec6ead5796df6a15df1e81b0a8598618f9d13f9e
+EBUILD json-c-0.9-r1.ebuild 769 SHA256 d7c7e8a74b7784fa10102a60977322bc287933d90553f455aff731193f6f06d6 SHA512 3dc5f46b703ebaaedea1a37f1ed91945d1d072d2f6810cd86103da58a93a06ccc6d0a7912179f634682bd7bab169d559537863869b5ae6c9f9078d9ebcf6c4b0 WHIRLPOOL 9d67fba693e4ad41da1cbb29e76d02eae393345ec800d8252a96dd5167572c99d41c7a6068c811593142c7e5e622774c8bd2f124089257a34e3b45f2515c1362
+EBUILD json-c-0.9.ebuild 688 SHA256 0baf0621535343720349573f1ded2205ad0d7fd8ab22d53e35626f54ef6a3f99 SHA512 0fe586e567abe2876522e125fc34ed64241bb80f65c1bd96b9e105232b7a344b6638f9c361c6b6385ad5ecffcadc7a3324afbb0656a00864f3b6bb696daa90d9 WHIRLPOOL 7c4c599b7997779e0bcc7b3485acc268db54390386b5cebd16df2a5afe73b2a203d776e8fb6f6abd229d2d122b7ad3655ddada1465d4d9c5dffb243e43f3e17c
+MISC ChangeLog 3015 SHA256 5bbee5697c5e1ffb211147c3b99b520809966d556ca269ff22bc64c1872cbf76 SHA512 d5bca4c0116d404d9330e4b17dbdba3fd85eb46cbfd1519c99646a10686f0f834807f5cb17a95eaf68a200efc76e837f10b8fd7479d7c0ec73d2e729640cec70 WHIRLPOOL 1a0e9208b81a25a36331260fa9fa01141ac6e9dafd7ebd258b0869da6c206af98a3783a1e3e7af6bd90650b15a8a59d19535da1163d6daad4d3667249c4a5985
+MISC metadata.xml 595 SHA256 47fc95dd198e86fecb56d13d0607467125878e5d35289e0a7e9581be110ef128 SHA512 9dc8f1b31242439b47c433df0672010138dd42d83a650297c8c752a37728ddcbdb49313f9fb9111c781b6691b308f3d605c17ae0d0f8a008f6959e707b3670db WHIRLPOOL 5db3674634bffe2857199e32d9082e2c273cc2524038d71b23089efa4b8597d3d68a0b9e1c08c968180f9fd127b38f5b7acedf81758409786275ef4ed2d85eda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBojAAACgkQuQc30/atMkCXVACgt51pjpcnNM5mMfDk+gxJYDry
-x/YAniDYDCJSSVHgKZsr9ip+gBybiw1W
-=CBLg
+iEYEAREIAAYFAlEGL74ACgkQgAnW8HDreRYU2QCgpiMTXVTkwbRalhG6UaOAZ/tH
+ZIkAoLDuf02zoMZwkx9tfxegDDZZQxil
+=1KYX
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/json-c/files/json-c-0.10-flags.patch b/dev-libs/json-c/files/json-c-0.10-flags.patch
new file mode 100644
index 000000000000..8634f8701777
--- /dev/null
+++ b/dev-libs/json-c/files/json-c-0.10-flags.patch
@@ -0,0 +1,6 @@
+--- json-c-0.10/Makefile.am.inc
++++ json-c-0.10/Makefile.am.inc
+@@ -1,2 +1,2 @@
+-AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Wwrite-strings -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+ 
diff --git a/dev-libs/json-c/files/json-c-0.10-headers.patch b/dev-libs/json-c/files/json-c-0.10-headers.patch
new file mode 100644
index 000000000000..f3486739b9da
--- /dev/null
+++ b/dev-libs/json-c/files/json-c-0.10-headers.patch
@@ -0,0 +1,27 @@
+--- json-c-0.10/json.pc.in
++++ json-c-0.10/json.pc.in
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: 
+ Libs:  -L${libdir} -ljson
+-Cflags: -I${includedir}/json
++Cflags: -I${includedir}/json-c
+--- json-c-0.10/Makefile.am
++++ json-c-0.10/Makefile.am
+@@ -8,7 +8,7 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = json.pc
+ 
+-libjsonincludedir = $(includedir)/json
++libjsonincludedir = $(includedir)/json-c
+ libjsoninclude_HEADERS = \
+ 	arraylist.h \
+ 	bits.h \
+@@ -17,6 +17,7 @@
+ 	json_config.h \
+ 	json_inttypes.h \
+ 	json_object.h \
++	json_object_iterator.h \
+ 	json_object_private.h \
+ 	json_tokener.h \
+ 	json_util.h \
diff --git a/dev-libs/json-c/json-c-0.10.ebuild b/dev-libs/json-c/json-c-0.10.ebuild
new file mode 100644
index 000000000000..150e0beb8a32
--- /dev/null
+++ b/dev-libs/json-c/json-c-0.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.10.ebuild,v 1.1 2013/01/28 07:58:55 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="A JSON implementation in C"
+HOMEPAGE="https://github.com/json-c/json-c/wiki"
+SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+
+	# bug 452234
+	"${FILESDIR}"/${P}-headers.patch
+	)
+
+# tests break otherwise
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_test() {
+	export USE_VALGRIND=0 VERBOSE=1
+	autotools-utils_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}"/doc/html )
+	autotools-utils_src_install
+}
diff --git a/dev-libs/json-c/json-c-0.9-r1.ebuild b/dev-libs/json-c/json-c-0.9-r1.ebuild
index a334e963fb40..cbcfe2ae5da9 100644
--- a/dev-libs/json-c/json-c-0.9-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild,v 1.8 2012/09/30 18:14:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild,v 1.9 2013/01/28 07:58:55 jlec Exp $
 
 EAPI="4"
 
@@ -13,6 +13,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
+RDEPEND="!dev-libs/jsoncpp"
+DEPEND=""
+
 DOCS=( README )
 
 src_configure() {
diff --git a/dev-libs/json-c/json-c-0.9.ebuild b/dev-libs/json-c/json-c-0.9.ebuild
index 3d81aa713960..6b934c87455f 100644
--- a/dev-libs/json-c/json-c-0.9.ebuild
+++ b/dev-libs/json-c/json-c-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9.ebuild,v 1.14 2012/03/25 14:45:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9.ebuild,v 1.15 2013/01/28 07:58:55 jlec Exp $
 
 EAPI="2"
 
@@ -13,6 +13,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
+RDEPEND="!dev-libs/jsoncpp"
+DEPEND=""
+
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
 	dodoc README || die "dodoc failed"
diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index b99509b6a233..50ec7e7d3332 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<longdescription lang="en">
+  <maintainer>
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <longdescription lang="en">
 "A JSON implementation in C" is probably the better description, and then
 "JSON-C implements a reference counting object model that allows you to 
 easily construct JSON objects in C, output them as JSON formatted 
 strings and parse JSON formatted strings back into the C 
 representation of JSON objects.
-</longdescription> </pkgmetadata>
-
+</longdescription>
+</pkgmetadata>