9 files changed, 375 insertions, 2 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 9b923605aa30..5c21ae797ee3 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 1ad48d9ef28b..e81fb90398b7 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -4,7 +4,9 @@ AUX gvmd.service.conf 608 BLAKE2B 95845701a20d93c1e09c960b912f32b063f9bdf90c955b
 DIST gvmd-23.1.0.tar.gz 1050719 BLAKE2B 9ff3e679ac4c4ff0e4a5eb1ee9ed4c9d243a96b5c4d63934576ec86d70f15f6ff6dee839e29c0de50af3a829e141fa416ac993935f0a683ca135f68f17e1489a SHA512 77d08067a168065bb3b4fd10ba94c48a3207378c9b8c0be42a9570c390c92b985ebf94c53cbbe04f78c2a802de430d599593e1971bc7b93d3f0652bfe59022a4
 DIST gvmd-23.4.0.tar.gz 1064194 BLAKE2B a74ed75c69f3f793058133ec6aca93ddba34efc51267b20333916d7291484f1b1eefa5527f3bb34137584a290e4d7d150d799f9f9b0f1473dfa8c3b4d83f9cfb SHA512 0c5b0d933444d25253e234f387e9063ebbeb379d330cab9ca4eaaddc0effe6fbda312b8de51b5f9784141d149f83b6f0069d7e1f72674857b8d041ab9bff6dfd
 DIST gvmd-23.5.2.tar.gz 1064064 BLAKE2B 84d2861f274a71b8a681cb1bfff01ee06f6bc9ab8ae0cb430e65b3f36e9f75076365efa9d5b5d6a5954d328fbc5e3aa6b942a4e1e875ca640ac814dbcc8d98be SHA512 4708fe0033d5244a988560ca9cbe8b0d5be0006690cc5c943eec3cd534329d776a556766a57257a07d40132fa5239455b9f71b4d0e9a5a4ba66d63436c2bc9f4
+DIST gvmd-23.6.2.tar.gz 1065818 BLAKE2B 65b999c42628eec4816aea984ba1ab0383a9147ba04f934b21b5763db10dac2679cfab821520e69be42accdaad061fbb0692c9d6cd8f30db592d9466c3cdc351 SHA512 935af9a842d7b82a8467ccbb9edf1c9e8ea05c4f8a4e263c3692a2d8993209312af3d760943e32c77f8c12d2220771b9731b10dba59c89d2570682a3e363767d
 EBUILD gvmd-23.1.0.ebuild 3231 BLAKE2B 85902d68a3c051b9fed5542a1fcd29a7ce00ea9b53959d5a0fad77747beea281c370e5164d44a556fa5de3363b6d6c4574f786df4deaf9ec1a051611d09b0e67 SHA512 05a4863b41b012730830a73a3bae507a2ae11e443f189b3058bd585c635d65d639a9c21671c65139f3c3916909d64e66cce01c34113be2cb261acd6380194d97
 EBUILD gvmd-23.4.0.ebuild 3232 BLAKE2B f1e6d93401d0c1a4232f28216bd1d952e31d06e1d812c4136874d4126e41fa4aa55a8e6a3727ed4c0b493bb9665aaf5fcee397e4182e5c53d83e8d596efaf04a SHA512 f19e2801a61fc620c24e2dcd3799f0bd4d5af2b0375c1ab23586a43dd50213e71851f4c17b35085a293849225ffaecfc66bbedcf0fa8216004817eda28ddb44d
 EBUILD gvmd-23.5.2.ebuild 3232 BLAKE2B d9017f0cb42483e40cad245b756bc3fe0406cd217e2914dedc835970fb0b8f45eb63e3812952a6182b9625cd86fa3dfb2396c440f89d47afdaf45282b218c727 SHA512 ec18968eceffdd1035e1912dca90b608a0c39b1d174cf507c5b74634231de7dee948735d7464f8c11188ed777827a399755c6915e9bad8f5252c3530f93debcb
