diff options
| author |   Sam James <sam@gentoo.org> | 2020-10-11 19:30:21 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2020-10-11 19:30:21 +0000 |
| commit | 7f330da7d87d963fe68d78b858dbe0be8a2fc252 (patch) | |
| tree | 9edf1055154c7d9729aa5afb0078978257c277ff | |
| parent | media-gfx/xli: Keyword 1.17.0-r5 arm64, #747178 (diff) | |
| download | gentoo-7f330da7.tar.gz gentoo-7f330da7.tar.bz2 gentoo-7f330da7.zip | |
profiles/package.mask: adjust Wireshark mask message
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 10 | ||||
| -rw-r--r-- | 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 8c50916e83e9..691afb13f9c1 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 22c355f33987..f59706fab2d7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -43,10 +43,9 @@ net-fs/openafs-kernel # Sam James <sam@gentoo.org> (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 <slyfox@gentoo.org> (2020-10-11) |