gentoo auto-resync : 01:04:2025 - 01:33:27

11 files changed, 180 insertions, 508 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 59a6047fa46c..842370048c41 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index f97cc31c3c8f..c3d570441cc4 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -5,5 +5,6 @@ AUX fail2ban-1.1.0-openssh-9.8-fixups.patch 1324 BLAKE2B 5ae79dbacc19e9936f81313
 AUX fail2ban-1.1.0-openssh-9.8.patch 2482 BLAKE2B 5ca3d572332470131ec93330a14676a988f85e7177d44441c36c25ecd3095d8c0ea34cf9535c64df258d211cddf22306119f4a055c8ec5fc19c49d4b5d2281b5 SHA512 c26efa8e4929ed8a3973e4176a8adb0ca3d34fdac550376b3b5da6788f8f0f0afffc7a9031b118e6ce70052af590ff4669ea191b09d34f97636abf3515fc548e
 DIST fail2ban-1.1.0.tar.gz 603854 BLAKE2B f7c2d3a1e5b5cdca1f26d92cefe75958bb61b87ad1cf316380b91527c96f3261e5665478c5fbb053f6419956dda934c8ef3ce837af2819b1b1c8d162246fc15f SHA512 9bff7b9c41e58a953901800468e5c4153c9db6af01c7eb18111ad8620b40d03a0771020472fb759b2809d250e2bb45471e6c7e8283e72ea48290ecf7bf921821
 EBUILD fail2ban-1.1.0-r2.ebuild 3831 BLAKE2B b92edebb5a8a4bfa37c24a62855d26753987a74b851057fee23b35b9dc6a114d218a26eb72ba682e66063f59b28c54b0b9ab6b58bf2924e174083f19f4d5a657 SHA512 3adbd98ba97720728e6d7d42da224eb5981a45fd3915cd61322be8fa5a18e63c8883badb740fb2ee45509cad3ad887490fcf5e12ae6ae5ab8b55f7d050236355
