gentoo auto-resync : 30:11:2024 - 02:06:22

9 files changed, 6 insertions, 350 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2842b6a72d82..d6088affd0ef 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 096698ab89ed..f88395f2aaea 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -3,11 +3,8 @@ AUX notus-scanner.initd 749 BLAKE2B 7297894e9bb740ed842870b9a09ed838eada8e5be16b
 AUX notus-scanner.logrotate 334 BLAKE2B 2b8bd9a2285eb418b26d3cf182ce27b68dc717309eaa5861f7701dbd140e921e88388006f5e5e7e8051d6d36b53e373cb0c35b944ab52c6fc9abda4bb36c2344 SHA512 81c6bb01315cfb2b2a787b88a8f1b0b3c74def31e85d80a246ad2f6115189560dd517a3a4283a044764300107c5d3e66fae990f85646dbcbbb51f786968cf5fd
 AUX notus-scanner.service.conf 93 BLAKE2B 17030f4836aa96f45fdc9be67fb1b1924680ec29193bfc03d470bc45bf973542ca1b2bbb13253eb20c1618132b4b07c3fcaadd39451cb583d4c8f6fcd6e26c65 SHA512 36d5fbe95cd02b728d048a0baeed03448899696d0b3344a166afc9eecd6620e8af347ecc86c014ec9211ce72cc55a202a84b9ea68a7662c268378c37a734b08f
 AUX notus-scanner.toml 272 BLAKE2B 41cd9a81754ee06604373e8d4644362167ed7165c36d2c1c6b2b991bdf5efdea3f620a83ee489f113b9b3500e638d516565b3f8dd830df14a3abb551399dae20 SHA512 476d795b53ce5ef1eabc335122298b2a8c23b5476822cc7f062a6849ecb0e322cd73fabf8d1928c30e557109c08a1c920413da73fade7d5e68c55511bd2d1f6d
-DIST notus-scanner-22.6.2.tar.gz 316406 BLAKE2B c24ec5e4fd9f8fc181145d64580d04f7045ccf1a7570f855f0a8a79bcea842fe7a73d91fadecd61c10b94cb3ee68ecae98b0f91b4059b84258765be98c95057f SHA512 ecbbb79950908641c2b83d379d141b189b8e0e27cac17753cbb381a5f4ebf28d7100f60bd24fc284c2681abc889f6fee36a64f469ac0b37323940eaeae7e7522
 DIST notus-scanner-22.6.3.tar.gz 293997 BLAKE2B 889416d2324088dc11f2df5146b3c88b276d1170552f55b2cb7ef49f4d8d855b98d6c0e53a1d49bd725b97b88c12df69a1997a38a614aa941dd699d0efb1de51 SHA512 fc3a05a3a9d61dd0b7a9913cfbbf507fec9dd3797a42a82283d14ab7fa8090fbc847487cf3a1d064f49572dda9acadba4bd7d30003fd32a179f572e327254546
 DIST notus-scanner-22.6.4.tar.gz 293607 BLAKE2B 75bdbd9d6247a2b9afaf7b049b8b80b2a44714ad4d6c951c9d14898c8bce319c39c4a19162fe1a380ef638164f025c210346ee5659ed1caefdb91bef2a0906d7 SHA512 5a3f23425a1945636c6fd9dd7b3ad39cf6f02920c33aaa35e3aa7ae1dfb8962d60f8e8519047e631c0e72a1a75c56ac5350c9dd291c20947fac2d4cdbb7f6387
