net-analyzer/wireshark: fix automagic libssh dep for wifidump

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

3 files changed, 8 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index ceb09bd64731..bd841198d5ad 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -66,6 +66,7 @@
 		<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
 		<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
 		<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
+		<flag name="wifi">Install wifidump, to dump and analyse 802.11 traffic</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">wireshark/wireshark</remote-id>
diff --git a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
index 96b63b7190c2..f402d1fc68c0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
@@ -29,7 +29,7 @@ IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmo
 IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
 IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt"
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
 
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -37,7 +37,6 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
-# TODO: wifidump/libssh automagic?
 # bug #753062 for speexdsp
 RDEPEND="
 	acct-group/pcap
@@ -84,6 +83,7 @@ RDEPEND="
 	spandsp? ( media-libs/spandsp:= )
 	sshdump? ( >=net-libs/libssh-0.6:= )
 	ssl? ( >=net-libs/gnutls-3.5.8:= )
+	wifi? ( >=net-libs/libssh-0.6:= )
 	zlib? ( sys-libs/zlib )
 	zstd? ( app-arch/zstd:= )
 "
@@ -219,6 +219,7 @@ src_configure() {
 		-DENABLE_SMI=$(usex smi)
 		-DENABLE_SNAPPY=$(usex snappy)
 		-DENABLE_SPANDSP=$(usex spandsp)
+		-DBUILD_wifidump=$(usex wifi)
 		-DENABLE_ZLIB=$(usex zlib)
 		-DENABLE_ZSTD=$(usex zstd)
 	)
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index bf6499163094..f402d1fc68c0 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmo
 IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
 IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt"
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
 
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -37,7 +37,6 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
-# TODO: wifidump/libssh automagic?
 # bug #753062 for speexdsp
 RDEPEND="
 	acct-group/pcap
@@ -48,7 +47,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:= )
@@ -84,6 +83,7 @@ RDEPEND="
 	spandsp? ( media-libs/spandsp:= )
 	sshdump? ( >=net-libs/libssh-0.6:= )
 	ssl? ( >=net-libs/gnutls-3.5.8:= )
+	wifi? ( >=net-libs/libssh-0.6:= )
 	zlib? ( sys-libs/zlib )
 	zstd? ( app-arch/zstd:= )
 "
@@ -219,6 +219,7 @@ src_configure() {
 		-DENABLE_SMI=$(usex smi)
 		-DENABLE_SNAPPY=$(usex snappy)
 		-DENABLE_SPANDSP=$(usex spandsp)
+		-DBUILD_wifidump=$(usex wifi)
 		-DENABLE_ZLIB=$(usex zlib)
 		-DENABLE_ZSTD=$(usex zstd)
 	)