Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
Date: Sat, 09 Oct 2021 04:21:51
Message-Id: 1633752094.9bbe7479fa74872bd57dc73cf377cd6890d1d5e7.sam@gentoo
1 commit: 9bbe7479fa74872bd57dc73cf377cd6890d1d5e7
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 9 04:01:34 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 9 04:01:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bbe7479
7
8 dev-cpp/nlohmann_json: add 3.10.3
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-cpp/nlohmann_json/Manifest | 1 +
13 dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild | 62 +++++++++++++++++++++++
14 2 files changed, 63 insertions(+)
15
16 diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
17 index 96a6c369deb..071915c2938 100644
18 --- a/dev-cpp/nlohmann_json/Manifest
19 +++ b/dev-cpp/nlohmann_json/Manifest
20 @@ -1,4 +1,5 @@
21 DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B 2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2 SHA512 1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
22 DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c SHA512 9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
23 +DIST nlohmann_json-3.10.3.tar.gz 7061586 BLAKE2B 266dc441a88b36c2314d5fb85699b03ba054be0d620718c62949a5860d7678bc07aede206b353d7d25b81e8813c1ec1190db6d322ff2c5bbcbdab7a2f3dc4c59 SHA512 92d438e9c23480ebc3f335213c77b0872524530f1118f9bba269ac4ec500c485e18e5e774bd0cf3c428db2f344c39a42b98dcc7e83121be0adcee301e415a0ea
24 DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
25 DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
26
27 diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild
28 new file mode 100644
29 index 00000000000..39a2c4c723a
30 --- /dev/null
31 +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild
32 @@ -0,0 +1,62 @@
33 +# Copyright 1999-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit cmake
39 +
40 +# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
41 +TEST_VERSION="3.0.0"
42 +DESCRIPTION="JSON for Modern C++"
43 +HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
44 +SRC_URI="
45 + https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
46 + test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
47 +S="${WORKDIR}/json-${PV}"
48 +
49 +LICENSE="MIT"
50 +SLOT="0"
51 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
52 +IUSE="doc test"
53 +#RESTRICT="!test? ( test )"
54 +# Need to report failing tests upstream
55 +# Tests only just added, large test suite, majority pass
56 +RESTRICT="test"
57 +
58 +BDEPEND="doc? ( app-doc/doxygen )"
59 +
60 +DOCS=( ChangeLog.md README.md )
61 +
62 +src_configure() {
63 + # Tests are built by default so we can't group the test logic below
64 + local mycmakeargs=(
65 + -DJSON_MultipleHeaders=ON
66 + -DJSON_BuildTests=$(usex test)
67 + )
68 +
69 + # Define test data directory here to avoid unused var QA warning, bug #747826
70 + use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
71 +
72 + cmake_src_configure
73 +}
74 +
75 +src_compile() {
76 + cmake_src_compile
77 +
78 + if use doc; then
79 + emake -C doc
80 + HTML_DOCS=( doc/html/. )
81 + fi
82 +}
83 +
84 +src_test() {
85 + cd "${BUILD_DIR}/test" || die
86 +
87 + # Skip certain tests needing git per upstream
88 + # https://github.com/nlohmann/json/issues/2189
89 + local myctestargs=(
90 + "-LE git_required"
91 + )
92 +
93 + cmake_src_test
94 +}