gentoo resync : 16.01.2021

2 files changed, 61 insertions, 0 deletions

diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 7f8759ba1fee..072ee696c744 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,10 +1,12 @@
 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
 EBUILD nlohmann_json-3.10.0.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.2.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.4.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
+EBUILD nlohmann_json-3.10.5.ebuild 1707 BLAKE2B 9da7b49fd416886d6a394315f53bcd5eb770c551661f8d5555af920ddd181db794a10e038eb46e78225097d9be5ba5df38af6cd911aba17d356170823504b42a SHA512 bc597ffe28c6d8d1f7cb0c616d4679d4ac749e9f30a2c28950c7aa06871766d7c528801d43b31805c0534081398326e1ee7d199d47d7f451c0409c0d91938481
 EBUILD nlohmann_json-3.9.1.ebuild 1564 BLAKE2B 5a5b4e28ec5a79e1f263a7a79b28ff000cfe8b62d56e1d1a6c29ab3fc11deff72e443dba409dc68b431b1e85f86a521f6b2383c8fdda66b6cb656178d2e49c47 SHA512 5cbf13fff01f5e1da5d594e86a3c2c22b135785579391c2d4d6067d95572a9fd0109b5580ae67ebadba745e4a1c8a06f789efdb0c17df0babb6161bbc7beda9c
 MISC metadata.xml 338 BLAKE2B c5eb95ba7048308eab4753ea01c015781ce85db42d2e50f8ed9e3f7fb6945cfb8b90f5b3216799ad53137ceef6eae4636eea482e86206b19589ddf2e42caaaa1 SHA512 4198102ff79678a8e9be9146fc97991b1b205be3d34ebaece3dcab46a36ee5af904f463fcd0dc2a88fb362aa7a81e8d713af7b55db594a7069efc0276c94ff49
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 000000000000..8bc260638ed9
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -0,0 +1,59 @@
+# 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.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="test"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+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
+}
+
+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
+}