[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: e9cd21ee5316841ff1c153d3d8aaa1405b532706
Author: Sam James gentoo org>
AuthorDate: Thu Nov 30 02:32:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 30 02:32:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9cd21ee
dev-cpp/nlohmann_json: add 3.11.3
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest| 1 +
dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild | 66 +++
2 files changed, 67 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index bb6d9f16263d..f1bdb358c437 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,4 +1,5 @@
DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B
e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c
SHA512
9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
DIST nlohmann_json-3.11.2.tar.gz 8097673 BLAKE2B
ebb67966739a330e0cfb8495a6eb58e87732655856a6d4e843072ed5e485cafbb8a75d8803859d0365b814deda7429448ecc473de414de4b23d3a3c455dc2511
SHA512
70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0
+DIST nlohmann_json-3.11.3.tar.gz 8053705 BLAKE2B
872f67e44d3003c9d8c9e5ca4674a357883d7341e3943a7694812af8c853fe5da65fbbe0cc986b634c7cbca12082a064fcf8e40d4d06e6b990f031ea47c21db5
SHA512
7df19b621de34f08d5d5c0a25e8225975980841ef2e48536abcf22526ed7fb99f88ad954a2cb823115db59ccc88d1dbe74fe6c281b5644b976b33fb78db9d717
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
DIST nlohmann_json-testdata-3.1.0.tar.gz 115036393 BLAKE2B
809be0728a0b9d007fcc752911bdf6f7e548d6e3ec59871ea2b16d87d8248ca4dd2f681a1d0f82c618463294188ad41d6d965b8bdc39c70fdcf4b939d4121e9c
SHA512
db6c411b37f2154f5dd1ed90f4e8fa0907f4a736cd0ff79943bcacf9da422285ff142bb6a7dc6022b236090083166ac1ab197be3f480d8dc50b26a91a9477821
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
new file mode 100644
index ..e9c1e4431fb6
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#DOCS_BUILDER="mkdocs"
+# Needs unpackaged plantuml-markdown too
+# ... but plantuml (Python bindings anyway) need network access to generate
bits at runtime.
+#DOCS_DEPEND="dev-python/mkdocs-material-extensions
dev-python/mkdocs-minify-plugin"
+#DOCS_DIR="doc/mkdocs"
+inherit cmake
+
+# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
+TEST_VERSION="3.1.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="
+ https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )
+"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_prepare() {
+ if use test ; then
+ ln -s "${WORKDIR}"/json_test_data-${TEST_VERSION}
"${S}"/json_test_data || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # Tests are built by default so we can't group the test logic below
+ local mycmakeargs=(
+ -DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
+ )
+
+ # Define test data directory here to avoid unused var QA warning, bug
#747826
+ use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}"/tests || die
+
+ # git_required:
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ #
+ # cmake_fetch_content_configure, cmake_fetch_content2_configure:
+ # Needs network (bug #865027, bug #865105)
+ local myctestargs=(
+ -E
"(git_required|cmake_fetch_content_configure|cmake_fetch_content2_configure|cmake_fetch_content_build|cmake_fetch_content2_build)"
+ )
+
+ cmake_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 3955f80c1f2bd985bd22370efef2c5e8e9aedc97
Author: Sam James gentoo org>
AuthorDate: Wed Oct 18 14:08:14 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Oct 18 14:08:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3955f80c
dev-cpp/nlohmann_json: Stabilize 3.11.2-r1 arm, #915949
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
index b7c24f30111c..c99929f0867e 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: c6e96aa4bc290f4fb0f7fac851d4ebf12682c8fc
Author: Sam James gentoo org>
AuthorDate: Wed Aug 30 04:55:52 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 30 05:14:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e96aa4
dev-cpp/nlohmann_json: add 3.10.2
This partially reverts 3591af18de7c094c01e71deadd4f2a8f9597f228.
Needed by qiskit-aer-0.12.2 for now.
Bug: https://github.com/Qiskit/qiskit-aer/issues/1742
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest| 2 +
dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild | 63 +++
2 files changed, 65 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 0ebb96ff79c9..bb6d9f16263d 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,2 +1,4 @@
+DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B
e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c
SHA512
9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
DIST nlohmann_json-3.11.2.tar.gz 8097673 BLAKE2B
ebb67966739a330e0cfb8495a6eb58e87732655856a6d4e843072ed5e485cafbb8a75d8803859d0365b814deda7429448ecc473de414de4b23d3a3c455dc2511
SHA512
70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0
+DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
DIST nlohmann_json-testdata-3.1.0.tar.gz 115036393 BLAKE2B
809be0728a0b9d007fcc752911bdf6f7e548d6e3ec59871ea2b16d87d8248ca4dd2f681a1d0f82c618463294188ad41d6d965b8bdc39c70fdcf4b939d4121e9c
SHA512
db6c411b37f2154f5dd1ed90f4e8fa0907f4a736cd0ff79943bcacf9da422285ff142bb6a7dc6022b236090083166ac1ab197be3f480d8dc50b26a91a9477821
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
new file mode 100644
index ..f7a64254bd24
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
+TEST_VERSION="3.0.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="
+ https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )
+"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+#RESTRICT="!test? ( test )"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+ # Tests are built by default so we can't group the test logic below
+ local mycmakeargs=(
+ -DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
+ )
+
+ # Define test data directory here to avoid unused var QA warning, bug
#747826
+ use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ emake -C doc
+ HTML_DOCS=( doc/html/. )
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}/test" || die
+
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ local myctestargs=(
+ "-LE git_required"
+ )
+
+ cmake_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: bf0d53b1eed64ae07d5f79b34fd6e51c78238195
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 24 14:07:14 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 24 14:07:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0d53b1
dev-cpp/nlohmann_json: Stabilize 3.11.2-r1 arm64, #902631
Signed-off-by: Arthur Zamarin gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
index 29560c84dd0f..b7c24f30111c 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 4d737881614072a69c2a1624a6238836b2480baa
Author: Sam James gentoo org>
AuthorDate: Wed Mar 22 05:44:35 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 22 05:44:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d737881
dev-cpp/nlohmann_json: Stabilize 3.11.2-r1 ppc64, #902631
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
index 86bb0d7964a7..29560c84dd0f 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/, dev-cpp/nlohmann_json/files/
commit: 0b9bc827044513629412186679b81112b5f633fd
Author: Arsen Arsenović gentoo org>
AuthorDate: Tue Feb 21 12:23:17 2023 +
Commit: Arsen Arsenović gentoo org>
CommitDate: Tue Feb 21 12:26:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9bc827
dev-cpp/nlohmann_json: Fix test build failure error on GCC 13
Closes: https://bugs.gentoo.org/895692
Signed-off-by: Arsen Arsenović gentoo.org>
.../files/nlohmann_json-3.11.2-gcc13-2.patch | 42 ++
.../nlohmann_json/nlohmann_json-3.11.2-r1.ebuild | 1 +
2 files changed, 43 insertions(+)
diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch
b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch
new file mode 100644
index ..a2931880dbcd
--- /dev/null
+++ b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch
@@ -0,0 +1,42 @@
+From a49829bd984c0282be18fcec070df0c31bf77dd5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?=
+Date: Tue, 21 Feb 2023 12:59:21 +0100
+Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range
+ comparisons
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes a build error on GCC 13:
+
+ /home/arsen/nlohmann_json/tests/src/unit-iterators2.cpp: In function ‘void
_DOCTEST_ANON_FUNC_2()’:
+ /home/arsen/nlohmann_json/tests/src/unit-iterators2.cpp:946:32: error: no
match for ‘operator==’ (operand types are
‘doctest::detail::Expression_lhs
> >&>’ and ‘nlohmann::json_abi_v3_11_2::json’ {aka
‘nlohmann::json_abi_v3_11_2::basic_json<>’})
+946 | CHECK(reversed == j_expected);
+|^~ ~~
+| |
+| nlohmann::json_abi_v3_11_2::json
{aka nlohmann::json_abi_v3_11_2::basic_json<>}
+
+Bug: https://bugs.gentoo.org/895692
+Closes: #3927
+---
+Forwarded: https://github.com/nlohmann/json/pull/3950
+
+ tests/src/unit-iterators2.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp
+index 27926084..72a5d9dc 100644
+--- a/tests/src/unit-iterators2.cpp
b/tests/src/unit-iterators2.cpp
+@@ -943,7 +943,7 @@ TEST_CASE("iterators 2")
+ json j_expected{5, 4, 3, 2, 1};
+
+ auto reversed = j | std::views::reverse;
+-CHECK(reversed == j_expected);
++CHECK(std::ranges::equal(reversed, j_expected));
+ }
+
+ SECTION("transform")
+--
+2.39.2
+
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
index 180f62d3f096..fbe212f01306 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
@@ -29,6 +29,7 @@ DOCS=( ChangeLog.md README.md )
PATCHES=(
"${FILESDIR}"/${PN}-3.11.2-gcc13.patch
+ "${FILESDIR}"/${PN}-3.11.2-gcc13-2.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: cb5ec26ff63275694e5419e3c3d26eaf750e64f5
Author: WANG Xuerui gentoo org>
AuthorDate: Tue Feb 14 08:46:48 2023 +
Commit: WANG Xuerui gentoo org>
CommitDate: Thu Feb 16 05:51:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5ec26f
dev-cpp/nlohmann_json: keyword 3.11.2-r1 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
index a3d79580696a..180f62d3f096 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/files/, dev-cpp/nlohmann_json/
commit: b9ebc9717b4378c3bc28b82dfe4cfc268de4d4e3
Author: Sam James gentoo org>
AuthorDate: Mon Jan 30 04:39:00 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 30 04:39:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ebc971
dev-cpp/nlohmann_json: (partially) fix build w/ gcc 13
Signed-off-by: Sam James gentoo.org>
.../files/nlohmann_json-3.11.2-gcc13.patch | 76 ++
.../nlohmann_json/nlohmann_json-3.11.2-r1.ebuild | 69
2 files changed, 145 insertions(+)
diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch
b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch
new file mode 100644
index ..5205e67a3c2c
--- /dev/null
+++ b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch
@@ -0,0 +1,76 @@
+https://github.com/nlohmann/json/issues/3927
+https://github.com/nlohmann/json/pull/3895
+
+From a5b09d50b786638ed9deb09ef13860a3cb64eb6b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Tue, 20 Dec 2022 22:08:12 +
+Subject: [PATCH] custom allocators: define missing 'rebind' type
+
+`gcc-13` added an assert to standard headers to make sure custom
+allocators have intended implementation of rebind type instead
+of inherited rebind. gcc change:
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
+
+Without the fix build fails on this week's `gcc-13` as:
+
+In file included from
<>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
+ from
<>-gcc-13.0.0/include/c++/13.0.0/bits/basic_string.h:39,
+ from <>-gcc-13.0.0/include/c++/13.0.0/string:54,
+ from
<>-gcc-13.0.0/include/c++/13.0.0/bits/locale_classes.h:40,
+ from <>-gcc-13.0.0/include/c++/13.0.0/locale:41,
+ from tests/src/unit-regression2.cpp:19:
+<>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In
instantiation of 'struct
std::__allocator_traits_base::__rebind, unsigned
char, void>':
+<>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11:
required by substitution of 'template using
std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc,
_Up>::type [with _Alloc = my_allocator; _Up = unsigned char]'
+<>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8:
required by substitution of 'template template using
std::allocator_traits< >::rebind_alloc =
std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc =
my_allocator]'
+<>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65:
required from 'struct __gnu_cxx::__alloc_traits,
unsigned char>::rebind'
+<>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required
from 'struct std::_Vector_base >'
+<>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required
from 'class std::vector >'
+tests/src/unit-regression2.cpp:807:63: required from here
+<>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error:
static assertion failed: allocator_traits::rebind_alloc must
be A
+ 70 | _Tp>::value,
+ | ^
+
+The change adds trivial `rebind` definition with expected return type
+and satisfies conversion requirements.
+--- a/tests/src/unit-allocator.cpp
b/tests/src/unit-allocator.cpp
+@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator
+ {
+ using std::allocator::allocator;
+
++bad_allocator() = default;
++template bad_allocator(const bad_allocator& /*unused*/) { }
++
+ template
+ void construct(T* /*unused*/, Args&& ... /*unused*/)
+ {
+ throw std::bad_alloc();
+ }
++
++template
++struct rebind
++{
++using other = bad_allocator;
++};
+ };
+ } // namespace
+
+--- a/tests/src/unit-regression2.cpp
b/tests/src/unit-regression2.cpp
+@@ -187,6 +187,15 @@ class my_allocator : public std::allocator
+ {
+ public:
+ using std::allocator::allocator;
++
++my_allocator() = default;
++template my_allocator(const my_allocator& /*unused*/) { }
++
++template
++struct rebind
++{
++using other = my_allocator;
++};
+ };
+
+ /
+
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
new file mode 100644
index ..a3d79580696a
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#DOCS_BUILDER="mkdocs"
+# Needs unpackaged plantuml-markdown too
+# ... but plantuml (Python bindings anyway) need network access to generate
bits at runtime.
+#DOCS_DEPEND="dev-python/mkdocs-material-extensions
dev-python/mkdocs-minify-plugin"
+#DOCS_DIR="doc/mkdocs"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 6630f365d69916c1927e78095ebebbf0bcfbc5d5
Author: Sam James gentoo org>
AuthorDate: Sun Dec 18 12:16:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 18 12:16:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6630f365
dev-cpp/nlohmann_json: Stabilize 3.11.2 arm64, #886907
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
index 3bac320e3a05..5d06d9de232c 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 02a7d65e5bf7d225fc0124163ea17ad01ff0baef
Author: Sam James gentoo org>
AuthorDate: Sat Aug 13 17:43:16 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 13 17:43:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a7d65e
dev-cpp/nlohmann_json: exclude more network tests
Again only seem to surface if no git repo in S...?
Closes: https://bugs.gentoo.org/865105
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
index 6104a266421f..3bac320e3a05 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
@@ -56,9 +56,9 @@ src_test() {
# https://github.com/nlohmann/json/issues/2189
#
# cmake_fetch_content_configure, cmake_fetch_content2_configure:
- # Needs network (bug #865027)
+ # Needs network (bug #865027, bug #865105)
local myctestargs=(
- -E
"(git_required|cmake_fetch_content_configure|cmake_fetch_content2_configure)"
+ -E
"(git_required|cmake_fetch_content_configure|cmake_fetch_content2_configure|cmake_fetch_content_build|cmake_fetch_content2_build)"
)
cmake_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: d69f52de506e328a27aad9c250a460760fbba422
Author: Sam James gentoo org>
AuthorDate: Sat Aug 13 13:31:17 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 13 13:31:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69f52de
dev-cpp/nlohmann_json: fix tests w/o git in S
Closes: https://bugs.gentoo.org/865027
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
index c631bc6644a9..6104a266421f 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
@@ -51,10 +51,14 @@ src_configure() {
src_test() {
cd "${BUILD_DIR}"/tests || die
+ # git_required:
# Skip certain tests needing git per upstream
# https://github.com/nlohmann/json/issues/2189
+ #
+ # cmake_fetch_content_configure, cmake_fetch_content2_configure:
+ # Needs network (bug #865027)
local myctestargs=(
- "-LE git_required"
+ -E
"(git_required|cmake_fetch_content_configure|cmake_fetch_content2_configure)"
)
cmake_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: c9a90505c34e9b65a54709655be06d63221ef6d6
Author: Sam James gentoo org>
AuthorDate: Fri Aug 12 19:28:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 12 21:02:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a90505
dev-cpp/nlohmann_json: add 3.11.2
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest| 2 +
dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild | 61 +++
2 files changed, 63 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 35ece5669df2..84ce2923e94b 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,2 +1,4 @@
DIST nlohmann_json-3.10.5.tar.gz 7021996 BLAKE2B
d4219d2f3168341eb8bd8f84af364e53f6caae67aa080b1ca0479216a98ee0256d5436243273b3c12ccdca904b4b17dbb90cf445fc273424d7dab6d2b95632bc
SHA512
4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2
+DIST nlohmann_json-3.11.2.tar.gz 8097673 BLAKE2B
ebb67966739a330e0cfb8495a6eb58e87732655856a6d4e843072ed5e485cafbb8a75d8803859d0365b814deda7429448ecc473de414de4b23d3a3c455dc2511
SHA512
70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
+DIST nlohmann_json-testdata-3.1.0.tar.gz 115036393 BLAKE2B
809be0728a0b9d007fcc752911bdf6f7e548d6e3ec59871ea2b16d87d8248ca4dd2f681a1d0f82c618463294188ad41d6d965b8bdc39c70fdcf4b939d4121e9c
SHA512
db6c411b37f2154f5dd1ed90f4e8fa0907f4a736cd0ff79943bcacf9da422285ff142bb6a7dc6022b236090083166ac1ab197be3f480d8dc50b26a91a9477821
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
new file mode 100644
index ..c631bc6644a9
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#DOCS_BUILDER="mkdocs"
+# Needs unpackaged plantuml-markdown too
+# ... but plantuml (Python bindings anyway) need network access to generate
bits at runtime.
+#DOCS_DEPEND="dev-python/mkdocs-material-extensions
dev-python/mkdocs-minify-plugin"
+#DOCS_DIR="doc/mkdocs"
+inherit cmake
+
+# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
+TEST_VERSION="3.1.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="
+ https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_prepare() {
+ if use test ; then
+ ln -s "${WORKDIR}"/json_test_data-${TEST_VERSION}
"${S}"/json_test_data || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # Tests are built by default so we can't group the test logic below
+ local mycmakeargs=(
+ -DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
+ )
+
+ # Define test data directory here to avoid unused var QA warning, bug
#747826
+ use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}"/tests || die
+
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ local myctestargs=(
+ "-LE git_required"
+ )
+
+ cmake_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: bce798554991b056dd94272649cda2739c5d7e7c
Author: Jakov Smolić gentoo org>
AuthorDate: Tue Jun 7 08:24:19 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Tue Jun 7 08:24:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce79855
dev-cpp/nlohmann_json: Stabilize 3.10.5 arm64, #850217
Signed-off-by: Jakov Smolić gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index 64ba3b9af5c7..3a1cf56d78ce 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
IUSE="test"
# Need to report failing tests upstream
# Tests only just added, large test suite, majority pass
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 3591af18de7c094c01e71deadd4f2a8f9597f228
Author: Sam James gentoo org>
AuthorDate: Sun Apr 17 19:20:24 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 17 19:20:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3591af18
dev-cpp/nlohmann_json: drop 3.9.1, 3.10.0, 3.10.2, 3.10.4
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest| 4 --
dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild | 62 ---
dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild | 62 ---
dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild | 62 ---
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 62 ---
5 files changed, 252 deletions(-)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 002d3c70b34a..35ece5669df2 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,6 +1,2 @@
-DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B
2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2
SHA512
1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
-DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B
e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c
SHA512
9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
-DIST nlohmann_json-3.10.4.tar.gz 7062443 BLAKE2B
7f526d12c4ce8148c874c76d280090ef69ae3adf817b63758bbcc23ff9476e119ede90bebc397b9bb84b54012f057e3e010d643c595b4699a8ecd437a5a3f913
SHA512
f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835
DIST nlohmann_json-3.10.5.tar.gz 7021996 BLAKE2B
d4219d2f3168341eb8bd8f84af364e53f6caae67aa080b1ca0479216a98ee0256d5436243273b3c12ccdca904b4b17dbb90cf445fc273424d7dab6d2b95632bc
SHA512
4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2
-DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
deleted file mode 100644
index 39a2c4c723af..
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
-TEST_VERSION="3.0.0"
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
-SRC_URI="
- https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )"
-S="${WORKDIR}/json-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
-# Need to report failing tests upstream
-# Tests only just added, large test suite, majority pass
-RESTRICT="test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-src_configure() {
- # Tests are built by default so we can't group the test logic below
- local mycmakeargs=(
- -DJSON_MultipleHeaders=ON
- -DJSON_BuildTests=$(usex test)
- )
-
- # Define test data directory here to avoid unused var QA warning, bug
#747826
- use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- emake -C doc
- HTML_DOCS=( doc/html/. )
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}/test" || die
-
- # Skip certain tests needing git per upstream
- # https://github.com/nlohmann/json/issues/2189
- local myctestargs=(
- "-LE git_required"
- )
-
- cmake_src_test
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: ed7e06df907b96ad9fcc1466e718ef6bb14f2580
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Feb 19 15:22:12 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Feb 19 15:22:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7e06df
dev-cpp/nlohmann_json: Stabilize 3.10.5 ppc64, #833739
Signed-off-by: Arthur Zamarin gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index a5db63c26c85..64ba3b9af5c7 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
IUSE="test"
# Need to report failing tests upstream
# Tests only just added, large test suite, majority pass
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: f0f10b3ad84430f3b4daf17c920d6b7765478fa9
Author: Jakov Smolić gentoo org>
AuthorDate: Sat Feb 19 13:21:40 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sat Feb 19 13:21:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f10b3a
dev-cpp/nlohmann_json: Stabilize 3.10.5 x86, #833739
Signed-off-by: Jakov Smolić gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index 8fc2cd5d441e..a5db63c26c85 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
IUSE="test"
# Need to report failing tests upstream
# Tests only just added, large test suite, majority pass
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 5b79bf03e1a223ef2371a8e5f4215d0a01541265
Author: Jakov Smolić gentoo org>
AuthorDate: Sat Feb 19 13:10:49 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sat Feb 19 13:15:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b79bf03
dev-cpp/nlohmann_json: Stabilize 3.10.5 amd64, #833739
Signed-off-by: Jakov Smolić gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index eb7bc06fd834..8fc2cd5d441e 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
IUSE="test"
# Need to report failing tests upstream
# Tests only just added, large test suite, majority pass
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 2537143c1b566d794b6c6969be399920c92f64b5
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Feb 19 09:05:38 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Feb 19 09:05:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2537143c
dev-cpp/nlohmann_json: Stabilize 3.10.5 ppc, #833739
Signed-off-by: Arthur Zamarin gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index 8bc260638ed9..eb7bc06fd834 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
IUSE="test"
# Need to report failing tests upstream
# Tests only just added, large test suite, majority pass
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 7b00b0d50adbead8ba39f90f90fe27d0b8a4aac6
Author: Sam James gentoo org>
AuthorDate: Tue Jan 11 04:32:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 11 04:33:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b00b0d5
dev-cpp/nlohmann_json: disable docs in 3.10.5
I tried to package the needed bits but they end up needing
network at runtime, it seems.
Closes: https://bugs.gentoo.org/830862
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index 0ac3b7c9dd07..8bc260638ed9 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -3,6 +3,11 @@
EAPI=8
+#DOCS_BUILDER="mkdocs"
+# Needs unpackaged plantuml-markdown too
+# ... but plantuml (Python bindings anyway) need network access to generate
bits at runtime.
+#DOCS_DEPEND="dev-python/mkdocs-material-extensions
dev-python/mkdocs-minify-plugin"
+#DOCS_DIR="doc/mkdocs"
inherit cmake
# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
@@ -17,13 +22,11 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
+IUSE="test"
# Need to report failing tests upstream
# Tests only just added, large test suite, majority pass
RESTRICT="test"
-BDEPEND="doc? ( app-doc/doxygen )"
-
DOCS=( ChangeLog.md README.md )
src_configure() {
@@ -41,11 +44,6 @@ src_configure() {
src_compile() {
cmake_src_compile
-
- if use doc; then
- emake -C doc
- HTML_DOCS=( doc/html/. )
- fi
}
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: c955c62a59718a53fc7a39760bc26f3f95ce209b
Author: Sam James gentoo org>
AuthorDate: Sun Jan 9 08:47:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 9 09:17:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c955c62a
dev-cpp/nlohmann_json: add 3.10.5
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest| 1 +
dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild | 61 +++
2 files changed, 62 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 5234c2e1989a..002d3c70b34a 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,5 +1,6 @@
DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B
2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2
SHA512
1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B
e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c
SHA512
9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
DIST nlohmann_json-3.10.4.tar.gz 7062443 BLAKE2B
7f526d12c4ce8148c874c76d280090ef69ae3adf817b63758bbcc23ff9476e119ede90bebc397b9bb84b54012f057e3e010d643c595b4699a8ecd437a5a3f913
SHA512
f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835
+DIST nlohmann_json-3.10.5.tar.gz 7021996 BLAKE2B
d4219d2f3168341eb8bd8f84af364e53f6caae67aa080b1ca0479216a98ee0256d5436243273b3c12ccdca904b4b17dbb90cf445fc273424d7dab6d2b95632bc
SHA512
4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
new file mode 100644
index ..0ac3b7c9dd07
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
+TEST_VERSION="3.0.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="
+ https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+ # Tests are built by default so we can't group the test logic below
+ local mycmakeargs=(
+ -DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
+ )
+
+ # Define test data directory here to avoid unused var QA warning, bug
#747826
+ use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ emake -C doc
+ HTML_DOCS=( doc/html/. )
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}/test" || die
+
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ local myctestargs=(
+ "-LE git_required"
+ )
+
+ cmake_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: b5c40a9ace50128951aaf2ddd6df3d727c0cebe3
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sat Oct 16 23:54:34 2021 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sun Oct 17 00:00:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c40a9a
dev-cpp/nlohmann_json: add 3.10.4, drop 3.10.3
Upstream-issue: https://github.com/nlohmann/json/issues/3070
Bear-issue: https://github.com/rizsotto/Bear/issues/420
Bug: https://bugs.gentoo.org/817233
Signed-off-by: Georgy Yakovlev gentoo.org>
dev-cpp/nlohmann_json/Manifest | 2 +-
.../{nlohmann_json-3.10.3.ebuild => nlohmann_json-3.10.4.ebuild}| 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 071915c2938..5234c2e1989 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,5 +1,5 @@
DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B
2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2
SHA512
1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B
e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c
SHA512
9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
-DIST nlohmann_json-3.10.3.tar.gz 7061586 BLAKE2B
266dc441a88b36c2314d5fb85699b03ba054be0d620718c62949a5860d7678bc07aede206b353d7d25b81e8813c1ec1190db6d322ff2c5bbcbdab7a2f3dc4c59
SHA512
92d438e9c23480ebc3f335213c77b0872524530f1118f9bba269ac4ec500c485e18e5e774bd0cf3c428db2f344c39a42b98dcc7e83121be0adcee301e415a0ea
+DIST nlohmann_json-3.10.4.tar.gz 7062443 BLAKE2B
7f526d12c4ce8148c874c76d280090ef69ae3adf817b63758bbcc23ff9476e119ede90bebc397b9bb84b54012f057e3e010d643c595b4699a8ecd437a5a3f913
SHA512
f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
similarity index 100%
rename from dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild
rename to dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 9bbe7479fa74872bd57dc73cf377cd6890d1d5e7
Author: Sam James gentoo org>
AuthorDate: Sat Oct 9 04:01:34 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 9 04:01:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bbe7479
dev-cpp/nlohmann_json: add 3.10.3
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest| 1 +
dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild | 62 +++
2 files changed, 63 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 96a6c369deb..071915c2938 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,4 +1,5 @@
DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B
2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2
SHA512
1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B
e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c
SHA512
9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
+DIST nlohmann_json-3.10.3.tar.gz 7061586 BLAKE2B
266dc441a88b36c2314d5fb85699b03ba054be0d620718c62949a5860d7678bc07aede206b353d7d25b81e8813c1ec1190db6d322ff2c5bbcbdab7a2f3dc4c59
SHA512
92d438e9c23480ebc3f335213c77b0872524530f1118f9bba269ac4ec500c485e18e5e774bd0cf3c428db2f344c39a42b98dcc7e83121be0adcee301e415a0ea
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild
new file mode 100644
index 000..39a2c4c723a
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
+TEST_VERSION="3.0.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="
+ https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+#RESTRICT="!test? ( test )"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+ # Tests are built by default so we can't group the test logic below
+ local mycmakeargs=(
+ -DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
+ )
+
+ # Define test data directory here to avoid unused var QA warning, bug
#747826
+ use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ emake -C doc
+ HTML_DOCS=( doc/html/. )
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}/test" || die
+
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ local myctestargs=(
+ "-LE git_required"
+ )
+
+ cmake_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: c9432932ce09503681f1da126c99b595e313dc47
Author: Sam James gentoo org>
AuthorDate: Sat Sep 25 18:04:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Sep 25 18:10:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9432932
dev-cpp/nlohmann_json: add 3.10.2
Closes: https://bugs.gentoo.org/814833
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest| 1 +
dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild | 62 +++
2 files changed, 63 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 25ae070a989..96a6c369deb 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,3 +1,4 @@
DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B
2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2
SHA512
1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
+DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B
e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c
SHA512
9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
new file mode 100644
index 000..39a2c4c723a
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
+TEST_VERSION="3.0.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="
+ https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+#RESTRICT="!test? ( test )"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+ # Tests are built by default so we can't group the test logic below
+ local mycmakeargs=(
+ -DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
+ )
+
+ # Define test data directory here to avoid unused var QA warning, bug
#747826
+ use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ emake -C doc
+ HTML_DOCS=( doc/html/. )
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}/test" || die
+
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ local myctestargs=(
+ "-LE git_required"
+ )
+
+ cmake_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 2181793962c430a137d7bb8746a3fc7fb3575d22
Author: Marek Szuba gentoo org>
AuthorDate: Thu Sep 2 13:18:56 2021 +
Commit: Marek Szuba gentoo org>
CommitDate: Thu Sep 2 13:26:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21817939
dev-cpp/nlohmann_json: keyword 3.10.0 for ~riscv
Signed-off-by: Marek Szuba gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
index 26cbb2ced43..39a2c4c723a 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="doc test"
#RESTRICT="!test? ( test )"
# Need to report failing tests upstream
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 633891ad5a4bc8e60599933427a55400ae5bcab4
Author: Sam James gentoo org>
AuthorDate: Wed Aug 18 03:45:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 18 03:45:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633891ad
dev-cpp/nlohmann_json: use same test archive name for 3.9.1
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest | 1 -
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 2217acaec3a..25ae070a989 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,4 +1,3 @@
DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B
2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2
SHA512
1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
-DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index ded1b462289..727db8df498 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -5,11 +5,13 @@ EAPI=7
inherit cmake
+# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
+TEST_VERSION="3.0.0"
DESCRIPTION="JSON for Modern C++"
HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
SRC_URI="
https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? (
https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz ->
${P}-testdata.tar.gz )"
+ test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )"
S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 75d441933c2febf9013abe0a390e816fd318f4ba
Author: Sam James gentoo org>
AuthorDate: Wed Aug 18 03:44:42 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 18 03:45:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d44193
dev-cpp/nlohmann_json: add 3.10.0
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest| 2 +
dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild | 62 +++
2 files changed, 64 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 93680873270..2217acaec3a 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,2 +1,4 @@
+DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B
2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2
SHA512
1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
+DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
new file mode 100644
index 000..26cbb2ced43
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+# Check
https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to
find test archive version
+TEST_VERSION="3.0.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="
+ https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz ->
${PN}-testdata-${TEST_VERSION}.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+#RESTRICT="!test? ( test )"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+ # Tests are built by default so we can't group the test logic below
+ local mycmakeargs=(
+ -DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
+ )
+
+ # Define test data directory here to avoid unused var QA warning, bug
#747826
+ use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ emake -C doc
+ HTML_DOCS=( doc/html/. )
+ fi
+}
+
+src_test() {
+ cd "${BUILD_DIR}/test" || die
+
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ local myctestargs=(
+ "-LE git_required"
+ )
+
+ cmake_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/, dev-cpp/nlohmann_json/files/
commit: 273b8b02f3d8b3fc7356d16f11b497fb2d0befb3
Author: Sam James gentoo org>
AuthorDate: Mon Apr 19 20:13:28 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 19 20:53:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273b8b02
dev-cpp/nlohmann_json: drop 3.6.1-r1, 3.7.0, 3.7.3
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest | 3 -
.../files/nlohmann_json-3.7.3-gcc-10.patch | 131 -
.../nlohmann_json/nlohmann_json-3.6.1-r1.ebuild| 45 ---
dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild | 45 ---
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 49
5 files changed, 273 deletions(-)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index e1b6029b11f..93680873270 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,5 +1,2 @@
-DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B
257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280
SHA512
e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
-DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B
25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311
SHA512
35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
-DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B
c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f00888ab8cd
SHA512
c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865
DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
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
deleted file mode 100644
index 1cdb6d594ec..000
--- a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+...@gmail.com>
-Date: Sun, 12 Apr 2020 22:32:39 +0300
-Subject: [PATCH 1/2] Templatize basic_json ctor from json_ref
-
- include/nlohmann/detail/meta/type_traits.hpp | 13
- include/nlohmann/json.hpp| 8
- single_include/nlohmann/json.hpp | 21
- 3 files changed, 34 insertions(+), 8 deletions(-)
-
-diff --git a/include/nlohmann/detail/meta/type_traits.hpp
b/include/nlohmann/detail/meta/type_traits.hpp
-index 280f69534..dd0b3084f 100644
a/include/nlohmann/detail/meta/type_traits.hpp
-+++ b/include/nlohmann/detail/meta/type_traits.hpp
-@@ -41,6 +41,19 @@ template struct is_basic_json : std::false_type
{};
- NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json : std::true_type {};
-
-+//
-+// jspn_ref helpers //
-+//
-+
-+template
-+class json_ref;
-+
-+template
-+struct is_json_ref : std::false_type {};
-+
-+template
-+struct is_json_ref> : std::true_type {};
-+
- //
- // aliases for detected //
- //
-diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
-index 336d69fe7..0598efc8c 100644
a/include/nlohmann/json.hpp
-+++ b/include/nlohmann/json.hpp
-@@ -1773,10 +1773,10 @@ class basic_json
- // other constructors and destructor //
- ///
-
--/// @private
--basic_json(const detail::json_ref& ref)
--: basic_json(ref.moved_or_copied())
--{}
-+template ,
-+ std::is_same>::value, int> = 0 >
-+basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
-
- /*!
- @brief copy constructor
-diff --git a/single_include/nlohmann/json.hpp
b/single_include/nlohmann/json.hpp
-index 09464f3b2..8927180e6 100644
a/single_include/nlohmann/json.hpp
-+++ b/single_include/nlohmann/json.hpp
-@@ -2794,6 +2794,19 @@ template struct is_basic_json :
std::false_type {};
-
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 5eb3bbce5e1de3a474577bf957115b21275bcc1b
Author: Sam James gentoo org>
AuthorDate: Mon Mar 15 06:37:36 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 15 06:37:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb3bbce
dev-cpp/nlohmann_json: Keyword 3.9.1 arm, #775908
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index 9e63f828a37..ded1b462289 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
IUSE="doc test"
#RESTRICT="!test? ( test )"
# Need to report failing tests upstream
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 962d55e3c6489f692ca2a0c5cd1ea37df8a8a755
Author: David Seifert gentoo org>
AuthorDate: Sat Jan 2 21:30:51 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sat Jan 2 21:30:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962d55e3
dev-cpp/nlohmann_json: Minor style clean up
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Seifert gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 27 ++--
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index dda1074ac3b..9e63f828a37 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -7,8 +7,9 @@ inherit cmake
DESCRIPTION="JSON for Modern C++"
HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz ->
${P}-testdata.tar.gz )"
+SRC_URI="
+ https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz ->
${P}-testdata.tar.gz )"
S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
@@ -20,7 +21,7 @@ IUSE="doc test"
# Tests only just added, large test suite, majority pass
RESTRICT="test"
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
DOCS=( ChangeLog.md README.md )
@@ -31,20 +32,19 @@ src_configure() {
-DJSON_BuildTests=$(usex test)
)
- if use test ; then
- # Define test data directory here to avoid unused var QA warning
- # #747826
- mycmakeargs+=(
- -DJSON_TestDataDirectory="${S}/json_test_data"
- )
- fi
+ # Define test data directory here to avoid unused var QA warning, bug
#747826
+ use test && mycmakeargs+=(
-DJSON_TestDataDirectory="${S}"/json_test_data )
cmake_src_configure
}
src_compile() {
cmake_src_compile
- use doc && emake -C doc
+
+ if use doc; then
+ emake -C doc
+ HTML_DOCS=( doc/html/. )
+ fi
}
src_test() {
@@ -58,8 +58,3 @@ src_test() {
cmake_src_test
}
-
-src_install() {
- cmake_src_install
- use doc && dodoc -r doc/html
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: b303773638d9da63596101266686762a5c6712d4
Author: Sam James gentoo org>
AuthorDate: Sat Jan 2 21:08:48 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 2 21:08:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3037736
dev-cpp/nlohmann_json: (really) build tests conditionally
Closes: https://bugs.gentoo.org/763177
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index cbad769efb0..dda1074ac3b 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,18 +25,20 @@ DEPEND="doc? ( app-doc/doxygen )"
DOCS=( ChangeLog.md README.md )
src_configure() {
+ # Tests are built by default so we can't group the test logic below
local mycmakeargs=(
-DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
)
if use test ; then
# Define test data directory here to avoid unused var QA warning
# #747826
mycmakeargs+=(
- -DJSON_BuildTests=ON
-DJSON_TestDataDirectory="${S}/json_test_data"
)
fi
+
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: e3b71ec251bfc748171342b1253aa6826b900717
Author: Sam James gentoo org>
AuthorDate: Wed Dec 16 21:34:30 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 16 21:34:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b71ec2
dev-cpp/nlohmann_json: Stabilize 3.9.1 amd64, #758836
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index c040d31592d..cbad769efb0 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
IUSE="doc test"
#RESTRICT="!test? ( test )"
# Need to report failing tests upstream
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 670ec3d58b585516a9a3451f2bcb98b7a372198d
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Dec 11 23:08:56 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Dec 11 23:08:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670ec3d5
dev-cpp/nlohmann_json: stable 3.9.1 for ppc64
stable wrt bug #758836
Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index 80a5933f0f9..c040d31592d 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ppc ppc64 x86"
IUSE="doc test"
#RESTRICT="!test? ( test )"
# Need to report failing tests upstream
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 96df68e98da7179d2503307dc84a7f0846422619
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Dec 11 23:06:16 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Dec 11 23:06:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96df68e9
dev-cpp/nlohmann_json: stable 3.9.1 for ppc
stable wrt bug #758836
Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index cbfe14e3ebf..80a5933f0f9 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ppc ~ppc64 x86"
IUSE="doc test"
#RESTRICT="!test? ( test )"
# Need to report failing tests upstream
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: b81de8b1062cc9d42981a0ca9c4c0a3e0fcd643a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Dec 10 21:31:10 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Dec 10 21:31:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81de8b1
dev-cpp/nlohmann_json: x86 stable (bug #758836)
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index 691afb13f9c..cbfe14e3ebf 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
IUSE="doc test"
#RESTRICT="!test? ( test )"
# Need to report failing tests upstream
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 462bee716e348083ab3d99e8b11266bf14b8880b
Author: Sam James gentoo org>
AuthorDate: Sun Oct 11 20:20:29 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 11 20:31:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462bee71
dev-cpp/nlohmann_json: conditionally pass test data dir
Closes: https://bugs.gentoo.org/747826
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index 8c50916e83e..691afb13f9c 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -26,11 +26,17 @@ DOCS=( ChangeLog.md README.md )
src_configure() {
local mycmakeargs=(
- -DJSON_BuildTests=$(usex test)
- -DJSON_TestDataDirectory="${S}/json_test_data"
-DJSON_MultipleHeaders=ON
)
+ if use test ; then
+ # Define test data directory here to avoid unused var QA warning
+ # #747826
+ mycmakeargs+=(
+ -DJSON_BuildTests=ON
+ -DJSON_TestDataDirectory="${S}/json_test_data"
+ )
+ fi
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/, profiles/
commit: 7563fef0f2908da3ccd1f42ce2dfc4ac8c4580d0
Author: Sam James gentoo org>
AuthorDate: Sun Oct 11 19:32:52 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 11 19:36:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7563fef0
Revert "profiles/package.mask: adjust Wireshark mask message"
Accidentally included an unrelated staged fix.
This reverts commit 7f330da7d87d963fe68d78b858dbe0be8a2fc252.
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 10 ++
profiles/package.mask| 7 ---
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index 691afb13f9c..8c50916e83e 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -26,17 +26,11 @@ DOCS=( ChangeLog.md README.md )
src_configure() {
local mycmakeargs=(
+ -DJSON_BuildTests=$(usex test)
+ -DJSON_TestDataDirectory="${S}/json_test_data"
-DJSON_MultipleHeaders=ON
)
- if use test ; then
- # Define test data directory here to avoid unused var QA warning
- # #747826
- mycmakeargs+=(
- -DJSON_BuildTests=ON
- -DJSON_TestDataDirectory="${S}/json_test_data"
- )
- fi
cmake_src_configure
}
diff --git a/profiles/package.mask b/profiles/package.mask
index f59706fab2d..22c355f3398 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -43,9 +43,10 @@ net-fs/openafs-kernel
# Sam James (2020-10-11)
# Current Wireshark in ~arch is vulnerable.
-# This forces a downgrade to the stable, fixed
-# Wireshark.
-# bug #744592
+# Maintainer did not want to update after QA
+# intervention.
+# Please use stable Wireshark for now.
+# 744592
=net-analyzer/wireshark-3.3.0
# Sergei Trofimovich (2020-10-11)
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 306fdab9eab759f62f25feb140882ea20257537e
Author: Sam James gentoo org>
AuthorDate: Sat Oct 10 06:28:42 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 10 06:31:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306fdab9
dev-cpp/nlohmann_json: bump to 3.9.1
Closes: https://bugs.gentoo.org/728750
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/Manifest | 2 +
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 57
2 files changed, 59 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index e64f5eccd1a..e1b6029b11f 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,3 +1,5 @@
DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B
257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280
SHA512
e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B
25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311
SHA512
35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B
c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f00888ab8cd
SHA512
c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865
+DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B
f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d
SHA512
d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
+DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B
97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090
SHA512
e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
new file mode 100644
index 000..8c50916e83e
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz ->
${P}-testdata.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+#RESTRICT="!test? ( test )"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DJSON_BuildTests=$(usex test)
+ -DJSON_TestDataDirectory="${S}/json_test_data"
+ -DJSON_MultipleHeaders=ON
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && emake -C doc
+}
+
+src_test() {
+ cd "${BUILD_DIR}/test" || die
+
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ local myctestargs=(
+ "-LE git_required"
+ )
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ use doc && dodoc -r doc/html
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: c94a45d56e6291e466a15e84780e0ef38cbf0af8
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Oct 7 07:07:30 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Oct 7 07:09:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94a45d5
dev-cpp/nlohmann_json: x86 stable wrt bug #746800
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
index 98dd62eb78c..4a92c0804ce 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 4996b2db6657766d71e0bf97e804ea5f64cc0648
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Oct 7 06:51:39 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Oct 7 06:51:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4996b2db
dev-cpp/nlohmann_json: ppc64 stable wrt bug #746800
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
index c146c84e1f4..98dd62eb78c 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: eb93562d2af03743ca770903a44950e5813b5785
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Oct 7 06:48:49 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Oct 7 06:48:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb93562d
dev-cpp/nlohmann_json: ppc stable wrt bug #746800
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
index 78a879afaa2..c146c84e1f4 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: d8ac35c984f00aa13617e5e90248ffbb66b9419b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Oct 7 06:39:47 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Oct 7 06:39:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ac35c9
dev-cpp/nlohmann_json: amd64 stable wrt bug #746800
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
index c3d5c780de6..78a879afaa2 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 497ab351b26473af47fa28867076489284d8653b
Author: Sam James gentoo org>
AuthorDate: Sun Oct 4 00:25:46 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 4 00:25:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=497ab351
dev-cpp/nlohmann_json: Keyword 3.7.3 arm64, #746407
Signed-off-by: Sam James gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
index c99fd51237e..c3d5c780de6 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/, dev-cpp/nlohmann_json/files/
commit: 29ae1e10e707b0d48cce53c08cf79ea3e26b07a8
Author: Nicolas Werner hotmail de>
AuthorDate: Fri May 8 23:11:40 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Fri May 15 00:34:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ae1e10
dev-cpp/nlohmann_json: fix build with gcc-10
Closes: https://bugs.gentoo.org/721712
Signed-off-by: Nicolas Werner hotmail.de>
Closes: https://github.com/gentoo/gentoo/pull/15719
Signed-off-by: Aaron Bauman gentoo.org>
.../files/nlohmann_json-3.7.3-gcc-10.patch | 131 +
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 4 +
2 files changed, 135 insertions(+)
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
new file mode 100644
index 000..1cdb6d594ec
--- /dev/null
+++ b/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch
@@ -0,0 +1,131 @@
+From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+...@gmail.com>
+Date: Sun, 12 Apr 2020 22:32:39 +0300
+Subject: [PATCH 1/2] Templatize basic_json ctor from json_ref
+
+---
+ include/nlohmann/detail/meta/type_traits.hpp | 13
+ include/nlohmann/json.hpp| 8
+ single_include/nlohmann/json.hpp | 21
+ 3 files changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/include/nlohmann/detail/meta/type_traits.hpp
b/include/nlohmann/detail/meta/type_traits.hpp
+index 280f69534..dd0b3084f 100644
+--- a/include/nlohmann/detail/meta/type_traits.hpp
b/include/nlohmann/detail/meta/type_traits.hpp
+@@ -41,6 +41,19 @@ template struct is_basic_json : std::false_type
{};
+ NLOHMANN_BASIC_JSON_TPL_DECLARATION
+ struct is_basic_json : std::true_type {};
+
++//
++// jspn_ref helpers //
++//
++
++template
++class json_ref;
++
++template
++struct is_json_ref : std::false_type {};
++
++template
++struct is_json_ref> : std::true_type {};
++
+ //
+ // aliases for detected //
+ //
+diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
+index 336d69fe7..0598efc8c 100644
+--- a/include/nlohmann/json.hpp
b/include/nlohmann/json.hpp
+@@ -1773,10 +1773,10 @@ class basic_json
+ // other constructors and destructor //
+ ///
+
+-/// @private
+-basic_json(const detail::json_ref& ref)
+-: basic_json(ref.moved_or_copied())
+-{}
++template ,
++ std::is_same>::value, int> = 0 >
++basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+
+ /*!
+ @brief copy constructor
+diff --git a/single_include/nlohmann/json.hpp
b/single_include/nlohmann/json.hpp
+index 09464f3b2..8927180e6 100644
+--- a/single_include/nlohmann/json.hpp
b/single_include/nlohmann/json.hpp
+@@ -2794,6 +2794,19 @@ template struct is_basic_json :
std::false_type {};
+ NLOHMANN_BASIC_JSON_TPL_DECLARATION
+ struct is_basic_json : std::true_type {};
+
++//
++// jspn_ref helpers //
++//
++
++template
++class json_ref;
++
++template
++struct is_json_ref : std::false_type {};
++
++template
++struct is_json_ref> : std::true_type {};
++
+ //
+ // aliases for detected //
+ //
+@@ -16632,10 +16645,10 @@ class basic_json
+ // other constructors and destructor //
+ ///
+
+-/// @private
+-basic_json(const detail::json_ref& ref)
+-: basic_json(ref.moved_or_copied())
+-{}
++template ,
++ std::is_same>::value, int> = 0 >
++basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+
+ /*!
+ @brief copy constructor
+
+From 70be9751cd60e622ce6463f41d47c02fc2d83cbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+...@gmail.com>
+Date: Sun, 12 Apr 2020 23:42:26 +0300
+Subject: [PATCH 2/2] typo fix
+
+---
+ include/nlohmann/detail/meta/type_traits.hpp | 2 +-
+ single_include/nlohmann/json.hpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/nlohmann/detail/meta/type_traits.hpp
b/include/nlohmann/detail/meta/type_traits.hpp
+index dd0b3084f..13e92cb48 100644
+--- a/include/nlohmann/detail/meta/type_traits.hpp
b/include/nlohmann/detail/meta/type_traits.hpp
+@@ -42,7 +42,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
+ struct is_basic_json : std::true_type {};
+
+ //
+-// jspn_ref helpers //
++// json_ref helpers //
+ //
+
+ template
+diff --git a/single_include/nlohmann/json.hpp
b/single_include/nlohmann/json.hpp
+index 8927180e6..294e7509b 100644
+--- a/single_include/nlohmann/json.hpp
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: eaf94a94a55cc33d0e9c52c5365f36c2133fa23c
Author: Tim Harder gentoo org>
AuthorDate: Thu Jan 16 15:41:46 2020 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Jan 16 15:45:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf94a94
dev-cpp/nlohmann_json: version bump to 3.7.3
Signed-off-by: Tim Harder gentoo.org>
dev-cpp/nlohmann_json/Manifest | 1 +
dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 45
2 files changed, 46 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 19aee47939a..e64f5eccd1a 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,2 +1,3 @@
DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B
257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280
SHA512
e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B
25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311
SHA512
35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
+DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B
c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f00888ab8cd
SHA512
c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
new file mode 100644
index 000..7a43019627d
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+S=${WORKDIR}/json-${PV}
+
+src_configure() {
+ local mycmakeargs=(
+ -DJSON_BuildTests=$(usex test)
+ -DJSON_MultipleHeaders=ON
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && emake -C doc
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ cmake_src_install
+ use doc && dodoc -r doc/html
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 2f3fc667b7590223e897bac98c5bcc70a44051d0
Author: Tim Harder gentoo org>
AuthorDate: Fri Sep 27 05:45:21 2019 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Sep 27 05:48:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f3fc667
dev-cpp/nlohmann_json: version bump to 3.7.0
Signed-off-by: Tim Harder gentoo.org>
dev-cpp/nlohmann_json/Manifest | 1 +
dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild | 45
2 files changed, 46 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 486ceb43b52..0f21d8807bc 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,2 +1,3 @@
DIST nlohmann_json-3.5.0.tar.gz 114796008 BLAKE2B
94caa0374be1d38230cb13b8cd9deb3da04e4b81d361ce6baf54c1bad231945a94df74683a31660dc98413dbf23ea7596c6ed1da9cda9e02add7d7c6568973e3
SHA512
e2874e10e12070e8e1b9c01f41ce24002a3859c4aca8bf46083ea08e68f44ed6725bdcdf8e592b1e50d69975d506836c62a8e10fc6da00f0844c149dd6676996
DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B
257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280
SHA512
e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
+DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B
25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311
SHA512
35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
new file mode 100644
index 000..ed480ec910f
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+S=${WORKDIR}/json-${PV}
+
+src_configure() {
+ local mycmakeargs=(
+ -DJSON_BuildTests=$(usex test)
+ -DJSON_MultipleHeaders=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && emake -C doc
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dodoc -r doc/html
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: be8e86e896300915c8f630dbdedd7ffaaa6f78e0
Author: Tim Harder gentoo org>
AuthorDate: Fri Sep 27 05:45:48 2019 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Sep 27 05:48:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8e86e8
dev-cpp/nlohmann_json: remove old
Signed-off-by: Tim Harder gentoo.org>
dev-cpp/nlohmann_json/Manifest | 1 -
dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild | 35
dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild | 35
3 files changed, 71 deletions(-)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 0f21d8807bc..19aee47939a 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,3 +1,2 @@
-DIST nlohmann_json-3.5.0.tar.gz 114796008 BLAKE2B
94caa0374be1d38230cb13b8cd9deb3da04e4b81d361ce6baf54c1bad231945a94df74683a31660dc98413dbf23ea7596c6ed1da9cda9e02add7d7c6568973e3
SHA512
e2874e10e12070e8e1b9c01f41ce24002a3859c4aca8bf46083ea08e68f44ed6725bdcdf8e592b1e50d69975d506836c62a8e10fc6da00f0844c149dd6676996
DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B
257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280
SHA512
e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B
25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311
SHA512
35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
deleted file mode 100644
index fd4f1a4593e..000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-src_compile() {
- meson_src_compile
- use doc && emake -C doc
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- meson_src_install
- use doc && dodoc -r doc/html
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
deleted file mode 100644
index fd4f1a4593e..000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-src_compile() {
- meson_src_compile
- use doc && emake -C doc
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- meson_src_install
- use doc && dodoc -r doc/html
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: e8630dda3332bcf78d67c0e9eac1b3feb82aadeb
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Sep 26 06:51:13 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Sep 26 06:51:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8630dda
dev-cpp/nlohmann_json: stable 3.6.1-r1 for ppc64, bug #695498
Package-Manager: Portage-2.3.76, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 7a0a142cd58..583d0ff52fc 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="doc test"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: ad9f337b71316b674a4f064921b63489ed810c68
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jul 23 08:22:47 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jul 23 08:22:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad9f337b
dev-cpp/nlohmann_json: amd64 stable wrt bug #689688
Signed-off-by: Agostino Sarubbo gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 229e596ac61..7a0a142cd58 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="doc test"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 080f76d14d2072906d4e058211a5355cc52de536
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Jul 21 08:23:27 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Jul 21 08:23:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=080f76d1
dev-cpp/nlohmann_json: stable 3.6.1-r1 for ppc, bug #689688
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index f9319151fbb..229e596ac61 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
IUSE="doc test"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: c75d23e88ebd6de9520abbecd0fca9d532865d21
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jul 18 14:29:13 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jul 18 14:32:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75d23e8
dev-cpp/nlohmann_json: x86 stable (bug #689688)
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 13acfc9d9c8..f9319151fbb 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
IUSE="doc test"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: 0682016ae2e1edbdfa11c73ce44cd0f981a91a0e
Author: Tim Harder gentoo org>
AuthorDate: Fri Jun 28 23:21:41 2019 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jun 28 23:24:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0682016a
dev-cpp/nlohmann_json: install non-amalgamated headers
Also, use cmake for building instead of meson.
Closes: https://bugs.gentoo.org/684280
Signed-off-by: Tim Harder gentoo.org>
.../nlohmann_json/nlohmann_json-3.6.1-r1.ebuild| 44 ++
1 file changed, 44 insertions(+)
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
new file mode 100644
index 000..13acfc9d9c8
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+S=${WORKDIR}/json-${PV}
+
+src_configure() {
+ local mycmakeargs=(
+ -DJSON_BuildTests=$(usex test)
+ -DJSON_MultipleHeaders=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && emake -C doc
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dodoc -r doc/html
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: a1de9346b9c7300f9f30698fbdad9294c1eee639
Author: Tim Harder gentoo org>
AuthorDate: Wed Apr 3 20:07:15 2019 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Apr 11 05:00:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1de9346
dev-cpp/nlohmann_json: version bump to 3.6.1
Signed-off-by: Tim Harder gentoo.org>
dev-cpp/nlohmann_json/Manifest | 1 +
dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild | 35
2 files changed, 36 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index e4b3cb520a1..486ceb43b52 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1 +1,2 @@
DIST nlohmann_json-3.5.0.tar.gz 114796008 BLAKE2B
94caa0374be1d38230cb13b8cd9deb3da04e4b81d361ce6baf54c1bad231945a94df74683a31660dc98413dbf23ea7596c6ed1da9cda9e02add7d7c6568973e3
SHA512
e2874e10e12070e8e1b9c01f41ce24002a3859c4aca8bf46083ea08e68f44ed6725bdcdf8e592b1e50d69975d506836c62a8e10fc6da00f0844c149dd6676996
+DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B
257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280
SHA512
e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
new file mode 100644
index 000..fd4f1a4593e
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+S=${WORKDIR}/json-${PV}
+
+src_compile() {
+ meson_src_compile
+ use doc && emake -C doc
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ meson_src_install
+ use doc && dodoc -r doc/html
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: e4c2346865120a19fd0658ab1c96bb5d0a129670
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Feb 17 17:38:38 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Feb 17 17:39:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c23468
dev-cpp/nlohmann_json: keyworded 3.5.0 for ppc/ppc64, bug #674034
Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
index 56411b04237..fd4f1a4593e 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="doc"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
commit: a14e62c7082d739a51c160a78201ab20a65a5c02
Author: Tim Harder gentoo org>
AuthorDate: Sat Dec 29 20:47:36 2018 +
Commit: Tim Harder gentoo org>
CommitDate: Sat Dec 29 20:59:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14e62c7
dev-cpp/nlohmann_json: initial import
Signed-off-by: Tim Harder gentoo.org>
dev-cpp/nlohmann_json/Manifest | 1 +
dev-cpp/nlohmann_json/metadata.xml | 11
dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild | 35
3 files changed, 47 insertions(+)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
new file mode 100644
index 000..e4b3cb520a1
--- /dev/null
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -0,0 +1 @@
+DIST nlohmann_json-3.5.0.tar.gz 114796008 BLAKE2B
94caa0374be1d38230cb13b8cd9deb3da04e4b81d361ce6baf54c1bad231945a94df74683a31660dc98413dbf23ea7596c6ed1da9cda9e02add7d7c6568973e3
SHA512
e2874e10e12070e8e1b9c01f41ce24002a3859c4aca8bf46083ea08e68f44ed6725bdcdf8e592b1e50d69975d506836c62a8e10fc6da00f0844c149dd6676996
diff --git a/dev-cpp/nlohmann_json/metadata.xml
b/dev-cpp/nlohmann_json/metadata.xml
new file mode 100644
index 000..eb8bff7e381
--- /dev/null
+++ b/dev-cpp/nlohmann_json/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ media-vi...@gentoo.org
+ Gentoo Video project
+
+
+ nlohmann/json
+
+
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
b/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
new file mode 100644
index 000..56411b04237
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/;
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+S=${WORKDIR}/json-${PV}
+
+src_compile() {
+ meson_src_compile
+ use doc && emake -C doc
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ meson_src_install
+ use doc && dodoc -r doc/html
+}
