gentoo resync : 21.12.2017

12 files changed, 65 insertions, 24 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 682b4b9aad2d..50281f59d145 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index defaf736774e..cfd751d31b52 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -5,4 +5,4 @@ AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c2
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
 EBUILD metalog-3-r2.ebuild 1488 BLAKE2B 5240b4290bc4df6738312a9c0474ca114b658fc9c55e371dd69c4ce1b680293d3d92899a7aa39a7dfd35db5eb583365fa539f75f203b912000b542dccd1ecbc3 SHA512 c116056aa22037bbfd20d6e53e55b60972821ebec8f0693dfbce8f928401a2cadac3dee4a2520527348b5d7c4174d2cd9e8937306e4a1550fa74d571d0e6e607
-MISC metadata.xml 412 BLAKE2B 669797f6cec852364918cc83bbd58c3902815ca8b060f142ce90ae1af18bbf37ae460aad132ab091a62f3d206f21f2a30a7162423f7fe5490af458ba5464adb8 SHA512 3c5b8ad724089154480e4a1672e714fba022f30e371d317e53c144411ded8d8ca92bddac9eb51503ed9eb9e8069b851a8ff5078f9c9b576542efc54e621a98a8
+MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index e6a099eb943e..cf5328e7d009 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 17155b7d2fcd..6aeaf9b027f7 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,5 +1,5 @@
 DIST r10k-1.5.1.gem 164864 BLAKE2B 398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
-EBUILD r10k-1.5.1-r1.ebuild 2102 BLAKE2B b080d33d3f98682ad55c04263927882b7923a9ad2607f5973b9eb87c1f44de7a172d7c05f88329ade2ace9a8ccf40417b5434f6ea191c148f930eeaa7673d990 SHA512 2243cf8da5001705005ba71b871f10be7a4b48a535e9164ed365597a76150548057591b3c067de9c188840e26239cc4f9479394b0120f80753f983c6d2455d77
-EBUILD r10k-1.5.1-r2.ebuild 2137 BLAKE2B 0c48285a87b7853bf9f4a206f0573acdd65c9ec2ad85bf065f93c765f2bcbecd397f836dfdb4cc5039719a510e2ffc98c17dba898808285e8c28149396c41e92 SHA512 155b09735b2ee73219dba88d4a6ab310b0ab388fb0bc654403432d62d1342187bef43a846fdadeb75c15b28f0293cabd1823108cdbc9d4d8fea1de884680f3e3
-EBUILD r10k-1.5.1.ebuild 1999 BLAKE2B 0d246cecf557ae538599b6cc7b87e6d1ca5b205e82284440be3b39a072af03aedf6b11a634ef280603dc19b711c06339498cf76ab05dd6dcdfe259acfe1ad2de SHA512 f415641c86940aea7352ecbedcf72ecc885c2dd30b55f63cea2e361bfa8d41889442576ea09434317d8f0b25cd66cc28e1d5edf1d10c55aeedfe0301632e1cc3
-MISC metadata.xml 697 BLAKE2B fd1f04f18c3209eb7f6d43b836ab994eeb7736e9322c91ad27347130ef54848a10dfa1201ff0688f9621ea8e00e70c8e52a2c355ba59997b82c950eefd6a5750 SHA512 223b3b6d5d9984e66f9a0ed9a0be6fbf82d6859d407a57222f447516a4db96c58516742b8eda263e2dc70447cc6d8c085d7f3ff197a24443daccb1292fa04436
+EBUILD r10k-1.5.1-r1.ebuild 2099 BLAKE2B b543d218a0ad9f1ae2757486b9262c203c994dd512d3b2c5466c321493c2feb46344436d14b649a46fdb006ab7515dce8deb18497fe06fb0fa55683015276e79 SHA512 bdff5cd90b0b6b2533ce625b1dd2042bf11c98e2469d34a9cce7b14d844649d4044fa71b6458a82f7462b7a2f5efb00c32ca480554ea2c6ac3a714161a9cc926
+EBUILD r10k-1.5.1-r2.ebuild 2134 BLAKE2B 597a5b42e0bda5da73b54d6535acf9aa614a71dc1e893951cb5c70e9ecaebfb7ec0bfcc9334162c5bf63d45d17254a732a1b4544d0916ca636e1baa37da81c9f SHA512 504697400828795efd7bdc3e5ee1d7dcc55a7cb01e56941b01555d3e28ec618733b45e3e0e8e316c56457d51153276b7b5db109c98edd05599dca72a28b22f43
+EBUILD r10k-1.5.1.ebuild 1996 BLAKE2B 84002c1f3961a39bbffc2dd51809afab7f5e8e02df5ff6dc1b0667c319e6d7606c160ae2244dc338ebcbbe71a0c43e0fa03b981ff750f252a3335de44bcf5f78 SHA512 fbb5ddf6a4dd7d34780cbc739d7b7fe74348ce4290c1317a23d00b62724ae41e7c5b51ceda111d222d62e09598267fd57489d97604c29db9db916311c7741bc1
+MISC metadata.xml 696 BLAKE2B 13606b1e280dd0e75f1871c7c749eb67a8e0b455a9f357bf65ffca50547c0811c050a31858fec52c97f3fbc9234222f34372f087660ca65e5a13fd1561d098f1 SHA512 1158620e00396d313aeda263aa479ac878a42162f5c122ca69b26a8fb41d84cbeae688b0c3cda77658edc12056ec17cd12a0c84b95422442ab1bb6aba3cc16df
diff --git a/app-admin/r10k/metadata.xml b/app-admin/r10k/metadata.xml
index 6a87f202ac65..685e7874f384 100644
--- a/app-admin/r10k/metadata.xml
+++ b/app-admin/r10k/metadata.xml
@@ -13,6 +13,6 @@
 		r10k provides a general purpose toolset for deploying Puppet environments and modules. It implements the Puppetfile format and provides a native implementation of Puppet dynamic environments.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">adrienthebo/r10k</remote-id>
