[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/, profiles/

[Sam James]

commit:     7563fef0f2908da3ccd1f42ce2dfc4ac8c4580d0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 19:32:52 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 19:36:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7563fef0

Revert "profiles/package.mask: adjust Wireshark mask message"

Accidentally included an unrelated staged fix.

This reverts commit 7f330da7d87d963fe68d78b858dbe0be8a2fc252.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 10 ++--------
 profiles/package.mask                            |  7 ++++---
 2 files changed, 6 insertions(+), 11 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 691afb13f9c..8c50916e83e 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -26,17 +26,11 @@ DOCS=( ChangeLog.md README.md )
 
 src_configure() {
 	local mycmakeargs=(
+		-DJSON_BuildTests=$(usex test)
+		-DJSON_TestDataDirectory="${S}/json_test_data"
 		-DJSON_MultipleHeaders=ON
 	)
 
-	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
 	cmake_src_configure
 }
 

diff --git a/profiles/package.mask b/profiles/package.mask
index f59706fab2d..22c355f3398 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -43,9 +43,10 @@ net-fs/openafs-kernel
 
 # Sam James <sam@g.o> (2020-10-11)
 # Current Wireshark in ~arch is vulnerable.
-# This forces a downgrade to the stable, fixed
-# Wireshark.
-# bug #744592
+# Maintainer did not want to update after QA
+# intervention.
+# Please use stable Wireshark for now.
+# 744592
 =net-analyzer/wireshark-3.3.0
 
 # Sergei Trofimovich <slyfox@g.o> (2020-10-11)