-EBUILD fail2ban-9999.ebuild 3692 BLAKE2B b0ad9a842e3e4b623f48b5f7e69bd8c61c1828dd53e90cee72966b736561dd3105e692d9cbcb4318fa5af7f40a63dbb3c4eae46cb15c4bd09140a50e2da76080 SHA512 6bc8b3092090abffcbbc7594df86d48ca1503fcbd52f97a12495a7a290015de987bd4ea42c80dfa982bfd9f0716b2d22e7071bd53deb557a64f2cdfaea3f966f
+EBUILD fail2ban-1.1.0-r3.ebuild 4057 BLAKE2B fe005737291663bbf4f3869e8175a8e9d412f9b69289e5dc012d8545b5de3f32e2bcef6c70371d27aac2b001eec60ba8a80751bef2f99d27bd97d3c60bf7ae05 SHA512 3765536c25c2af07015442cf9502029168c679fde55ab6a9ae5bbaa74770f8b5ab1bff8ec8570f4dfc0266441d6879a7db3318c59894ae37265c1fdbd8e98b89
+EBUILD fail2ban-9999.ebuild 3911 BLAKE2B f86b42eb5947e6a0af5696d71694cdfac8b81e2b285eecaaadbe0d69db999e1020138eca3c044e47a7dabc3b98ed64e5c0da23cfb4ea99ae3b7c61a49aeea437 SHA512 51c9384243a845d2e9607400cdcadf89b8d4082e63135d0258eeb2e11df235e57e611bee4fb6367a9b8854a23d713c265425a01cdb3084dd3e960b90adf27d65
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-1.1.0-r3.ebuild b/net-analyzer/fail2ban/fail2ban-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..caf87142fe5b
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-1.1.0-r3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 edo python-single-r1 systemd tmpfiles
+
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://www.fail2ban.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fail2ban/fail2ban"
+	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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pyasyncore[${PYTHON_USEDEP}]
+		dev-python/pyasynchat[${PYTHON_USEDEP}]
+	' 3.12)
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? (
+		$(python_gen_cond_dep '
+			dev-python/python-systemd[${PYTHON_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/aiosmtpd[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
+	"${FILESDIR}"/${PN}-1.0.2-umask-tests.patch
+	"${FILESDIR}"/${PN}-1.1.0-openssh-9.8.patch
+	"${FILESDIR}"/${PN}-1.1.0-openssh-9.8-fixups.patch
+	"${FILESDIR}"/${PN}-1.1.0-openrc-nftables.patch
+)
+
+src_prepare() {
+	default
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+}
+
+src_compile() {
+	edo ${EPYTHON} setup.py build
+}
+
+src_test() {
+	# Skip testRepairDb for bug #907348 (didn't always fail..)
+	# https://github.com/fail2ban/fail2ban/issues/3586
+	bin/fail2ban-testcases \
+		--no-network \
+		--ignore databasetestcase.DatabaseTest.testRepairDb \
+		--verbosity=4 || die "Tests failed with ${EPYTHON}"
+
+	# Workaround for bug #790251
+	rm -rf fail2ban.egg-info || die
+}
+
+src_install() {
+	edo ${EPYTHON} setup.py install --prefix="${EPREFIX}/usr" --root="${D}"
+	python_fix_shebang "${ED}"/usr/bin
+	python_optimize
+
+	einstalldocs
+
+	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
+
+	newconfd files/fail2ban-openrc.conf ${PN}
+	# These two are placed in the ${BUILD_DIR} after being "built"
+	# in install_scripts().
+	newinitd "${S}"/build/fail2ban-openrc.init ${PN}
+	systemd_dounit "${S}"/build/${PN}.service
+
+	dotmpfiles files/${PN}-tmpfiles.conf
+
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+
+	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
+	if [[ ${previous_less_than_0_7} == 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2Ban!"
+		elog
+		elog "Fail2Ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version dev-python/pyinotify ; then
+		elog "For most jail.conf configurations, it is recommended you install"
+		elog "dev-python/pyinotify to control how log file modifications are detected"
+	fi
+
+	if ! has_version dev-lang/python[sqlite] ; then
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 45aad51f16eb..37e63e45d9a9 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
+inherit bash-completion-r1 edo python-single-r1 systemd tmpfiles
 
 DESCRIPTION="Scans log files and bans IPs that show malicious signs"
 HOMEPAGE="https://www.fail2ban.org/"
@@ -23,8 +22,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="selinux systemd test"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyasyncore[${PYTHON_USEDEP}]
 		dev-python/pyasynchat[${PYTHON_USEDEP}]
@@ -39,6 +40,9 @@ RDEPEND="
 	)
 "
 BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/aiosmtpd[${PYTHON_USEDEP}]
@@ -53,15 +57,19 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2-umask-tests.patch
 )
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
+src_prepare() {
+	default
 
 	# Replace /var/run with /run, but not in the top source directory
 	find . -mindepth 2 -type f -exec \
 		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
 }
 
-python_test() {
+src_compile() {
+	edo ${EPYTHON} setup.py build
+}
+
+src_test() {
 	# Skip testRepairDb for bug #907348 (didn't always fail..)
 	# https://github.com/fail2ban/fail2ban/issues/3586
 	bin/fail2ban-testcases \
@@ -73,17 +81,20 @@ python_test() {
 	rm -rf fail2ban.egg-info || die
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
+src_install() {
+	edo ${EPYTHON} setup.py install --prefix="${EPREFIX}/usr" --root="${D}"
+	python_fix_shebang "${ED}"/usr/bin
+	python_optimize
+
+	einstalldocs
 
 	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
 
 	newconfd files/fail2ban-openrc.conf ${PN}
-
 	# These two are placed in the ${BUILD_DIR} after being "built"
 	# in install_scripts().
-	newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}"
-	systemd_dounit "${BUILD_DIR}/${PN}.service"
+	newinitd "${S}"/build/fail2ban-openrc.init ${PN}
+	systemd_dounit "${S}"/build/${PN}.service
 
 	dotmpfiles files/${PN}-tmpfiles.conf
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index d29688a63654..6c6e75b2519d 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -15,10 +15,7 @@ AUX snmptrapd.conf 517 BLAKE2B dced765351c6fbd74166da9c3631993a06135569e8bc7b237
 AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf9252404b49f8c58355b4def5d751df0b3c7878bcce0bf703ccb7ba022db108eb1496b68eb2bb4a035612da SHA512 316964703559082b1626280bd0532a32533185741d1919f255473ae6bfe30f82b71bee79093cb0b341c99427e14a5ed201b6aa2886a9123c89d5f5f78496f706
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
-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 6551 BLAKE2B 60e0ecc6bc9090c422aa69b74784b23fe05c97d94a17f6384f277900a2ee29734a1d5013b5d77a40ed1e6af2c5eafbbcaf91d136d45661fce9e5f4e6650f09e2 SHA512 0394e0a0781e7570f2a9ff196173fd2f78ef21d49c426dd620bb22b74c04c66c537969cc83882a06c1c96c415b5713d2abec4a8229920b4ffb8636eecf9f64de
-EBUILD net-snmp-5.9.4-r1.ebuild 6550 BLAKE2B e874ce873fc9e9b56d914b22cda25e4acb7afc2defcf9dc1e92201e019da2e6d17eb9ef6ce575b2da15b3e486fa51b0f8a797b8b1216d392a135ff862bd9c95f SHA512 5d380a179750412e9ca0f1e22353e02f55c80a764f2896eb3050f4354904b2f3fa3287a07202747f1d0321be1242eb355c202e494917409b206b1ea3e623d37e
-EBUILD net-snmp-5.9.4.ebuild 6513 BLAKE2B 7e47752150ff6de4ae5cc9e2f638ef2fc1adc044ba2a149f7325433c3e45f26a22559cbf42ee2a7345f654aae8d171e444e4af1deb4328ac9b7b93f3fb2d8595 SHA512 497f82d38f7d46530943da06d165fd89ca7d772ad4dff30f18b6e4b6328edcc57beff63fd96a799985ddf85982d23b324d452337683a1624ec94d699af7749b8
-EBUILD net-snmp-9999.ebuild 6180 BLAKE2B 75b6afa5962936a894620450bd89ffb1e6aae53513a53abf6c34f1c9bc916c24197138738c0415119f874b5798216be49216c7091e3034e4217f69cdaf11a507 SHA512 d5b81080bc990c5f0743046132d5a4d9396a5cd23b61663d3b2de46025acf032dc85685420a379ed2d18201f8185f719724999d39c9cb03dc3bdf125628d2f90
+EBUILD net-snmp-5.9.4-r1.ebuild 6505 BLAKE2B 3099ea85784d47237b966d13f1cc6a0f6a1cd7992d363ad4c9f21079d1354cbb0c4959ecbe2ebebaae3e585a9c8a64cd84c74e06a4a254a298e9f7ab0334bbcc SHA512 10e42df3df73640d3ef5c248ac7781bdd4163f71ab9a381b8922290208072341a9589a3c23eee060f5bace5ad1a9b48c8f49fabe26c5e3f86d2ba5a97f69ccc3
+EBUILD net-snmp-9999.ebuild 6135 BLAKE2B c962a293feab28909e70e6b52f295779111ee6b6b43c0686ad55e521456014ef6429eb81aa8c70cff1734f9334d13a8e3b7a2ae745e423a47125ab6defb3b3a4 SHA512 04b692c0f91128b2cf5e1c188e3142b30ad744064d34baa3e955d00e40207549d95b38948f909e7b325092ae2d919bb48f186dcfae71415d4171fb064200c685
 MISC metadata.xml 1552 BLAKE2B 4e2f3ca85f76e2bd5992e87385485055dc61f2ff52ba7a6ccc6cf2a3e34557a0d98840cfd34a88ee3c1513ebd2609e294f2db68d5963fa884eb0eb940d8599e3 SHA512 b666ad1730772cc9856bde562ad43db51b7ae1b2b9865d5804dd3313a0ca9200989d036be4ac33eaf1f5b1eda9864d9b9be4f5a58bcca8b1455d6e508e534bc2
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
deleted file mode 100644
index 3890cec80340..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# 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..12} )
-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}/${PV}/${P}.tar.gz"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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
-	"${FILESDIR}"/${P}-configure-clang16.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
-)
-
-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/net-snmp/net-snmp-5.9.4-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
index 78fcf925ee18..ba264e867217 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 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..12} )
 WANT_AUTOMAKE=none
 
-inherit autotools distutils-r1 libtool perl-module systemd
+inherit autotools python-single-r1 libtool perl-module systemd
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="https://www.net-snmp.org/"
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild
deleted file mode 100644
index 6624db0c1416..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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..12} )
-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 ~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
-)
-
-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/net-snmp/net-snmp-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild
index 6546b019fbb5..a96348082cd5 100644
--- a/net-analyzer/net-snmp/net-snmp-9999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 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..12} )
 WANT_AUTOMAKE=none
 