+EBUILD gvmd-23.6.2.ebuild 3232 BLAKE2B 8fb8fa3baa61b26fa9b05d632583c5a9e854723beef24001c4d6e4bb0244a17949ac307a65dc502be7320516a3b746fe577f8d0a4845217f2538d4798b1bdbe0 SHA512 adb621428a2c177a68cb72d13d5e09fb230b2c999c66e35db9b41228bb12e8390992d08ae9047110699bd0ba68dd5afa8c52c4026751f1f92a3a0091c19c47b7
 MISC metadata.xml 1138 BLAKE2B 5abfda85605cdc2bacbfc1295b9b443ceecda1a3bd51423a1c35c4799d42f8aec6c4d5c8bc29293a800193016bc0065361ff55616859064c061b105b31fb0f18 SHA512 f09448bd5acd5ed22611ac455c94a3ae0a0531a9aeec6bad638c48cfeb627fef5214c0734d04951ef18ee96046b8e89b812c198e6147fb21f8d5dd495ed4bb67
diff --git a/net-analyzer/gvmd/gvmd-23.6.2.ebuild b/net-analyzer/gvmd/gvmd-23.6.2.ebuild
new file mode 100644
index 000000000000..cda404200d43
--- /dev/null
+++ b/net-analyzer/gvmd/gvmd-23.6.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd toolchain-funcs
+
+DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/"
+SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/gvm
+	app-crypt/gpgme:1=
+	dev-libs/libbsd
+	>=dev-db/postgresql-9.6:=[uuid]
+	>=dev-libs/glib-2.42:2
+	>=dev-libs/libical-1.0.0:=
+	>=net-analyzer/gvm-libs-22.9
+	>=net-libs/gnutls-3.2.15:=[tools]
+"
+
+# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive
+# and xmlstartlet are used for (PDF) report generator at runtime.
+RDEPEND="
+	${DEPEND}
+	app-text/xmlstarlet
+	dev-perl/XML-Twig
+	dev-texlive/texlive-latexextra
+	>=net-analyzer/ospd-openvas-22.4
+	>=dev-db/pg-gvm-22.4
+"
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		app-text/xmltoman
+		app-text/htmldoc
+		dev-libs/libxslt
+	)
+	test? ( dev-libs/cgreen )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
+	sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die
+	sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die
+	# QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
+	if use doc; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
+		"-DSBINDIR=${EPREFIX}/usr/bin"
+		"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
+		"-DGVM_DEFAULT_DROP_USER=gvm"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
+	fi
+	if use test; then
+		cmake_build tests
+	fi
+	cmake_build rebuild_cache
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake_src_install
+
+	insinto /etc/gvm/sysconfig
+	newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf"
+	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm
+	fi
+
+	newinitd "${FILESDIR}/${PN}-22.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/gvm/gvmd
+	if ! use prefix; then
+		fowners -R gvm:gvm /var/lib/gvm
+	fi
+
+	systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \
+			${PN}.service
+}
+
+pkg_postinst() {
+	elog "If you are upgrading from a previous version, you need to update the database version."
+	elog "Please, create the running directory and give write permission to the database user"
+	elog "then run gvmd as the gvm user with --migrate option:"
+	elog "~# mkdir /run/gvmd"
+	elog "~# setfacl -m u:gvm:rwx /run/gvmd/"
+	elog "~# sudo -u gvm gvmd --migrate"
+}
diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 653dc7df25a7..b6a0718d0d41 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -3,5 +3,7 @@ AUX notus-scanner.initd 749 BLAKE2B 7297894e9bb740ed842870b9a09ed838eada8e5be16b
 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
 EBUILD notus-scanner-22.6.2.ebuild 2131 BLAKE2B d754be7534a460285cddf9387039523f998e5342c71ad0db5780a0766d06e89402f36eee19de6d0621f2b1d94ded87086f66b508741f7a8b0b1e3e25d4f96198 SHA512 6be8b83e4a6a8edeb0511b03b387420c171349921ac4a38d260b72e26f51f71e98e99d930d034ae5177f7e0a917a62afe9b67e5b001a649f67f5dd4f84095531
