[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/

[Mike Gilbert]

commit:     b5575e0caf8da2036079e8be329f346afb170b29
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 20:19:17 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 20:19:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5575e0c

sys-apps/systemd-utils: wire up src_configure for 'acl' and 'kmod'

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 ...utils-250.4-r2.ebuild => systemd-utils-250.4-r3.ebuild} | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild 
b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
similarity index 97%
rename from sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild
rename to sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
index f81737003eb0..f6bc25624f70 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
@@ -118,7 +118,6 @@ multilib_src_configure() {
        local emesonargs=(
                -Drootprefix="${EPREFIX:-/}"
                -Dsysvinit-path=
-               $(meson_native_true acl)
                $(meson_native_use_bool boot efi)
                $(meson_native_use_bool boot gnu-efi)
                $(meson_native_use_bool selinux)
@@ -126,7 +125,6 @@ multilib_src_configure() {
                $(meson_use test tests)
                $(meson_native_use_bool tmpfiles)
                $(meson_use udev hwdb)
-               $(meson_native_use_bool udev kmod)
 
                -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 
@@ -209,6 +207,18 @@ multilib_src_configure() {
                -Dzstd=false
        )
 
+       if use tmpfiles || use udev; then
+               emesonargs+=( $(meson_native_use_bool acl) )
+       else
+               emesonargs+=( -Dacl=false )
+       fi
+
+       if use udev; then
+               emesonargs+=( $(meson_native_use_bool kmod) )
+       else
+               emesonargs+=( -Dkmod=false )
+       fi
+
        if use elibc_musl; then
                # Avoid redefinition of struct ethhdr.
                append-cppflags -D__UAPI_DEF_ETHHDR=0