-inherit autotools distutils-r1 perl-module systemd
+inherit autotools python-single-r1 perl-module systemd
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="https://www.net-snmp.org/"
diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index ead3211b22f1..29843a31bd89 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -4,5 +4,5 @@ AUX ospd-openvas.logrotate 333 BLAKE2B 9265d7b1ace6a43204bbb31ab3b9e5896d91282b1
 AUX ospd-openvas.service.conf 208 BLAKE2B b392bddb4caa281087a238c79c368bdf38439c9ddaf470e034db60d9847269966e19d6a111218fe92e6c5f05dc414ab88c0fefd1916c0d5c5bca28b30d92824a SHA512 ea1e59e1c4e6d98ca0058f42bd7454768cafb8c410611350eaaa7e232d7c580f61986f41de5fdeb752b73bd9cafd04c1e9ab44975b8d177e63537ed991418fc4
 AUX ospd-openvas.service_notus.conf 479 BLAKE2B f0c63fdd48396c39001823890aafe08228b2b37d14b81b02350b9ab0c31c02905c4b407785ca7b325f1ef48f92e38bf6f4bba287c406a274974c51d402a35dce SHA512 5d95f366f7b139717897b668e86d3f98ef98d7744106ecf456e5ba6bcf37ea6baa19a7925a46853a5f31a76c94a2537309fd944d5b99b07da19c020128937153
 DIST ospd-openvas-22.7.1.tar.gz 250148 BLAKE2B 7840376790f451e9316ad33556bac49e9672c7911ac0e3813e4c3a182a06b2c603fa80fa6ac6d2822c87ca35df172d99a3b60d3e16649328387267080572a507 SHA512 ae7fe56a2b825efc33d9e29f2a51ab1034155ee70a5790d98f3b811a29f4b35830afabc27abd14593d74e1bcc5dac0ea1cd33ed46cc3ca459256a4b452e10552
