commit: 9a429b9703e75a47273ed5dc331819ea61efaa15 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Tue Jan 7 17:51:28 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 7 18:53:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a429b97
net-analyzer/wireshark: prefer zlib-ng by default in live Upstream prefers zlib-ng to zlib and supports it natively. Bug: https://bugs.gentoo.org/947293 Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Closes: https://github.com/gentoo/gentoo/pull/40029 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/wireshark/wireshark-9999.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 5c5d9c7af028..91ce4666a268 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -61,7 +61,7 @@ RDEPEND=" lua? ( ${LUA_DEPS} ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) - minizip? ( sys-libs/zlib[minizip] ) + minizip? ( sys-libs/minizip-ng ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) @@ -80,7 +80,7 @@ RDEPEND=" sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) - zlib? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib-ng ) zstd? ( app-arch/zstd:= ) " DEPEND=" @@ -242,7 +242,8 @@ src_configure() { -DENABLE_SNAPPY=$(usex snappy) -DENABLE_SPANDSP=$(usex spandsp) -DBUILD_wifidump=$(usex wifi) - -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZLIB=OFF + -DENABLE_ZLIBNG=$(usex zlib) -DENABLE_ZSTD=$(usex zstd) )
