gentoo auto-resync : 25:07:2023 - 22:29:01

3 files changed, 5 insertions, 108 deletions

diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 12a10c123721..15b002192310 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -3,9 +3,7 @@ AUX gsad-daemon.conf 416 BLAKE2B 7c6dff183ceb8afdbe7abb75333fb8aa570be406ecb1864
 AUX gsad.init 601 BLAKE2B 79b76f512904c55f235cc6ac1b3513f920dee9cbaaa06c115c93f7abb215302f544a8e021fe0e7a66f0d646807da75a3fc4ed68cf01e00eaaa003b1ff39c1c9e SHA512 610db173cf45de0ff907dacfabba0b6e03c6a83fda97f3b76d253a80e2353961f9ac61bfd9131561e34339075556d4930273dadef94d8f9e2f8f30f50266e44d
 AUX gsad.service.conf 25 BLAKE2B fb1972cc41f5f8970717136ef71c81b74cb1abb6c0419d3c8f7f51a9f54f933eb1c1551cfb56149bc7b5e2c68dd11d731b556a7ba2da678b02f24cf143810b4f SHA512 ece2d5838f743a820dd732a5e5b17d91e85ce07655173a0143740ef6bcd20156d6aebfcf8c43d53caa7713402607d88acc0328499326f6921e3b057bd0ef9d66
 DIST gsad-21.4.4.tar.gz 220618 BLAKE2B 276164ce1e03a6ed211d3bdf24c7f9b5ac832c07891b34b467f61ec02c5670d5368ea3219b3cc445e4ef83fef0aee7375c89ce8008746ea7e08abf50da8fb9fd SHA512 092c8187754b3f0503e4ae6fd9c41dbd6917264668a5f8f831d40e88c7b8db6772acd354db62ac66b4af13b7c27e78516d4975f5bfede0d28001007a46c39f75
-DIST gsad-22.4.1.tar.gz 224061 BLAKE2B 2357d8eac221c934509ed2c4e47d3e16ac392d11212320152bc1d247be2b8eb1275fbaffbb6c71568dac45b41e6380242c8b3afce46e8ee97aad7be8d24544ba SHA512 7f957fcdc842b81aaf69858f98f1edd8a808eb70d2e0bd86413d6a9dfe053e10b6ed2f4e2cadcc023fd580d96d624c007e8701133fb3fea2e072ce26f9a64ed4
 DIST gsad-22.5.1.tar.gz 223290 BLAKE2B 24530f085c644895d5153929038d040fbcb0626b4b2df0ce3966d96fc8c756fbb2b78540b2a57affab2f2eb97cf868f09b7ac863f9a314cb1f74a829fbea48cc SHA512 52ec1377d57d90f64e949472f5f6d1f94e9cdce86d7a807451ed9f01ff36e392606d725461e416246b9e706f00aa536cbc5672fb977695b20d0c5957b67447aa
 EBUILD gsad-21.4.4.ebuild 2329 BLAKE2B 35f607bb6ca44b9a42ad60bcda84c825251453a77ef146147b0f551f6b04968cc4a38c9a3f566bd0539436761ce6ed072b5b925e98f9db74faa0698c80ff1094 SHA512 4084d98b9893a037512fc0233a908ee1ec7afbe43f1e700a45627f40291da44b17f627ea731623ab1500e4f72ab31b4b5f846d84751185dbfde82c8f946fdcea
