Backport upstream patch for automake-1.13 to json-c-0.10. Bug #466960

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

4 files changed, 56 insertions, 18 deletions

diff --git a/dev-libs/json-c/ChangeLog b/dev-libs/json-c/ChangeLog
index bf632dfcbfbf..3ea2bcb6e212 100644
--- a/dev-libs/json-c/ChangeLog
+++ b/dev-libs/json-c/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/json-c
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.27 2013/04/25 19:21:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.28 2013/04/29 18:51:01 hwoarang Exp $
+
+  29 Apr 2013; Markos Chandras <hwoarang@gentoo.org>
+  +files/json-c-0.10-automake-1.13.patch, json-c-0.10-r1.ebuild:
+  Backport upstream patch for automake-1.13 to json-c-0.10. Bug #466960
 
 *json-c-0.11 (25 Apr 2013)
 
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 73d6c4184faa..88b2e63f2a16 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,33 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX json-c-0.10-automake-1.13.patch 1113 SHA256 da6b892ccf8ee29b6946e75eeaaf8aaadd75e2c59734a65b69a5f4d1e51326b4 SHA512 e46686386180a276097fafdc7508a94fa0b407ce4db103f35797ae382262e198d54cc86c44fc184c7e5f4cff79c79f86a36f8e569fa7495b687deebabfef8d14 WHIRLPOOL 0e0dfc98e949c27be4a530b6308f7cf2a93f5844ce4dc43a16f23b98db14670ec7bdaea66a1f482f5bc5546e24513b74884ae69572bc3ca6bfffe22865cf06c0
 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.11.tar.gz 557263 SHA256 28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c SHA512 65ab563fe908d585ba05fff3b77283050ec4f94114ff6e4b916557013d75498271cf65b2660a0aaf74b23beaa80385c80d37ab6a700ba967dd859fa779a81cb0 WHIRLPOOL f47c78b206a49a6e1d2570d041917593f3b889125b47a951ec1347f5c470082113225e86ff593869b5d859c2c815ceda268d4a3c890f53af77fae8dbbf7d97f8
 DIST json-c-0.9.tar.gz 340953 SHA256 702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475 SHA512 40e4f7efd82fac732ff6da439a1ca95944d4ecfa8a673c7466e93134f29f8863f4d86f4e6e859a7be0096a25837047bd167a625cc0c61d6b919b55c5a47a76e8 WHIRLPOOL 7a666bae6c12ce910815d0d0253a88a024c5fe11a7a5e97b571d426f9de00d1a676f98bc8ccc41d948b5c64b1e768c5e5cdfbad98d63b03152b0e7a6ed1c181e
-EBUILD json-c-0.10-r1.ebuild 981 SHA256 cb5b781f970aa0d50f81f7d7420aef692b62bc28ebd79e2a5c5e4a4b7b6de215 SHA512 f11a1979805b0c4e4057a54d68e3f376b31e5484d688d2d437987eee87f0f24e82295c2b9b27d73d7c5955f2d0376689edfbd969c043e713fb093693bdc6e7c1 WHIRLPOOL a51b94fb71c8c950f920da9470d2967dfde81a9a047aa758356a282d30cc8ae7afeb07e4bb5356502cc6f6220527e4c4d57f2fa18d4f410aa9ff854f05391042
+EBUILD json-c-0.10-r1.ebuild 1034 SHA256 4f40f9d29f5ee0c0964fbecd23739ed25842b03de5c5cd5c20e4e2ced2f99af8 SHA512 353ca99e9be5b230396cf15c43b0567dbe2fe9b5266c5f5403528280b018bfca288e58d4627395942d4e8129b7ab4321ae72b357fb22000dbb9abd7e458850a6 WHIRLPOOL c2d7392245f94c3caecd50bd95f5b71e50de048b173265f82e983b11728d0d027d191921b0ef70af805fc10a2c8b78a61e2b63220c1c73dd5c5bffb128c36872
 EBUILD json-c-0.11.ebuild 1125 SHA256 c0b48b8e7ca72a8a3b44505c4069170ef3e47ab7dbbe323507f9585101f836bb SHA512 442b43fd7bb0e2f9af30ba5a37cb4ab98669b2c8311a4e3f769f7dbc9dc5aa420f1eb31fe87eddc59d00ea0972f680bc34f568d013a4e90c65256d760263659b WHIRLPOOL 5ed181a5f75c29b7bce9b7fc398022a7408b7aab26163a650cec62152d15b926466f8f3bf2a1d87c6cb431970a54b7faf8ee1b46883b478310fbe36a51908b7b
 EBUILD json-c-0.9-r1.ebuild 783 SHA256 d8fc6d4b0bffb887536ed30ab1deaf83405c7320049ece96c2022d42adc5b904 SHA512 7cc49b4658d4dfe4419d1089791856c5d60bc2f688efc387b4f9c74e5e542af27419ac9e678ee40073952925bd32ee9db9016d7bbc236a700f82d5c6ff506b79 WHIRLPOOL b59c700719fd1bb928121b3a615b60b6495b7676a3f916a9369314753569cf87e03e82389a3cbc18f08836e75286545775b7dc916938620c856625ca63b15ba6
 EBUILD json-c-0.9.ebuild 688 SHA256 0baf0621535343720349573f1ded2205ad0d7fd8ab22d53e35626f54ef6a3f99 SHA512 0fe586e567abe2876522e125fc34ed64241bb80f65c1bd96b9e105232b7a344b6638f9c361c6b6385ad5ecffcadc7a3324afbb0656a00864f3b6bb696daa90d9 WHIRLPOOL 7c4c599b7997779e0bcc7b3485acc268db54390386b5cebd16df2a5afe73b2a203d776e8fb6f6abd229d2d122b7ad3655ddada1465d4d9c5dffb243e43f3e17c