+EBUILD notus-scanner-22.6.3.ebuild 2138 BLAKE2B 262811a4dc3f5d3165e181cc2e8677f15c5d80d00c40eab9aaf4d0a353d61e1faf889d6d5dfecf78814fc4ea561b9d3e18e3edea525a2b48e5f3105a1c478001 SHA512 00248fa65d7802be2ed7d1ac571bda377c3835be76485d231a638208ec57d7e6a7bd9629fdaed503e464fb550fc8ffb11346ea4a61db16dfd7b97fdfc18e6a40
 MISC metadata.xml 735 BLAKE2B 78af413540fe6af7214b65b50b50aaf9cf59280037ada5228d38e529d90752b0516bf1d7514e7d9436edd93b50cd8a9dadc1e9fbf84a5c57a0ff0cb45b712cc8 SHA512 fdb4ce92c1eede58fe267ed2a4832dd1d4e7a1694591efb3d2ff372a621320275c4090317cb57c50724ceb7e386fa28965e45b724b311127ecd8665e2908cf92
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.3.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.3.ebuild
new file mode 100644
index 000000000000..c14414c68226
--- /dev/null
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.3.ebuild
@@ -0,0 +1,81 @@
+# 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.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/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index a3e47d93c26b..5cf600ebce95 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -10,7 +10,9 @@ AUX redis-openvas.tmpfiles 63 BLAKE2B 8e3d29cef1ae0f815f7ef4da76b14168168675be41
 DIST openvas-scanner-22.7.9.tar.gz 1069904 BLAKE2B 908810997880d1267f41df59905acc2ac2d491ab8453001ae8e2cc6881958150e8866b07b4e335888e8e574b5a347b33880bd24c9b8d140edd6c384e498e5dc9 SHA512 279a781fe698496fb88efd28c0ee6ede66a0180237b60c4d7b083fe10c7b7ac054ec04b08c9b33e6dd142f60529faedfef4441421cc04e95eaa08865e47b58dd
 DIST openvas-scanner-23.0.1.tar.gz 1387550 BLAKE2B 22f0b7f10fbb8be7d0897ce1895035ec9e330adee2a56d7c724e9e9fd54808ed10de5f05b3bb02918e44e45a7f85035e7d63fdd89345dcdb09d5180740823c74 SHA512 e2107ca762abcbb20d4506d2cc4479d5fbf5efd744a598ec63ea3c66ae6a6f1743deeb4b7aa9863b78c186c8a4d4b5f2212d241cef51b91c6c5bcd0879c45dc7
 DIST openvas-scanner-23.3.0.tar.gz 1416508 BLAKE2B de5864183b19df7b825bb74a5c38493b484494c5ef0f871f83e77efd6f6ce9934fd0a2365c5e7fe2b53e0c3f0c6a0eccd57528571dcd8586cbe5ef575aa5ec4f SHA512 cebe73f376a0b7731ffcb3eb9eb6e223ad490d8c0b708f07f508c562f2cfea956fa61e2bfb9141d2bf826c727be901ef2f455b74c055032f72cd52b7591bd171
