gentoo resync : 25.08.2020

5 files changed, 68 insertions, 12 deletions

diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 3497ddb6bdb6..2f7b1fe5e721 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -4,8 +4,10 @@ AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764
 DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d
+DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
 EBUILD json-c-0.12.ebuild 916 BLAKE2B 835228c2ad857ff7a698d12400958b8aaa7da2828d92617b36db62e01433a3efbd3704134089b63f3a440489ae03bfcf873c303b35ccca516099d47f7633fb0c SHA512 02b0f07045736394ef18ca98901496c73153043e8825da2039c89607d5d2ca399e70ae371297f0b88ec05caad06a95ba83e589ebc89eea5345ecb12a05b4b3de
 EBUILD json-c-0.13.1-r1.ebuild 979 BLAKE2B 7df2aca92e501c35826dc6c30e190cbafc2719203bba58bcf525b8d6bb15e3602d4b69c5544032c34e90fd6e9a285cedeab5094e383aa2b0d434660ee8b72b35 SHA512 b7ed1dd4ac4ba08082c244bfe414abc1462491ab03d3ee1756641936323f8c19d6ee45a4681e48f3facd6584c8678e5c200d920950a4533b0b8c345273885056
-EBUILD json-c-0.14-r3.ebuild 1171 BLAKE2B c721f662a31ea9027873323bd09d4e36ea0dd65b532b68a0cb399fb94c6a25a87f90b5607bb9dbef8d76b6bb0b089b7776a037524f4342fac8e44859b2141cb7 SHA512 3b9eafd2027eee5164ad6ff6a952c6ee27490ee62085e5b1dd7803f95acd80e1c36d4bb2a61397355b9efd87ddec0998a8997f0512e314ae234294a513d46aab
-EBUILD json-c-9999.ebuild 896 BLAKE2B 50472b5af6d32d7f34260d23cd3104b169950f4d2558e709e4ac1891a5fd3318e3642c24aac053237dddf3164407d028270c7380c211ae7df24679bbc2bccf66 SHA512 e415df947a96271e63acd845b5a61032f7258b9cbfe60771f849c928f0223728f2053b73045163fd5a9601551956567b0f802f893e1077c4a87cfc60020fdd18
-MISC metadata.xml 1000 BLAKE2B 3b29ad6f95a8a66a09a2db159cc3bb6881cca30bf12a6659999c68500b739a5562e67d56380aca518da55f32e4edc117f59200adcb73b51257d34e6e952a460e SHA512 fc23e7b7ab9b16a04e5a1bc85571edb5629d37eb599d76db34ab9d988e54dd4d2ddc98f8e2567a97bc18871c0375cf3353053a67ae7eea47657928f40b363f6f
+EBUILD json-c-0.14-r3.ebuild 1239 BLAKE2B 457644ffbce97ecfdfab9a0c5a65ba96c6c8a29c439001af513f4c6a93d4f309a09da08c92597a680a3786b5e25d4fd69d7e1ca8d8935a09dcfec30a4b117fc8 SHA512 84039f735a86db328a40443bf7b06a2b1427e61cd3ea9d25b5bbc9da44d61c74256d698aea4a2a6c7c31787ff1b379b8c5ded801293c54bcfe963a5ea7e3187e
+EBUILD json-c-0.15.ebuild 1087 BLAKE2B ab379406d0c4b66ef69440c5871ebe7e26bda599ff605d17f62f774b32e035ab160d012cfe296e7ed40bf95cf3b20fb5918bafc2f1ae537534bf26b935ab2437 SHA512 bc5a606bf685f358fb72471318f70855748597fb48869fd0b944623370c8f1a085593a8022823bd5a2b7233ed8a641bb7343700e59f85bca0defd043b9771a53
+EBUILD json-c-9999.ebuild 1015 BLAKE2B 4d5baa21396b2dba874146c9d8bba5bfbbd69174f7a5fa0a2f2f298c1a7118a72ba3a9f73470b697b20e6fb922dc84933b7aceaf471c2ce6ac20dd0d701b0a15 SHA512 28b3443e3b9bc50d0bb36c6fe1b98d68cc00899f5facbeb421c2e98178255d9d61e105731837ff21cd05f725095b34963121dc09e1147ec08480d30ca8fe4aaa
+MISC metadata.xml 984 BLAKE2B 392320cc8a02c2d1cd3190d7f0631771d6be73a131a68602c4f25a22fd6e22e00e491415a36708a739363de526b5497517544f95582f69fbe2dfd8ae89f308f7 SHA512 207f7d87d807b29467e23f7609a2a041eac3a9444d93b23d8950605cc7230212ee44f4e20dffb90d843937876fba63f4b477bc35e5a2cd3118adbc1ce3cc6e05
diff --git a/dev-libs/json-c/json-c-0.14-r3.ebuild b/dev-libs/json-c/json-c-0.14-r3.ebuild
index 2b34de77a7fe..0eae66557750 100644
--- a/dev-libs/json-c/json-c-0.14-r3.ebuild
+++ b/dev-libs/json-c/json-c-0.14-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/5"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs threads"
+IUSE="cpu_flags_x86_rdrand doc static-libs threads"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.14-cmake-static-libs.patch"
@@ -34,6 +34,7 @@ multilib_src_configure() {
 		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DDISABLE_WERROR=ON
+		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
 		-DENABLE_THREADING=$(usex threads)
 	)
 
diff --git a/dev-libs/json-c/json-c-0.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild
new file mode 100644
index 000000000000..06f7928f8f96
--- /dev/null
+++ b/dev-libs/json-c/json-c-0.15.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A JSON implementation in C"
+HOMEPAGE="https://github.com/json-c/json-c/wiki"
+SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_rdrand doc static-libs threads"
+
+BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/json-c/config.h
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DDISABLE_WERROR=ON
+		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
+		-DENABLE_THREADING=$(usex threads)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && cmake_src_test
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( "${S}"/doc/html/. )
+	einstalldocs
+}
diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild
index eac441be4e78..effac5b4d6ca 100644
--- a/dev-libs/json-c/json-c-9999.ebuild
+++ b/dev-libs/json-c/json-c-9999.ebuild
@@ -12,7 +12,9 @@ EGIT_REPO_URI="https://github.com/json-c/json-c.git"
 
 LICENSE="MIT"
 SLOT="0/5"
-IUSE="doc static-libs threads"
+IUSE="cpu_flags_x86_rdrand doc static-libs threads"
+
+BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/json-c/config.h
@@ -24,9 +26,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
 		-DDISABLE_WERROR=ON
 		-DENABLE_THREADING=$(usex threads)
+		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 	)
 
@@ -35,6 +37,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	cmake_src_compile
+	use doc && doxygen doc/Doxyfile
 }
 
 multilib_src_test() {
@@ -42,6 +45,6 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
+	use doc && HTML_DOCS=( "${BUILD_DIR}-abi_x86_64.amd64"/doc/html/. )
 	einstalldocs
 }
diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index ca10c6aa7ae5..e822c83364dc 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -14,11 +14,11 @@
     <name>Proxy Maintainers</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.
+    JSON-C is a JSON implementation written in C. It 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>
   <upstream>
     <remote-id type="github">json-c/json-c</remote-id>