Fix json-c automagic, bug 525362

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

7 files changed, 41 insertions, 25 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 989300eb8c27..07a6bf5336c6 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind-tools
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.273 2014/12/11 07:05:51 idl0r Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.274 2015/02/07 12:34:32 idl0r Exp $
+
+  07 Feb 2015; Christian Ruppert <idl0r@gentoo.org>
+  bind-tools-9.10.1_p1.ebuild:
+  Fix json-c automagic, bug 525362
 
 *bind-tools-9.10.1_p1 (11 Dec 2014)
 
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 2102e7d406be..6cd17bca215f 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 SHA256 5e39cd20da4f2b3bf5ee352d73249c105de1e182c595afb20a15e950f2f88f02 SHA512 f46290cddfb39b077269cd2198d04eef6a7e680b5f0f8dcf471e551a61b4b7a56871a56cdd20afdeaa86edb790513d8c522032fb725a266c18e0e59eee803dcc WHIRLPOOL 01365d359cd7a6e1e2e8015a041df3747c58b3942a0c586c9db6f2cde36351e95ee8650483ba0439b9a748a354e134145945217a44e38e11722fad5f21278972
 DIST bind-9.10.1-P1.tar.gz 8356463 SHA256 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d SHA512 5fedff46d9cb0ff2544624c6d998f4f4bcd82152730e8e936c2611847fe443018b5c5c1dfb1dc49888dde5e3e30c3814f08369525612f0770575d54a3133ed48 WHIRLPOOL 6f39ff0e15676ed68f6d48d2ec5894b00de5192edbbbff94444f62dcf83e62a1e72019d575da97b6e6cde91b8918da78721c48510dbaad88095d4f2b3af375eb
 DIST bind-9.9.5.tar.gz 7729695 SHA256 d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1 SHA512 2639e73c0b57a6a34727e65e44a6d4c90e8682145f92a0a543f80fe0d3cdf707287b67d7ff9f1da5cf91a3c23861033b542871bc909ce0f538b4d3d368932574 WHIRLPOOL ad25df5dfebe06db950755d46531ceb36ae5f8dde38d1a53a3ca593bbd62161535b8a611c6a89701ff5853c740a5a2ff5e7f83da3841ea5482718e569b9f9c71
-EBUILD bind-tools-9.10.1_p1.ebuild 2866 SHA256 9a4ec81d210c54d480aba39a4a666aab694d3cb587221c59a1015783b67f8336 SHA512 d26aab411d265947a50e65b1809923afa165059fe3775fe5173a30e94216f3f4b81ef2c7f99e8261453c70d5732e513435c8b8204bb522ce588e0c0e4159b555 WHIRLPOOL b649e1e064212f6bfeaeb10ef99b0f90faf504a55d082f34756c0879adc3cc8d5f73a506e5f5963567330acc9db4d368b03354d4d006501cd14e1ae8f2522b4b
+EBUILD bind-tools-9.10.1_p1.ebuild 2888 SHA256 107e1e6445bdb06bc432057191cc551b6b8f8cab6ac5ea7029c24ce13066729b SHA512 b2486f19fd128148042317168fc71a19cdf33398b6aa5d77dec713e0fb21e39bbbaf4f4bdd9421c4cdeadade1411276c8e365b305e1c2278792e1ca932eb5976 WHIRLPOOL 81982cd3434191a1b985302eb403456156326eadb04cfed7ba7bb674fbc656048fcaf4473826887fc16e65faabfcbf60930bf80ef9893b619960e9dfa3eea53f
 EBUILD bind-tools-9.9.5.ebuild 2725 SHA256 ee0c2ad62f49fd08b907c3d4eac80867226603902b0280c323457b51f11b7739 SHA512 44eb686d6390f1320757dd31c1eab84fcd524acf3323e2ac909561937652438febfc515619584070ced40628182d7deb68c69621c39460b1d8f0f204ad54cc33 WHIRLPOOL 22e3a13da29727f6894fff6c33e8ccb5257d1690ae12948e6130ccbeee6921a38af90b7cfd729de38bf2bb030bea7501ee05283f334339c68647f9f5aafedbe8
