gentoo resync : 29.12.2022

5 files changed, 176 insertions, 110 deletions

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index ee6a8297e7dd..3a7da033f868 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,15 +1,18 @@
-AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
 AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb46c53aaba95dae6bacd8c0f9b270499be3df7b82464d6f29a872e0bf9253c3d1a47d3d62727adb166388e2944682 SHA512 6e0220083dd6fcc1426a3d0b8250e8249e83868963e55e7e31221e3df2e2469794d73a59e3068722d20fb5bfb33c9d49ba5c9aa18028c8afd8a8d0d066f29a11
 AUX simdjson-1.0.0-dont-bundle-cxxopts.patch 611 BLAKE2B 65671f33b25e9569de8a938801663178290f2627019936d82986bd94a57517edded5fa0e1183c96ca716b512bde2aae54f6cacd75415e054db74205e0eae9559 SHA512 12f9626b375eac67f7ee17ded553653cffcfdbced9abcb7ab15f51ef731477e707304cf1dc0d5e40c79fc3faeafe644f23e81cccba8b6f6408190b71dbf4eb97
 AUX simdjson-1.0.0-dont-fetch-data-tarball.patch 658 BLAKE2B e15a9d8186f422f14e66bd42f07b72441f69b6d6c1caf2536f08f56445f3b869f3a97d49e96e12536e5e86fb1f886233724abcad723ccd19e7563c9d5450fe79 SHA512 5e6aabff62a58274ae058ff8f0057569048578207914c9a983ce0c51bd23eb77e272d0c2f92ff7b164a592569fbd677327f83955700967b71e8ada7f1d103646
 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
-DIST simdjson-0.9.7.tar.gz 7956250 BLAKE2B 2fa04be699eb5573ac17db9b476ded1853cfe45c0993c9303b70bfd0e8e4343b69e4a02f21dac35d2c0255826bfedf41123fd635d36d48a08f74b28b5a6536ce SHA512 6f4ad854adc2b932f9926610cdd28ddda7fc1776b84a224adb5b337f81c92721bd11c8ab180897117891cdefe9c1ef14b9f062c9a1a2ebc5b5582c29cb656bf0
 DIST simdjson-1.0.0.tar.gz 1546728 BLAKE2B 6b70416404776b4fcc30cd3ab07b8048899bbe3497af779504a685bc2459424e82bd40bf100d7ed8ccfa05e871a0a1edd9eebd11294cdc3d1780797d7f79ba1e SHA512 dbf8abfeec5c079f4d87e8bf31d1af27601f7f0578ebb8ad28a25f496b4b771b68a75f9a11f61706c539d54c36a493a2d2819bd15427c3b7f7a0b36811177f17
 DIST simdjson-1.0.2.tar.gz 1551616 BLAKE2B 534e312de977b82604595ccf889348545ed355fb9cfb6f618d42236122578f6102ce7bcd31204c3013dbeeff17c35effaff62531a7e17e5e83ac07150b1456ab SHA512 04a3bee2d847680aa1f55115007ceec01652bebb8d5187cfbca0af81bedff355cbac949862a82e3060071da1a58b62d5b028bcd91562b962756aa5cab614f073
+DIST simdjson-1.1.0.tar.gz 1555845 BLAKE2B 6dfd4e938b9f1f6a6314f39929b74a7e822fbb37510914eb3db0660b9bbf68ef0b2fb4c45aa2e1246f6530d3848d0055220d4c5ead3093f97956a6154b22a899 SHA512 f8718bd039e1a25f0b95880b957c43e6eba6eada6bb7f58cedde37669a46b15b3ff9f4c4ea775e1cf949657642ef0472fa8bac5bdc98882df63e7f292fb5a723
+DIST simdjson-2.0.4.gh.tar.gz 1612055 BLAKE2B af60f4ae6780eb4068ac85c2d6784539b14fad6b7871c091f2ec3dc4f8cc9add8510f4d92a8db6ea305a1c2cc6919c8f8604d31d4e939677f3ed121b53891c24 SHA512 5d993939aece8555dc7fc5d63be14103af4ca164fb0cd53ac96578ed8a9fac61f974c247544ad007710c7a710bfaea7ad94098a143c713097237cd47c7792463
 DIST simdjson-data-1.0.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-1.0.2.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-EBUILD simdjson-0.9.7.ebuild 1165 BLAKE2B 453e53adad33e3475e3a1a6afa87972896dc4c8852da2c44475de102bc8b21ca3e95108896a27094c251600c1f39602279f5e6e522c9cdecf38d34d7341bc734 SHA512 33055dcbe20f9c060aaef86959b54439a9001bf45526437d30d03af17cc909c1155393ff27581b5322e2b4f1865acc95dba12f191e6c9c9e0c0ba55b398a90e2