-EBUILD ospd-openvas-22.7.1.ebuild 2425 BLAKE2B 6c9af7a2e5c7214ae01fe11d4c9929992e99cabfcb9e7eb4b2f5cab19645773c11ca6cf09d561f0847f8a9cc253c145859b7d0dcde55dbb06838352f1a253d61 SHA512 097426b8f10252465d181a66a53041999970dbdae5bf490a9f60b8465f5a8bf74d1ca3746b87dbdd84a1eaaee5f6e7700f10bbbd704299ef3a23b2a5ba632dbc
+EBUILD ospd-openvas-22.7.1-r1.ebuild 2379 BLAKE2B 6f1b2470f6ca2d5949fb304e43a55c4fe61aebc331591ba0e817f7950d0b2ead6c444d9996f413aefcf4f89c0440b2e9c4a118d3cf766731fb75d4d0693f3a25 SHA512 d85afa0fd515304d981dc1c5bcbbc99889425d0feb101be87960ee61dcad5de37b7bb914f54a9d20797ca3a40f2e802bce41d7852e067157b77806192b906352
 MISC metadata.xml 906 BLAKE2B 8d23a0fd547a007a3cbc5df5b9edfc2e9f9b87c684ee089943a19551b66466e3586876772b1700f7d220615c0fb296d1f8af491612d75fd08ca7e3855a0bae13 SHA512 dae76e492c818779eb3e044c24a657bd27edbf60c82364acce2e2dda2fdd36837cb277cc626454099c04d061342911baa414d1353ec4c96f8fb600b018eb6ccb
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild
index 5ba56c4137f7..3d8fa048e255 100644
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild
@@ -19,7 +19,6 @@ IUSE="doc +notus"
 DEPEND="
 	acct-user/gvm
 	>=dev-python/defusedxml-0.6[${PYTHON_USEDEP}]
-	<dev-python/defusedxml-0.8[${PYTHON_USEDEP}]
 	>=dev-python/deprecated-1.2.10[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
 	<dev-python/lxml-6.0.0[${PYTHON_USEDEP}]