-MISC ChangeLog 39622 SHA256 b47bc524ed6dbfce2b83901c3225e176ad5d980ac02124f17fa71e20cf6b01e8 SHA512 543e2ae4b94696fe0231b44c15ec7a968b55d8de0a6db48809b0d1b566bb5ad93b3d8bd353eb31f1f43d5e4e280724075843ee9f6ed05c8c2d42c54b0366c98b WHIRLPOOL 4fb20a9fd12d84ad6be3c05728404dea8d0cdff2e09e76ea8c72c09e3aaf7874186f15d87c4a0af9cac88cd57acc3cc270f59626d2ecc99d09d8da09c7151e86
+MISC ChangeLog 39741 SHA256 c638ffcfe5bfe42b02fc7e7e422256a77a29fc4d1d9645d25c1d03e9793778d5 SHA512 33d3f434997e2246bc4f3614d109c62c95fe0f477bcad52688482c7f245614c57df01a2ae03b4677220a6511ac951f80b08852dbb5a65013177b8fb96a373dc0 WHIRLPOOL da7109c0d11c7e0fc59325db686952c714485ccf625bf34250ba94213c01d431b336552a958528d7ec0471395279567702f318aa4bd4073efd8acb8d12b1d840
 MISC metadata.xml 499 SHA256 8d5d4d0257735d89c3435d0c595aa743e08e79cc8345996a00f1cd0744d92c3e SHA512 d6c960b12a25d46a767131b94712d643c6fcd9508cf9dc02eaff1681749819a0a11615d8fb2b76ba6b78252fa14d21755f05b4f9a7157e16a97a52bdbb688301 WHIRLPOOL d7d8ddf46cfcc638c539d7eea0212086923fdd866b4f9b4c6d1808ead5ccd9bfce63736ede94163998fc50a99664ce36ee923cbdd133dcc033448edb4f7ec0bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUiUJVAAoJEMOx0zmdw4Z1LsYIALBtjLvrPth+ZHhPxZs9LJbz
-bLdx+tyKdkuENtnFxinUT60rKCNPlDYDo5y7eQry5z91RqiAGLEpcu3mAlQvJn1O
-HmB1OPwaFd6ny+SCSyS15u6U0YJYKone4DwAKVVKBgnEUgBHJ+5SqU/+zKEMXl4j
-bP5PtRbZGUO6jlnCQvyPf9xShvNIwswZgr4Slb+/J/b9V4lBHePvcZsrNNJChpN1
-SfAzI/LUPMUXWn7mVKH7mIfMsIjvQi0MngFeSrA1HM64kdNe6vn3Hlun6/I51z2p
-w9kuBJyVAgTEhm6EWEC5iiZsyqFfeuBS0NqnXOh+oGWpW83DcDH0RwYeKEIp30Q=
-=XyuI
+iQEcBAEBCAAGBQJU1gZZAAoJEMOx0zmdw4Z1xCkH/R4FkRztcV4R3YK9kqqeXbHO
+hPrjiIg63MVSIs8pyR2l/QxWp0HjIL0sxmYmg2BLM8bhSFT2UTabfGmdz2dPQuLL
+/5RIAMYbx8KwC70AN0GyNApJokzvQaF0MWiL8Erp6hb/5CUR1LErfmNudJ7a+YJW
++Gy2WYMt2xdR0Z1OZV0aYVb7cwPiMrri5ju+MRQ097miYgNTW5iiOFNrqQSCLniC
+Vh6LsniSGrFLBQhixkPRJunIlBmocapNyrS+XrQ6cfXos8oYwDipAW3CLiwoAgXm
+5BYjCDmMStmnfN7trqpaey+wkn+pwO0J45yGUeSs67Qs/uqmXjQ2Y6bvji1ubhw=
+=5X1A
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild b/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild
index e7c365c36114..31a93d99df21 100644
--- a/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild,v 1.1 2014/12/11 07:05:51 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild,v 1.2 2015/02/07 12:34:32 idl0r Exp $
 
 EAPI="5"
 
