Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
Date: Sat, 15 May 2021 17:47:44
Message-Id: 1621100857.7ca2192750bcd16fa2962d32aeb45f443d06eabc.chutzpah@gentoo
1 commit: 7ca2192750bcd16fa2962d32aeb45f443d06eabc
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 15 17:45:38 2021 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Sat May 15 17:47:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca21927
7
8 dev-libs/simdjson: Remove old
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
12
13 dev-libs/simdjson/Manifest | 2 -
14 .../files/simdjson-0.7.0-dont-bundle-cssopts.patch | 30 ----------
15 dev-libs/simdjson/simdjson-0.7.1.ebuild | 57 ------------------
16 dev-libs/simdjson/simdjson-0.8.2.ebuild | 67 ----------------------
17 4 files changed, 156 deletions(-)
18
19 diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
20 index 6473785cbae..5cef261c3d1 100644
21 --- a/dev-libs/simdjson/Manifest
22 +++ b/dev-libs/simdjson/Manifest
23 @@ -1,3 +1 @@
24 -DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
25 -DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
26 DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6
27
28 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
29 deleted file mode 100644
30 index f734a65bd89..00000000000
31 --- a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
32 +++ /dev/null
33 @@ -1,30 +0,0 @@
34 -diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
35 -index 51ab3a31..d3d5e86e 100644
36 ---- a/dependencies/CMakeLists.txt
37 -+++ b/dependencies/CMakeLists.txt
38 -@@ -105,6 +105,3 @@ endif()
39 - set_off(CXXOPTS_BUILD_EXAMPLES)
40 - set_off(CXXOPTS_BUILD_TESTS)
41 - set_off(CXXOPTS_ENABLE_INSTALL)
42 --
43 --import_dependency(cxxopts jarro2783/cxxopts 794c975)
44 --add_dependency(cxxopts)
45 -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
46 -index f1a82be7..5c36d994 100644
47 ---- a/tools/CMakeLists.txt
48 -+++ b/tools/CMakeLists.txt
49 -@@ -1,10 +1,7 @@
50 --if(TARGET cxxopts) # we only build the tools if cxxopts is available
51 - message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
52 -- link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
53 -+ link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
54 - add_executable(json2json json2json.cpp)
55 - add_executable(jsonstats jsonstats.cpp)
56 -- add_executable(jsonpointer jsonpointer.cpp)
57 -+ add_executable(simdjsonpointer jsonpointer.cpp)
58 - add_executable(minify minify.cpp)
59 --else()
60 -- message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
61 --endif()
62 -\ No newline at end of file
63 -+ install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)
64
65 diff --git a/dev-libs/simdjson/simdjson-0.7.1.ebuild b/dev-libs/simdjson/simdjson-0.7.1.ebuild
66 deleted file mode 100644
67 index 40e114a8f65..00000000000
68 --- a/dev-libs/simdjson/simdjson-0.7.1.ebuild
69 +++ /dev/null
70 @@ -1,57 +0,0 @@
71 -# Copyright 2020-2021 Gentoo Authors
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI=7
75 -
76 -inherit cmake
77 -
78 -DESCRIPTION="SIMD accelerated C++ JSON library"
79 -HOMEPAGE="
80 - https://simdjson.org/
81 - https://github.com/simdjson/simdjson
82 -"
83 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
84 -
85 -LICENSE="Apache-2.0 Boost-1.0"
86 -SLOT="0/4"
87 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
88 -IUSE="test tools"
89 -
90 -BDEPEND="
91 - sys-apps/file
92 - sys-apps/findutils
93 - sys-apps/grep
94 -"
95 -DEPEND="
96 - tools? ( dev-libs/cxxopts:= )
97 -"
98 -
99 -REQUIRED_USE="test? ( tools )"
100 -RESTRICT="!test? ( test )"
101 -
102 -PATCHES=(
103 - "${FILESDIR}/simdjson-0.7.0-dont-bundle-cssopts.patch"
104 -)
105 -
106 -src_prepare() {
107 - sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
108 - cmake_src_prepare
109 -}
110 -
111 -src_configure() {
112 - local -a mycmakeargs
113 -
114 - if use tools; then
115 - mycmakeargs+=(
116 - -DSIMDJSON_JUST_LIBRARY=OFF
117 - -DSIMDJSON_GOOGLE_BENCHMARKS=OFF
118 - -DSIMDJSON_COMPETITION=OFF
119 - )
120 - else
121 - mycmakeargs+=(
122 - -DSIMDJSON_JUST_LIBRARY=ON
123 - )
124 - fi
125 -
126 - cmake_src_configure
127 -}
128
129 diff --git a/dev-libs/simdjson/simdjson-0.8.2.ebuild b/dev-libs/simdjson/simdjson-0.8.2.ebuild
130 deleted file mode 100644
131 index 8dd574e4361..00000000000
132 --- a/dev-libs/simdjson/simdjson-0.8.2.ebuild
133 +++ /dev/null
134 @@ -1,67 +0,0 @@
135 -# Copyright 2020-2021 Gentoo Authors
136 -# Distributed under the terms of the GNU General Public License v2
137 -
138 -EAPI=7
139 -
140 -inherit cmake
141 -
142 -DESCRIPTION="SIMD accelerated C++ JSON library"
143 -HOMEPAGE="
144 - https://simdjson.org/
145 - https://github.com/simdjson/simdjson
146 -"
147 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
148 -
149 -LICENSE="Apache-2.0 Boost-1.0"
150 -SLOT="0/4"
151 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
152 -IUSE="test tools"
153 -
154 -BDEPEND="
155 - sys-apps/file
156 - sys-apps/findutils
157 - sys-apps/grep
158 -"
159 -DEPEND="
160 - tools? ( dev-libs/cxxopts:= )
161 -"
162 -
163 -REQUIRED_USE="test? ( tools )"
164 -RESTRICT="!test? ( test )"
165 -
166 -PATCHES=(
167 - "${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
168 -)
169 -
170 -DOCS=(
171 - AUTHORS
172 - CONTRIBUTING.md
173 - CONTRIBUTORS
174 - HACKING.md
175 - README.md
176 -)
177 -
178 -src_prepare() {
179 - sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
180 - cmake_src_prepare
181 -}
182 -
183 -src_configure() {
184 - local -a mycmakeargs=(
185 - -DSIMDJSON_ENABLE_THREADS=ON
186 - )
187 -
188 - if use tools; then
189 - mycmakeargs+=(
190 - -DSIMDJSON_JUST_LIBRARY=OFF
191 - -DSIMDJSON_GOOGLE_BENCHMARKS=OFF
192 - -DSIMDJSON_COMPETITION=OFF
193 - )
194 - else
195 - mycmakeargs+=(
196 - -DSIMDJSON_JUST_LIBRARY=ON
197 - )
198 - fi
199 -
200 - cmake_src_configure
201 -}