[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/

["Florian Schmaus" <flow@gentoo.org>]

commit:     bf80824644ed64dcbb691284941ea978e3bac58d
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 09:20:54 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed May  4 09:27:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf808246

net-analyzer/gvmd: upstream systemd/logrotate, fix doc dir, minor fixes

Use the systemd service file and logrotate configuration from
upstream. Fix doc directory. Drop CMAKE_MAKEFILE_GENERATOR. Shorten
HOMEPAGE. Fix upstream systemd service file. Drop gvmd-startpre.sh
script.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh       |  8 --------
 net-analyzer/gvmd/files/gvmd-21.4.5.init              |  9 ++++++++-
 .../{gvmd-21.4.5.ebuild => gvmd-21.4.5-r1.ebuild}     | 19 +++++++------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh b/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh
deleted file mode 100644
index 85e6f008abe0..000000000000
--- a/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Greenbone Vulnerability Manager Systemd ExecStartPre
-mkdir -p /run/gvmd
-touch /run/gvmd/gvm-{checking,create-functions,helping,migrating,serving}
-chown -R gvm:gvm /run/gvmd/
-touch /run/feed-update.lock
-chown gvm:gvm /run/feed-update.lock

diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5.init b/net-analyzer/gvmd/files/gvmd-21.4.5.init
index ae9a170921b2..047ad8446a4f 100644
--- a/net-analyzer/gvmd/files/gvmd-21.4.5.init
+++ b/net-analyzer/gvmd/files/gvmd-21.4.5.init
@@ -19,5 +19,12 @@ depend() {
 }
 
 start_pre() {
-	/bin/bash /etc/gvm/gvmd-startpre.sh
+	mkdir /run/gvmd
+	for p in gvm-checking gvm-create-functions gvm-helping gvm-migrating gvm-serving; do
+		touch /run/gvmd/${p}
+	done
+	chown -R gvm:gvm /run/gvmd/
+
+	touch /run/feed-update.lock
+	chown gvm:gvm /run/feed-update.lock
 }

diff --git a/net-analyzer/gvmd/gvmd-21.4.5.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild
similarity index 82%
rename from net-analyzer/gvmd/gvmd-21.4.5.ebuild
rename to net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild
index 4d133ecc4f04..4c49deefa350 100644
--- a/net-analyzer/gvmd/gvmd-21.4.5.ebuild
+++ b/net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake systemd toolchain-funcs
 
 DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gvmd/"
+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"
 
 SLOT="0"
@@ -49,8 +48,8 @@ BDEPEND="
 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/gvmd-${PV}/html/*g" doc/CMakeLists.txt || die
-	sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" CMakeLists.txt || die
+	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
@@ -64,6 +63,9 @@ src_prepare() {
 		   done
 		fi
 	fi
+
+	# https://github.com/greenbone/gvmd/pull/1819
+	sed -i "/^EnvironmentFile/d" config/gvmd.service.in || die
 }
 
 src_configure() {
@@ -72,6 +74,7 @@ src_configure() {
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 		"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
 		"-DSBINDIR=${EPREFIX}/usr/bin"
+		"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
 	)
 	cmake_src_configure
 }
@@ -97,19 +100,11 @@ src_install() {
 	insinto /etc/gvm/sysconfig
 	doins "${FILESDIR}/${PN}-daemon.conf"
 
-	exeinto /etc/gvm
-	newexe "${FILESDIR}"/${P}-startpre.sh gvmd-startpre.sh
-
 	fowners -R gvm:gvm /etc/gvm
 
 	newinitd "${FILESDIR}/${P}.init" "${PN}"
 	newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
 
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
 	# Set proper permissions on required files/directories
 	keepdir /var/lib/gvm/gvmd
 	fowners -R gvm:gvm /var/lib/gvm