gentoo auto-resync : 08:01:2025 - 06:41:21

4 files changed, 17 insertions, 225 deletions

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index ea45deb005b9..04f6f1c80e04 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -9,14 +9,10 @@ DIST CPM_0.40.2.cmake 41017 BLAKE2B 012ee2bfc1aac818efc49a04a52e77a3f574c63a12b2
 DIST simdjson-3.10.1.gh.tar.gz 2652674 BLAKE2B 3ccfc55d5bf8ce6a7e8be1b6cb28ed7b6289e23b1d4fe8505e35a42f4ff32a0ee7f500402828164bdeacae1b72e238413575288082151723d6d0c87dcefd1fa0 SHA512 b19fde8d81eaff34b83bb41028d7ee3a408ae5bc896277148e96879b1cba1a7cfc4af0064973bcb07e2b56e0955c3a3a581910d7af23d68510374e7f297c3b7c
 DIST simdjson-3.11.0.gh.tar.gz 2703217 BLAKE2B 85a747a99ff0e8cae3d91743501838742dd070e15b2430706e7244d2a304d05aa8059a2d8fbaa9feddecf1a42800aac3b0a4d0b0b0097ef1871064c75f00f482 SHA512 a08a440d62274c1e788db5ce3ac4c4f7dc06ccf29ecb3b9156e79d31febb5207b39ffab9ca8fa41e440fe8d56d857c4ad7eccbfbe2cd86b6c060729aada132ad
 DIST simdjson-3.11.2.gh.tar.gz 2703937 BLAKE2B 390c99f46efa92893b8b1fb193baf9333a7f19b909d7c9e621988eb9b11a89a3feea672069fbba044495d8b4d2f76f38a293b4ffcdddfb2be4820e527edc7866 SHA512 417e158e8b03ee50a50e927606ee8771eb457b94c8bba8e106c2aeb3eab3455a9431b9d5a92a852938e475a8101624b5785d0a2a45965490e42331cfe17efa62
-DIST simdjson-3.9.1.gh.tar.gz 2636602 BLAKE2B 82c4956ebc902574ed1b36196097c6c07e9ca0f11384f71b260ae95ff5e7c436ce016da417197f84c21ece0ae2239fc1c4e02cf63672fae98b3fa69831de3adb SHA512 b8c091e7ecce4cdc67f538ab6715ce89bff16e68f6d56bdc37e05ab0b110b90bc6b039d5c76e2dceef9e30f35cb6ace5e4e230d4c70e928329a376f989b23bed
-DIST simdjson-3.9.3.gh.tar.gz 2643869 BLAKE2B f2e0f8d13a234c7ee639a57333b66a464312a20bd67f808688f6456ded7b6bdac75d857b10207adc03e05d89e701efe874d068774a90c3082d9e83792ed784d1 SHA512 893ce0cb380b1418438f5910262325031f8071c4577589a491713f91c980964b4105c1e1aa7f2b9373deed40ecf6b48fe48a1aa243151e424f138f5418e4821c
-DIST simdjson-3.9.4.gh.tar.gz 2646588 BLAKE2B c0f0e5d6af2342d338ea7fbe033af2715e4317cd81818fca9dfcc04cb25ffe1eb08683f04d43162305d317178b14ed5f78e8ffa115ed02c7af41b8646c4eae76 SHA512 6fa940ad60b7560d1865806195428ae17f0daf19de803bdb7bd93b0704490994ec3cddc09c9d91f2e70036c6cb34153cdc5c998e7ebee2e4504f6a23944e25c1
+DIST simdjson-3.11.4.gh.tar.gz 2706732 BLAKE2B 63b1544b5e9e3149038fdcc97b9a852d9fe4d5d096a993ad733f2e21c93c3c320057892347fef3ba107a6418b9c1f1226f6f9eb320be07e84d2c3446d43c8254 SHA512 cd951a944f0c100f189056dc1fa7cc22bf244a2ad4e6eae21ad8f0b5b1ef230babde1cc575fe604f893d870d136f45ef83a2c27a787da4d1f6c2af5c019e6d3e
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-3.10.1.ebuild 2331 BLAKE2B f5294e10991fe6a5287183b93fa3a9f298884c739ebc028f5e368227ea5d65352e8a4ca584702b00dc3deec3194f38e0acba31f5f33987b9224c9c1d3e67a1e5 SHA512 8c19453eff16f16d2e024d9f052c430ed6243b4e6c89ba941085cd2d426d4f321facacd774c8f40ef4a174a4839360dc4176bc7fd796c5f0d785fbcc7a06f66e
 EBUILD simdjson-3.11.0.ebuild 2641 BLAKE2B 197d84a7d8cde56d577556cfa6018cb5e73257258ba0996d017aa9e8f419dfe710d8831ed3974c661f93735c4dc918a99f1c52defa1586c60d925a881b940590 SHA512 a9eae183889e3bdd8c084367c71b076ee076f681bbe25ec0bf0df7f58e3d1fe1895f8fa3a685db2c215ac5c7e9eb5033fe2c0937cd6ed4d0de4416c3b952eaeb
 EBUILD simdjson-3.11.2.ebuild 2646 BLAKE2B 9506392749ff9c6da0481124451ebeb453f4751ea3505ece5fc041418ff1db8b4402ae4914810e0aeb556d744384bfd5ce9b72e3da74205deb749ac9047eb477 SHA512 8e2c5342181a327c544c10b8e0de30ac7b601869340b0613b4212545e275b347061850d6f8b18c13e3186bb2d550efd171cbf36dc8e713ef00ab222a7fafa9e7
