[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/

[Joonas Niilola]

commit:     9610d99869f591742d96e180e987a95d23b31a0b
Author:     Michal Privoznik <michal.privoznik <AT> gmail <DOT> com>
AuthorDate: Sun Jun 18 08:27:13 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 12:56:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9610d998

app-emulation/libvirt: Fix EnvironmentFile= in systemd units

Libvirt installs systemd unit files with EnvironmentFile= derived
from initconfdir option passed in the configure phase, e.g.:

  src/ch/virtchd.service.in:21:EnvironmentFile=-@initconfdir@/virtchd

And since we explicitly pass:

  -Dinitconfdir="${EPREFIX}/etc/conf.d"

this results in systemd unit files using /etc/conf.d/ which is
discouraged.

Closes: https://bugs.gentoo.org/908750
Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31526
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/libvirt/libvirt-9.4.0.ebuild | 2 +-
 app-emulation/libvirt/libvirt-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/libvirt/libvirt-9.4.0.ebuild 
b/app-emulation/libvirt/libvirt-9.4.0.ebuild
index 194bcf790db6..6c17559eba62 100644
--- a/app-emulation/libvirt/libvirt-9.4.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.4.0.ebuild
@@ -303,7 +303,7 @@ src_configure() {
                -Ddriver_vmware=enabled
 
                --localstatedir="${EPREFIX}/var"
-               -Dinitconfdir="${EPREFIX}/etc/conf.d"
+               -Dinitconfdir="${EPREFIX}/etc/systemd"
                -Drunstatedir="${EPREFIX}/run"
                -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
        )

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild 
b/app-emulation/libvirt/libvirt-9999.ebuild
index 1976124be9e6..cc80f16e8bc8 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -302,7 +302,7 @@ src_configure() {
                -Ddriver_vmware=enabled
 
                --localstatedir="${EPREFIX}/var"
-               -Dinitconfdir="${EPREFIX}/etc/conf.d"
+               -Dinitconfdir="${EPREFIX}/etc/systemd"
                -Drunstatedir="${EPREFIX}/run"
                -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
        )