@@ -67,6 +67,7 @@ src_configure() {
 		--localstatedir=/var \
 		--without-python \
 		--disable-seccomp \
+		--without-libjson \
 		$(use_enable ipv6) \
 		$(use_with idn) \
 		$(use_with ssl openssl "${EPREFIX}"/usr) \
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 3d8d31df7c74..90ed59099c7f 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.525 2014/12/28 16:17:11 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.526 2015/02/07 12:31:55 idl0r Exp $
+
+  07 Feb 2015; Christian Ruppert <idl0r@gentoo.org> bind-9.10.1_p1.ebuild,
+  metadata.xml:
+  Fix json-c automagic, bug 525362
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> bind-9.9.5-r3.ebuild,
   bind-9.10.1_p1.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 7b81bf10bfd9..bd08465bbe21 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -19,14 +19,18 @@ DIST bind-9.9.5.tar.gz 7729695 SHA256 d4b64c1dde442145a316679acff2df4008aa117ae5
 DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 SHA512 463b9c5178cd00b8c3626fafc32e2c4db5005b9442c364525a22a3bd20b6f3ff99fab32e9103355d08546b349398499e221109a96d8d073d1fbe9a1f3d385ae9 WHIRLPOOL a00f0e5564f37b434f84d152e797c249640913e13ab7f109e2ff0abc45c519a28ad24e4f6173fa587c4774653f4c9381f9b8ab33c5697f47b30fa139eed48569
 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 SHA512 62690ef3471055e4ae3d8dcedd296c0a5c3a75a3be237c76fdea07aa879f2bb1df4c56b8ca1e3ed9b488a980d16f9c9a3a12a53ef3208607472d18c225916ac5 WHIRLPOOL da3683f815509c5adf0ef819cf1165b64ba35efc6c588fd46b1c6b3d0374766442acb02ecf19dd90bbad5afb174dd27fd3e0894166ea8e78901e95ae870f9f5e
 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
-EBUILD bind-9.10.1_p1.ebuild 11882 SHA256 49e938c5ca782a8ec0bdc35b690f4916a4abc3074476c48151fcfa71026f0fe7 SHA512 a8ff74d2f04a339de06f3c7da8b00e0f224fdb66ddd20952c711dca1c883389e422d80b913c65dd83b03558570f58317275f3e8517f5386afe31f56d3a529abf WHIRLPOOL 7a2ba1731f2114a4a3b4214e4c75a9095d167bd29d6cb01f53a8c20c4514954957190235fa22994537339eafac3531b6dac3c97550c9fb31bb642be29b0d1599
+EBUILD bind-9.10.1_p1.ebuild 11938 SHA256 9843ae3d208efa936f8488b90406e43855a3cf7b35fdc42f7c4839699e61d0f8 SHA512 fa62444a0ade2d55b30593985b057ebb8f051eea3e88e1ceabdf282d4482752306a79b09ef37e729cc67b698c77671b1013db2f710314d046a9fba99383ec968 WHIRLPOOL 2d44532330ebc0c6126441b4a24b91f4e166da6bd43d11071851ae8f4775053ad33963a0d757f41daea51a394a013640abf38594de76a90382d646dc56f02d4c
 EBUILD bind-9.9.5-r3.ebuild 13833 SHA256 43a751a4b205339a3ae2a9bab0453643cfda43ded39cdff98942d90206270e69 SHA512 45a798815897e6f9bedbcf839077f96ed7457b3d5f823b51a71a38bf1721d20678df7d97c872afc01ce5f1f6ae57705c20d4f56a58397f7e00a7a91e67a142ea WHIRLPOOL 331b622443a7a7b805304da1796ead9205e91971a7a680d709e44ee37053816b303b89a9db2bdbd743e85b5abfcbd8aadf4d0867f458c65912d4279b28fd47cf
-MISC ChangeLog 83075 SHA256 839aeb757d8b44714e5f28aafc8b3b94a8dd055c82e0d1241710572525898f9d SHA512 86f1b10bfcfbf060c3cbe6a3f070973f64cb4c7c11b7b987582402c440423be1164497d062a478cf534e0ae2ff0464832e48f27960c6afe659e3bcf0e1214b72 WHIRLPOOL af785e6de90f61c780069a5a696e568d0d84e262ead730efb5bd346e72c3aa6330035adc37e2f864f22f7a8ebf9026be3b98a67ffc2a99a82039855f35a14b75
-MISC metadata.xml 1091 SHA256 0cbbcee4db61f456c451c9fbc25566eb6fa1a3a98511e31311ff2ef14591d5ee SHA512 c7fcce7b0d1a9424780c19ba8cf891de57c41d5b0ea0ef5d4b44012a6ffc6bfb130912852dba9b1f72e7d31c08391007e3ac81258ab50ef28de83210786780ad WHIRLPOOL f46f4e8a9f897c9de5f9fefe838cf2c71ef8bbc57f3f712874400678b260fc19f7a3d2222d0f9948a3addae7b9e13cb5f625f46e81508f5f69171a7971de65c8
+MISC ChangeLog 83197 SHA256 2061ce1ad2106e8c3081024a68799a94eeda43bbaac66082f54e2953c1f9f0db SHA512 74cb447d57db21159543ba261c678f12afb89650e30602644c8c48406d78670fdac4b3445ac3fbe47647557952b7ba780e0993e1c153f8b833a2141babeeea09 WHIRLPOOL 2175df3564bee665ef282df191498198ba9272783eabffcb2cb69cbc9265cbdc37b582f3adcb8387b00393ec94449aff0075b76dc205372b85a26e35e005110e
+MISC metadata.xml 1149 SHA256 f7e74359d00c60516ade19a1f0dbd1d1825e49998f533277e279c2872e704702 SHA512 c418575d20b87a43cb692200a476f4c339f15036770f72f381a6e48ffbf329694b78299b3f85a2c6bb74a692aa9205d47d689b99239a602f54498340072cc25c WHIRLPOOL 3c7b51864526b927a5df4739a045ab903f1fc0d7ca5cb2e87e20282aa63a23b4bed14606fb92c30cd81cc67c7f93916b3943de3403ea274006c4a3bccbb79347
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgLQgACgkQVxOqA9G7/aDwAQD/W0uB2P3R8yPJUJzbSd7QdSvt
-DiYFPAdbZbYhPRTCp1sA/3GSkw6NjCSYZjPZV7xGNSZrdzykksGB+PKM9xNkQ3in
-=RnaW
+iQEcBAEBCAAGBQJU1gW9AAoJEMOx0zmdw4Z1XY0H/2tngZ9QeWJsYC7j0qnllY84
+Up+JHhDm/1Xpp7vqlv1i6HOygEd39Et/FLde17iwBivarDmnh+Y0pBb9dtyysHKa
+1sn9NjQNCNzpBHF8IylDt1XZ5weLgJ+A3FDRAtwU56sXGVATGoRqLQDndfsYai5u
+PB/Z1Eyf3Gb5RrOTQA9EoHXn0CKj73mXyRpZrdgoFgD6/Tl5Bfi/NSwcFdofsBFK
+BBO1gv0eS3sKtQcjJXMGSMHiH1mR4JB+V3kUm2KD+8SxFIyWa74G2pjkwH4p/3+r
+p48y0srnU/tCJ/ZjpqKeSgFxfiT9/6l5dphN7+IYWfAkXxxwwDX+iZy3UzkodLE=
+=EkDa
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.10.1_p1.ebuild b/net-dns/bind/bind-9.10.1_p1.ebuild
index 7ad6186c3c7f..ff4f1a2893b4 100644
--- a/net-dns/bind/bind-9.10.1_p1.ebuild
+++ b/net-dns/bind/bind-9.10.1_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.10.1_p1.ebuild,v 1.12 2014/12/28 16:17:11 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.10.1_p1.ebuild,v 1.13 2015/02/07 12:31:55 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -41,7 +41,7 @@ LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
-ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
+json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
 +threads urandom xml"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
@@ -66,7 +66,8 @@ DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
 	geoip? ( >=dev-libs/geoip-1.4.6 )
 	gssapi? ( virtual/krb5 )
 	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
-	seccomp? ( sys-libs/libseccomp )"
+	seccomp? ( sys-libs/libseccomp )
+	json? ( dev-libs/json-c )"
 #	sdb-ldap? ( net-nds/openldap )
 
 RDEPEND="${DEPEND}
@@ -169,6 +170,7 @@ src_configure() {
 		$(use_enable fixed-rrset) \
 		$(use_with python) \
 		$(use_enable seccomp) \
+		$(use_with json libjson) \
 		--without-readline \
 		${myconf}
 
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index a917d4a721d8..ae7086a38a32 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="fixed-rrset">Enables fixed rrset-order option</flag>
 		<flag name="gost">Enables gost OpenSSL engine support</flag>
 		<flag name="gssapi">Enable gssapi support</flag>
+		<flag name="json">Enable JSON statistics channel</flag>
 		<flag name="nslint">Build and install the nslint util</flag>
 		<flag name="rpz">Enable response policy rewriting (rpz)</flag>
 		<flag name="rrl">Response Rate Limiting (RRL) - Experimental</flag>