[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/

[Sam James]

commit:     077a7b0c85c80d1ca837e4838cb7f7aa9dd8adf1
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb  6 05:12:28 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 22:49:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077a7b0c

sys-apps/util-linux: sync live

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/util-linux/util-linux-9999.ebuild | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild 
b/sys-apps/util-linux/util-linux-9999.ebuild
index ad0a0bbd4117..f0f5f21353c8 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -55,8 +55,10 @@ RDEPEND="
        rtas? ( sys-libs/librtas )
        selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
        slang? ( sys-libs/slang )
-       !build? ( systemd? ( sys-apps/systemd ) )
-       udev? ( virtual/libudev:= )
+       !build? (
+               systemd? ( sys-apps/systemd )
+               udev? ( virtual/libudev:= )
+       )
 "
 BDEPEND="
        virtual/pkgconfig
@@ -213,8 +215,6 @@ multilib_src_configure() {
                $(multilib_native_use_enable suid makeinstall-setuid)
                $(multilib_native_use_with readline)
                $(multilib_native_use_with slang)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with udev)
                $(multilib_native_usex ncurses "$(use_with magic libmagic)" 
'--without-libmagic')
                $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" 
'--without-ncursesw')
                $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" 
'--without-ncurses')
@@ -228,6 +228,18 @@ multilib_src_configure() {
                $(use_with selinux)
        )
 
+       if use build ; then
+               myeconfargs+=(
+                       --without-systemd
+                       --without-udev
+               )
+       else
+               myeconfargs+=(
+                       $(multilib_native_use_with systemd)
+                       $(multilib_native_use_with udev)
+               )
+       fi
+
        if multilib_is_native_abi ; then
                myeconfargs+=(
                        --disable-chfn-chsh