gentoo auto-resync : 02:06:2024 - 00:07:23

13 files changed, 324 insertions, 365 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index eaa7815a3e14..5282e9389d87 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 87227f8d31c1..90386899979d 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -4,7 +4,7 @@ AUX fail2ban-1.0.2-umask-tests.patch 1329 BLAKE2B a7535b515e5d3be56d6e842b34e37c
 DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb
 DIST fail2ban-1.1.0.tar.gz 603854 BLAKE2B f7c2d3a1e5b5cdca1f26d92cefe75958bb61b87ad1cf316380b91527c96f3261e5665478c5fbb053f6419956dda934c8ef3ce837af2819b1b1c8d162246fc15f SHA512 9bff7b9c41e58a953901800468e5c4153c9db6af01c7eb18111ad8620b40d03a0771020472fb759b2809d250e2bb45471e6c7e8283e72ea48290ecf7bf921821
 EBUILD fail2ban-1.0.2-r2.ebuild 3524 BLAKE2B f809eaaf425c548842f6b4c749f1f9613b4fd6e1c44aa6dbf5c3790e96b34ea9d14a62fb7b2d1e76afa31a9f05efdc840db5a3415f2af422cc9254b4afdd59ef SHA512 070ee0ef942c9fb8559afb7f60d188d91b83759bbb9c343ab31484292aee94fe55c3d1f1642e090d99fe2685f448e2f9048c095aebc05d47dd7030508dcd91fb
-EBUILD fail2ban-1.0.2-r3.ebuild 3824 BLAKE2B 95a5fca9e00f00d4d39abbe64c0d5e75631ba62b6a50d008bb2d8b5d7e35ab756303e0d847d369e71c84b5abc1c2141c59991c80f8764519841b6e97deaa3ca5 SHA512 3e3839a6ec9e362632e14893313512d2f75d787fad9959691a3445a9dc063d85c4008c2c98433d365b7a225d4c78bd405c1d1a99ee1947440b60ba8bd65efb8f
+EBUILD fail2ban-1.0.2-r3.ebuild 3817 BLAKE2B 350ebf2c9d0523009ed9f390548132367805742b20014c719fa396f3edf8df188b531374237922324b591238f4e8df5ff5fdade2505c32444e301a9b3f3d533b SHA512 9b42311a494d88f0f9ac71ed85ad1cc47917824f54858a13857176674c3ccaee66ff88b1f4fa63245556563274bcb0de891c8777f925deef3b4156e02f1c5c32
 EBUILD fail2ban-1.1.0.ebuild 3692 BLAKE2B 0185481423dd83d1ebbd22f249e483852a496f22208084840c59e67d86978452e956f66da4e8021cb9fe9322513bc9316b29ab412ed3c50ba3f8e14512355e0b SHA512 bd8c84d5976a2b6d7cb823f6090a5f4ab88b2a9588f1368d8a736ed62224ef72c803a308b5e23184d667ac93966763f4c1255a5b51423bb9f0091797bb5f1743
 EBUILD fail2ban-9999.ebuild 3692 BLAKE2B 0185481423dd83d1ebbd22f249e483852a496f22208084840c59e67d86978452e956f66da4e8021cb9fe9322513bc9316b29ab412ed3c50ba3f8e14512355e0b SHA512 bd8c84d5976a2b6d7cb823f6090a5f4ab88b2a9588f1368d8a736ed62224ef72c803a308b5e23184d667ac93966763f4c1255a5b51423bb9f0091797bb5f1743
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild
index f78595850988..fd9d7373924e 100644
--- a/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index ad642e0e5dab..ad2681f242fd 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -7,6 +7,7 @@ AUX net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch 1786 BLAKE2B 3f672a
 AUX net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch 1045 BLAKE2B 1cb4eb17363b9de90cecec0670ce220b04bdcb7e91af6931889139ba82ea69c24f399c5e4e1fd7ef3ae192372d7cd5bc5737b49a662cfeb685aab982ae321ede SHA512 0a1c51555359cec3f4294c0fe931c40e1cf1139a9a0e15fa7c75d6934b69cbedecc70b1bf44747f296274649bd39bf55ca55c0f9c4096a106e042b90698c95a1
 AUX net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch 722 BLAKE2B 00c301bbf6482f201ef2b4b82fb9899458a27e26bd0564bd98c69895f905b3abbbf5b1b8dc1ea7069059d9f1ad84a1335b84a6c151e7e75b81fc7fa3a135c578 SHA512 23e5e8920e41911dc4183a1c14b33f284a7d026a12c800dca6ddf0fa685e5a31041787599cab2671949163f539c85879e1e962128bab31ec478ebd47195ae3e0
 AUX net-snmp-5.9.3-configure-clang16.patch 4779 BLAKE2B fbe551a16272c6a374ed1abdcb024e7babd15bf8854cbfec568c3c58546b3f78302ea27cbb289faa5eb84b5e8b2086505fe74bba62e76e9d1a84a09949700f26 SHA512 3b85e813b645a3a3220d1ef1b5aceee4b2ea4150159f723249171f6283c1d45a034069b3d79e5ed0faa32556a0cb662c3a8b4ad93bd69ff12d517622df21291e
