gentoo auto-resync : 16:06:2023 - 01:40:03

3 files changed, 28 insertions, 102 deletions

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 125dfed1d67d..930a2372e01d 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -4,13 +4,11 @@ AUX simdjson-1.0.0-dont-fetch-data-tarball.patch 658 BLAKE2B e15a9d8186f422f14e6
 AUX simdjson-1.0.0-install-tools.patch 933 BLAKE2B 1464f6eba0bc747dc24fc94ceebefdf52fbdd147293fce80a2d3612c0130a4c0a68bbc7dcad5ac1dbe2f1bbd4b6030ade7dd78717c80be74e497872fd66f0037 SHA512 ba399139793ac9b8be76eba69844d74c931c9edaa20adf42f21353bb242ec9d5e093c9cb26e36542b7b8cb12f75a5a8906992b6569c990af77af189318c67ba7
 AUX simdjson-1.0.0-tests.patch 383 BLAKE2B dc3dcbc08ec78608a94e5d04ff217a774e1c41d45f8c0c0135a52bdb2e217bf15cf9b16b35f9dbf77fc84353f904bdeaa25bf7068e93a452203dd7e9b3e40932 SHA512 95e6d933c0b673b26496aada4bca7dddd386617733dc23b15e6bd7f8275a24c206d149e95159985941257b49ae633dc8c340bec034595f3f781ed81accc5f9d9
 AUX simdjson-3.1.7-tests.patch 562 BLAKE2B f246a10e4c8af534b41314a7dd8a213f598bcdd313a15b1b6697fd4ba9700696d4b581122306c55195e84eeb2dbfb7b577eea4d81093282783db5264b9a27af4 SHA512 4f95c52bf56d170edc08050f17d9eca85c10d25637e385f096caa2ee7d5c7c32cceba9688f98a1c83360880945955c4a7a5c38e3fb72e3a79e477951f341a2ad
-DIST simdjson-3.0.0.gh.tar.gz 1628275 BLAKE2B eef18be927c50527885f6e042ef22317b7e6da6a77d652a4415b98ec7fda227a1b3b798774c12b587a1a011b16c4011a0656f1bf1a20886432796e64076f4775 SHA512 4ea58cd4d059f5e83734f8f084056a58a587529e13df5c47fbb42b141052688f8517ab4e7d6cd4581c6b560f8804968fa0c9c7184b1d8d54e45c280302a069ec
 DIST simdjson-3.1.1.gh.tar.gz 1633897 BLAKE2B a2bc394bfbf7916bc7743d3891b84eb3743cce2998242ecb427a7a3357986ea90c6ee546c3048aeb5629c9475f9ce862038f349ced51f684d199441632cca7ef SHA512 fb7d0963236c8fa692bf6c4ed2a66da5b29632c02e357894e0d5c604467e82f9a56cc7e8229769d9e401ed5bf5dfb25ae46f40fbe68605cedf58d763d03af93f
-DIST simdjson-3.1.6.gh.tar.gz 1643625 BLAKE2B 547eec2c332ffbc63a3878582b12b611447170c659e56e7d3e9c7a264427b5c8550f376cd2070b7f84f7603005ae4f9ef78a4ae7bd02df9b6813626b2ac2a6a9 SHA512 72f27b010e659025f9c8842daf79364d0d0f40cddd66858956ab4fa4f3f3a631fe342f440201d58ed9af42a4356aafafaac8d3caf3317dd1a6314dad3a71081a
 DIST simdjson-3.1.7.gh.tar.gz 1648370 BLAKE2B 46ca65569ba4fcf80bac1e1670bd0dea172c5d157f2ed05135c64c620bc7361f894d7227513545e0112643fd75d93bac02b3d0488ea0efe0401dbf5946d332b2 SHA512 6b54723720aa83333816e3bbd5cfe8dc71b087ac1d20d8982601563b70146bd63629a9f74cbc460a78ab2c83c689991586ef20a268fc67946b57dcc3f5486bc5