-EBUILD notus-scanner-22.6.2.ebuild 2131 BLAKE2B d754be7534a460285cddf9387039523f998e5342c71ad0db5780a0766d06e89402f36eee19de6d0621f2b1d94ded87086f66b508741f7a8b0b1e3e25d4f96198 SHA512 6be8b83e4a6a8edeb0511b03b387420c171349921ac4a38d260b72e26f51f71e98e99d930d034ae5177f7e0a917a62afe9b67e5b001a649f67f5dd4f84095531
-EBUILD notus-scanner-22.6.3-r2.ebuild 2172 BLAKE2B 837baebcbefe7fae784369e17da4b1a769bef21af599d029e11075834e093cf3d9cf30fa39ae29cec3e176e14f7249b1f178ff6dc3836ac600278870f2cfd3e4 SHA512 d14c86e099a5e7c6d72489b705984d27a404ebb0a3b6df41a25a6b44017fa76ff7ed416dc5bd30d704a7b0c521f05ed59eefdd85a8635c1c74740a0970d9d2aa
-EBUILD notus-scanner-22.6.3-r3.ebuild 2427 BLAKE2B a011c779de18e74f16e436e667de15900183a53a79ec2e7a69b122600ffa9b1564733ea3152ae6191e79f7c8e76e81acd290aa62153906da2faea1d7226773c0 SHA512 1e88c7733583a16b2a1f6676a19480d27eab5371e4bd1970477ef6e5391866f443c3fa912135ccaa289ed8c2d1f510d8bed60c874105f0686084786a2cfa769c
-EBUILD notus-scanner-22.6.4-r1.ebuild 2132 BLAKE2B 631c0b941e151cb805b7b08b2c533b4772115122ee6af3112928c4bac485eca853c8a308dde6a772453cb02a79277e00076c80c013f8857869147e150e51c629 SHA512 385da17160bcfa28f2a6758bb1f071ab13ef3fccc97d4430d7b862760fbd15059989db2bf917842ad86e8ff84ab11f71b3eb174f3f2acfe7de501785a5788938
+EBUILD notus-scanner-22.6.3-r3.ebuild 2420 BLAKE2B ce6e80ed70553deeb2882e15c638d45d4248f7b960a8efc37ae95951f1ee7aeea64a943a667bc03319204c28d93c3480f3d83cb349a7c0ea5e1945fde0d40f25 SHA512 f74633b0d3fd53285e4991201dc39032b01fd696e8b7ba74309870d9db6808c7cef4a4992afbbc5598d4474650c6ac06457385eddd7ce52d356859448e718373
+EBUILD notus-scanner-22.6.4-r2.ebuild 2126 BLAKE2B 4d744b8bfc976f78e944c0f76a5e9aaca54e9e67c492c1b40a668035fc7c36b2173571d4158419f0a5f11ee8717fe444b9a92aac0656f258ac86469a7f331651 SHA512 ff8dfccd47e27711f4c8be4ed9ea69729cae7d9300b3e936efa323fc61e8e4178e90f6a91ca4ad7cb716af79484a8a185c7daee47b1922831e97575fcfe84d2c
 MISC metadata.xml 735 BLAKE2B 78af413540fe6af7214b65b50b50aaf9cf59280037ada5228d38e529d90752b0516bf1d7514e7d9436edd93b50cd8a9dadc1e9fbf84a5c57a0ff0cb45b712cc8 SHA512 fdb4ce92c1eede58fe267ed2a4832dd1d4e7a1694591efb3d2ff372a621320275c4090317cb57c50724ceb7e386fa28965e45b724b311127ecd8665e2908cf92
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild
deleted file mode 100644
index f62ecf25aaa3..000000000000
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 readme.gentoo-r1 systemd
-
-DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks"
-HOMEPAGE="https://github.com/greenbone/notus-scanner"
-SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3 AGPL-3+"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	acct-user/gvm
-	net-libs/paho-mqtt-c
-	>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-	>=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}]
-	<dev-python/packaging-24.1[${PYTHON_USEDEP}]
-	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	<dev-python/tomli-3[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
-	${DEPEND}
-	app-misc/mosquitto
-"
-
-PATCHES=(
-	"${FILESDIR}"/notus-scanner-22.6.2-remove-tests.patch
-)
-
-DOC_CONTENTS="
-For validating the feed content, a GnuPG keychain with the Greenbone Community Feed integrity key needs to be created.
-Please, read here on how to create it:
-https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation
-https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner
-
-To enable feed validation, edit /etc/gvm/${PN}.toml
-and set
-disable-hashsum-verification = false"
-DISABLE_AUTOFORMATTING=true
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	insinto /etc/gvm
-	use prefix || fowners -R gvm:gvm /etc/gvm
-	newins "${FILESDIR}/${PN}.toml" "${PN}.toml"
-	use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/notus
-	keepdir /var/lib/notus/products
-	keepdir /var/lib/notus/advisories
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/notus
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-
-	systemd_dounit config/${PN}.service
-
-	systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \
-			${PN}.service
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.3-r2.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.3-r2.ebuild
deleted file mode 100644
index f183e1fe25a1..000000000000
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.3-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 readme.gentoo-r1 systemd
-
-DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks"
-HOMEPAGE="https://github.com/greenbone/notus-scanner"
-SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 AGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	acct-user/gvm
-	net-libs/paho-mqtt-c
-	>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-	>=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}]
-	<dev-python/packaging-24.2[${PYTHON_USEDEP}]
-	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		<dev-python/tomli-3[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-RDEPEND="
-	${DEPEND}
-	app-misc/mosquitto
-"
-
-PATCHES=(
-	"${FILESDIR}"/notus-scanner-22.6.2-remove-tests.patch
-)
-
-DOC_CONTENTS="
-For validating the feed content, a GnuPG keychain with the Greenbone Community Feed integrity key needs to be created.
-Please, read here on how to create it:
-https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation
-https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner
-
-To enable feed validation, edit /etc/gvm/${PN}.toml
-and set
-disable-hashsum-verification = false"
-DISABLE_AUTOFORMATTING=true
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	insinto /etc/gvm
-	use prefix || fowners -R gvm:gvm /etc/gvm
-	newins "${FILESDIR}/${PN}.toml" "${PN}.toml"
-	use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/notus
-	keepdir /var/lib/notus/products
-	keepdir /var/lib/notus/advisories
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/notus
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-
-	systemd_dounit config/${PN}.service
-
-	systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \
-			${PN}.service
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.3-r3.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.3-r3.ebuild
index 3e9f94355696..8126d3eb5357 100644
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.3-r3.ebuild
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.3-r3.ebuild
@@ -13,14 +13,14 @@ SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar
 
 LICENSE="AGPL-3 AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	acct-user/gvm
 	net-libs/paho-mqtt-c
 	>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
 	>=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}]