+AUX net-snmp-5.9.4-c99.patch 1123 BLAKE2B dbb8ede2a810023f73a80b28d19c936c81df484b3d6b8dab96150a773a82650926945279c20e0dc8483f8a99b74a7abcb7ac0e6d790d5f43653db809f40cf183 SHA512 2ec4bb80b6f1ae11ebefd59e72e1ddc7df46e4a5dae44c1533bad6a5aadffd8b45797ac5f81ba5ec5e0b3f8eddaddf4b0e985f7962d671f2b9848145a3e8fbda
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
 AUX snmpd.service 181 BLAKE2B e68aa957e78178c624faa41c93eee84dcadec817fd0b0fcba19eeded1b52d265923cfe69070d3fb71a03ba071fe10bc6b5ce0c99e3c9720521d2b37d04ce8ace SHA512 e8fe55538bf8c14ddb84c464bceddc33fdd0a03d303413783fb23d49c5d2417ead17fbcbbe460bf89738a5cff543f3ea0c7a4fd28e6f598dc9458da1d30d74ac
@@ -17,6 +18,7 @@ DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c
 DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
 DIST net-snmp-5.9.4.tar.gz 6681606 BLAKE2B 2f3dfdc4ce2f4d9a1a771a77e0b0c427a89e3de6dc217009df385baabc7d860ca7714fa76360a4d14521f1b88c9c13ad46b25d3975e33e8bc4bce3eb3b27b99d SHA512 a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423
 EBUILD net-snmp-5.9.3-r3.ebuild 6557 BLAKE2B 719158070ba93af0208d0d970b7ac5b9858ff612f8de4ef83c6e6c6cb63e8c51f0f5452e7df220a67c3e6d660390b56d8b7b800379f1df3171eec1440fa0fcde SHA512 a63a6b28d9ce43e8f0660be514ed75f4b09adc145d04422f2f55fb4ee11604777ab25850b266d18674f976404756a13ab55e299fa72ed5115ce786665d15e44e
