net-analyzer/openvas-scanner: add 23.8.4, drop 22.7.9, drop 23.0.1, drop 23.3.0

Signed-off-by: Giuseppe Foti <foti.giuseppe@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38032
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

4 files changed, 10 insertions, 335 deletions

diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index a8294a39bc80..1e8154929c2f 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,4 +1,2 @@
-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
+DIST openvas-scanner-23.8.4.tar.gz 1448233 BLAKE2B 6ee681ebae29cecfdb237ac9e60959bc8cdaa5acf04af7e4d8b3de587a72f827101a6609e7434a34459b12842d555da2ecaf30c571609bdf7359e7d9c406b7c1 SHA512 63a5301610f16d046b709849dfe4c8a3cc57f551de0c8c30ae701cb278ba4ade964b1007efd14d74eedf1077537ae05b4fd6f84dd62a730240ee12fc85397a9b
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild
deleted file mode 100644
index 8e66176a615b..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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
-"
-
-SLOT="0"
-LICENSE="GPL-2 GPL-2+"
-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 )
-"
-PATCHES=(
-	# See https://github.com/greenbone/openvas-scanner/pull/1611
-	"${FILESDIR}"/openvas-scanner-23.0.1-link-pcap.patch
-)
-
-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/openvas-scanner/openvas-scanner-23.3.0.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild
deleted file mode 100644
index b26024cee8d1..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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 )
-"
-PATCHES=(
-	# See https://github.com/greenbone/openvas-scanner/pull/1647
-	"${FILESDIR}"/openvas-scanner-23.3.0-link-curl.patch
-)
-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/openvas-scanner/openvas-scanner-22.7.9.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.8.4.ebuild
index 5c8c16dce1d2..4437e7dc21b4 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-23.8.4.ebuild
@@ -13,26 +13,27 @@ SRC_URI="
 	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
 "
 
-SLOT="0"
 LICENSE="GPL-2 GPL-2+"
-KEYWORDS="amd64 ~x86"
+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/json-glib-1.4.4
-	>=net-libs/gnutls-3.2.15:=
-	>=net-analyzer/gvm-libs-22.4
-	net-libs/libpcap
-	app-crypt/gpgme:=
 	>=dev-libs/libgcrypt-1.6:=
 	dev-libs/libgpg-error
 	>=dev-libs/libksba-1.0.7
-	>=net-libs/libssh-0.6.0:=
 	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}"
@@ -82,7 +83,6 @@ src_configure() {
 		"-DSBINDIR=${EPREFIX}/usr/bin"
 		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
 		"-DOPENVAS_RUN_DIR=/run/ospd"
-		"-DINSTALL_OLD_SYNC_SCRIPT=OFF"
 		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
 	)
 	cmake_src_configure