+		<remote-id type="github">puppetlabs/r10k</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/r10k/r10k-1.5.1-r1.ebuild b/app-admin/r10k/r10k-1.5.1-r1.ebuild
index 5d19a50800da..0044332eec8a 100644
--- a/app-admin/r10k/r10k-1.5.1-r1.ebuild
+++ b/app-admin/r10k/r10k-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="https://github.com/adrienthebo/r10k"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -51,7 +51,7 @@ pkg_postinst() {
 	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
 	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
 	ewarn
-	ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
+	ewarn "GH-48 (https://github.com/puppetlabs/r10k/issues/48) introduced the ability"
 	ewarn "for environments to be prefixed with the source name so that multiple sources"
 	ewarn "installed into the same directory would not overwrite each other. However"
 	ewarn "prefixing was automatically enabled and would break existing setups where"
@@ -62,6 +62,6 @@ pkg_postinst() {
 	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
 	ewarn "to enable prefixing on a per-source basis."
 	ewarn
-	ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
+	ewarn "Please see the issue (https://github.com/puppetlabs/r10k/issues/48) for more"
 	ewarn "information."
 }
diff --git a/app-admin/r10k/r10k-1.5.1-r2.ebuild b/app-admin/r10k/r10k-1.5.1-r2.ebuild
index 4ca3d11a8025..02b0e351a6cc 100644
--- a/app-admin/r10k/r10k-1.5.1-r2.ebuild
+++ b/app-admin/r10k/r10k-1.5.1-r2.ebuild
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="https://github.com/adrienthebo/r10k"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -52,7 +52,7 @@ pkg_postinst() {
 	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
 	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
 	ewarn
-	ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
+	ewarn "GH-48 (https://github.com/puppetlabs/r10k/issues/48) introduced the ability"
 	ewarn "for environments to be prefixed with the source name so that multiple sources"
 	ewarn "installed into the same directory would not overwrite each other. However"
 	ewarn "prefixing was automatically enabled and would break existing setups where"
@@ -63,6 +63,6 @@ pkg_postinst() {
 	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
 	ewarn "to enable prefixing on a per-source basis."
 	ewarn
-	ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
+	ewarn "Please see the issue (https://github.com/puppetlabs/r10k/issues/48) for more"
 	ewarn "information."
 }
diff --git a/app-admin/r10k/r10k-1.5.1.ebuild b/app-admin/r10k/r10k-1.5.1.ebuild
index 79ba3681ff20..c9589256bce3 100644
--- a/app-admin/r10k/r10k-1.5.1.ebuild
+++ b/app-admin/r10k/r10k-1.5.1.ebuild
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="https://github.com/adrienthebo/r10k"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -46,7 +46,7 @@ pkg_postinst() {
 	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
 	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
 	ewarn
-	ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
+	ewarn "GH-48 (https://github.com/puppetlabs/r10k/issues/48) introduced the ability"
 	ewarn "for environments to be prefixed with the source name so that multiple sources"
 	ewarn "installed into the same directory would not overwrite each other. However"
 	ewarn "prefixing was automatically enabled and would break existing setups where"
@@ -57,6 +57,6 @@ pkg_postinst() {
 	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
 	ewarn "to enable prefixing on a per-source basis."
 	ewarn
-	ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
+	ewarn "Please see the issue (https://github.com/puppetlabs/r10k/issues/48) for more"
 	ewarn "information."
 }
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 9844e2590519..20b03e9bf5eb 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -14,6 +14,7 @@ AUX 3.7/syslog-ng.conf.gentoo.hardened 4520 BLAKE2B 968f77526cb027259acf507177f0
 AUX 3.7/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
 AUX 3.7/syslog-ng.rc6 1919 BLAKE2B 5769cd9f4464dbdde9a8af7b700292f59772132b3f32cf542b4cb4f596541c7f244c906d236650f09921c131e84722813578493b36e8d8281df401a1d127d3c9 SHA512 2681f6b1c4acd9fbb9e29b4b732c09b8384ffdb501aed15bbaac97409cc79269f2e5068dac5746bfcc52751c5943279c3cce5d3f869b4c6ec2cc5f23d2ad3b04
 AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
+AUX patches/syslog-ng-3.12.1-json-c-0.13+.patch 862 BLAKE2B aeab5c994f0c9e5c3909300f5f8b56ed22194746f95b6cc2f6e600dbe04c9f4016b3f1d085c222f0d7d6922765f71c56d1bd3ac1757b1ca07d11c9d15a6fc1b4 SHA512 ded991eeee706e4d51f48e803db75d39e907f83aaf9cb9994eef146ba8d7cc784e5d3890eb18acdb4ff2702dcf8291686c6975ba3b0c4f0d3817a301ae81a641
 AUX syslog-ng.logrotate 231 BLAKE2B ede8c2e3bd6fa67b2740bca74fa45e799a88dcb9aac456df4fbad5db919f0ac8671b7e073efa1d7fdf1f2c119521d6fe8d5e6d4209b0fb09062e8499bd3377be SHA512 f8dfdbc4ea59c4cbb500b9ac0d4f8c7e33d0510049c7945ee1ae50039dc011b1ca2835c18ee145bf3d9ca306aca0d0de879735c3298b8a0f944db6ba4747ab1b
 AUX syslog-ng.logrotate.hardened 1614 BLAKE2B c9845bb43bd09a210f06912131dd2ba88164f0dc58f9d81455c13bba0ee923d1b9a6025f6b8e5fd066254bf6d0c81588b8d515aa055da157c29aaa0aa63fd700 SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760
 AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c8f77d2ffa8508cd7b8c32d13a22ff63bc883ac7a79f21287681b906430ecb05bae7665c064adbe161e4e1647e3ace9c29 SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620
@@ -21,7 +22,7 @@ AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e
 DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036 SHA512 00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
-EBUILD syslog-ng-3.12.1.ebuild 4324 BLAKE2B 7b977e4ecee7072986d2e86ce074fecb02783fa339c3aaa0e3bb9863294b9df0c7d5db3ef37d89fe0ca4cf05361c1094915aec5d736cf46fc52e1fa91f8d438a SHA512 07c7854b1967daa778f67bf683d2649fcd11b2da32d13435916b7ca206b08573bf092510cbc41a2eeda5b24a2684affbd116a4dc1b578eee0df9d9f7ce72b540
-EBUILD syslog-ng-3.13.2.ebuild 4846 BLAKE2B a4a3d7cfbdecbaeea4a2884b120d0cc1f5949175c7387ef286bf5cc9146df65417d7a8a25051932596e0a0eb44066a74982338ad1605618074eb1bd00c25ea67 SHA512 2c64ee79bfcb457b4e03db752a2f770f5c3b814a1435c517db4f6e1f65d43ad9170184ef78482211bd491a3e239795d4a2abedc6c23b226f20c181ab7645316c
+EBUILD syslog-ng-3.12.1.ebuild 4392 BLAKE2B 34e8dc5ea99bf60d155229ae71938efd748f2e2003b03351d42fa8f2f42783a99c26176f6274451b58553cffb5dca1b31a7ea6b38d49f827a1adb43738c7247d SHA512 1658ad695798f020a24c571a0f924bfdae14528adb3b85f189669887350144102855daf042f4c4440b79049faee3f6989ac054c816e2ae11701db71139fbd1ed
+EBUILD syslog-ng-3.13.2.ebuild 4914 BLAKE2B 066accdc2db5ed70aa505ec415e84ec3a60a1db16918b010c011eec59d363f95ab7b296b5f95f2db7452174ec2481a2ed23d7540b31466e2e342ffbd8cdd05b1 SHA512 863f48b1c0940193a718bf5bd52c6ca6e55ed239034a7ed7942aea86affe5172465c62968b8a4b69199c2c60e6554352ab2426c65da004e30dc4e15eb7a8c098
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 880 BLAKE2B 9b7990fb5e4a4e373237b06d8468e958d98a60f52cba20d4018e1e0d39272525d503bf60206d8361798921e9c1da6b2fc8427ecf309cf2cdb8d2a39cdcd2da72 SHA512 84c16673492dbd6157c8f71810aa1377adce2855374485b1de57069f8516ba73893904b9ac22beb636eb9d04c7b3fcc49eebe7de9b219dfe8939f3f41136eb96
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
new file mode 100644
index 000000000000..3703bec22ba1
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
@@ -0,0 +1,33 @@
+From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Mon, 11 Dec 2017 15:46:06 +0100
+Subject: [PATCH] modules/json: Adaptions for json-c v0.13
+
+---
+ modules/json/json-parser.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
+index 0368ed8f7..356df48b9 100644
+--- a/modules/json/json-parser.c
++++ b/modules/json/json-parser.c
+@@ -20,6 +20,8 @@
+  * COPYING for details.
+  */
+ 
++#define JSON_C_VER_013 (13 << 8)
++
+ #include "json-parser.h"
+ #include "dot-notation.h"
+ #include "scratch-buffers.h"
+@@ -28,7 +30,10 @@
+ #include <ctype.h>
+ 
+ #include <json.h>
++
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+ #include <json_object_private.h>
++#endif
+ 
+ typedef struct _JSONParser
+ {
diff --git a/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
index cc6115f26bd5..b608df786967 100644
--- a/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
@@ -33,16 +33,20 @@ RDEPEND="
 	spoof-source? ( net-libs/libnet:1.1 )
 	systemd? ( sys-apps/systemd )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/ivykis-0.36.1
 	>=dev-libs/libpcre-6.1
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	!dev-libs/eventlog
 	>=dev-libs/glib-2.10.1:2"
 DEPEND="${RDEPEND}
-	>=dev-libs/ivykis-0.36.1
 	sys-devel/flex
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
+)
+
 S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_setup() {
@@ -59,7 +63,6 @@ src_prepare() {
 
 	if use !json ; then
 		sed -i -e '/cim/d' scl/Makefile.am || die
-		eautoreconf
 	fi
 
 	for f in "${FILESDIR}"/*logrotate*.in ; do
@@ -73,6 +76,8 @@ src_prepare() {
 	done
 
 	default
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index 54ef037f4114..ddb99e5c2c89 100644
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -33,16 +33,20 @@ RDEPEND="
 	spoof-source? ( net-libs/libnet:1.1 )
 	systemd? ( sys-apps/systemd )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/ivykis-0.36.1
 	>=dev-libs/libpcre-6.1
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	!dev-libs/eventlog
 	>=dev-libs/glib-2.10.1:2"
 DEPEND="${RDEPEND}
-	>=dev-libs/ivykis-0.36.1
 	sys-devel/flex
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
+)
+
 S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_setup() {
@@ -60,7 +64,6 @@ src_prepare() {
 	# drop scl modules requiring json
 	if use !json; then
 		sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
-		eautoreconf
 	fi
 
 	# use gentoo default path
@@ -80,6 +83,8 @@ src_prepare() {
 	done
 
 	default
+
+	eautoreconf
 }
 
 src_configure() {