1 |
commit: 306fdab9eab759f62f25feb140882ea20257537e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 06:28:42 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 06:31:31 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306fdab9 |
7 |
|
8 |
dev-cpp/nlohmann_json: bump to 3.9.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/728750 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
dev-cpp/nlohmann_json/Manifest | 2 + |
15 |
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 57 ++++++++++++++++++++++++ |
16 |
2 files changed, 59 insertions(+) |
17 |
|
18 |
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest |
19 |
index e64f5eccd1a..e1b6029b11f 100644 |
20 |
--- a/dev-cpp/nlohmann_json/Manifest |
21 |
+++ b/dev-cpp/nlohmann_json/Manifest |
22 |
@@ -1,3 +1,5 @@ |
23 |
DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a |
24 |
DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d |
25 |
DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f008883333ab8cd SHA512 c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865 |
26 |
+DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891 |
27 |
+DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642 |
28 |
|
29 |
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..8c50916e83e |
32 |
--- /dev/null |
33 |
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild |
34 |
@@ -0,0 +1,57 @@ |
35 |
+# Copyright 1999-2020 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=7 |
39 |
+ |
40 |
+inherit cmake |
41 |
+ |
42 |
+DESCRIPTION="JSON for Modern C++" |
43 |
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" |
44 |
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
45 |
+SRC_URI+=" test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> ${P}-testdata.tar.gz )" |
46 |
+S="${WORKDIR}/json-${PV}" |
47 |
+ |
48 |
+LICENSE="MIT" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" |
51 |
+IUSE="doc test" |
52 |
+#RESTRICT="!test? ( test )" |
53 |
+# Need to report failing tests upstream |
54 |
+# Tests only just added, large test suite, majority pass |
55 |
+RESTRICT="test" |
56 |
+ |
57 |
+DEPEND="doc? ( app-doc/doxygen )" |
58 |
+ |
59 |
+DOCS=( ChangeLog.md README.md ) |
60 |
+ |
61 |
+src_configure() { |
62 |
+ local mycmakeargs=( |
63 |
+ -DJSON_BuildTests=$(usex test) |
64 |
+ -DJSON_TestDataDirectory="${S}/json_test_data" |
65 |
+ -DJSON_MultipleHeaders=ON |
66 |
+ ) |
67 |
+ |
68 |
+ cmake_src_configure |
69 |
+} |
70 |
+ |
71 |
+src_compile() { |
72 |
+ cmake_src_compile |
73 |
+ use doc && emake -C doc |
74 |
+} |
75 |
+ |
76 |
+src_test() { |
77 |
+ cd "${BUILD_DIR}/test" || die |
78 |
+ |
79 |
+ # Skip certain tests needing git per upstream |
80 |
+ # https://github.com/nlohmann/json/issues/2189 |
81 |
+ local myctestargs=( |
82 |
+ "-LE git_required" |
83 |
+ ) |
84 |
+ |
85 |
+ cmake_src_test |
86 |
+} |
87 |
+ |
88 |
+src_install() { |
89 |
+ cmake_src_install |
90 |
+ use doc && dodoc -r doc/html |
91 |
+} |