-EBUILD simdjson-3.9.1.ebuild 2370 BLAKE2B 6ad4c0a75ab0c4b8e8951551a5f74bfc0f8939bd9e1eca475a2244a7c1cf144b3c867c83ebb1f4eea90c8043cfac621d51889f9c8363e631c7d1c5d1283db387 SHA512 9e4a02079594ba7abf9e084e19c19c6ba86c473daf8c2c3d8908cf8f9cd3f0da47541cd441a4408572157106d3ad30dbd25bb82399510ffd12e896523d80c742
-EBUILD simdjson-3.9.3.ebuild 2375 BLAKE2B 2654cfa619c94e80cab4f90ac71bbf5544817933d5d9f428d3fffebf2cd06e9c64bd438c96641c44e235167c55011c2f647f4d9a9c1a536dd5a2964cc43bd98c SHA512 cea5b77ab55d00737f47e1640dd9a255df4d8163eeafb6f7baf8d41d8549cfde02e21c83acfd4bb2dbd4065129686406231f72b3653406b3353c86dc1fcfad7e
-EBUILD simdjson-3.9.4.ebuild 2375 BLAKE2B 2654cfa619c94e80cab4f90ac71bbf5544817933d5d9f428d3fffebf2cd06e9c64bd438c96641c44e235167c55011c2f647f4d9a9c1a536dd5a2964cc43bd98c SHA512 cea5b77ab55d00737f47e1640dd9a255df4d8163eeafb6f7baf8d41d8549cfde02e21c83acfd4bb2dbd4065129686406231f72b3653406b3353c86dc1fcfad7e
+EBUILD simdjson-3.11.4.ebuild 2646 BLAKE2B a228e21d4220f18d067d0f7dcdcd5dddde2f0fa17d8a1c5d968a91eee4d76168f4fbb2d92cf2adc4b1c41ba53059ee77f4b0e92211a6e7356a50a96d4f8f142e SHA512 43f731b3cb3b1aa0f10c891ebd244b4c698a7c161723d2742de83bdaa624c84b8afaa9d6cb360ec37f2850630d5105f6c99217a62b982ffde13316ff7c74a1a6
 MISC metadata.xml 499 BLAKE2B e3b1183b2eb058d569a2e74d8262cbb56184aa163181a80db80d7a9e195320d8f72ff370302e61584f745a54a7e25eeff828f8c59c38a02555052a742a21bb04 SHA512 fa6e20ac52b31c88b1252d7d85b393dc6f0bf8396d66994e6276f895a1b1df22db4f3860ff1c3bc34a9d414e1e9612b97f78a182f1f74176cd661147bdca75bf
diff --git a/dev-libs/simdjson/simdjson-3.9.3.ebuild b/dev-libs/simdjson/simdjson-3.11.4.ebuild
index 613f210c0376..91e3578a07dd 100644
--- a/dev-libs/simdjson/simdjson-3.9.3.ebuild
+++ b/dev-libs/simdjson/simdjson-3.11.4.ebuild
@@ -1,11 +1,13 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit toolchain-funcs cmake
 
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+SIMDJSON_DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+CPM_SIMDJSON_DATA_HASH="01efb6b90e94a7163d69e4e28efc28d96dbeaf0b"
+CPM_VERSION="0.40.2"
 DESCRIPTION="SIMD accelerated C++ JSON library"
 HOMEPAGE="
 	https://simdjson.org/
