From 2099ff9b640e648be67527e29760263a7c6274e5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 28 Apr 2023 05:11:40 +0100
Subject: gentoo auto-resync : 28:04:2023 - 05:11:40

---
 dev-libs/simdjson/Manifest                 |   4 +-
 dev-libs/simdjson/metadata.xml             |   1 +
 dev-libs/simdjson/simdjson-3.1.7-r1.ebuild | 102 +++++++++++++++++++++++++++++
 dev-libs/simdjson/simdjson-3.1.7.ebuild    |  87 ------------------------
 4 files changed, 105 insertions(+), 89 deletions(-)
 create mode 100644 dev-libs/simdjson/simdjson-3.1.7-r1.ebuild
 delete mode 100644 dev-libs/simdjson/simdjson-3.1.7.ebuild

(limited to 'dev-libs/simdjson')

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index b0416bcb4179..125dfed1d67d 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -12,5 +12,5 @@ DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE
 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.ebuild 1969 BLAKE2B dadc69d7134f74bf4a0525c60f6c7d646e98b189376bddb6b2e7bc76a772aa187bac95423ae8e73d695cd830b21f751c52a2cd073023a4147e0f3088b151944a SHA512 b27a2353c6b197f12e4a047cf11a7e37e30c417f73b70bfe3b2ed5419f5d6bc739e37d503efaf21ef9b974f04e286f689a01963f93d9b19e7b09dc8e07505155
-MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
+EBUILD simdjson-3.1.7-r1.ebuild 2333 BLAKE2B bef486c49950e6494c1fe371c8c9101cc015d602144e3e7d83fef333d94cdcde21f31c3ab1b330a8bad2c2499bee8aaf7a0a6137633caec8f0d64ee53392270d SHA512 b9b520dcbb2f177900163d58e4d06c5e07e0fd36b501923dddd7b7d5443f6174ae6a2c16b4acd8d41bb12b6d423a2e223d07add51c9af5f190e099188e4ccd74
+MISC metadata.xml 417 BLAKE2B fa60b19f3372b1794fa5d83a0767e1eaed6569bf314cd74bb14baee7aee454c83ae0268cebd46bee877dd46472e735ee23136983f991d63d7ff3d64f0b7bb258 SHA512 a3afde0d4740ffc6e8f26c5d937d141bdec24f59082a89232962e1d75513a51cb050d1b93b439450051f05281f206e06a5052f67037d685a95ee4e28e7ece113
diff --git a/dev-libs/simdjson/metadata.xml b/dev-libs/simdjson/metadata.xml
index 0bd99c992917..d541fa2ee4a1 100644
--- a/dev-libs/simdjson/metadata.xml
+++ b/dev-libs/simdjson/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="tools">Build and install extra command line tools</flag>
+		<flag name="all-impls">Enable all implementations rather than only onem</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/simdjson/simdjson-3.1.7-r1.ebuild b/dev-libs/simdjson/simdjson-3.1.7-r1.ebuild
new file mode 100644
index 000000000000..7900f6af3b7b
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-3.1.7-r1.ebuild
@@ -0,0 +1,102 @@
+# 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/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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-dont-fetch-data-tarball.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-3.1.7-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: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 || 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
+
+	cmake_src_configure
+}
diff --git a/dev-libs/simdjson/simdjson-3.1.7.ebuild b/dev-libs/simdjson/simdjson-3.1.7.ebuild
deleted file mode 100644
index 433f9a71935e..000000000000
--- a/dev-libs/simdjson/simdjson-3.1.7.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/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="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-dont-fetch-data-tarball.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-3.1.7-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
-}
-- 
cgit v1.2.3