+EBUILD net-snmp-5.9.4-r1.ebuild 6563 BLAKE2B c29cb709e787b68ca8f3659e79c07aeec2fed913697ba82bbd81193f4fd405ed04a47c2a0c34776e16324f9c896be3f71e788de4568975c857e9b0fc0de9d22d SHA512 a6662327bd0bc448a1281c107363db5fd056587cf14e78924fbf4d964f6bc84139a20e906cfd95a9150e353d087703fca27d1972ab7fd112447fcd44f841facb
 EBUILD net-snmp-5.9.4.ebuild 6526 BLAKE2B fc0a68e7e79abb9f55bab849a9378720050ba08312b671f158ed4b0e8774d667e0e10f3fa27dd5f75f9f6006ea823215b610286e9308a45818b3a9d5597298f3 SHA512 b8ce931bc4955761018ba20a6f6dadebbe1fcff2b95f9e81969970fc78484903930ba0999cc9865e470dc4c2b7bff49f8d85ea81419ca8fcab626070c44cf754
 EBUILD net-snmp-9999.ebuild 6186 BLAKE2B 41fdd326cd4b9b7281aa455c741d8aa7756f6f8ef49477fa04386e809a9a1252c1881f7a50738b83896adb276f0e0545228e8d88c544bd1604d1a6d51cf685c9 SHA512 1ffc81d800fd8b20fc97bbd4cce48990c7b037ac76ff4336d681bec62c0d69d4a976cacfdfee751fe75deb8067f53da44eef16c90a3c0d632779e93d336eee8f
 MISC metadata.xml 1552 BLAKE2B 4e2f3ca85f76e2bd5992e87385485055dc61f2ff52ba7a6ccc6cf2a3e34557a0d98840cfd34a88ee3c1513ebd2609e294f2db68d5963fa884eb0eb940d8599e3 SHA512 b666ad1730772cc9856bde562ad43db51b7ae1b2b9865d5804dd3313a0ca9200989d036be4ac33eaf1f5b1eda9864d9b9be4f5a58bcca8b1455d6e508e534bc2
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch
new file mode 100644
index 000000000000..fd8f16c7b6e2
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch
@@ -0,0 +1,30 @@
+https://github.com/net-snmp/net-snmp/issues/815
+https://github.com/net-snmp/net-snmp/commit/d30d63523bfd9ccc85175e484fea821815273237
+
+From d30d63523bfd9ccc85175e484fea821815273237 Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <bvanassche@acm.org>
+Date: Wed, 15 May 2024 10:08:04 -0600
+Subject: [PATCH] snmptrapd: Fix compilation against recent versions of the
+ MySQL library
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix the following build error:
+
+snmptrapd_sql.c:541:50: error: assignment to ‘_Bool *’ from incompatible pointer type ‘char *’ [-Wincompatible-pointer-types]
+541 | _tbind[TBIND_v3_SECURITY_ENGINE].is_null = &_no_v3;
+
+Fixes: https://github.com/net-snmp/net-snmp/issues/815
+--- a/apps/snmptrapd_sql.c
++++ b/apps/snmptrapd_sql.c
+@@ -201,7 +201,7 @@ typedef struct sql_buf_t {
+  * static bind structures, plus 2 static buffers to bind to.
+  */
+ static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX];
+-static char       _no_v3;
++static typeof(*((MYSQL_BIND*)NULL)->is_null) _no_v3;
+ 
+ static void _sql_process_queue(u_int dontcare, void *meeither);
+ 
+
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
new file mode 100644
index 000000000000..bf9f27337a9c
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{10..11} )
+WANT_AUTOMAKE=none
+
+inherit autotools distutils-r1 libtool perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="https://www.net-snmp.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
+	inherit git-r3
+else
+	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+IUSE="
+	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl:= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		>=dev-libs/openssl-0.9.6d:0=
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+BDEPEND="doc? ( app-text/doxygen )"
+DEPEND="
+	${COMMON_DEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? (
+			virtual/perl-Carp
+			virtual/perl-Data-Dumper
+			virtual/perl-Getopt-Long
+			dev-perl/JSON
+			dev-perl/Mail-Sender
+			dev-perl/TermReadKey
+			virtual/perl-Term-ReadLine
+		)
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	# https://github.com/net-snmp/net-snmp/pull/493
+	"${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch
+	"${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch
+	"${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch
+	"${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch
+	"${FILESDIR}"/${PN}-5.9.4-c99.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+	elibtoolize
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	export ac_cv_header_valgrind_{valgrind,memcheck}_h=$(usex valgrind)
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with pcre) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared \
+		--with-default-snmp-version="3" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
+	done
+
+	use doc && emake docsdox
+}
+
+src_install() {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6c66f4fe3462..debb9326e99f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,10 +1,9 @@
 AUX README.gentoo 188 BLAKE2B 1734362317f1c09b63ebb946961a3f31e5b785787ac3c4e026d71c95c14367f4f3df752706e0d04e14792c95c33c3829eea704806b3b14a96339819f8c2ad4f7 SHA512 92811e9bb6df95d87058e6b77ed09dd086db922721b71ea87af0fdfcc44e2585ef28cf264095d8645a9b5bb60a3990b21376f892305debac19a3f01518918959
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
+AUX wireshark-4.2.5-http2-test.patch 1191 BLAKE2B 60ea4213237f0f7bf8899c6f0b470b8277c3d17286de9c9e75bfa08b2b52ecbc4c3305bfca3e6da111269333dd9c299e2651da3733b38bf83b0d1511e5b4c03a SHA512 8c42c33cbb4a93d07651c1fbe4d1332ac8191341979229ededafe86d04a778140eae4774ee854950ab4f74d0301a7efa298f9f67991199bb0e95285b425e1afb
 DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c SHA512 d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4
 DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc SHA512 c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f
-DIST wireshark-4.0.14-signatures.txt 2521 BLAKE2B 371bf67dc0f36fe46848fef77194e221879db1ff422420949ba0fce4280fb9ee84ca18363046a0ce6fd1e7879ba336c1c16c9bdea13b8d14f14137f59d76212e SHA512 f084d454d1756be35e1e1ed4636cb994bd9c49bd4666d355ce3719d526bf71f9e3cc929b4dca311231d43b046711b223a379c6d915aa260966f0b7bab8a8e352
-DIST wireshark-4.0.14.tar.xz 43186416 BLAKE2B 1b67079cc0f9cdc33ce7e2fce0b49deb4d3016db79099a3bd2003099477a3bac43d4e31d4820c72a92135cca14572ac46406f41e477d794a63e96a6329d30199 SHA512 e88a4b2f41489f3ffe82c4c79c9c89ec521d931a716a5dacaede28c03b0625a0603935e723d5d869f801cfcab440a7d2f310c910707e15f9b0bca0c131398d73
 DIST wireshark-4.0.15-signatures.txt 2521 BLAKE2B 2ca4163fff33708288b355978220014707fa8ba84ea2237a9a4dcb9da8cd7986811ee3805416cd82d348968edc9d873fa63b5fd121f40e623f0099ab1fd01716 SHA512 e47ad252b260016d7cce60f53c6d308a36c1ae8c194359212fa38ec934d961bba6e1ace53d1ff3c909c5c5cad09ff8c1ded39d9ce7cac10b1b987eeee594c565
 DIST wireshark-4.0.15.tar.xz 43197644 BLAKE2B 6720ee6c879a0005c37452da32bc8e99051baf3eadd53d42b5e93a7f7e2c3cf63657393fd2d4e2d245f1b33ffc10b52c6e5af9fd527e78497dc8d1ad9405473b SHA512 6f1915c48860f79c25df8ac753aac4391393db9cf6d4b3d4ba11499fafb5cae8c1e56b7f735ea14b9f18560cb4156a3cbb65c567102db52b40e5d1f53e00be7a
 DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e SHA512 273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9
@@ -12,9 +11,8 @@ DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 03806a167a4b055409fadbc54ba338c9d27
 DIST wireshark-4.2.5-signatures.txt 2706 BLAKE2B d10f6e9b4d8bcd8f0a30501bbbfee9ee696d82c7ca95957532f6614905e7836e5865d1b7093ca6aab2ebc1da5365648803f8b20508c95cdf5b42e8ac8e288f65 SHA512 050cb90e8958b73428fc7dc6c9801ba3b361f8cf4df8f22505789d759edf7967867915a0cbf351fa251d4d28b211920a3fb34e8fa209d475a10b4bcd2957fcc0
 DIST wireshark-4.2.5.tar.xz 45014156 BLAKE2B 536743a7e402f7a511d7612454d9770f0e67a0f2ebc1ab49912b12965e605f2082eff37f41f7642b89859257926ce13d88728194b79cbe5dcf6b15d72516c5fc SHA512 92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b
 EBUILD wireshark-4.0.11.ebuild 8629 BLAKE2B 570d1896cdc2a12deca6e12740fd6db574ba4591191541e329c9a9e71bbcd71cf3bc547ef8be4584ee5d7d39715ea4498f6bd558b5169e623cf4f3f68f17a49d SHA512 f8c4693e14e9d7b60832ffacf70b79ecb387abee9abab3f02292ef06f08a270b3580a9e0a7569d27404b22a05adf6159027f6f494bb9c81bccff57fc389befe9
-EBUILD wireshark-4.0.14.ebuild 8634 BLAKE2B 9bcd06b8fbbce57d7a599170c19b1ca46901682593fd067b2abad6091cdf8b342c03c6be789b7b0752be5b42db905527ed3a0963d7cc1518449b8e8a7ad0c376 SHA512 27da4af400f64d9a2cf4f0eaa68de6cbc300369b0c769a57ddf8b916d4b8ed57aa18097d2801c65b3289601e46c62c5cd6bd4c6e8b3d0ab1826818c036032183
-EBUILD wireshark-4.0.15.ebuild 8634 BLAKE2B 9bcd06b8fbbce57d7a599170c19b1ca46901682593fd067b2abad6091cdf8b342c03c6be789b7b0752be5b42db905527ed3a0963d7cc1518449b8e8a7ad0c376 SHA512 27da4af400f64d9a2cf4f0eaa68de6cbc300369b0c769a57ddf8b916d4b8ed57aa18097d2801c65b3289601e46c62c5cd6bd4c6e8b3d0ab1826818c036032183
-EBUILD wireshark-4.2.4-r1.ebuild 8844 BLAKE2B faaf34ec668969a18cf0bb6efc7c942efbf2317a20cd8e9ca2bd365ce48568fba2cbcff24b9e980b70d568dda49972f5605de1767f84318285ff3baaac84dbad SHA512 09f695840b532adae298228a3a708fa5f840c497248e8666813ce35afbb09b4d0f3ec273a0ea51d92134369a8f692118b0e624c7e5ef9322334ec5112e25f2fe
-EBUILD wireshark-4.2.5.ebuild 8846 BLAKE2B e642ce7d0da51c69d2ccb3b5fd566e7a6fc16a029e799eddb231028d6beac04981313511863c7795b8df0522c874c4ad932ca9860ce43c99fab8f903ddd9760a SHA512 06ad3c9b44afca7c935e49778648705e88da27abec72a085246eb5ea702ceb61090f6eea958842d816097febe06aee6f2bc3dc8811f5da94c025decf44252785
-EBUILD wireshark-9999.ebuild 8846 BLAKE2B e642ce7d0da51c69d2ccb3b5fd566e7a6fc16a029e799eddb231028d6beac04981313511863c7795b8df0522c874c4ad932ca9860ce43c99fab8f903ddd9760a SHA512 06ad3c9b44afca7c935e49778648705e88da27abec72a085246eb5ea702ceb61090f6eea958842d816097febe06aee6f2bc3dc8811f5da94c025decf44252785
+EBUILD wireshark-4.0.15.ebuild 8630 BLAKE2B 580ac6e5184c69d9766b0697a22f147840a181b6014421d01846628c27c7506ceb564a2dadef2cb6181c26795d6488fc86a5d8b5383f0add5c735beeac6a317d SHA512 19d09a778fdd24998a0f5879b6ce32311745111b53edb46cd41fd953fca0fbb6090a20bf99afd98a276bde7b36babdf557f8822b582e05b964b891196424b4f4
+EBUILD wireshark-4.2.4-r1.ebuild 8904 BLAKE2B 3d9d741806defe5c9d87d6ecf240632cb4a18561aaa9c5c59672ce351c04d8d601e26694e2bd25a82a19a110099bcc982286dad2f0c2b0ba2f829b44ccb69079 SHA512 6b22e258580abc67c34da5ab9b8430cbd9533c5c026bbf46ffbe61966f218dba7e6797769ae43800400664ca3ced3606c976ea60cb0f8a8a8e6beeadc129cb27
+EBUILD wireshark-4.2.5.ebuild 8826 BLAKE2B d4529cec9eae4eb887e96c3c30abddec5a8b4512fc94fdb874130c568d7d60db58cc180718a8df65b0e61bdaf655d19aa973f9369cef63c2b093eec6d7cc7285 SHA512 5e61f48782f8abb40a20702874ef998b9f459dc91c648f04f9937b89c42fd0b8d57695d19e7ee9268f9902ef042773c0fee1f22aa5519600da3e6aecd085c180
+EBUILD wireshark-9999.ebuild 8818 BLAKE2B 6abcff955a4a038252f5ef742c39b98f35ed912f519916c7ff8c008fa133fae0d71fb66f726d85334f80d85d4b342710b3864245a1db399816bda946d98bdaf1 SHA512 f1549fe351261b790f3bfddf4ec1331e10195e1fda7047686d04c590cec3fd490fcd09d61b586e0edec74ac33db1d73f762f488dd8d80c896dbb4f88ac6f3cf5
 MISC metadata.xml 5352 BLAKE2B 319ae9385ccf49cf52abdc3bb2292a6181f8bad974eecb1863b69dc248e8e1b17d95de5c7267e4e70ee28809bffc82a13f06de3e7d15541d32e2e2ab7ada638f SHA512 15580364ef3f86e9d4020c8b7e2e765a2be97742dc398d11697b87e15085e1a95e951d0200eea71484fb8d124d54b86da8542921c0b8f29d064a26681192d919
diff --git a/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch b/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch
new file mode 100644
index 000000000000..f32109237d6d
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch
@@ -0,0 +1,31 @@
+https://gitlab.com/wireshark/wireshark/-/merge_requests/15824
+
+From cc8264d68f638c72ada1e94a9913902462c1a25a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 1 Jun 2024 02:25:05 +0100
+Subject: [PATCH] test: skip test_sharkd_req_follow_http2 test if no http2
+ support
+
+Originally reported downstream in Gentoo at https://bugs.gentoo.org/933290.
+
+This is the same kind of thing as https://gitlab.com/wireshark/wireshark/-/merge_requests/9029.
+--- a/test/suite_sharkd.py
++++ b/test/suite_sharkd.py
+@@ -1174,7 +1174,13 @@ class TestSharkd:
+             },
+         ))
+ 
+-    def test_sharkd_req_follow_http2(self, check_sharkd_session, capture_file):
++    def test_sharkd_req_follow_http2(self, check_sharkd_session, capture_file, features):
++        # If we don't have nghttp2, we output the compressed headers.
++        # We could test against the expected output in that case, but
++        # just skip for now.
++        if not features.have_nghttp2:
++            pytest.skip('Requires nghttp2.')
++
+         check_sharkd_session((
+             {"jsonrpc":"2.0", "id":1, "method":"load",
+              "params":{"file": capture_file('quic-with-secrets.pcapng')}
+-- 
+2.45.1
+
diff --git a/net-analyzer/wireshark/wireshark-4.0.14.ebuild b/net-analyzer/wireshark/wireshark-4.0.14.ebuild
deleted file mode 100644
index 808132d6248f..000000000000
--- a/net-analyzer/wireshark/wireshark-4.0.14.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
-	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 )"
-	S="${WORKDIR}/${P/_/}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-	fi
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 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 wifi zlib +zstd"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( test ) test"
-
-# bug #753062 for speexdsp
-RDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.50.0:2
-	dev-libs/libpcre2
-	>=net-dns/c-ares-1.13.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-1.11.0:= )
-	ilbc? ( media-libs/libilbc:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	gui? (
-		x11-misc/xdg-utils
-		qt6? (
-			dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-			dev-qt/qt5compat:6
-			dev-qt/qtmultimedia:6
-		)
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtconcurrent:5
-			dev-qt/qtgui:5
-			dev-qt/qtmultimedia:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-		)
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd:= )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy:= )
-	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:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? (
-		!qt6? (
-			dev-qt/qtdeclarative:5
-		)
-	)
-"
-# 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
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		dev-ruby/asciidoctor
-	)
-	gui? (
-		qt6? (
-			dev-qt/qttools:6[linguist]
-		)
-		!qt6? (
-			dev-qt/linguist-tools:5
-		)
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${RDEPEND}
-	gui? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-)
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
-	else
-		if use verify-sig ; then
-			cd "${DISTDIR}" || die
-			verify-sig_verify_signed_checksums \
-				${P}-signatures.txt \
-				openssl-dgst \
-				${P}.tar.xz
-			cd "${WORKDIR}" || die
-		fi
-
-		default
-	fi
-}
-
-src_configure() {
-	local mycmakeargs
-
-	python_setup
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use gui ; then
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# crashes at runtime
-	# https://bugs.gentoo.org/754021
-	filter-lto
-
-	mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex gui MOC=$(qt5_get_bindir)/moc '')
-		$(usex gui RCC=$(qt5_get_bindir)/rcc '')
-		$(usex gui UIC=$(qt5_get_bindir)/uic '')
-
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-
-		-DBUILD_wireshark=$(usex gui)
-		-DUSE_qt6=$(usex qt6)
-
-		-DENABLE_WERROR=OFF
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		# only appends -flto
-		-DENABLE_LTO=OFF
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=OFF
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DBUILD_wifidump=$(usex wifi)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	EPYTEST_DESELECT=(
-		# TODO: investigate
-		suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-	)
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins "${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use gui ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins resources/icons/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/wireshark/wireshark-4.0.15.ebuild b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
index 808132d6248f..7dfb89f2d31c 100644
--- a/net-analyzer/wireshark/wireshark-4.0.15.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 	fi
 fi
 
