commit: 7f330da7d87d963fe68d78b858dbe0be8a2fc252
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 19:30:21 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 19:30:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f330da7
profiles/package.mask: adjust Wireshark mask message
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, 11 insertions(+), 6 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 8c50916e83e..691afb13f9c 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -26,11 +26,17 @@ 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 22c355f3398..f59706fab2d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -43,10 +43,9 @@ net-fs/openafs-kernel
# Sam James <[email protected]> (2020-10-11)
# Current Wireshark in ~arch is vulnerable.
-# Maintainer did not want to update after QA
-# intervention.
-# Please use stable Wireshark for now.
-# 744592
+# This forces a downgrade to the stable, fixed
+# Wireshark.
+# bug #744592
=net-analyzer/wireshark-3.3.0
# Sergei Trofimovich <[email protected]> (2020-10-11)