-EBUILD gsad-22.4.1.ebuild 2382 BLAKE2B 31855fa71d9fef958690359ca77b363597d5d5f06491d4aab1963cc69a0e16edf0f4b9087fe10e9da0dc6a221ffe7fb444bc84b070275639d4544db8b18bff3a SHA512 85b5c669ab0a4e64ddb899acfe14aa33083f0d8823cd3fc1685761c42ccd58aa3b79ffb384761a612d06725e35fd4f9c6cb07c084fa0fcfa65303b363990f050
-EBUILD gsad-22.5.1.ebuild 2383 BLAKE2B 1c23f04262bf9da78397b776d7e0b6ffa3fdb6ee020938e5b695415d7682adb5a3ed55d6bb69a684c7d36ab61c23ca69785186101d09ea471c2c264f1f4ff38c SHA512 4f6ae587acc46fcf881916483b8fe4a7ada74f013190bbd739b6ee8d93ee89475227b2134a72248facc809c4e00254608affbc73f5c592b9aa5edea9c5ecaec4
+EBUILD gsad-22.5.1-r1.ebuild 2458 BLAKE2B 16a1c2ec681ea43caaed5fd62aa9f792d58d36bc97dc6d23872d5a0be5c30cbe9f6a0b1235f16bd671e0daf1ba3b2661227580f1e8a6caf4f7a69e74193140c7 SHA512 ff3f19b5ae4dd336f030cc74c0b5f7ef2ad441049960cd6a4035e89d346b01ebc471a8439bd47228b40b4b69f6893ea3c2ade019e1eec3e7be6c959a8fb1deea
 MISC metadata.xml 602 BLAKE2B d3c36459de572672fec6a1cd7d7c29c5b8be3a421455c8702a2bfbcf4d969c5783d5026024bbffe4b765a18b50852b534b9d2a1174f5586327ff13a4f704781f SHA512 e15e39148d80f4b6c8c6e14c18ae977d6ebcec98b201e4d9b58d83f4a183023f383d4c5ae986064b6a176b741d0ac923173cb4f78a30185ce341c642002e13d7
diff --git a/net-analyzer/gsad/gsad-22.4.1.ebuild b/net-analyzer/gsad/gsad-22.5.1-r1.ebuild
index 6cf730484c9d..49e02618b234 100644
--- a/net-analyzer/gsad/gsad-22.4.1.ebuild
+++ b/net-analyzer/gsad/gsad-22.5.1-r1.ebuild
@@ -26,8 +26,8 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	>=net-analyzer/gvmd-${PV}
-	>=net-analyzer/gsa-${PV}
+	>=net-analyzer/gvmd-22.4
+	>=net-analyzer/gsa-22.4
 	net-analyzer/ospd-openvas
 "
 BDEPEND="
@@ -70,6 +70,8 @@ src_configure() {
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 		"-DSBINDIR=${EPREFIX}/usr/bin"
+		"-DGSAD_RUN_DIR=${EPREFIX}/run/gsad"
+		"-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd"
 		"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
 		"-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d"
 	)
diff --git a/net-analyzer/gsad/gsad-22.5.1.ebuild b/net-analyzer/gsad/gsad-22.5.1.ebuild
deleted file mode 100644
index 0bb4755d34c5..000000000000
--- a/net-analyzer/gsad/gsad-22.5.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd toolchain-funcs
-#
-DESCRIPTION="Greenbone Security Assistant"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsad"
-SRC_URI="https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	acct-user/gvm
-	dev-libs/glib:2
-	dev-libs/libgcrypt:0=
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=net-analyzer/gvm-libs-${PV}
-	net-libs/gnutls:=
-	net-libs/libmicrohttpd:=
-"
-RDEPEND="
-	${DEPEND}
-	>=net-analyzer/gvmd-${PV}
-	>=net-analyzer/gsa-22.5.0
-	net-analyzer/ospd-openvas
-"
-BDEPEND="
-	dev-python/polib
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		app-doc/xmltoman
-		app-text/htmldoc
-		sys-devel/gettext
-	)
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# 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
-
-	# Do not install the empty /run/gsad run dir. https://github.com/greenbone/gsad/pull/54
-	sed -i "/^install.*GSAD_RUN_DIR/d" CMakeLists.txt || die
-
-	# Drop Group= directive. https://github.com/greenbone/gsad/pull/55
-	sed -i "/^Group=/d" config/gsad.service.in || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-		"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
-		"-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	# setting correct PATH for finding react-js
-	NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile
-	if use doc; then
-		cmake_build -C "${BUILD_DIR}" doc
-		cmake_build doc-full -C "${BUILD_DIR}" doc
-	fi
-	cmake_build rebuild_cache
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${BUILD_DIR}/doc/generated/html/." )
-	fi
-	cmake_src_install
-
-	systemd_install_serviced "${FILESDIR}/gsad.service.conf" \
-			${PN}.service
-
-	insinto /etc/gvm/sysconfig
-	doins "${FILESDIR}/${PN}-daemon.conf"
-
-	newinitd "${FILESDIR}/${PN}-22.init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-}