gentoo auto-resync : 30:09:2024 - 01:25:52nextedge

4 files changed, 81 insertions, 2 deletions

diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index d4819786df20..6ccb7c21b8f3 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,6 +1,8 @@
+AUX jsoncpp-1.9.6-cmake.patch 670 BLAKE2B 5d3fd44f2d5bf64e78c24659f017d16e05842381ab98192e896b777a96ea2f526f7124ca25de3e8e52ad930e77f057306717c37f5919a4844a544dc2183fa80d SHA512 4c36a9ed41355233b0fd63eb059cdf7f6f33a959f9d54c4180830a721d8715f0842d742bc850dfc13434b749bfdb9a0aac24b5913e17573e04ae7616e0eb7e89
 DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
 DIST jsoncpp-1.9.6.tar.gz 212682 BLAKE2B efa5dea68ddc175391200077666204f7ec66cd1f96a889a2a3c53d0e22e1f96ead1a2e7a871940f60dbd4261650f133b83de428b9c8b663fa13bd7ab4b9fdffe SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
 EBUILD jsoncpp-1.9.5-r1.ebuild 1224 BLAKE2B ec92cfb2bddd3682e93ff592e3822a1cbf8620d25267e906b7829d735f399b76aa71a146b161b67b9821438a975060ccc7d2b12bada47c2ae415e218641d7e30 SHA512 590e8e7049d704c11af84773e7f0efa09d335228ea65bef85a1ac838af30b219fc149fefc36d6058fcc826a6c060152ac38cea46d4a7fca30ac967846aa4a09e
 EBUILD jsoncpp-1.9.5.ebuild 1187 BLAKE2B ee28a0bac674e2df4b78a76c38dfcdc81b49fb13d6381556e24dd3760954598d92b7b0585ca528dfdb6828cbaf282c32a5f94b953aedeeaef196560724a523a8 SHA512 11ebe8f21df756c03d5eafdba0bcd30ae57a6ab1b7b899230feee82c825cc14910792d72fb3646f0c7a243b2515411884a7f28cd3c5e7305981a9849e82e9d00
-EBUILD jsoncpp-1.9.6.ebuild 1226 BLAKE2B 6bcb5f5700f5966378278c316c0ad19b91359044ddb59440ca7fae6fea794e91be44409bdbc8a51e14f6bde18d41ea9d50a8a468ccab2b314c691a65f164cb0d SHA512 87c938f2c070381fb6b3262ed4db3bb54891bd658af60868e165a34300916508ba6de04ec33013a68c6fdafecdac1cf9dfa3eb5cb4782ffe3b4f2f1ef449bef2
+EBUILD jsoncpp-1.9.6-r1.ebuild 1336 BLAKE2B 471d77b49966bea4b94a5718d357cdcdbac9917d74a5c5ffd906e6963fb588ec25f45d8a8e17264df50f75a41b0d143db610336bb8d9f0b520a9497149e55956 SHA512 62ec1471e8f86ac8ac85e17482e16b53626f7586925d770653dbb2b405a6ae172b561feb8118a4e99da6f1063b47a709ce1c4483b0d2fc9c071c4da3cfc0c925
+EBUILD jsoncpp-1.9.6.ebuild 1225 BLAKE2B 910e8da2e97222b16b6db0df2577f656910d1e6453e64067b86148beb3038362ad8ca5b256fbb304b55cc65d72bfc7a02921610ca33923d083517f7f3527ebaf SHA512 d13209f83eba98b4208198c24172b0e3fe76b37c85788472e7b80b1970c3b65202b5c8c3e449edad83c0b6ab1652615dadd1ab3c78e3bc02b0f08bf1fe294f7a
 MISC metadata.xml 473 BLAKE2B cee9ea6f824489bf51f6c293faff24e62bb8c3457d49638b9547d104bfbed8b5c566e429b4d597dfa9b556955450c758261231ce83ea28216c1386a2d645176b SHA512 f7e2f0a82c5370802072e94a727bcb19d138979ab46670f01bdb17ed19b59f8e79bd28d37a8d939917f108fd4a64f53f67153ceaa9dad393840e9eb0247538e1
diff --git a/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch b/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch
new file mode 100644
index 000000000000..9e24533ae9f9
--- /dev/null
+++ b/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch
@@ -0,0 +1,21 @@
+From 8d9109992e34cdacd3f2750ada5c2460d346898f Mon Sep 17 00:00:00 2001
+From: Rui Chen <rui@chenrui.dev>
+Date: Thu, 19 Sep 2024 15:10:21 -0400
+Subject: [PATCH] fix(build): remove `check_required_components` for meson
+ build
+
+Signed-off-by: Rui Chen <rui@chenrui.dev>
+---
+ jsoncppConfig.cmake.meson.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/jsoncppConfig.cmake.meson.in b/jsoncppConfig.cmake.meson.in
+index 0f4866d6d..be8852d0c 100644
+--- a/jsoncppConfig.cmake.meson.in
++++ b/jsoncppConfig.cmake.meson.in
+@@ -4,5 +4,3 @@
+ @MESON_STATIC_TARGET@
+ 
+ include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )
+-
+-check_required_components(JsonCpp)
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..6f29211cc90b
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson-multilib python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
+SRC_URI="
+	https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-text/doxygen )
+"
+
+PATCHES=(
+	# https://github.com/open-source-parsers/jsoncpp/pull/1570
+	"${FILESDIR}/${P}-cmake.patch"
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		--includedir include/jsoncpp
+		-Dtests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson-multilib_src_compile
+
+	if use doc; then
+		echo "${PV}" > version || die
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
+
+multilib_src_test() {
+	# increase test timeout due to failures on slower hardware
+	meson_src_test -t 2
+}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild
index 1932b4d9205a..92c06cb15f05 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"