gentoo resync : 27.03.2021

3 files changed, 34 insertions, 2 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bcaf964a1368..30f0daf49494 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,9 +1,10 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
+AUX wireshark-3.4.4-cmake-3.20.patch 1081 BLAKE2B f45b08a9ec1510d4bc18ecca581bc9508eb30b748d8e84b68e872acd20baf8373c78cfeaca9caffcb27467094c71de1c7c1c43e075937cdccbbb2a157b1b4ea0 SHA512 17cbd1805a03c12d55d2f3310ff433b43a27fcfc28e58d14810126a0e5c093f1b7e7fd89290ea231b4f13de158ee5bf3eee9c46773c980490556f9fd153996d5
 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2 SHA512 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
 DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd SHA512 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172
 EBUILD wireshark-3.4.3.ebuild 7060 BLAKE2B a1fbc00d217ce8ad232dfe2f3ca53dd78f5b12927af0bfa87d65cddc48a861fffe94d706e93d13e168ff89abc30593e215bc03663ec491dfadd321fc6ee517a0 SHA512 7e2944802986fffaabafd0f10eb9a504505c896ccc0b612d583eb2bca3bcca67560a31e4b23f6b765da975c2485b627f090bf0f82b3335e91e7884572af3fcd1
-EBUILD wireshark-3.4.4.ebuild 7065 BLAKE2B d345268ad37cc9fa39e860f7c7890db9d5be8e04b2830520a6b02b9ca66bf76757ebccb8e81e1097917fa376dd08e5d234e3e06c725d51eb8f40086150bcc315 SHA512 c357cd2cfe522fdb0d4edd394bfc1d3f4fd0d1c430a2d97cd8a38181b4974ea27e63c90514262276709a66729a3d884f5f63a8fca17790cbe4a59b153ab440a9
+EBUILD wireshark-3.4.4.ebuild 7098 BLAKE2B f656a967464c94e1f5d88f936720197fefcd6c569b74a86fb6604d7c114fd3d73051760c98df70befdf3a919190b78a4a81118c0fa620661962c9867f64769ee SHA512 60dbb299e0a09770587407b9fc6f2536a3563ab2c1e0cdac52a423598e6039233219d60d6f6e4056fe7d184d1f063cb00ba1ee2381b398ad1fd6a9c6234e644e
 EBUILD wireshark-9999.ebuild 6996 BLAKE2B c5e8c2938682bd4798bf4e89105abebe479efa1e2d6f10a992b8f7da3f0b81a5f790e3902eb1cdf54f7e59cddc1e489c3525c1d3efd839a6603926b43739e841 SHA512 07ba086d124909c54a5bbad139888e4dd0e0a19cd02d76c25d93b52db9c3e25fa0163d9ff72334d3dffb18af3cb660522787304063bf0010543a53ef5f309d13
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch
new file mode 100644
index 000000000000..63d62e8e254a
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch
@@ -0,0 +1,30 @@
+https://gitlab.com/wireshark/wireshark/-/merge_requests/2532?commit_id=6ef6e8f607456e239e5f1a326803846930d34fa8.diff
+https://bugs.gentoo.org/775029
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1115,6 +1115,10 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
+ 
+ # Build the Qt GUI?
+ if(BUILD_wireshark)
++	set(CMAKE_AUTOMOC ON)
++	set(CMAKE_AUTOUIC ON)
++	set(CMAKE_AUTORCC ON)
++
+ 	# Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
+ 	# somewhere. The if WIN32 in this place is annoying as well.
+ 	if(WIN32)
+diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
+index ff0efeae1614511fbe12ed00d5b82f2714fa55f5..cd36913f10d949a8a701060833b0878086798bf4 100644
+--- a/ui/qt/CMakeLists.txt
++++ b/ui/qt/CMakeLists.txt
+@@ -631,10 +631,6 @@ include_directories(
+ 	${CMAKE_CURRENT_SOURCE_DIR}
+ )
+ 
+-set(CMAKE_AUTOMOC TRUE)
+-set(CMAKE_AUTOUIC TRUE)
+-set(CMAKE_AUTORCC TRUE)
+-
+ if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9")
+ 	# Drop the file modification time of source files from generated files
+ 	# to help with reproducible builds. We do not use QFileInfo.lastModified
diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index 9d6d887293aa..c37f3c484d2a 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
 	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
@@ -101,6 +101,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
 	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
+	"${FILESDIR}"/${P}-cmake-3.20.patch
 )
 
 pkg_setup() {