+DIST openvas-scanner-23.3.2.tar.gz 1416687 BLAKE2B 6d8b0ba5b0a6f503ef27962fc9007f5538ecc6747aa713baec402acb20c5f7da01743a055173ed736ea90beb6d62f54ad8db8bffc915ce946416553f953b9842 SHA512 045a0811b5480170e52a218c8005d01acf064658aa0c3999ec9c07df9a0da47c53ad3de17565c1542c6f13521153e0477e9fdf92dee5f05e6723e29915cebc15
 EBUILD openvas-scanner-22.7.9.ebuild 3657 BLAKE2B 38af296726719db9d3c3727aa271475ae255296ac8a36151022cb25dcb8c8066e34c2dff6bdc00e8c8777163f4262dd38fda3b4887a08de3ad8113eb4777e7c8 SHA512 55a156026a45e02d50e4684c93d9284de88cbd1da725f6b1a17453f472c6dcc19e99dffc6b2780a23804a26db3743331c3e486e3290073e267a389620fdb3d04
 EBUILD openvas-scanner-23.0.1.ebuild 3780 BLAKE2B bfefffbd95c2be01ae02aabc773ebc231ce372543199ff90d3baf2e0df6002692e5e4e99db38b0a2d5f2b3226e9756f1551a947e0c28f78f79c2124a3d94a7e2 SHA512 932807fc8f505db39f376dd9897c895bd9ccdc18870ca94a84036a30714a919e366da06f20bc24eb9b67ca7562f4075b287d8c70177e7524a403d9ad937b52ad
 EBUILD openvas-scanner-23.3.0.ebuild 3779 BLAKE2B 72df699aeb35d24116a4393ea9859800f2cd254a2056f95cf4424d6c9c0b87a311104f03e48ef4c9687217113d09c2165e8e144dc465f7af1151c73b03272e93 SHA512 63feacfddbcb042f57960457fc390fea1892564a0cd2111746fb2869e15dad818655b7e663849673faaeaa6128c2efffc2b7336a488e10afc4d17b501034747c
