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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B05F1382C5 for ; Sat, 2 Jan 2021 21:31:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AAF3E082F; Sat, 2 Jan 2021 21:31:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E468E082F for ; Sat, 2 Jan 2021 21:31:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19E68340D4D for ; Sat, 2 Jan 2021 21:31:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E2A8CC for ; Sat, 2 Jan 2021 21:31:00 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1609623051.962d55e3c6489f692ca2a0c5cd1ea37df8a8a755.soap@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/nlohmann_json-3.9.1.ebuild X-VCS-Directories: dev-cpp/nlohmann_json/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 962d55e3c6489f692ca2a0c5cd1ea37df8a8a755 X-VCS-Branch: master Date: Sat, 2 Jan 2021 21:31:00 +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: 4a4004fb-d200-4d8a-8ee0-c585f35a1f28 X-Archives-Hash: 9b0e30c9fcf9c53e4b065cdc349a4b0b commit: 962d55e3c6489f692ca2a0c5cd1ea37df8a8a755 Author: David Seifert gentoo org> AuthorDate: Sat Jan 2 21:30:51 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jan 2 21:30:51 2021 +0000 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 -}