From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- dev-libs/simdjson/Manifest | 9 +-- .../files/simdjson-0.7.0-dont-bundle-cssopts.patch | 30 ---------- dev-libs/simdjson/simdjson-0.7.1.ebuild | 57 ------------------ dev-libs/simdjson/simdjson-0.8.2.ebuild | 67 --------------------- dev-libs/simdjson/simdjson-0.9.2.ebuild | 2 +- dev-libs/simdjson/simdjson-0.9.3.ebuild | 68 ++++++++++++++++++++++ 6 files changed, 72 insertions(+), 161 deletions(-) delete mode 100644 dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch delete mode 100644 dev-libs/simdjson/simdjson-0.7.1.ebuild delete mode 100644 dev-libs/simdjson/simdjson-0.8.2.ebuild create mode 100644 dev-libs/simdjson/simdjson-0.9.3.ebuild (limited to 'dev-libs/simdjson') diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest index e55b0ba3227a..ab880480eb84 100644 --- a/dev-libs/simdjson/Manifest +++ b/dev-libs/simdjson/Manifest @@ -1,10 +1,7 @@ -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 AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb46c53aaba95dae6bacd8c0f9b270499be3df7b82464d6f29a872e0bf9253c3d1a47d3d62727adb166388e2944682 SHA512 6e0220083dd6fcc1426a3d0b8250e8249e83868963e55e7e31221e3df2e2469794d73a59e3068722d20fb5bfb33c9d49ba5c9aa18028c8afd8a8d0d066f29a11 -DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c -DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127 DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6 -EBUILD simdjson-0.7.1.ebuild 1027 BLAKE2B 4df6580a768cec9c70144946a9b482fcfd339b99838e540d8dcf1a05254e70966a7cb7afad5614757ba0eddfc1fca149bc3589c04682670473308a20cf954079 SHA512 2078e75afd5cfc8970d0a52bed6509670ebfbe8e3315de7e6786e6e358a91d3db8db4d5d5ac6487551502e0d9e98e59c6378c7db587f59940865f9940af4c078 -EBUILD simdjson-0.8.2.ebuild 1136 BLAKE2B cf2d1e06ac050b97552bca05cc93ebfa575e4b9fac4da2a5bfa9b010a6c67c1cc2cc3b401dd9ab99ed8eda032be23bbe9989d3e336bb88b45fabfa7a755993f7 SHA512 5e0731442161b68f7695c433fe72ac6670643be4ac74cf052608ebef1497020a3947208ee7cc60e0c29b6e035ee01b4340be09df9427d37d36fa410351ff2786 -EBUILD simdjson-0.9.2.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315 +DIST simdjson-0.9.3.tar.gz 7957869 BLAKE2B fc47f26843defaac5879f2e8b9d218df503cdeab9cd23820548e8797fa59d0bc4a715bf386a4436b807dd3b0c8100415c408bb7ab5908b1b1eb237712d9a66ed SHA512 d9c02d00832853c166c952755796838d09f8b096613bcb5f41eb4ee0b7db237cabd4839dd739231f0aa0dcd8c937cd63dfc79da19788ff55754c9466a7183d32 +EBUILD simdjson-0.9.2.ebuild 1185 BLAKE2B a3fb6be762829803a2fe3822452c19ffc93eb1e33711d02f61467d95dfc60fed93c24db58f86f868a0ffd842a8ad6e54e47dca2e1d6a00ebdd20273ce65c2c87 SHA512 cd5d0a75e28a315ffeb03f2c0716e5fe82b3fff11b506b0a45d4b05572a16cad19ed91ace2d78056d2a0ed1572c157ec541c1564b79613bb178fa733e4c95feb +EBUILD simdjson-0.9.3.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32 diff --git a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch deleted file mode 100644 index f734a65bd891..000000000000 --- a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt -index 51ab3a31..d3d5e86e 100644 ---- a/dependencies/CMakeLists.txt -+++ b/dependencies/CMakeLists.txt -@@ -105,6 +105,3 @@ endif() - set_off(CXXOPTS_BUILD_EXAMPLES) - set_off(CXXOPTS_BUILD_TESTS) - set_off(CXXOPTS_ENABLE_INSTALL) -- --import_dependency(cxxopts jarro2783/cxxopts 794c975) --add_dependency(cxxopts) -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index f1a82be7..5c36d994 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -1,10 +1,7 @@ --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.7.1.ebuild b/dev-libs/simdjson/simdjson-0.7.1.ebuild deleted file mode 100644 index 40e114a8f658..000000000000 --- a/dev-libs/simdjson/simdjson-0.7.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2020-2021 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" -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.7.0-dont-bundle-cssopts.patch" -) - -src_prepare() { - sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs - - 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-0.8.2.ebuild b/dev-libs/simdjson/simdjson-0.8.2.ebuild deleted file mode 100644 index 8dd574e4361f..000000000000 --- a/dev-libs/simdjson/simdjson-0.8.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2020-2021 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" -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 -} diff --git a/dev-libs/simdjson/simdjson-0.9.2.ebuild b/dev-libs/simdjson/simdjson-0.9.2.ebuild index ce97a46f1129..98f7465e5ad0 100644 --- a/dev-libs/simdjson/simdjson-0.9.2.ebuild +++ b/dev-libs/simdjson/simdjson-0.9.2.ebuild @@ -14,7 +14,7 @@ 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" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="test tools" BDEPEND=" diff --git a/dev-libs/simdjson/simdjson-0.9.3.ebuild b/dev-libs/simdjson/simdjson-0.9.3.ebuild new file mode 100644 index 000000000000..ce97a46f1129 --- /dev/null +++ b/dev-libs/simdjson/simdjson-0.9.3.ebuild @@ -0,0 +1,68 @@ +# Copyright 2020-2021 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/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" + "${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 +} -- cgit v1.2.3