diff --git a/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
index 44d0382c77bb..4b5688aeff54 100644
--- a/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
@@ -203,6 +203,9 @@ src_configure() {
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
 
+		# Force bundled lemon (bug 933119)
+		-DLEMON_EXECUTABLE=
+
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
 		$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
 		$(usex gui MOC=$(qt5_get_bindir)/moc '')
diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index 0e0d86d74067..ef484db79a7e 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -24,7 +24,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~hppa"
+		KEYWORDS="amd64 ~arm arm64 ~hppa ~x86"
 	fi
 fi
 
@@ -141,6 +141,7 @@ fi
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-4.2.5-http2-test.patch
 )
 
 python_check_deps() {
@@ -203,6 +204,9 @@ src_configure() {
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
 
+		# Force bundled lemon (bug 933119)
+		-DLEMON_EXECUTABLE=
+
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
 		$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
 		$(usex gui MOC=$(qt5_get_bindir)/moc '')
@@ -269,11 +273,6 @@ src_configure() {
 src_test() {
 	cmake_build test-programs
 
-	EPYTEST_DESELECT=(
-		# TODO: investigate
-		suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-	)
-
 	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
 	epytest \
 		--disable-capture \
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 0e0d86d74067..173fb4221235 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -141,6 +141,7 @@ fi
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-4.2.5-http2-test.patch
 )
 
 python_check_deps() {
@@ -203,6 +204,9 @@ src_configure() {
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
 
+		# Force bundled lemon (bug 933119)
+		-DLEMON_EXECUTABLE=
+
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
 		$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
 		$(usex gui MOC=$(qt5_get_bindir)/moc '')
@@ -269,11 +273,6 @@ src_configure() {
 src_test() {
 	cmake_build test-programs
 
-	EPYTEST_DESELECT=(
-		# TODO: investigate
-		suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-	)
-
 	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
 	epytest \
 		--disable-capture \