diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index 055e3c6a09aa..b1b5fc88ef5e 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -1,4 +1,2 @@
-DIST ospd-openvas-22.7.1-add-delay-in-mqtt-test.patch 1238 BLAKE2B 72d107f5056b72f7269e7408712b6a6a67b201c71024eff299eca0b1b5471dceb69c5d00df2d021d81cfd465bec85ea743f1e4c566840264d3f40481f5bca639 SHA512 c37e0d69ac4eb0eb6ee48c3f519c6ad2049b3cb81904fa9c0475e4fb700a2addf57001f277fdc0e48d40fb23b835ed17400cda3d46db5fa7e61babd1ee7d7c14
-DIST ospd-openvas-22.7.1.tar.gz 250148 BLAKE2B 7840376790f451e9316ad33556bac49e9672c7911ac0e3813e4c3a182a06b2c603fa80fa6ac6d2822c87ca35df172d99a3b60d3e16649328387267080572a507 SHA512 ae7fe56a2b825efc33d9e29f2a51ab1034155ee70a5790d98f3b811a29f4b35830afabc27abd14593d74e1bcc5dac0ea1cd33ed46cc3ca459256a4b452e10552
 DIST ospd-openvas-22.8.2.tar.gz 250151 BLAKE2B 444ce2e73c32367530c14d1b698e5b7563ddb6f7775e517064185713edb8348c6d8f4ee3c3fa1f8edbcb3ff4c2d6720d7fc29d6fa5f6889b486e0d40f0c5972d SHA512 72d868f41f575d0ef20b665afaf32113bf40f37f1f3a0626ec432f5e1e2f0ebade283c13c2a8c9dc8eab185997bcd9d890a9be0bc5964e7c65f32ba8b24ee070
 DIST ospd-openvas-22.9.0.tar.gz 250165 BLAKE2B 4e82df9902dcd10bcfa0cf6024875025ad78d8811da25b1b25d5d188b1b2e69243e7e5141199d82f845da70f7544bf2f87166d1e0fdefe91055c0bf3e5c037cf SHA512 5bbfadd1b5a75a0b0a44c1382d730cea824f66bfe22d33cc263328ff633f4ac1d39c1dc1416ecab5d06a5c8b47fa8241debac48baff98a4c2a305e0942d9b07f
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r2.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r2.ebuild
deleted file mode 100644
index 2a45e7d3190a..000000000000
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2020-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
-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
-	https://github.com/greenbone/ospd-openvas/commit/f968bcc540c22dad89a2ee3bdfc6384b97b6fa0f.patch
-		-> ${PN}-22.7.1-add-delay-in-mqtt-test.patch
-"
-
-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/deprecated-1.2.10[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
-	<dev-python/lxml-7.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${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.6[${PYTHON_USEDEP}]
-	<dev-python/paho-mqtt-3[${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 )
-"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-22.7.1-add-delay-in-mqtt-test.patch" #934153
-)
-
-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
-}