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

[Florian Schmaus]

commit:     82ca4a49e19d69a79906f6553c4c37ce2cf77409
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 09:34:20 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon May  9 09:36:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ca4a49

net-analyzer/gvmd: add XML-Twig dependency, do not install runtime dir

Also check not-prefix before calling fowners.

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

 ...{gvmd-21.4.5-r2.ebuild => gvmd-21.4.5-r3.ebuild} | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/gvmd/gvmd-21.4.5-r2.ebuild 
b/net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild
similarity index 87%
rename from net-analyzer/gvmd/gvmd-21.4.5-r2.ebuild
rename to net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild
index c1263553cba5..ea09acaeeeb5 100644
--- a/net-analyzer/gvmd/gvmd-21.4.5-r2.ebuild
+++ b/net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild
@@ -24,12 +24,15 @@ DEPEND="
        dev-libs/libical:=
        >=net-analyzer/gvm-libs-21.4.4
        net-libs/gnutls:=[tools]
-       doc?   (
+       doc? (
                app-text/xmlstarlet
-               dev-texlive/texlive-latexextra )
+               dev-texlive/texlive-latexextra
+       )
 "
+# gvmd (optionally) uses xml_split from XML-Twig at runtime.
 RDEPEND="
        ${DEPEND}
+       dev-perl/XML-Twig
        net-analyzer/ospd-openvas
 "
 BDEPEND="
@@ -72,6 +75,9 @@ src_prepare() {
                -e 's/^RuntimeDirectory=gvm/RuntimeDirectory=gvmd/' \
                -e 's/GVM_RUN_DIR/GVMD_RUN_DIR/' \
                config/gvmd.service.in || die
+
+       # https://github.com/greenbone/gvmd/pull/1824
+       sed -i '/^install (DIRECTORY DESTINATION ${GVMD_RUN_DIR})/d' 
CMakeLists.txt || die
 }
 
 src_configure() {
@@ -105,15 +111,16 @@ src_install() {
 
        insinto /etc/gvm/sysconfig
        doins "${FILESDIR}/${PN}-daemon.conf"
-
-       fowners -R gvm:gvm /etc/gvm
+       if ! use prefix; then
+               fowners -R gvm:gvm /etc/gvm
+       fi
 
        newinitd "${FILESDIR}/${P}.init" "${PN}"
        newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
 
        # Set proper permissions on required files/directories
        keepdir /var/lib/gvm/gvmd
-       fowners -R gvm:gvm /var/lib/gvm
-
-       rm -r "${D}/run" || die
+       if ! use prefix; then
+               fowners -R gvm:gvm /var/lib/gvm
+       fi
 }