commit:     84d7744253a8f1a4c81807574d54e3fb15c2a89d
Author:     Anders Larsson <anders.git <AT> larsson <DOT> xyz>
AuthorDate: Tue Oct 29 20:27:25 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 21:59:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d77442

net-nds/389-ds-base: Fix systemd support

Bug: https://bugs.gentoo.org/942473
Signed-off-by: Anders Larsson <anders.git <AT> larsson.xyz>
Closes: https://github.com/gentoo/gentoo/pull/39152
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-nds/389-ds-base/389-ds-base-3.0.2.ebuild | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/net-nds/389-ds-base/389-ds-base-3.0.2.ebuild 
b/net-nds/389-ds-base/389-ds-base-3.0.2.ebuild
index eb95bd5965db..5a5199ac853f 100644
--- a/net-nds/389-ds-base/389-ds-base-3.0.2.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-3.0.2.ebuild
@@ -231,7 +231,11 @@ src_configure() {
                $(use_enable ldapi)
                $(use_with selinux)
                $(use_with !systemd initddir "/etc/init.d")
+               $(use_with systemd)
                $(use_enable test cmocka)
+               --with-systemdgroupname="dirsrv.target"
+               --with-tmpfiles-d="${EPREFIX}/usr/lib/tmpfiles.d"
+               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
                --enable-rust-offline
                --with-pythonexec="${PYTHON}"
                --with-fhs
@@ -240,15 +244,6 @@ src_configure() {
                --disable-cockpit
        )
 
-       # https://github.com/389ds/389-ds-base/issues/4292 part 2
-       # creates wrongly named unit file if == no
-       use systemd && myconf+=(
-               $(use_with systemd)
-               $(use_with systemdgroupname "dirsrv.target")
-               $(use_with tmpfiles-d "/usr/lib/tmpfiles.d")
-               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-       )
-
        econf "${myeconfargs[@]}"
 
        rm .cargo/config || die

Reply via email to