gentoo auto-resync : 28:09:2024 - 01:25:57

3 files changed, 86 insertions, 4 deletions

diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index ca3bd8325ab2..963a640d3d98 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,4 +1,6 @@
 DIST json-c-0.17.tar.gz 390045 BLAKE2B 26be25141447f2b652fa09d7096141a8bf7992469bcc53b275c1bc0108fc36a8898a8185c381218d3146d00fa03bdd0b837be073410fc93af943b5f083dbaa69 SHA512 4cbedd559502bf9014cfcd1d0bb8bb80d2abac4e969d95d4170123cd9cbafb0756b913fdbb83f666d14f674d6539a60ed1c5d0eb03c36b8037a2e00dc1636e19
+DIST json-c-0.18.tar.gz 401788 BLAKE2B d39bab289976cb2f76bcf3ad8254f7f5b4d11e2aa4dedebd60dc7d131a3f6ec57beacdc575aeeb191cf449d16c549d424172e78464731eeb66305f47f72371c2 SHA512 4763f2352414dac3599bc2183b4fa57dbfaac0ca24de890097bd7d0bdda93c91efa280f6566e949e6d94212ef39a63fc76c5f9d0c54ff3d04b13c859717dba5a
 EBUILD json-c-0.17.ebuild 1203 BLAKE2B 698ce62f043343b1e32ecf5d8f5e141d79d6c2e3485d0492e74287fb726be90aa9acfa2ec49d323918f9519c7988d712689ad7a5ecd2c0d2f45a85c0f9cc3ff3 SHA512 451ade9ba1d173b70309b88c6746ab789a127e5a9184ec0bd1a400070d9e65fa74ecffa92433c1e30431ca832a3ebca170f1ce154e37aa475ea6901dfeba6dc8
-EBUILD json-c-9999.ebuild 1299 BLAKE2B 8183d6588f97a6db4b3cddf2dc8dc52d7807b8c2b59be3b0f8d182ad397cda6bfeb794963acd0e33d84b76b90e22c3f2338ed182474c810797409891d440f6e6 SHA512 f00396cc36eb236c4949b63eb4eacb537563f7cdc8b42fec3d36f764cd656d9a6b9de32d09e5353cc50cca05ef30aeeb74d9b010d217a72aa29f15cda7707565
+EBUILD json-c-0.18.ebuild 1647 BLAKE2B 593be622a108c706b691244328e76dcc9d40e9e16a7e8dd7477efe1a14111964b9a2561f74fe8095922f319ab8c7fc78618ad63f4eed37e7187472e8170af1aa SHA512 683d7a1b6a05acf7336c5b8bbbde4223253ede5b49572ae73050040e1de6c1ca7cedeb485c0f616a19af57a16acc6128493771d8677cc6f1e6e1366ddaccb2f2
+EBUILD json-c-9999.ebuild 1647 BLAKE2B 593be622a108c706b691244328e76dcc9d40e9e16a7e8dd7477efe1a14111964b9a2561f74fe8095922f319ab8c7fc78618ad63f4eed37e7187472e8170af1aa SHA512 683d7a1b6a05acf7336c5b8bbbde4223253ede5b49572ae73050040e1de6c1ca7cedeb485c0f616a19af57a16acc6128493771d8677cc6f1e6e1366ddaccb2f2
 MISC metadata.xml 657 BLAKE2B 4a1755bb32db3d622b77db8f9f362d696e7b9f1a1d5983beef1994f00499a21a0fa8124fbcef01d46dc615569c0e1fc51f207658f20e48235caf245edac2fa4c SHA512 67df67ef6ab7a0b871bc7c6d436aef9a1f4754eeb38a9cfdf8885877951927e2238d74e7b8bc5dabe0553a1bf62bf8357a0374ddfa95b1d155c6254ee79b5e16
diff --git a/dev-libs/json-c/json-c-0.18.ebuild b/dev-libs/json-c/json-c-0.18.ebuild
new file mode 100644
index 000000000000..582ba35e41c2
--- /dev/null
+++ b/dev-libs/json-c/json-c-0.18.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A JSON implementation in C"
+HOMEPAGE="https://github.com/json-c/json-c/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/json-c/json-c.git"
+	inherit git-r3
+else
+	SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="MIT"
+# .1 is a fudge factor for 0.18 fixing compat w/ 0.16, drop on next
+# SONAME change.
+SLOT="0/5.1"
+IUSE="cpu_flags_x86_rdrand doc static-libs threads"
+
+BDEPEND="doc? ( >=app-text/doxygen-1.8.13 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/json-c/config.h
+)
+
+multilib_src_configure() {
+	# Tests use Valgrind automagically otherwise (bug #927027)
+	export USE_VALGRIND=0
+
+	local mycmakeargs=(
+		# apps are not installed, so disable unconditionally.
+		# https://github.com/json-c/json-c/blob/json-c-0.17-20230812/apps/CMakeLists.txt#L119...L121
+		-DBUILD_APPS=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DDISABLE_EXTRA_LIBS=ON
+		-DDISABLE_WERROR=ON
+		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
+		-DENABLE_THREADING=$(usex threads)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	if use doc && multilib_is_native_abi; then
+		cmake_build doc
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && cmake_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi; then
+		use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild
index 2ee46fcafda5..582ba35e41c2 100644
--- a/dev-libs/json-c/json-c-9999.ebuild
+++ b/dev-libs/json-c/json-c-9999.ebuild
@@ -3,14 +3,24 @@
 
 EAPI=8
 
-inherit cmake-multilib git-r3 multibuild
+inherit cmake-multilib
 
 DESCRIPTION="A JSON implementation in C"
 HOMEPAGE="https://github.com/json-c/json-c/wiki"
-EGIT_REPO_URI="https://github.com/json-c/json-c.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/json-c/json-c.git"
+	inherit git-r3
+else
+	SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
 
 LICENSE="MIT"
-SLOT="0/5"
+# .1 is a fudge factor for 0.18 fixing compat w/ 0.16, drop on next
+# SONAME change.
+SLOT="0/5.1"
 IUSE="cpu_flags_x86_rdrand doc static-libs threads"
 
 BDEPEND="doc? ( >=app-text/doxygen-1.8.13 )"
@@ -49,6 +59,8 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
+	cmake_src_install
+
 	if multilib_is_native_abi; then
 		use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 		einstalldocs