gentoo auto-resync : 30:08:2023 - 10:08:01

2 files changed, 66 insertions, 0 deletions

diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index b895436f1ae5..c76460b7bb61 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,7 +1,10 @@
 AUX nlohmann_json-3.11.2-gcc13-2.patch 1830 BLAKE2B b0cbbee4195c58c42ec9d35387429ace8040cfb7ecf115cc73e16911e18c10ebf2a01a59744ead65295765340e540af84336392ac7831ee59fc75cfccf0230d3 SHA512 b3e0c373c5566be5e300a9a46a02c446132220903ec102637e4e6bdb821f524dceeb1db5501a96c16c61ca1a94a96dccd190287a8e31aceb85fb2151e5c8e5bb
 AUX nlohmann_json-3.11.2-gcc13.patch 3812 BLAKE2B 2c88e14333ddf47df921c0dd1bc250e478a08e3f59bfcc733dbd95f9209fe1cbd3f735f31844d2b80cef86da32694f993d348e45a0494c9e9d607ba62b83a46f SHA512 8a99f0b18efa8d2f5f6e5cca52e59b28012d5e10ea09f641b21abff3785058191ece7a6bd18d9cdc69d8ce1f12beb7d4f59301277636889b8250011ad2127087
+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
+EBUILD nlohmann_json-3.10.2.ebuild 1576 BLAKE2B 8bbf008662887c01d8510eac2941d0f2e48112532036afe96bb53280da9d89c0598bf5097c18aca329f97a04866bfe48e263167b98afe20092b98db684efccd1 SHA512 bbb75c1a9625d10420fb9d1bad8659fc8b2594677caffd980e7b7fe2c18d28bb5656764bd82a302e622f403174fef0a27c565301ac7cdc02c4e350c58a127f9f
 EBUILD nlohmann_json-3.11.2-r1.ebuild 2070 BLAKE2B 32d2405d884e025aa1e1994bc46a85a7551eb1bd453d6d468d204a2bc7e859207adcaea62e0a9ab84b7cc196ad89168d49c6fb0946beaa8ba7ce65e307fdd407 SHA512 3a0f676dcfe0822d1bb48f41245e89006c7537fafbf407585d37bac56cfc6db501af75399aa7fc59b0a572e6ecc04d44887f131a0af71e98a9cd5223004baf97
 EBUILD nlohmann_json-3.11.2.ebuild 1968 BLAKE2B 0189ac08dad78df6b312780263ef313d6e50cf2687a8b54b68f42289e20bed3e7d7be4778568dd43676fd8baa608b179582656448e71a01826e2ea661cc16752 SHA512 0e6d817be5007b7d82b419cbc1b2a30188e9384d230d1ceb73ca067c63db8ec3f04630cde569466ed3509002c07c9849a14d2e940e58d6b2d59d31de0d1a409d
 MISC metadata.xml 338 BLAKE2B c5eb95ba7048308eab4753ea01c015781ce85db42d2e50f8ed9e3f7fb6945cfb8b90f5b3216799ad53137ceef6eae4636eea482e86206b19589ddf2e42caaaa1 SHA512 4198102ff79678a8e9be9146fc97991b1b205be3d34ebaece3dcab46a36ee5af904f463fcd0dc2a88fb362aa7a81e8d713af7b55db594a7069efc0276c94ff49
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 000000000000..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
+}