Fix building with json-c-0.11 (bug #467700, thanks to Markos Chandras for the patch).

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 56 insertions, 18 deletions

diff --git a/dev-libs/libreport/ChangeLog b/dev-libs/libreport/ChangeLog
index ca76851514d5..56921172674d 100644
--- a/dev-libs/libreport/ChangeLog
+++ b/dev-libs/libreport/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libreport
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/ChangeLog,v 1.18 2013/03/25 16:21:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/ChangeLog,v 1.19 2013/04/28 14:38:45 tetromino Exp $
+
+  28 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libreport-2.0.13.ebuild, +files/libreport-2.0.13-json-c-0.11.patch:
+  Fix building with json-c-0.11 (bug #467700, thanks to Markos Chandras for the
+  patch).
 
   25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> libreport-2.0.13.ebuild:
   Stable for x86, wrt bug #458984
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index b95e252c1dae..924cfb981853 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,31 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libreport-2.0.13-automake-1.12.patch 2285 SHA256 b4c764e104cf76336661d96228786ce2d347ca6339e44c85a993c3c10fc0a215 SHA512 59a6f857604ab45c049030ab351cef28dc51b78aabd5575ff45abdd607d6b973020f32687666fd11a879e0ee18aca75650fa9e3fa2284a8e05c6b65216479b9f WHIRLPOOL 660303844f839d8d7f494d22f041d4543b502074603183801def34741f7a3e5fddb06a54d0b8372c49e508ca1076b1c81063e36c426134f0903efb642b17cb4c
 AUX libreport-2.0.13-gentoo.patch 10369 SHA256 7dec2b0708121c5deb5e8036d9ef5ee20aebd9713ee191d701b27920a4ab0f49 SHA512 762e389c62efaeaad08a04871e5dec05aadc26fb9457291bf2308835128241068b2e799585060b3ce4f7bd17f275a4e5c7da37835d4e8940651ea5e5928402f0 WHIRLPOOL 0b253ba384ee40aa60c36564739101e328e326fcf5e3543644ed46b71a89fbb34d8567ce5892a162ba7b26f6bc780514601e6fc32f883f3276c7a1229529ac92
+AUX libreport-2.0.13-json-c-0.11.patch 1145 SHA256 e47adb08f2c4d844e8ee824f33f6861331773308520e75714fe07b4e9f9126f2 SHA512 fd07c360d599d71fddb6766860203052fb390cde6cb795779e75a2d2a826affd6f03c6977eb99237caffdc41ac9f0e1c600a9414f72629ff5fc2102c70d8ca67 WHIRLPOOL 4b0dab98d5390443296d26c808fb095d45b7977b55073f69556905e4e60d6326b993ef3c031fd6d9b9fb28db40a35bcb765b348624cba04a1a6230ac578bdb2f
 AUX libreport-2.0.7-uploader_event-syntax.patch 610 SHA256 b93e9e05396b70754fcacf7e7358ccfa4cc995fa3e1a3fbe598c540ae4f0c148 SHA512 b0ae2617a013fd8cb3475e5a51073677f2ea965a57169c760e542474351293e70f70e678a66beeb3b3fa163589aaf7f79f0883fa55ff524e62b5fcd3ae919bf0 WHIRLPOOL 9c0e00a502a216ce47c513f052e1a63b0d57910d8790d180978522f860d980f8f216cf5773830f9ba3b5fdbf8dd7e3f661e41e008398a8d6de5e525a2e95c8d3
 AUX libreport-2.0.9-gentoo.patch 8795 SHA256 f3d0ee0e1c9f6032ce71d6daa92d8796306d9bfd91a346fb0c874f49368807ea SHA512 308ca2d73deadd351ff188941b37ce4d01c3b9d395038fa58b4bd03bd418659942d4def77c2423976f0113160642e92a9c55e7826e30ed2afe8c47116c7658ce WHIRLPOOL ba7891e9859de7cf8927da24080153c4e1c7f8df8762e27fc9d6d12e5dd5b0e0801511af341739000db41b3c6f39e775edd419ee1bbb0cff8e4e2dd54fd57907
 AUX libreport-2.0.9-no-bugzilla.patch 2620 SHA256 794b862cdd8d3d946eb80558cd7531f01a18944a2fa11be2fb9f585d397c4f05 SHA512 3d00eaa2aca33295af7331a0ebde312506edce6b8df5efe26ca190e9c431b6d5c6b9055c7dfbd5be923e39315f3b23a766b3ee2e46dea2d379839933467c348f WHIRLPOOL 46d3a99a8880ccbd9247a49903adbfc3e94a127253d5c0267a14da86f8023cae04dea9ef79f9a1ca23a2b02166415097931bf61343729c5386a5dd796f5fcbbd
 DIST libreport-2.0.10.tar.gz 1204194 SHA256 ab8f2bb2eeb93719b6a946b8a810527cec653815fd59c3fb03efca88e6e80408 SHA512 f9eca6aacb28c856e5bc109545dbd371baf57de4f2431b988dfce0d9d1a1e38269a056a924453bbfaed7c80890ddddbddca086754385a7397e23b6d1b8a17702 WHIRLPOOL 2429cd98c9d897a953956d92a9680fd65ccaf79f89da84c0862356c11acf318a50b41a674ac4de07e020836a2e4efcd38f1d949e2136a2abb854324a2c9a2a5a
 DIST libreport-2.0.13.tar.gz 1190147 SHA256 4a0609abe80b9432ae81c5a512680a7035b547cd1fef29c63c730d92c1be8b05 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181 WHIRLPOOL 647da27bf88cf77dbb25ace9f446dfe9a875370c27fef05999843dcee1f653ba07af44d4e5a36107dbf69f0241f1f66d3a6a58ae7897faca7b049d2b1aa00301
 EBUILD libreport-2.0.10.ebuild 3082 SHA256 2e3c64992a0709e7299cd3d7060198760efadaaa936b2f497310c77bb4749c6b SHA512 f0d76b4ab8fb66ea207e0940189ee8afd44d02c88b3007806098a68756e3a5b0a83a356e94a5f678eb0dd74a9c4ed0d0f58f45d950ed84e0e4dbdf216405ee75 WHIRLPOOL 7d43bac6f66fa5d037b0e64d52ef8027478d822143b5a4a0faf95eeb62f5b1c684e49e08905279f06f6f1966a75b7ad0224f7c5ce28d043fc5d7a515b9b22a5d
-EBUILD libreport-2.0.13.ebuild 2109 SHA256 083eb20cf883256fe47c247be3b4061840198ee0d2f9ee13391367827845ad58 SHA512 c853ec9fb33cd041155428529a24008ded99d7285cfe7d88da8e5f9702d2ad09027003aed1afe4178d4c65836b455bc6003e197e367c3eabe1475e91fe7eea8d WHIRLPOOL 7c717e2ab2acb750be4e86221967dabce3e18e91b386cc0de2f346eddfaaa1bbcda4e58b84fc12a047b2b4fdda94a57ba7417d660c4bab99220e257cdde82658
-MISC ChangeLog 3040 SHA256 4e52e4555b46447953389229668db5461fcf79b26bef76b835c9aa9737975867 SHA512 b73af1de02d297f83a7202b592a2d19b433951fc81e54f1d6996b5c8512352f3ebfaeeb93a726cb24756b6333ccfde1c41ea2ea1141d9eeda1cc23b228a8f911 WHIRLPOOL 9e748938f3b9cb52e82536bb93fd1d8d5be496ded260d1c2b595d3df61fd208bebf247aecedb8e6ea606aa32a15c5b75f1be9f22f97a923f69c8dd2efeccf9e2
+EBUILD libreport-2.0.13.ebuild 2228 SHA256 7ad560fdf03a76d36a6188995f470d77b059cd7ee457ee6cc5361985267c2634 SHA512 696a26a6629c71e3bad88304943611fbb2bf0e45d60eb5305400d475ac132dd6c3178e9d1a8ac353cb93403db0e21db5fe54d6eb84c37279e6dd28203f018af8 WHIRLPOOL d316e1b4ac57545bcdd597b4b4fcc1bca63d43546b1bc5f02379bf7613ba4c3a0cea921ae1ee12dddc36b2df02b5d8bd58680d610bd6bb8805f12351e45436c1
+MISC ChangeLog 3266 SHA256 7c258be6fbdbf6193ac9f222d1e9a689fa4bc61b4f52c103cc4364d871b2815a SHA512 e3db67964a5608d07fba38fe49253204acbddc6b6bfc3d7421f2c2e5528a468a8a59358f4e6a91f0fb5cdd99afab5d634ea11c488f35bc600d1f25191bd2e1bc WHIRLPOOL ae11acdc3a991dab0ef430b29a8f09fc52a7220bbd8e8f9deb7d1ddf878aae4389d2fff51d20d81e127928808ac42ac64f5afb3424e30894157e9b3c3649ee5f
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRUHjyAAoJELp701BxlEWfe0kP/0DrJAXjhjKRIV2F55MPSTzZ
-Q9alwf3Ex5ayKkMvxik914i0QLh1Rci1tqKODlPhc1ALGYDlICNhFlZnv/sxIfbX
-d/vdgq2nPLvhtETocHXs/l+NEVDx6V/UEFP1zHcosLsPSW4pkxhNnQ9Hd2xGHGnd
-V5hQLyuONgaM2ENFHteiyG+K9Cxxc7cH8Wc3cJWPMii/e5rS84z38+FGBVN388/s
-FidseOdyIeVvrECenl+E0mE8plIw9bKj5uoGssx09d3mzrG6XcszY6we+l6BnUoh
-ywMClwf59Rle3lQKb8IQBN1l7IsVVpSDe+rC1WbV5ux/Vlz8Yh9xUzoTYh+lJzbx
-E8djPf7aimYSRlgda+Qv395HDqQJ8vMNL/xulUTegW6+CzhESLXrjnFHjG6yiBe0
-w+HbvYCwt1snJtoOgRh9iozTGOuNZIRYPUoHmjicMVzW3uLaD1XIhmfEx/+hhIRr
-Y7vIMykkaURLSDEz3wXwZIawuUN+crxyUs1KRXg0UrsK2CWYh5zlIvdgRNmCMgN9
-megEfotAhfB2QKgk9sJ9DtONhZtTac84CqtGwDF2jtJ2zNlAzAlrvGwww9nntqvD
-nuSo/UYsDwNVKc6KXUtUMxsWrhhcWtTaThHf58EB4brX8feDU0q2+Zyu7PG0/rxH
-BOXpmBUIwDt51UCNvr8o
-=6Bcq
+iQEcBAEBCAAGBQJRfTR2AAoJEJ0WA1zPCt1hj1sH/1WsV7bdp9UVrrK+f1bP3oPD
+xASVe2soLtLs8jayLxJJdOc8emytTmc7p7em/vAMSwFVfduiZOvAcbYKP6qMP1TM
+h0vnaowjuCJLoLJJaAUZn/NWLQ6+xQPfn7dGEZ4Vy39ZrQnuaY/Iu027WL9f9KS2
+Vob7/J1K1d3pOtqlsHXaHZXyPbRoBiqmH9FrOUd1nFoED7R4KHjYylv9+G42Y5SD
+9voPy9pceuuVtRt1unbFf4xvUQ8bzMTQUfAeAOjJtQrXZx4I+CrU6gHBpeBu014X
+B/h8z7gtu3t9deVVgqmNig6u/xKN5kTYOKhYJ2gdQVnTjEHCfs3VPZN7PkG0t5w=
+=hna+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch
new file mode 100644
index 000000000000..e5191e8e313d
--- /dev/null
+++ b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch
@@ -0,0 +1,35 @@
+From 4a874dde53cf6acca7db2e7be3c10106fb50ec62 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <hwoarang@gentoo.org>
+Date: Sun, 28 Apr 2013 12:27:57 +0100
+Subject: [PATCH] configure.ac: Fix json-c detection for json-c >= 0.11
+
+json-c-0.11 renamed the pkgconfig file to json-c
+https://github.com/json-c/json-c/blob/master/ChangeLog
+The configure.ac file was fixed to look for json-c if json
+is not available.
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.0.13]
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd50bcf..0ca5e67 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,7 +104,9 @@ PKG_CHECK_MODULES([DBUS], [dbus-1])
+ PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
+ PKG_CHECK_MODULES([NSS], [nss])
+ PKG_CHECK_MODULES([CURL], [libcurl])
+-PKG_CHECK_MODULES([JSON_C], [json])
++PKG_CHECK_MODULES([JSON_C], [json],,[
++    PKG_CHECK_MODULES([JSON_C], [json-c])
++])
+ PKG_CHECK_MODULES([BTPARSER], [btparser])
+ PKG_CHECK_MODULES([NEWT], [libnewt])
+ PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [
+-- 
+1.8.2.1
+
diff --git a/dev-libs/libreport/libreport-2.0.13.ebuild b/dev-libs/libreport/libreport-2.0.13.ebuild
index 53a4aa7d2b05..9f28d95114d2 100644
--- a/dev-libs/libreport/libreport-2.0.13.ebuild
+++ b/dev-libs/libreport/libreport-2.0.13.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/libreport/libreport-2.0.13.ebuild,v 1.3 2013/03/25 16:21:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/libreport-2.0.13.ebuild,v 1.4 2013/04/28 14:38:45 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -60,6 +60,9 @@ src_prepare() {
 	# automake-1.12
 	epatch "${FILESDIR}/${PN}-2.0.13-automake-1.12.patch"
 
+	# json-c-0.11, https://github.com/abrt/libreport/pull/159
+	epatch "${FILESDIR}/${PN}-2.0.13-json-c-0.11.patch"
+
 	python_clean_py-compile_files
 
 	mkdir -p m4