-	<dev-python/packaging-24.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		<dev-python/tomli-3[${PYTHON_USEDEP}]
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.4-r1.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.4-r2.ebuild
index cc3cdd16a286..6f68cb09ca2f 100644
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.4-r1.ebuild
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1 greadme systemd
 
@@ -20,7 +20,7 @@ DEPEND="
 	net-libs/paho-mqtt-c
 	>=dev-python/psutil-6.0[${PYTHON_USEDEP}]
 	>=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}]
-	<dev-python/packaging-24.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
 	<dev-python/tomli-3[${PYTHON_USEDEP}]
 "
diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index 539f6be9c705..7ccc4ed90748 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -3,10 +3,6 @@ AUX ospd-openvas-22.initd 596 BLAKE2B 5cd640050fcd374bfdefaf17c904fbfdd99ea795b0
 AUX ospd-openvas.logrotate 333 BLAKE2B 9265d7b1ace6a43204bbb31ab3b9e5896d91282b142c357373c113babd793dca101913aabc9d41c9d27125c43389b22a2b025e8f68b8aa41a669be444e97fe5d SHA512 378d049316928aea00bc5bf6332ecb5e671688681bd187f8b49104f056be2e75ec899e9bf9ecce1d1ad05caf654162e15715cbba8f375a9dd6c917839d85d5af
 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.6.2.tar.gz 246360 BLAKE2B 22c95cafdc6c223465805f30b522d357c28b9da3df74743cdee3cc608215d730da9101c37d2498e9680f506ed1301e12d9af3c8bab1c2a1847c034c7d6c10ca8 SHA512 a405779b9ea89b1300122c39553f8f9bf079b8610dc61ec6244affa9c9273725234a4a556df05e3013045681678646226cf12af66f051def8b042b84bb639ffe
-DIST ospd-openvas-22.7.0.tar.gz 246142 BLAKE2B bb5ea9bdc82929958466d2002ce28e63e5ff8c72561758f328c05f0d8c6431f7e305772707027f764fd881334d3c0b993d7f1727f8d7d16da83cc34b9a608895 SHA512 5a2c533589dc7a27a1be1b834243054eaf1bdb250fc41a98b0b35e6e60b8a2793e0e1d7dcd8bbf638bf23da1636efb5a80310df75727990768035743300ca8b1
 DIST ospd-openvas-22.7.1.tar.gz 250148 BLAKE2B 7840376790f451e9316ad33556bac49e9672c7911ac0e3813e4c3a182a06b2c603fa80fa6ac6d2822c87ca35df172d99a3b60d3e16649328387267080572a507 SHA512 ae7fe56a2b825efc33d9e29f2a51ab1034155ee70a5790d98f3b811a29f4b35830afabc27abd14593d74e1bcc5dac0ea1cd33ed46cc3ca459256a4b452e10552
