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

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

commit:     bf006a3ff0c3c58adf4ab9697c9e73b66152c64e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 03:33:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 03:33:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf006a3f

net-analyzer/wireshark: add 4.0.0_rc1 (unkeyworded)

Still need to polish off the wifidump/libssh bit (need to
decide really what to do about the huge number of USE flags here)
but may as well commit what got so far given it works fine.

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

 net-analyzer/wireshark/Manifest                    |  1 +
 ...hark-9999.ebuild => wireshark-4.0.0_rc1.ebuild} | 22 ++++++++++++++--------
 net-analyzer/wireshark/wireshark-9999.ebuild       | 22 ++++++++++++++--------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 816d4f92d449..c9f0a82a4ac0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,3 +4,4 @@ DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B 3b636867d946f0cf748eb719874e815c919
 DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B 4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0 SHA512 9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
 DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1 SHA512 c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
 DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B 0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b SHA512 caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
+DIST wireshark-4.0.0rc1.tar.xz 41291340 BLAKE2B 96dc9616702c67f47517cf5fc575bf555d5f7e83cc90284301e3ef26476ca6292f8aba3c7230c3ca7e6404a9b953861247a448826b339fa586d5a8206c787989 SHA512 16d4f3d39198bb208d4ad58059c38a40f21352186abf2cafb4140674d048e5bd29e5dbc079ed50f28f1dde150733bba6a26c6fc7d10e524e4556bd20c6ae2856

diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
similarity index 92%
copy from net-analyzer/wireshark/wireshark-9999.ebuild
copy to net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
index 68dc99e8c15c..0bdf2a0c919a 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
@@ -18,7 +18,9 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	fi
 fi
 
 LICENSE="GPL-2"
@@ -34,17 +36,19 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 
 RESTRICT="!test? ( test )"
 
+# TODO: wifidump/libssh automagic?
 # bug #753062 for speexdsp
 RDEPEND="acct-group/pcap
-	>=dev-libs/glib-2.38:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
+	>=dev-libs/glib-2.50.0:2
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.14.0:=
+	>=dev-libs/libgcrypt-1.8.0:=
 	media-libs/speexdsp
 	bcg729? ( media-libs/bcg729 )
 	brotli? ( app-arch/brotli:= )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
+	http2? ( >=net-libs/nghttp2-1.11.0:= )
 	ilbc? ( media-libs/libilbc )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
@@ -69,10 +73,12 @@ RDEPEND="acct-group/pcap
 	snappy? ( app-arch/snappy )
 	spandsp? ( media-libs/spandsp )
 	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
+	ssl? ( >=net-libs/gnutls-3.5.8:= )
 	zlib? ( sys-libs/zlib )
 	zstd? ( app-arch/zstd:= )"
 DEPEND="${RDEPEND}"
+# TODO: 4.0.0_rc1 release notes say:
+# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
 BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
 	sys-devel/flex
@@ -130,7 +136,7 @@ src_configure() {
 	fi
 
 	if use qt5 ; then
-		export QT_MIN_VERSION=5.3.0
+		#export QT_MIN_VERSION=5.3.0
 		append-cxxflags -fPIC -DPIC
 	fi
 
@@ -164,7 +170,7 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=ON
+		-DENABLE_WERROR=OFF
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_BROTLI=$(usex brotli)
 		-DENABLE_CAP=$(usex filecaps caps)

diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 68dc99e8c15c..0bdf2a0c919a 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -18,7 +18,9 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	fi
 fi
 
 LICENSE="GPL-2"
@@ -34,17 +36,19 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 
 RESTRICT="!test? ( test )"
 
+# TODO: wifidump/libssh automagic?
 # bug #753062 for speexdsp
 RDEPEND="acct-group/pcap
-	>=dev-libs/glib-2.38:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
+	>=dev-libs/glib-2.50.0:2
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.14.0:=
+	>=dev-libs/libgcrypt-1.8.0:=
 	media-libs/speexdsp
 	bcg729? ( media-libs/bcg729 )
 	brotli? ( app-arch/brotli:= )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
+	http2? ( >=net-libs/nghttp2-1.11.0:= )
 	ilbc? ( media-libs/libilbc )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
@@ -69,10 +73,12 @@ RDEPEND="acct-group/pcap
 	snappy? ( app-arch/snappy )
 	spandsp? ( media-libs/spandsp )
 	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
+	ssl? ( >=net-libs/gnutls-3.5.8:= )
 	zlib? ( sys-libs/zlib )
 	zstd? ( app-arch/zstd:= )"
 DEPEND="${RDEPEND}"
+# TODO: 4.0.0_rc1 release notes say:
+# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
 BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
 	sys-devel/flex
@@ -130,7 +136,7 @@ src_configure() {
 	fi
 
 	if use qt5 ; then
-		export QT_MIN_VERSION=5.3.0
+		#export QT_MIN_VERSION=5.3.0
 		append-cxxflags -fPIC -DPIC
 	fi
 
@@ -164,7 +170,7 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=ON
+		-DENABLE_WERROR=OFF
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_BROTLI=$(usex brotli)
 		-DENABLE_CAP=$(usex filecaps caps)