gentoo resync : 22.01.2021

3 files changed, 110 insertions, 0 deletions

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 626a8736d4e7..11f46a2b5100 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,9 +1,12 @@
 AUX simdjson-0.7.0-dont-bundle-cssopts.patch 1318 BLAKE2B 29fef993c326fd918c279ea70c06eba2bf69ff881577326c90b037ac538c4e0c75f156a86406b7fc357eaad7f5211bc255e885b57419c88af91087d519561e54 SHA512 77901d87773b2469011bce126520d33463907568991a1f2192492ac52331789c1e1cdc8251e2cf413c6493bb97a5e8737799ed3258616cb552ee038e9be65d26
+AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
 DIST simdjson-0.4.7.tar.gz 4119328 BLAKE2B f19a603b83282081457f548bd9b609f4fc4b9b0e32c868c8d4ecc15fbc359e6463576c24f38b6623cd72cc4681a1db42ec45ee605df6096876982caa9f96be91 SHA512 023e8b75652cb29c41eb1e01ebc6c484b28ff5f6736c885fb5d8c639b1047660fd0eb24d131dabc035fc7fc824e15fe49b177bc3613e329f1d8cd956173a490f
 DIST simdjson-0.6.0-ppc64.patch.xz 23704 BLAKE2B ab26e93960d3e3cc2c7782516ef2e6e36fb259c1bd83b967f32b0ba899ca9f80468a47cc3344dd9dc392898626a88b4a1de42899502a989511945e573bf7f259 SHA512 c8e1233c7e6f92cf0c92206ae1023cd30067004e4e53fed86d11e105490f281bf1b8a0806880d02427485fbade24aeb7a7b027b17c9f05552089cf867f3029eb
 DIST simdjson-0.6.1.tar.gz 7889048 BLAKE2B 35b40e5e278e5093f5f07ad9e27ae23417f206bf2f4f624a6130931882db49632fc5141d027deca4977a3efa1fdfc7d8fc0bc2149d938a985a850eff4250f5bf SHA512 df5f6c717b3c4cfcde7757dff74d51c93f4682729fdbcdaae89d82db13bba006fe0378bc601d5bdf1d4cf2f0fafce56eb88aba8ca9648787a64cf160cab479e4
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
+DIST simdjson-0.8.0.tar.gz 7993692 BLAKE2B f2f04b3f9815645fcb4fcf2d10b0a234177042a0f4e306b0e130d5136c627344201a1f7c4d1ba6cb1ce30debf44f00694bc9a5bb646040bb614e91ae31bf43bb SHA512 8c41e07dbc3668105131c5a22060891c54f7663ec512d6c12f18eed0971fe245c3adb8d27c27305827314ebff39d2c940bd3715fa12e1ce9332d9bf3693424f2
 EBUILD simdjson-0.4.7.ebuild 622 BLAKE2B 591dc46e83afe30ff0aca4594a199302a237b078be207e3f7634bb76b1694319caf14ae83b3b7fff22c5bdd93cad5292c0e57ed5935c8c28c9931fae6bf75f80 SHA512 0bda85cfeb83a52657c9a127ae8711af162a92fe247f00e957896ba077509634654df11619c628cafc75fcd5efe528e57c69f69819582c91610e5e7b063d5cac
 EBUILD simdjson-0.6.1.ebuild 928 BLAKE2B c672740e77bc519b647d2f72efec2262b46629c3b9bdc429a647c0f08ecdb2fe3dd76ce81209d0359cdf9978086fe87e9428853369fd6f08de2698ccceb90364 SHA512 08daa7a4bae1325d3cd4dcc8bed8d44f86c2971404310dc013a0bc5ce4ccb9c61cead4dbc478cdc97f9bcb360289901ffa81abb7c29c592074f16de720f2da87
 EBUILD simdjson-0.7.1.ebuild 1038 BLAKE2B 0aea6fa87992593836dd852a8982bb5fdaec652a629d4fd2e5783cd2a5823539a0b0227f77aa0ee6077d9f20f0fe44209d0564ed4c80c60e5ad05010a346d0df SHA512 ac317104a1255436a41cc860f854fc2e2054ac2adc0866cd5b86b289833f8823d7360b72433dfedd91208e828a45d7fccc135e24fefa0f4c4ef964832f0ded1b
+EBUILD simdjson-0.8.0.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
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
new file mode 100644
index 000000000000..6a76cf83ed98
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
@@ -0,0 +1,40 @@
+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.8.0.ebuild b/dev-libs/simdjson/simdjson-0.8.0.ebuild
new file mode 100644
index 000000000000..b97cc2e514e7
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.8.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs 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"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	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"
+)
+
+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
+}