1 |
commit: 273b8b02f3d8b3fc7356d16f11b497fb2d0befb3 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 19 20:13:28 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 19 20:53:53 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273b8b02 |
7 |
|
8 |
dev-cpp/nlohmann_json: drop 3.6.1-r1, 3.7.0, 3.7.3 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-cpp/nlohmann_json/Manifest | 3 - |
13 |
.../files/nlohmann_json-3.7.3-gcc-10.patch | 131 --------------------- |
14 |
.../nlohmann_json/nlohmann_json-3.6.1-r1.ebuild | 45 ------- |
15 |
dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild | 45 ------- |
16 |
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 49 -------- |
17 |
5 files changed, 273 deletions(-) |
18 |
|
19 |
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest |
20 |
index e1b6029b11f..93680873270 100644 |
21 |
--- a/dev-cpp/nlohmann_json/Manifest |
22 |
+++ b/dev-cpp/nlohmann_json/Manifest |
23 |
@@ -1,5 +1,2 @@ |
24 |
-DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a |
25 |
-DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d |
26 |
-DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f008883333ab8cd SHA512 c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865 |
27 |
DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891 |
28 |
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642 |
29 |
|
30 |
diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch |
31 |
deleted file mode 100644 |
32 |
index 1cdb6d594ec..00000000000 |
33 |
--- a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch |
34 |
+++ /dev/null |
35 |
@@ -1,131 +0,0 @@ |
36 |
-From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001 |
37 |
-From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@×××××.com> |
38 |
-Date: Sun, 12 Apr 2020 22:32:39 +0300 |
39 |
-Subject: [PATCH 1/2] Templatize basic_json ctor from json_ref |
40 |
- |
41 |
---- |
42 |
- include/nlohmann/detail/meta/type_traits.hpp | 13 ++++++++++++ |
43 |
- include/nlohmann/json.hpp | 8 ++++---- |
44 |
- single_include/nlohmann/json.hpp | 21 ++++++++++++++++---- |
45 |
- 3 files changed, 34 insertions(+), 8 deletions(-) |
46 |
- |
47 |
-diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp |
48 |
-index 280f69534..dd0b3084f 100644 |
49 |
---- a/include/nlohmann/detail/meta/type_traits.hpp |
50 |
-+++ b/include/nlohmann/detail/meta/type_traits.hpp |
51 |
-@@ -41,6 +41,19 @@ template<typename> struct is_basic_json : std::false_type {}; |
52 |
- NLOHMANN_BASIC_JSON_TPL_DECLARATION |
53 |
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {}; |
54 |
- |
55 |
-+////////////////////// |
56 |
-+// jspn_ref helpers // |
57 |
-+////////////////////// |
58 |
-+ |
59 |
-+template <typename> |
60 |
-+class json_ref; |
61 |
-+ |
62 |
-+template<typename> |
63 |
-+struct is_json_ref : std::false_type {}; |
64 |
-+ |
65 |
-+template <typename T> |
66 |
-+struct is_json_ref<json_ref<T>> : std::true_type {}; |
67 |
-+ |
68 |
- ////////////////////////// |
69 |
- // aliases for detected // |
70 |
- ////////////////////////// |
71 |
-diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp |
72 |
-index 336d69fe7..0598efc8c 100644 |
73 |
---- a/include/nlohmann/json.hpp |
74 |
-+++ b/include/nlohmann/json.hpp |
75 |
-@@ -1773,10 +1773,10 @@ class basic_json |
76 |
- // other constructors and destructor // |
77 |
- /////////////////////////////////////// |
78 |
- |
79 |
-- /// @private |
80 |
-- basic_json(const detail::json_ref<basic_json>& ref) |
81 |
-- : basic_json(ref.moved_or_copied()) |
82 |
-- {} |
83 |
-+ template <typename JsonRef, |
84 |
-+ detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>, |
85 |
-+ std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 > |
86 |
-+ basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {} |
87 |
- |
88 |
- /*! |
89 |
- @brief copy constructor |
90 |
-diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp |
91 |
-index 09464f3b2..8927180e6 100644 |
92 |
---- a/single_include/nlohmann/json.hpp |
93 |
-+++ b/single_include/nlohmann/json.hpp |
94 |
-@@ -2794,6 +2794,19 @@ template<typename> struct is_basic_json : std::false_type {}; |
95 |
- NLOHMANN_BASIC_JSON_TPL_DECLARATION |
96 |
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {}; |
97 |
- |
98 |
-+////////////////////// |
99 |
-+// jspn_ref helpers // |
100 |
-+////////////////////// |
101 |
-+ |
102 |
-+template <typename> |
103 |
-+class json_ref; |
104 |
-+ |
105 |
-+template<typename> |
106 |
-+struct is_json_ref : std::false_type {}; |
107 |
-+ |
108 |
-+template <typename T> |
109 |
-+struct is_json_ref<json_ref<T>> : std::true_type {}; |
110 |
-+ |
111 |
- ////////////////////////// |
112 |
- // aliases for detected // |
113 |
- ////////////////////////// |
114 |
-@@ -16632,10 +16645,10 @@ class basic_json |
115 |
- // other constructors and destructor // |
116 |
- /////////////////////////////////////// |
117 |
- |
118 |
-- /// @private |
119 |
-- basic_json(const detail::json_ref<basic_json>& ref) |
120 |
-- : basic_json(ref.moved_or_copied()) |
121 |
-- {} |
122 |
-+ template <typename JsonRef, |
123 |
-+ detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>, |
124 |
-+ std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 > |
125 |
-+ basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {} |
126 |
- |
127 |
- /*! |
128 |
- @brief copy constructor |
129 |
- |
130 |
-From 70be9751cd60e622ce6463f41d47c02fc2d83cbc Mon Sep 17 00:00:00 2001 |
131 |
-From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@×××××.com> |
132 |
-Date: Sun, 12 Apr 2020 23:42:26 +0300 |
133 |
-Subject: [PATCH 2/2] typo fix |
134 |
- |
135 |
---- |
136 |
- include/nlohmann/detail/meta/type_traits.hpp | 2 +- |
137 |
- single_include/nlohmann/json.hpp | 2 +- |
138 |
- 2 files changed, 2 insertions(+), 2 deletions(-) |
139 |
- |
140 |
-diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp |
141 |
-index dd0b3084f..13e92cb48 100644 |
142 |
---- a/include/nlohmann/detail/meta/type_traits.hpp |
143 |
-+++ b/include/nlohmann/detail/meta/type_traits.hpp |
144 |
-@@ -42,7 +42,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION |
145 |
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {}; |
146 |
- |
147 |
- ////////////////////// |
148 |
--// jspn_ref helpers // |
149 |
-+// json_ref helpers // |
150 |
- ////////////////////// |
151 |
- |
152 |
- template <typename> |
153 |
-diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp |
154 |
-index 8927180e6..294e7509b 100644 |
155 |
---- a/single_include/nlohmann/json.hpp |
156 |
-+++ b/single_include/nlohmann/json.hpp |
157 |
-@@ -2795,7 +2795,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION |
158 |
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {}; |
159 |
- |
160 |
- ////////////////////// |
161 |
--// jspn_ref helpers // |
162 |
-+// json_ref helpers // |
163 |
- ////////////////////// |
164 |
- |
165 |
- template <typename> |
166 |
- |
167 |
|
168 |
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild |
169 |
deleted file mode 100644 |
170 |
index aee715391e6..00000000000 |
171 |
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild |
172 |
+++ /dev/null |
173 |
@@ -1,45 +0,0 @@ |
174 |
-# Copyright 1999-2021 Gentoo Authors |
175 |
-# Distributed under the terms of the GNU General Public License v2 |
176 |
- |
177 |
-EAPI=7 |
178 |
- |
179 |
-inherit cmake |
180 |
- |
181 |
-DESCRIPTION="JSON for Modern C++" |
182 |
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" |
183 |
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
184 |
- |
185 |
-LICENSE="MIT" |
186 |
-SLOT="0" |
187 |
-KEYWORDS="amd64 ppc ppc64 x86" |
188 |
-IUSE="doc test" |
189 |
-RESTRICT="!test? ( test )" |
190 |
- |
191 |
-BDEPEND="doc? ( app-doc/doxygen )" |
192 |
- |
193 |
-DOCS=( ChangeLog.md README.md ) |
194 |
- |
195 |
-S=${WORKDIR}/json-${PV} |
196 |
- |
197 |
-src_configure() { |
198 |
- local mycmakeargs=( |
199 |
- -DJSON_BuildTests=$(usex test) |
200 |
- -DJSON_MultipleHeaders=ON |
201 |
- ) |
202 |
- |
203 |
- cmake_src_configure |
204 |
-} |
205 |
- |
206 |
-src_compile() { |
207 |
- cmake_src_compile |
208 |
- use doc && emake -C doc |
209 |
-} |
210 |
- |
211 |
-src_test() { |
212 |
- emake check |
213 |
-} |
214 |
- |
215 |
-src_install() { |
216 |
- cmake_src_install |
217 |
- use doc && dodoc -r doc/html |
218 |
-} |
219 |
|
220 |
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild |
221 |
deleted file mode 100644 |
222 |
index c5617336644..00000000000 |
223 |
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild |
224 |
+++ /dev/null |
225 |
@@ -1,45 +0,0 @@ |
226 |
-# Copyright 1999-2021 Gentoo Authors |
227 |
-# Distributed under the terms of the GNU General Public License v2 |
228 |
- |
229 |
-EAPI=7 |
230 |
- |
231 |
-inherit cmake |
232 |
- |
233 |
-DESCRIPTION="JSON for Modern C++" |
234 |
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" |
235 |
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
236 |
- |
237 |
-LICENSE="MIT" |
238 |
-SLOT="0" |
239 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
240 |
-IUSE="doc test" |
241 |
-RESTRICT="!test? ( test )" |
242 |
- |
243 |
-BDEPEND="doc? ( app-doc/doxygen )" |
244 |
- |
245 |
-DOCS=( ChangeLog.md README.md ) |
246 |
- |
247 |
-S=${WORKDIR}/json-${PV} |
248 |
- |
249 |
-src_configure() { |
250 |
- local mycmakeargs=( |
251 |
- -DJSON_BuildTests=$(usex test) |
252 |
- -DJSON_MultipleHeaders=ON |
253 |
- ) |
254 |
- |
255 |
- cmake_src_configure |
256 |
-} |
257 |
- |
258 |
-src_compile() { |
259 |
- cmake_src_compile |
260 |
- use doc && emake -C doc |
261 |
-} |
262 |
- |
263 |
-src_test() { |
264 |
- emake check |
265 |
-} |
266 |
- |
267 |
-src_install() { |
268 |
- cmake_src_install |
269 |
- use doc && dodoc -r doc/html |
270 |
-} |
271 |
|
272 |
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild |
273 |
deleted file mode 100644 |
274 |
index 03d646be1e0..00000000000 |
275 |
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild |
276 |
+++ /dev/null |
277 |
@@ -1,49 +0,0 @@ |
278 |
-# Copyright 1999-2021 Gentoo Authors |
279 |
-# Distributed under the terms of the GNU General Public License v2 |
280 |
- |
281 |
-EAPI=7 |
282 |
- |
283 |
-inherit cmake |
284 |
- |
285 |
-DESCRIPTION="JSON for Modern C++" |
286 |
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" |
287 |
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
288 |
- |
289 |
-LICENSE="MIT" |
290 |
-SLOT="0" |
291 |
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86" |
292 |
-IUSE="doc test" |
293 |
-RESTRICT="!test? ( test )" |
294 |
- |
295 |
-BDEPEND="doc? ( app-doc/doxygen )" |
296 |
- |
297 |
-DOCS=( ChangeLog.md README.md ) |
298 |
- |
299 |
-S=${WORKDIR}/json-${PV} |
300 |
- |
301 |
-PATCHES=( |
302 |
- "${FILESDIR}"/${PN}-3.7.3-gcc-10.patch |
303 |
-) |
304 |
- |
305 |
-src_configure() { |
306 |
- local mycmakeargs=( |
307 |
- -DJSON_BuildTests=$(usex test) |
308 |
- -DJSON_MultipleHeaders=ON |
309 |
- ) |
310 |
- |
311 |
- cmake_src_configure |
312 |
-} |
313 |
- |
314 |
-src_compile() { |
315 |
- cmake_src_compile |
316 |
- use doc && emake -C doc |
317 |
-} |
318 |
- |
319 |
-src_test() { |
320 |
- emake check |
321 |
-} |
322 |
- |
323 |
-src_install() { |
324 |
- cmake_src_install |
325 |
- use doc && dodoc -r doc/html |
326 |
-} |