From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 8 Jan 2021 11:28:34 +0000
Subject: gentoo resync : 08.01.2021

---
 dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 33 +++++++++++-------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild')

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 cbad769efb0c..9e63f828a377 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
@@ -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,29 +21,30 @@ 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 )
 
 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
+	# 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() {
@@ -56,8 +58,3 @@ src_test() {
 
 	cmake_src_test
 }
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r doc/html
-}
-- 
cgit v1.2.3