[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

["Sam James" <sam@gentoo.org>]

commit:     9774304300267d61722e6f74a32ff3824d4f7c57
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 16:11:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 16:18:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97743043

net-analyzer/wireshark: add missing Qt deps

Closes: https://bugs.gentoo.org/876265
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{wireshark-4.0.0.ebuild => wireshark-4.0.0-r1.ebuild}      | 10 ++++++++--
 net-analyzer/wireshark/wireshark-9999.ebuild                   |  8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-4.0.0.ebuild b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
similarity index 98%
rename from net-analyzer/wireshark/wireshark-4.0.0.ebuild
rename to net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
index 34d454166c63..96b63b7190c2 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 	media-libs/speexdsp
 	bcg729? ( media-libs/bcg729 )
 	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6 )
+	ciscodump? ( >=net-libs/libssh-0.6:= )
 	filecaps? ( sys-libs/libcap )
 	http2? ( >=net-libs/nghttp2-1.11.0:= )
 	ilbc? ( media-libs/libilbc:= )
@@ -70,6 +70,7 @@ RDEPEND="
 		)
 		!qt6? (
 			dev-qt/qtcore:5
+			dev-qt/qtconcurrent:5
 			dev-qt/qtgui:5
 			dev-qt/qtmultimedia:5
 			dev-qt/qtprintsupport:5
@@ -116,7 +117,12 @@ BDEPEND="
 "
 RDEPEND="
 	${RDEPEND}
-	gui? ( virtual/freedesktop-icon-theme )
+	gui? (
+		virtual/freedesktop-icon-theme
+		!qt6? (
+			dev-qt/qtdeclarative:5
+		)
+	)
 	selinux? ( sec-policy/selinux-wireshark )
 "
 

diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 34d454166c63..bf6499163094 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
 		)
 		!qt6? (
 			dev-qt/qtcore:5
+			dev-qt/qtconcurrent:5
 			dev-qt/qtgui:5
 			dev-qt/qtmultimedia:5
 			dev-qt/qtprintsupport:5
@@ -116,7 +117,12 @@ BDEPEND="
 "
 RDEPEND="
 	${RDEPEND}
-	gui? ( virtual/freedesktop-icon-theme )
+	gui? (
+		virtual/freedesktop-icon-theme
+		!qt6? (
+			dev-qt/qtdeclarative:5
+		)
+	)
 	selinux? ( sec-policy/selinux-wireshark )
 "