+DIST simdjson-3.2.0.gh.tar.gz 1653237 BLAKE2B b1745b2a96d9ff9f7187329191007e63a5f0c7051fb85a97212cf06076740ca01be035858bbb66805d10ba49ff90d05961a8b77750fc0d789e8dfe5865937f0b SHA512 02723d05fe88cfc69c1ec3eef92ae9e7da169a99645992829d4e40a00edecb98e21593dc9e04aeb2959cbcdbb8f40bb464daef9eb26cf3bd344c39271f6add2e
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-EBUILD simdjson-3.0.0.ebuild 1963 BLAKE2B a05d5f1aa3b2cc2b0275c591436eab6ffc22940d02a6f23444880f4b6904aae69fc6b2a0f712991cc54c66270bb525c80fa35216314c6acac134349170c764b3 SHA512 0da58455e1442d1753e5502f32e352a825a6f27f1303e6641e7f1f5a4d96efbf9d0445d659143df8ed05e0ca57f0be01d5df92a2f9b8823d9a7375395d8d484a
 EBUILD simdjson-3.1.1-r1.ebuild 1968 BLAKE2B be3bd4b065675ba22ec7001b949c60f429d1a1ff7430c01c893ca6a63ecc31735a8400b55cf0ca4c12ff9f989bdeecadfe55053487722ae5ad6630095ed6a418 SHA512 1cfd1feadc05deba1d1c2dee941290230a65da53fbf17341e01799d785e141d446fc88eef682e3f9cf447a8a8ec7f7e2f491cee911fa1aa8f09af8db1a6d3123
-EBUILD simdjson-3.1.6.ebuild 1969 BLAKE2B 22cce1e40f89079463f2aea26c064d686f5b7b0b03b30aab7f38fb68da6d74d241ae0ea825a3373ca885eff256288442e905e9ef4e8e3597039071a373a72e91 SHA512 81a5fce579d2bde4e3eed83cf7d811741e9a6127246c8dcf96a96099614979fab61a1824b8aff96023eba914e61ccc36007e20dfc10106cc27a5085c0762360e
 EBUILD simdjson-3.1.7-r1.ebuild 2333 BLAKE2B bef486c49950e6494c1fe371c8c9101cc015d602144e3e7d83fef333d94cdcde21f31c3ab1b330a8bad2c2499bee8aaf7a0a6137633caec8f0d64ee53392270d SHA512 b9b520dcbb2f177900163d58e4d06c5e07e0fd36b501923dddd7b7d5443f6174ae6a2c16b4acd8d41bb12b6d423a2e223d07add51c9af5f190e099188e4ccd74
+EBUILD simdjson-3.2.0.ebuild 2333 BLAKE2B 7f2de5f7f12127c944630873fbfabe4decfd5bcaf3283e0926b4dc9d8ac9858838bd4c752ec712fb5a8ae30e134839e028d42f15e2765c86786d58352d984087 SHA512 c460bf40afc463b9340b84bbf618fcb4cf568a16a3343f56e0d1a0ca6bc510943edcb033626f253bdfbaf4fe21b5fbfc270f4bf94d8ce81f389acd22389b03eb
 MISC metadata.xml 417 BLAKE2B fa60b19f3372b1794fa5d83a0767e1eaed6569bf314cd74bb14baee7aee454c83ae0268cebd46bee877dd46472e735ee23136983f991d63d7ff3d64f0b7bb258 SHA512 a3afde0d4740ffc6e8f26c5d937d141bdec24f59082a89232962e1d75513a51cb050d1b93b439450051f05281f206e06a5052f67037d685a95ee4e28e7ece113
diff --git a/dev-libs/simdjson/simdjson-3.0.0.ebuild b/dev-libs/simdjson/simdjson-3.0.0.ebuild
deleted file mode 100644
index b56e63ef874b..000000000000
--- a/dev-libs/simdjson/simdjson-3.0.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2023 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/14"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-	virtual/pkgconfig
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-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-dont-fetch-data-tarball.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-1.0.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${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=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-			-DSIMDJSON_TOOLS=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-3.1.6.ebuild b/dev-libs/simdjson/simdjson-3.2.0.ebuild
index 3556dd4aab2c..33a873755541 100644
--- a/dev-libs/simdjson/simdjson-3.1.6.ebuild
+++ b/dev-libs/simdjson/simdjson-3.2.0.ebuild
@@ -17,9 +17,9 @@ SRC_URI="
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/15"
+SLOT="0/16"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
+IUSE="+all-impls test tools"
 
 BDEPEND="
 	sys-apps/file
@@ -38,7 +38,7 @@ PATCHES=(
 	"${FILESDIR}/simdjson-0.9.0-tests.patch"
 	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
 	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-1.0.0-tests.patch"
+	"${FILESDIR}/simdjson-3.1.7-tests.patch"
 )
 
 DOCS=(
@@ -63,23 +63,38 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
+		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
 	)
 	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS=ON
+		-DSIMDJSON_TESTS:BOOL=ON
 	)
 
 	if use tools; then
 		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-			-DSIMDJSON_TOOLS=ON
+			-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_MODE=OFF
+			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
+		)
+	fi
+
+	if use all-impls; then
+		local -a impls=("fallback")
+		if use amd64 || use x86; 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