-EBUILD ospd-openvas-22.6.2.ebuild 2327 BLAKE2B 5e9b938d6a798e73f950420e291591bb0fe48cdb3086beff560289a986b3617c4d2d1cd69549b7624b15a5d9c938ec36a3f4abb4ca5acca5e479f555a358b6a2 SHA512 63fdd9ebb30fa44f1591711f123779022a635c59c21995ea5fb4a59c09cbe2fa863760185d0cff9caae20eedfaa8324c44a76c868bde5c99f0cecd4c9bd47abf
-EBUILD ospd-openvas-22.7.0.ebuild 2370 BLAKE2B b03060cfc3406090aa2cf3ff86e3ea19d2f17734942be0d9b4710511c88202376394ecb7a10c215341d4ee9ef8c4df92e67dd822c9b4fcc0dd26bfa7a6d77ba1 SHA512 502cebc84d27b9bb047c47091678702d78ce60ab7e152007bb34ef2153cfb65e3399baddc7eeae401e62f12e17ee4c09d360881c92405b3bb4198c4c1acb9b2f
 EBUILD ospd-openvas-22.7.1.ebuild 2416 BLAKE2B 180cedc78496f579797da43dfb0b823bf986274b3bac1605416ea8802a84774eba3e7703e3d8bf14127c8745908b5018fc4012b7e3d57ebb68ab49c5a8a519b3 SHA512 8d4b0c666185dd91355233ae2f77ad8e706fdb4a300e383c167c1b32b635a1e10db8857870950ca9555329defed9d68abe91f88689e82e9936fb1de377e7db49
 MISC metadata.xml 906 BLAKE2B 8d23a0fd547a007a3cbc5df5b9edfc2e9f9b87c684ee089943a19551b66466e3586876772b1700f7d220615c0fb296d1f8af491612d75fd08ca7e3855a0bae13 SHA512 dae76e492c818779eb3e044c24a657bd27edbf60c82364acce2e2dda2fdd36837cb277cc626454099c04d061342911baa414d1353ec4c96f8fb600b018eb6ccb
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild
deleted file mode 100644
index d202b6f35bd0..000000000000
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 systemd
-
-DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas"
-SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-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/packaging-20.4[${PYTHON_USEDEP}]
-	<dev-python/packaging-24.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
-	<dev-python/python-gnupg-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
-	net-libs/paho-mqtt-c
-	app-misc/mosquitto
-"
-RDEPEND="
-	${DEPEND}
-	app-admin/sudo
-	>=net-analyzer/openvas-scanner-22.4
-	notus? ( >=net-analyzer/notus-scanner-22.4 )
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	if use doc; then
-		bash "${S}"/docs/generate || die
-		HTML_DOCS=( "${S}"/docs/. )
-	fi
-	distutils-r1_python_compile
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	insinto /etc/gvm
-	doins config/${PN}.conf
-	if ! use prefix; then
-		fowners -R gvm:gvm /etc/gvm
-	fi
-
-	newinitd "${FILESDIR}/${PN}-22.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-22.confd" "${PN}"
-
-	systemd_dounit config/${PN}.service
-
-	if use notus; then
-		systemd_install_serviced "${FILESDIR}/ospd-openvas.service_notus.conf" \
-			${PN}.service
-	else
-		systemd_install_serviced "${FILESDIR}/ospd-openvas.service.conf" \
-			${PN}.service
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/ospd-openvas.logrotate" ospd-openvas
-
-	# OSPD OpenVAS attempts to call openvas via sudo as network security
-	# scanning often requires priviliged operations.
-	insinto /etc/sudoers.d
-	newins - openvas <<-EOF
-	gvm  ALL = NOPASSWD: /usr/bin/openvas
-EOF
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/openvas
-}
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild
deleted file mode 100644
index 99c6e7b40fe7..000000000000
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 systemd
-
-DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas"
-SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	<dev-python/packaging-25.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
-	<dev-python/python-gnupg-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
-	net-libs/paho-mqtt-c
-	app-misc/mosquitto
-"
-RDEPEND="
-	${DEPEND}
-	app-admin/sudo
-	>=net-analyzer/openvas-scanner-22.4
-	notus? ( >=net-analyzer/notus-scanner-22.4 )
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	if use doc; then
-		bash "${S}"/docs/generate || die
-		HTML_DOCS=( "${S}"/docs/. )
-	fi
-	distutils-r1_python_compile
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	insinto /etc/gvm
-	doins config/${PN}.conf
-	if ! use prefix; then
-		fowners -R gvm:gvm /etc/gvm
-	fi
-
-	newinitd "${FILESDIR}/${PN}-22.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-22.confd" "${PN}"
-
-	systemd_dounit config/${PN}.service
-
-	if use notus; then
-		systemd_install_serviced "${FILESDIR}/ospd-openvas.service_notus.conf" \
-			${PN}.service
-	else
-		systemd_install_serviced "${FILESDIR}/ospd-openvas.service.conf" \
-			${PN}.service
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/ospd-openvas.logrotate" ospd-openvas
-
-	# OSPD OpenVAS attempts to call openvas via sudo as network security
-	# scanning often requires priviliged operations.
-	insinto /etc/sudoers.d
-	newins - openvas <<-EOF
-	gvm  ALL = NOPASSWD: /usr/bin/openvas
-EOF
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/openvas
-}