+DIST simdjson-data-1.1.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
+DIST simdjson-data-2.0.4.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-1.0.0-r1.ebuild 1835 BLAKE2B 1ee4777881353dedeeb986d5d3cb309cff58353b71ebe97a2bcfbf209c53e29f8dccd1780307248f310370c8f4b2da9f47311bff3a0abf1fddfa72e4c204a8e3 SHA512 39815d3422d6fdab49d9684295c48ac84a1d1e1f68835edd89a766d809cdd857dbc5f65d5da3a41fb4a67e05add726f6bce91dc24fc2a596a8fdc7f66651b7dd
 EBUILD simdjson-1.0.2.ebuild 1836 BLAKE2B 942a16cd6611fba7763ff2bf1498eafa240c5a1cec900baf2d9f9e0c41bb41004ea491dcb2e5bff1c51265b7d4afea5bebe1b9944b91e3878cf111fc50598c4c SHA512 d0380c7e3d7d351136d95acf5e4b01577baf79fcb7a132af243bbbc99c1e5fc5c471e3322db3e7a30b31420fc7fe7a011aebbbe743725dd9fa5215518d9b45fe
+EBUILD simdjson-1.1.0.ebuild 1836 BLAKE2B 4138055e3875f3fbe8179bf6a28763f269f1e91bb72ded3ace4a7b158fe2e701e0ae7b6de4e615085d7348fa9951d3eb09cf16ec6a103279c29812d3ebbab536 SHA512 b02ed933a900e8a43a9e9bf31c50367dae27e40dce1da1f6532607a3154b53e197cb0d30897f0e40b08480afd7c4ae29531b463d5a1cb60b49f320858d4167db
+EBUILD simdjson-2.0.4.ebuild 1842 BLAKE2B f7ddb79888fc5224565e6e58203db7c22f444732d159ca55efd6a0af4617f23db7e8a7ea0eebf828ab2285dc4a6ce9b030238bcaa10c7c162313a3b0ccc21e7c SHA512 c42d70b050e1819f0e735bd06a7cf306fb3bd57328499a573f69775a362089c6eb214d5171f385384e6c66bbd6cc6df02c70c8b553d8aae322db127267a2a4c3
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
deleted file mode 100644
index 6a76cf83ed98..000000000000
--- a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
-index 2c41169f..2f5d4436 100644
---- a/dependencies/CMakeLists.txt
-+++ b/dependencies/CMakeLists.txt
-@@ -129,15 +129,3 @@ endfunction()
- if(SIMDJSON_COMPETITION)
-   competition_scope_()
- endif()
--
--cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
--        SIMDJSON_ALLOW_DOWNLOADS OFF)
--
--if(SIMDJSON_CXXOPTS)
--  set_off(CXXOPTS_BUILD_EXAMPLES)
--  set_off(CXXOPTS_BUILD_TESTS)
--  set_off(CXXOPTS_ENABLE_INSTALL)
--
--  import_dependency(cxxopts jarro2783/cxxopts 794c975)
--  add_dependency(cxxopts)
--endif()
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index f1a82be7..b1b7b1a0 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -1,10 +1,8 @@
--if(TARGET cxxopts) # we only build the tools if cxxopts is available
-   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
--  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
-+  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
-   add_executable(json2json json2json.cpp)
-   add_executable(jsonstats jsonstats.cpp)
--  add_executable(jsonpointer jsonpointer.cpp)
-+  add_executable(simdjsonpointer jsonpointer.cpp)
-   add_executable(minify minify.cpp)
--else()
--  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
--endif()
-\ No newline at end of file
-+  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)
-+
diff --git a/dev-libs/simdjson/simdjson-0.9.7.ebuild b/dev-libs/simdjson/simdjson-0.9.7.ebuild
deleted file mode 100644
index 9ce02457aecb..000000000000
--- a/dev-libs/simdjson/simdjson-0.9.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}.tar.gz"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/8"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=ON
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-1.1.0.ebuild b/dev-libs/simdjson/simdjson-1.1.0.ebuild
new file mode 100644
index 000000000000..01fbcc889778
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-1.1.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2020-2022 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}.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+"
+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 "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a 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-2.0.4.ebuild b/dev-libs/simdjson/simdjson-2.0.4.ebuild
new file mode 100644
index 000000000000..c4d2349ceae7
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-2.0.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2020-2022 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-${PV}.gh.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+"
+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 "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a 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
+}