commit: 41636c82e99c598ed3c76c5438ed631c2683f329 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Thu Oct 9 09:43:00 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 9 18:03:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41636c82
net-analyzer/wireshark: updates to 9999 - use libpcre2 subslot - remove USE=libxml2, now required unconditionally - make signature download work for release candidates - release notes have changed their file name Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Part-of: https://github.com/gentoo/gentoo/pull/44108 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/wireshark/wireshark-9999.ebuild | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 952bc6123f50..946f66a9fe85 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -19,7 +19,7 @@ else inherit verify-sig SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"; - SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV/_/}.txt -> ${P}-signatures.txt )" S="${WORKDIR}/${P/_/}" if [[ ${PV} != *_rc* ]] ; then @@ -30,7 +30,7 @@ fi LICENSE="GPL-2" SLOT="0/${PV}" IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" -IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos lua lz4 maxminddb" IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt" IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" IUSE+=" sdjournal test +text2pcap +tshark +udpdump wifi zlib +zstd" @@ -45,7 +45,8 @@ RESTRICT="!test? ( test )" RDEPEND=" acct-group/pcap >=dev-libs/glib-2.50.0:2 - dev-libs/libpcre2 + dev-libs/libpcre2:= + dev-libs/libxml2:= >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp @@ -57,7 +58,6 @@ RDEPEND=" http3? ( net-libs/nghttp3 ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2:= ) lua? ( ${LUA_DEPS} ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) @@ -203,7 +203,6 @@ src_configure() { -DENABLE_GNUTLS=$(usex ssl) -DENABLE_ILBC=$(usex ilbc) -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) -DENABLE_LUA=$(usex lua) -DLUA_FIND_VERSIONS="${ELUA#lua}" -DENABLE_LZ4=$(usex lz4) @@ -248,19 +247,19 @@ src_install() { if ! use doc; then # prepare Relase Notes redirector (bug #939195) - local relnotes="doc/release-notes.html" + local relnotes="doc/Wireshark Release Notes.html" # by default create a link for our specific version local relversion="wireshark-${PV}.html" # for 9999 we link to the release notes index page - if [[ ${PV} == *9999* ]] ; then + if [[ ${PV} == *_rc* ]] || [[ ${PV} == *9999* ]] ; then relversion="" fi # patch version into redirector & install it - sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die - dodoc ${relnotes} + sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > "${relnotes}" || die + dodoc "${relnotes}" fi # FAQ is not required as is installed from help/faq.txt
