From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80F3E158086 for ; Sun, 9 Jan 2022 09:17:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D4942BC012; Sun, 9 Jan 2022 09:17:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 351822BC012 for ; Sun, 9 Jan 2022 09:17:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96ECC342D38 for ; Sun, 9 Jan 2022 09:17:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D125721E for ; Sun, 9 Jan 2022 09:17:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1641719854.c955c62a59718a53fc7a39760bc26f3f95ce209b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/nlohmann_json/Manifest dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild X-VCS-Directories: dev-cpp/nlohmann_json/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c955c62a59718a53fc7a39760bc26f3f95ce209b X-VCS-Branch: master Date: Sun, 9 Jan 2022 09:17:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c893bea8-33de-4b71-8ab1-5e9a16996212 X-Archives-Hash: 4fcdc20bbb9ca922c63571adea709831 commit: c955c62a59718a53fc7a39760bc26f3f95ce209b Author: Sam James gentoo org> AuthorDate: Sun Jan 9 08:47:09 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 9 09:17:34 2022 +0000 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 000000000000..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 +}