-MISC ChangeLog 3581 SHA256 1e549be0ebf9dbdfaf7f5de1b1ad7786b97c3b650c18bd01df25640b7411821e SHA512 81c244bf06a2e282bc793f43788809e5432601d6ab9edd8bd9fb4346130031bc75599f5a301431e17d0ae93df75a80770aaf66eb074fc298726c7602b100ce24 WHIRLPOOL df5d7fe3f18e8ace9d067b17235526b06f8e88a62c76e6ce65e9ba0e1f716542308500157877f77997b438fcc1ed3e6e0cc7cad3946710dbff23154a136acdd6
+MISC ChangeLog 3772 SHA256 c8f926c7d7a61351544360488e669036ef4ae09bf6df43fef49f0e9149a08a19 SHA512 5f70743c76d69a5ffa89613549f55f014bd6188ddab69968e2f9174aaacba73d381b4db215e03a81e3e785c5878e860cf2fd7057b5ce41d234d7f409cf9af1ec WHIRLPOOL 72b5d8df1128a71051117dd119995dc58b0cf7e57c10f88699ba3d6291965f8d781df694d52977a4b41e944b85a9cfa8cd97a352e2be10ee7a4f4cb27c994ef6
 MISC metadata.xml 595 SHA256 47fc95dd198e86fecb56d13d0607467125878e5d35289e0a7e9581be110ef128 SHA512 9dc8f1b31242439b47c433df0672010138dd42d83a650297c8c752a37728ddcbdb49313f9fb9111c781b6691b308f3d605c17ae0d0f8a008f6959e707b3670db WHIRLPOOL 5db3674634bffe2857199e32d9082e2c273cc2524038d71b23089efa4b8597d3d68a0b9e1c08c968180f9fd127b38f5b7acedf81758409786275ef4ed2d85eda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJReYJWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRfsEVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88NzQP/RtVZEs6Fvp2JsQVV5+A8gtw