+EBUILD openvas-scanner-23.3.2.ebuild 3652 BLAKE2B ac47a105e1970e5cf20c3e19322c44af5e5e8d9e42be927fe983e059bc00498a66467f10edc48bf17bc7727ae15e09c2038585114ce57a08d456445be8620935 SHA512 6ac5234552af6186b05cb8bc231e0f3d7c2442207c85e039038b63751781156076e968f3686092f3e6faeb039a0b77be2ca2fc55abb39e50772e552e8c5fc4bf
 MISC metadata.xml 1082 BLAKE2B a428b18c1fba3380a42e1120fc58c8c950900723f5cb11febdff5d86cd16bce0a17fcdb4c48867435a7c39243a7fa7e5c15ebb3fb0d6d44fc23ef56197530b6a SHA512 e41f348b1ae728e27efb71e5ebb9e468ac5d0b31526a4db922f1bc2d3f3029a5b75be2db6cbac14754107326c4af570e6673b2e66f44317677e319116daadaf6
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.3.2.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.3.2.ebuild
new file mode 100644
index 000000000000..4437e7dc21b4
--- /dev/null
+++ b/net-analyzer/openvas-scanner/openvas-scanner-23.3.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature
+
+MY_DN="openvas"
+
+DESCRIPTION="Open Vulnerability Assessment Scanner"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
+SRC_URI="
+	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc snmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/gvm
+	app-crypt/gpgme:=
+	>=dev-db/redis-5.0.3
+	>=dev-libs/glib-2.42:2
+	>=dev-libs/libgcrypt-1.6:=
+	dev-libs/libgpg-error
+	>=dev-libs/libksba-1.0.7
+	dev-libs/libbsd
+	>=net-libs/libssh-0.6.0:=
+	>=dev-libs/json-glib-1.4.4
+	>=net-analyzer/gvm-libs-22.4
+	>=net-libs/gnutls-3.6.4:=
+	net-libs/libpcap
+	>=net-misc/curl-7.74.0[ssl]
+	snmp? ( net-analyzer/net-snmp:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/bison-2.5
+	app-alternatives/lex
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		app-text/xmltoman
+		app-text/htmldoc
+		dev-perl/CGI
+		dev-perl/SQL-Translator
+		virtual/pandoc
+	)
+	test? ( dev-libs/cgreen )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# QA-Fix | Remove -Werror compiler flag
+	sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560
+	# QA-Fix | Remove !CLANG doxygen warnings for 7.0.0
+	if use doc; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+
+	#Remove tests that doesn't work in the network sandbox
+	if use test; then
+		sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		"-DSBINDIR=${EPREFIX}/usr/bin"
+		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
+		"-DOPENVAS_RUN_DIR=/run/ospd"
+		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_build -C "${BUILD_DIR}" doxygen-full manual
+	fi
+	cmake_build rebuild_cache
+	if use test; then
+		cmake_build tests
+	fi
+}
+
+src_install() {
+	if use doc; then
+		mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die
+		local HTML_DOCS=(
+			"${BUILD_DIR}"/doc/generated/html/.
+			"${BUILD_DIR}"/doc/html-manual
+		)
+	fi
+	cmake_src_install
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/log/gvm
+	if ! use prefix; then
+		fowners gvm:gvm /var/log/gvm
+	fi
+
+	keepdir /var/lib/openvas/{gnupg,plugins}
+	if ! use prefix; then
+		fowners -R gvm:gvm /var/lib/openvas
+	fi
+
+	insinto /etc/openvas
+	newins "${FILESDIR}/openvas.conf-22" openvas.conf
+
+	systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service
+	newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf
+
+	insinto /etc/gvm
+	doins config/redis-openvas.conf
+	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf
+	fi
+
+	fperms 0750 /etc/gvm
+	fperms 0640 /etc/gvm/redis-openvas.conf
+
+	newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas
+	newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o gvm -g gvm
+	fi
+	keepdir /var/lib/openvas/redis
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	tmpfiles_process redis-openvas.conf
+	optfeature "port scanner" net-analyzer/nmap
+	readme.gentoo_print_elog
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 03b5924db0c9..f594f82a291e 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,3 +1,3 @@
 DIST testssl-3.0.8.tar.gz 9372229 BLAKE2B cf463236fb0812c2bc5fd5673d0d2d395fc405697817827ee8c660c96d789601a090b57febd48400e33fd9f28b23d42d432734b176b23a8e8ddf710c9b275485 SHA512 4634bc5dc57ad8910ca097b22d86511a26e855fb4dc7bef9550a795cb1f53a959b8472008756b40a670d7433ad56236b5a36fe0c88c15de99fdf586e9919b080
-EBUILD testssl-3.0.8.ebuild 1522 BLAKE2B 6e2a842edc7487fc36056f898257875958fbd684787554bd380ad0b876b5aa964da802f696a602ece8da64841cfda8cbb42945f1f70a2df244b12f4f0f7d835a SHA512 92330bcb303f990ac538f7bf74bef37e87d494010a5226aebdcf69ae8018b409099693c813c6209628147618aa638dd200e3c35844333276ef726e38fe3696f7
+EBUILD testssl-3.0.8.ebuild 1521 BLAKE2B 377253f88b6625e808870f4c23fc82feaefdda48a8826e23c7966c94d6c348475b75874158975476ced07275b9084743726e44214b0490c3df903d765746e363 SHA512 431a1cd03d774629f95208d690b50b076c92e67a2fac2df7864e50bc30bd337fb7985d056b09c7ea0c77d186bfef5793e3ce07f207e58e21ead72fa5144c511e
 MISC metadata.xml 374 BLAKE2B a4554be687cb1b711340474d9b08b97cc2b5b5a54b4556010deef35d67a408118ccea72caa48a076d9bcf87b230b196f362757137fb9e6e9115f35b8fac026b2 SHA512 efd06f3175b36a607e4bbf97dd26802b09cad1442a2e0d3cdacf28a98db99e93aebb97687212122723d78b03dfd98082cb955c1a8de88bdf405210cdb3ff0e6f
diff --git a/net-analyzer/testssl/testssl-3.0.8.ebuild b/net-analyzer/testssl/testssl-3.0.8.ebuild
index 895f0662c62e..59df413e58c6 100644
--- a/net-analyzer/testssl/testssl-3.0.8.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="bundled-openssl kerberos"
 
 RDEPEND="