[gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/

[Patrick McLean]

commit:     5e62d51a6854f970c0641e8a0c3eacd3507ff77e
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 18:33:29 2024 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 18:33:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e62d51a

dev-libs/simdjson: add 3.7.1, drop 3.7.0

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                              |  2 +-
 .../simdjson/files/simdjson-3.7.1-data-optional.patch   | 17 +++++++++++++++++
 .../{simdjson-3.7.0.ebuild => simdjson-3.7.1.ebuild}    |  5 +++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 81e18b1fe3e1..456066e66f29 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,4 +1,4 @@
 DIST simdjson-3.6.3.gh.tar.gz 2302220 BLAKE2B 
c46eeb8a07460cc5427fc35714fd262069cd3d913732e6037d808281d0fed0e82e0423dfd16abaeb515264559fe4454c42f81211354723eb21b212decfe7834b
 SHA512 
b9fa7e554ded4e6cbe9d70ee29aa5b582e58b8b2ada1a781e58746082bb7d31791a4e2ea8b43d9391d783e61e489554f260448029c0b7e730cc69dc44f4aa86a
 DIST simdjson-3.6.4.gh.tar.gz 2301736 BLAKE2B 
512effe54c6d36e31c95983cd9bd2ddb000c979c5050cb0c4b8ae2eae743ec50720e15ccf8b457b085d7d5bea24e0a0f793cba97a0af35dedbe59cab105ab2b9
 SHA512 
30dbc39166f092808d8642a2e4ca37c10999c511aa90e349409b3f4765c638498070ed9ed53ec7bfda9a9442557c7407ee0468a0845d53346d4a990f6d8c3c5b
-DIST simdjson-3.7.0.gh.tar.gz 2309580 BLAKE2B 
8689169aaaa5a81056524fe3677ff85026173ccec802ddf96bfc993537645537c9116ca3086a35fe31685c67a51745d3b6d70daaa96064f8b09d831aec7cc2bb
 SHA512 
b642327bebc81ecd59debcc8439983db5e1875895987c9939b629b4b0e3432b19691d8ebbf43b57f437d2914ec45250b6abe4d48be5e2a85b863145b8789457e
+DIST simdjson-3.7.1.gh.tar.gz 2319851 BLAKE2B 
06de2f3dbdb65e7cd5aa418ecb7db27ae01f1e205e355f4d8cb38929d284407bb3edc93a5ee13e30457123ee83bdee35923a265ada520ff94365d1eb71de6ccb
 SHA512 
536f2cd174d50890611942accdcc5b41f5a0d0bc6f03d5627a64c75fa6d88efc9bf4304da4c4607b472223d2a713edaeecbfa66e0e7e5efa1f45a60c93eee96a
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 
BLAKE2B 
563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7
 SHA512 
168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1

diff --git a/dev-libs/simdjson/files/simdjson-3.7.1-data-optional.patch 
b/dev-libs/simdjson/files/simdjson-3.7.1-data-optional.patch
new file mode 100644
index 000000000000..f7192d74042c
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-3.7.1-data-optional.patch
@@ -0,0 +1,17 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index 1d98e6f7..ad903481 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -20,8 +20,10 @@ if(SIMDJSON_GOOGLE_BENCHMARKS)
+ endif()
+ 
+ # The bulk of our benchmarking and testing data has been moved 
simdjson/simdjson-data
+-import_dependency(simdjson-data simdjson/simdjson-data 
a5b13babe65c1bba7186b41b43d4cbdc20a5c470)
+-add_dependency(simdjson-data)
++if(SIMDJSON_TESTS)
++      import_dependency(simdjson-data simdjson/simdjson-data 
a5b13babe65c1bba7186b41b43d4cbdc20a5c470)
++      add_dependency(simdjson-data)
++endif()
+ option(SIMDJSON_USE_BOOST_JSON "Try to include BOOST_JSON, this may break 
your binaries under some systems." OFF)
+ # This prevents variables declared with set() from unnecessarily escaping and
+ # should not be called more than once

diff --git a/dev-libs/simdjson/simdjson-3.7.0.ebuild 
b/dev-libs/simdjson/simdjson-3.7.1.ebuild
similarity index 92%
rename from dev-libs/simdjson/simdjson-3.7.0.ebuild
rename to dev-libs/simdjson/simdjson-3.7.1.ebuild
index 1755f239d7c2..86f2f2dbe6cf 100644
--- a/dev-libs/simdjson/simdjson-3.7.0.ebuild
+++ b/dev-libs/simdjson/simdjson-3.7.1.ebuild
@@ -36,9 +36,9 @@ 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"
+       "${FILESDIR}/simdjson-3.7.1-data-optional.patch"
 )
 
 DOCS=(
@@ -51,7 +51,8 @@ DOCS=(
 
 src_prepare() {
        if use test; then
-               mv "${WORKDIR}/${PN}-data-${DATA_HASH}" 
"${S}/dependencies/${PN}-data" || die
+               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