-8AvW8u8eIdBc1/L1TYSUMyIhjCcqGwkDTwYomvg148ISszYUGAxEY3HQBdL8geUQ
-Zckuelm7cAOB0Iaq4nwHOx1XKjX55gVqLWUihQ4y0dLh3z/gmYGrNnTfq+pvR2Vu
-xq6D4S2LYAP/t4Js50RrfbPfzZdpkkjoxo9YLjpebfmlH1q8ThoZ4PDq4nanAlIv
-cY0cxBPLonrbwjumW/Yh9Tx9T5Wnr2xgtW8V11QaRz+LXAdRDtHUhtngwTVBfOKb
-UF/m0D0gE3OE5NI6zBmpHduDa/lrRSUSRyg+nTbZnlYEasabuec9XTezWDPY7Yht
-HGB/tnJcagu6owOIz5Xmm2rPYRVmvPYAHQ9FmrxSWUegv60L2xPFaFc1nrfAxa/q
-3XfCMERRXDSoeUdzuXmz2woI/2YKxpFpRYDxQUtuQSK6tPwLjPKUu/Zv8R+wzwm0
-gQo92EMpThvwspDWuc/FDtsxjuHG7U+sjeWRS0vJIqjs2miFXXcvMdvHHxjmuBxf
-2IHwUzbNIpaCpcpXh+eGR9s4fWnAAPbfJTJC/Gw9gO387W97Z+sJ/N1x6O2WIpzX
-uc0T/D2ky7cxfQpmpsH29ihohKVZub+Is9RRuc5l9c/ZrS9fXwDPcZMaR5VZxTZt
-02XYtTvheAZPLBozPplk
-=ngCc
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88bFgP/jf1Tlxdow9cz92QQ5JUIZPv
+8V/ZyUBS5zpHFbWTmChse2g4E59S1D/tcgQwlYF2wHBldQq2P47vVG9HYIsrbhjm
+gR5huGuHmLtA280+5QspnVTC+zJPSLn7NpYX5WCSUiWOE2MLUFtTtlBFvt/FZGER
+BAOjgk1KrSOhRbAXWuSzOivts+Vew7qOCIMwWbIeO+2athEzNtDYa0CVS7lj0hGk
+nPr06dDRTb+ofHqxQ60aICXYwBA8x5zIqFBfeeHHoM4lvqxbRNtN5iFogY0WPPXt
+kCoyYdXJj62zkRpKxUIPPS28VpS3I/KJG4s2AAUl6LOpDbhmIakIyQ8bujq1eKd5
+u4ln9SmOnCfhS4KRAThbBxRlkozsDGCM+BMlHcpbAlZXS60D7m6vchKKzizoXXS7
+iFHid36yrQCwxdHLTdCrC78QREa/G2MePnyxJtBAp0qhf2iqNQVOWtJ69NmYO9UV
++S8Xfg3xneW282vA4SjJK01so8jmMUQQX9RTlrxDVGwBUPP03AaR9Z/TJjIzcLn3
+G8XS2Wt9fo72MUp0NZuozlWQtbJ+XYBGQ1xsccfmGZaocSWkUzLMKzTrRSAqcfR8
+P5V+cMjL2lFsUhsUyiIR7dy5WkG191Sv+x2X3QS6tkawlTDyzrEXyAEmfCb79Hzh
+3A73sQeec6qmlRgnZUWt
+=qe6g
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/json-c/files/json-c-0.10-automake-1.13.patch b/dev-libs/json-c/files/json-c-0.10-automake-1.13.patch
new file mode 100644
index 000000000000..285c68b8b8aa
--- /dev/null
+++ b/dev-libs/json-c/files/json-c-0.10-automake-1.13.patch
@@ -0,0 +1,31 @@
+https://github.com/json-c/json-c/commit/36ec47db49277f4a5eda30823cf6d1f238f34991
+
+From 36ec47db49277f4a5eda30823cf6d1f238f34991 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20Gst=C3=A4dtner?= <thomas@gstaedtner.net>
+Date: Sun, 3 Mar 2013 00:17:25 +0100
+Subject: [PATCH] configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER
+
+the former has been deprecated and does not work on newer autoconf
+versions.
+---
+ configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 1a428b6..d68d7a1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -20,8 +20,8 @@ AM_CONDITIONAL(ENABLE_OLDNAME_COMPAT, [test "x${enable_oldname_compat}" != "xno"
+ # Checks for libraries.
+ 
+ # Checks for header files.
+-AM_CONFIG_HEADER(config.h)
+-AM_CONFIG_HEADER(json_config.h)
++AC_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(json_config.h)
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/cdefs.h] [sys/param.h] stdarg.h locale.h)
+ AC_CHECK_HEADER(inttypes.h,[AC_DEFINE([JSON_C_HAVE_INTTYPES_H],[1],[Public define for json_inttypes.h])])
+-- 
+1.8.1.6
+
diff --git a/dev-libs/json-c/json-c-0.10-r1.ebuild b/dev-libs/json-c/json-c-0.10-r1.ebuild
index f3177754ce40..da9b9b07ede9 100644
--- a/dev-libs/json-c/json-c-0.10-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.10-r1.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/json-c/json-c-0.10-r1.ebuild,v 1.1 2013/02/01 21:16:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.10-r1.ebuild,v 1.2 2013/04/29 18:51:01 hwoarang Exp $
 
 EAPI=5
 
@@ -22,6 +22,8 @@ PATCHES=(
 
 	# bug 452234
 	"${FILESDIR}"/${P}-headers.patch
+	# bug 466960
+	"${FILESDIR}"/${P}-automake-1.13.patch
 	)
 
 # tests break otherwise