@@ -13,11 +15,12 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
+	https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_VERSION}/CPM.cmake -> CPM_${CPM_VERSION}.cmake
+	https://github.com/${PN}/${PN}-data/archive/${SIMDJSON_DATA_HASH}.tar.gz -> ${PN}-data-${SIMDJSON_DATA_HASH}.tar.gz
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/22"
+SLOT="0/24"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+all-impls test tools"
 
@@ -27,18 +30,15 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	tools? ( <dev-libs/cxxopts-3.1:= )
+	tools? ( >=dev-libs/cxxopts-3.2:= )
 "
 
 REQUIRED_USE="test? ( tools )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
 	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-3.1.7-tests.patch"
-	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
+	"${FILESDIR}/simdjson-3.10.1-tests.patch"
 )
 
 DOCS=(
@@ -50,10 +50,10 @@ DOCS=(
 )
 
 src_prepare() {
-	if use test; then
-		mkdir "${S}/dependencies/.cache" || die
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die
-	fi
+	# Need to make sure that CPM finds the data package
+	mkdir "${WORKDIR}/cpm" "${WORKDIR}/${PN}-data" || die
+	cp "${DISTDIR}/CPM_${CPM_VERSION}.cmake" "${WORKDIR}/cpm/CPM_${CPM_VERSION}.cmake" || die
+	ln -s "../${PN}-data-${SIMDJSON_DATA_HASH}" "${WORKDIR}/${PN}-data/${CPM_SIMDJSON_DATA_HASH}" || die
 
 	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
 	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
@@ -65,6 +65,8 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
+		-DCPM_SOURCE_CACHE:STRING="${WORKDIR}"
+		-Wno-dev
 	)
 	use test && mycmakeargs+=(
 		-DSIMDJSON_TESTS:BOOL=ON
diff --git a/dev-libs/simdjson/simdjson-3.9.1.ebuild b/dev-libs/simdjson/simdjson-3.9.1.ebuild
deleted file mode 100644
index b9e577db4eed..000000000000
--- a/dev-libs/simdjson/simdjson-3.9.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/22"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="+all-impls test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-	virtual/pkgconfig
-"
-DEPEND="
-	tools? ( <dev-libs/cxxopts-3.1:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-3.1.7-tests.patch"
-	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mkdir "${S}/dependencies/.cache" || die
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS:BOOL=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE:BOOL=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF
-			-DSIMDJSON_COMPETITION:BOOL=OFF
-			-DSIMDJSON_TOOLS:BOOL=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
-		)
-	fi
-
-	if use all-impls; then
-		local -a impls=("fallback")
-		if use amd64; then
-			impls+=("westmere" "haswell" "icelake")
-		elif use arm64; then
-			impls+=("arm64")
-		elif use ppc64; then
-			impls+=("ppc64")
-		fi
-
-		mycmakeargs+=(
-			-DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}")
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-3.9.4.ebuild b/dev-libs/simdjson/simdjson-3.9.4.ebuild
deleted file mode 100644
index 613f210c0376..000000000000
--- a/dev-libs/simdjson/simdjson-3.9.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+all-impls test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-	virtual/pkgconfig
-"
-DEPEND="
-	tools? ( <dev-libs/cxxopts-3.1:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-3.1.7-tests.patch"
-	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mkdir "${S}/dependencies/.cache" || die
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS:BOOL=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE:BOOL=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF
-			-DSIMDJSON_COMPETITION:BOOL=OFF
-			-DSIMDJSON_TOOLS:BOOL=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
-		)
-	fi
-
-	if use all-impls; then
-		local -a impls=("fallback")
-		if use amd64; then
-			impls+=("westmere" "haswell" "icelake")
-		elif use arm64; then
-			impls+=("arm64")
-		elif use ppc64; then
-			impls+=("ppc64")
-		fi
-
-		mycmakeargs+=(
-			-DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}")
-		)
-	fi
-
-	cmake_src_configure
-}