[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ospd-openvas/

[Florian Schmaus]

commit:     9ccb149cc7f7a87df6ceab715db8b3bfde38f25c
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 18:32:05 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun May  8 18:32:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ccb149c

net-analyzer/ospd-openvas: use upstream config and systemd service

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

 ...envas-21.4.4-r1.ebuild => ospd-openvas-21.4.4-r2.ebuild} | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r1.ebuild 
b/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r2.ebuild
similarity index 86%
rename from net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r1.ebuild
rename to net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r2.ebuild
index 7b1a313ff2e8..83fcc3b84069 100644
--- a/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r1.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r2.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 DEPEND="
-       acct-group/gvm
        acct-user/gvm
        dev-python/defusedxml[${PYTHON_USEDEP}]
        dev-python/deprecated[${PYTHON_USEDEP}]
@@ -35,6 +34,13 @@ RDEPEND="
 
 distutils_enable_tests unittest
 
+src_prepare() {
+       default
+
+       # https://github.com/greenbone/ospd-openvas/pull/649
+       sed -i '/^Group=gvm/d' config/ospd-openvas.service || die
+}
+
 python_compile() {
        if use doc; then
                bash "${S}"/docs/generate || die
@@ -49,12 +55,11 @@ python_install() {
        dodoc "${FILESDIR}"/redis.conf.example
 
        insinto /etc/openvas
-       doins "${FILESDIR}"/ospd.conf
-
+       doins config/${PN}.conf
        fowners -R gvm:gvm /etc/openvas
 
        newinitd "${FILESDIR}/${PN}.initd" "${PN}"
        newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
-       systemd_dounit "${FILESDIR}/${PN}.service"
+       systemd_dounit config/${PN}.service
 }