6 files changed, 34 insertions, 101 deletions
diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest
index 5a9e1f923927..843d7959099b 100644
--- a/net-analyzer/gvm/Manifest
+++ b/net-analyzer/gvm/Manifest
@@ -1,4 +1,2 @@
-EBUILD gvm-10.0.1.ebuild 1088 BLAKE2B 1c4bb9db1ac9572e2141cd3fb0bdfca7e4601c3c084d61a93d97ed3a2d5ea5f879a12c66f2cdbead74358b47e5ec35466bb8675910b0f304206a239f6f4fc3aa SHA512 055bdd4bf8184a602971b4600abf33736c6ac6edea840925ed544ff8f3afefd8f2477cac014cec42437bcf2d0e82a700a2601ce26eb4da21ec2d276dad753f4c
-EBUILD gvm-11.0.0.ebuild 1088 BLAKE2B dbba29d6420643d00abd9ac10722e043bbea554c8f8ae3e9a5a1bb47dc6c56b058ffaa864aa255b61faed75b6391794c587b87ec05e076c6b6ee3ac13482acbb SHA512 c8a020bf7a47cf08f39d097b0a6552092b025bb1eb3fe36e58a6953f567140867184b4c52812d48d6cffecb0e505b4546d523874c72986cd5e4ec0c11170512d
-EBUILD gvm-20.8.0.ebuild 1094 BLAKE2B 02d3d065343df60a838497de5bd68dc57a5a0e9c4e22ae189169e2eedc3f7e38f0122d30948619a34a2792f3431987ebc34fc7a249eac7532f7aeb42251ad463 SHA512 be8b7c12f3f29fabf98ea36fab3086111ebc7ff03e13d23c908c647a521a0fb6b8d71b42417cf501a75ad59c7d2c6a320c573c7cf1231a8f0e9f0926f54bd787
-MISC metadata.xml 1201 BLAKE2B 2e3ba8bec61dd3bd045e69e906a27cbe2cbfeaa4b8f6ae659c35925879b815bca887b59b9c7754b17814c0e3cb801d7a41518c98fdfbed57b02b8e21900d50db SHA512 b3a41b9f9c90d99784fbbc0d240b695a373b00994b250c608da0a96aef221c61479301433ecc4e484a2f8ab6dc0ca4eb6c73009e33d5b992e9669a0c60841ee8
+EBUILD gvm-21.4.ebuild 899 BLAKE2B d1088b804e9c6ef988e60e6e8fed8346f172ac364b59e7ff03ca5db8de22986db5f6c6e476d4d664c9cbd73cb32359a779002bb9eddd05c6a97d465cc666b4fb SHA512 045aa2ff19fdc6178d934df1f06606c1ad862c83569e4d12592671ac7d31ade18c27f7adf97f660f402ed50c150207b4e806bed1564500ba8c3158479e8f3d69
+MISC metadata.xml 1042 BLAKE2B 5c5e07241f9cad0fb2af276179e65db742e310cfadd1b7fef0b3133928e3cfb82658a561995be65b583b2c724c50c998a9165b605a0dcbb780b385a7a8009072 SHA512 16f537f50d3a83bde58c7e30531e03d8b9eeebbd7700951328cc239e0cde1cd449ba9048d9de6a64d5e62b797b1cd696f2ce7d0fbca06874401167f873e19028
diff --git a/net-analyzer/gvm/gvm-10.0.1.ebuild b/net-analyzer/gvm/gvm-10.0.1.ebuild
deleted file mode 100644
index 25b7338d62e4..000000000000
--- a/net-analyzer/gvm/gvm-10.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS"
-HOMEPAGE="https://www.greenbone.net/en/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli +cron +extras +gsa ldap ospd radius"
-
-RDEPEND="
-	>=net-analyzer/gvm-libs-10.0.1[extras?,ldap?,radius?]
-	>=net-analyzer/gvmd-8.0.1[extras?]
-	>=net-analyzer/openvas-scanner-6.0.1[cron?,extras?]
-	cli? ( >=net-analyzer/gvm-tools-2.0.0 )
-	gsa? ( >=net-analyzer/greenbone-security-assistant-8.0.1[extras?] )
-	ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )"
-
-pkg_postinst() {
-	optfeature "web server scanning and testing tool" net-analyzer/nikto
-	optfeature "port scanner" net-analyzer/nmap
-	optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "web application attack and audit framework" net-analyzer/w3af
-}
diff --git a/net-analyzer/gvm/gvm-11.0.0.ebuild b/net-analyzer/gvm/gvm-11.0.0.ebuild
deleted file mode 100644
index 7eefd05a5af8..000000000000
--- a/net-analyzer/gvm/gvm-11.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS"
-HOMEPAGE="https://www.greenbone.net/en/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli +cron +extras +gsa ldap ospd radius"
-
-RDEPEND="
-	>=net-analyzer/gvm-libs-11.0.0[extras?,ldap?,radius?]
-	>=net-analyzer/gvmd-9.0.0[extras?]
-	>=net-analyzer/openvas-scanner-7.0.0[cron?,extras?]
-	cli? ( >=net-analyzer/gvm-tools-2.0.0 )
-	gsa? ( >=net-analyzer/greenbone-security-assistant-9.0.0[extras?] )
-	ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )"
-
-pkg_postinst() {
-	optfeature "web server scanning and testing tool" net-analyzer/nikto
-	optfeature "port scanner" net-analyzer/nmap
-	optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "web application attack and audit framework" net-analyzer/w3af
-}
diff --git a/net-analyzer/gvm/gvm-20.8.0.ebuild b/net-analyzer/gvm/gvm-20.8.0.ebuild
deleted file mode 100644
index d0b25e297509..000000000000
--- a/net-analyzer/gvm/gvm-20.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="Greenbone Vulnerability Management, previously named OpenVAS"
-HOMEPAGE="https://www.greenbone.net/en/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli +cron +extras +gsa ldap ospd radius"
-
-RDEPEND="
-	>=net-analyzer/gvm-libs-20.8.0[extras?,ldap?,radius?]
-	>=net-analyzer/gvmd-20.8.0[extras?]
-	>=net-analyzer/openvas-scanner-20.8.0[cron?,extras?]
-	cli? ( >=net-analyzer/gvm-tools-20.8.0 )
-	gsa? ( >=net-analyzer/greenbone-security-assistant-20.8.0[extras?] )
-	ospd? ( >=net-analyzer/ospd-20.8.0[extras?] )"
-
-pkg_postinst() {
-	optfeature "web server scanning and testing tool" net-analyzer/nikto
-	optfeature "port scanner" net-analyzer/nmap
-	optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "web application attack and audit framework" net-analyzer/w3af
-}
diff --git a/net-analyzer/gvm/gvm-21.4.ebuild b/net-analyzer/gvm/gvm-21.4.ebuild
new file mode 100644
index 000000000000..6097666ebdc9
--- /dev/null
+++ b/net-analyzer/gvm/gvm-21.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Greenbone Vulnerability Management, previously named OpenVAS"
+HOMEPAGE="https://www.greenbone.net"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli doc +gsa ldap ospd radius"
+
+RDEPEND="
+	>=net-analyzer/gvm-libs-${PV}[doc?,ldap?,radius?]
+	>=net-analyzer/gvmd-${PV}[doc?]
+	>=net-analyzer/openvas-scanner-${PV}[doc?]
+	cli? ( >=net-analyzer/gvm-tools-21.10.0 )
+	gsa? ( >=net-analyzer/gsad-${PV}[doc?] )
+	ospd? ( >=net-analyzer/ospd-openvas-${PV}[doc?] )
+"
+
+pkg_postinst() {
+	optfeature "web server scanning and testing tool" net-analyzer/nikto
+	optfeature "port scanner" net-analyzer/nmap
+	optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
+	optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
+}
diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml
index 88c7b1dd1b6a..ea9418af8543 100644
--- a/net-analyzer/gvm/metadata.xml
+++ b/net-analyzer/gvm/metadata.xml
@@ -11,14 +11,12 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Command Line Interface for OpenVAS Scanner</flag>
-		<flag name="cron">A cron job to update GVM's vulnerability feeds daily</flag>
-		<flag name="extras">Extra fonts, pdf-results! and html docs support</flag>
 		<flag name="gsa">Greenbone Security Assistant (WebUI)</flag>
 		<flag name="ospd">Enable support for scanner wrappers</flag>
 	</use>
 	<longdescription lang="en">
-	GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner 
-	with associated tools like a graphical user front-end. 
+	GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner
+	with associated tools like a graphical user front-end.
 	The core component is a server with a set of network vulnerability tests (NVTs) to detect security problems in remote systems and applications.
 	</longdescription>
 	<upstream>