commit:     69e381a87b02c98c38b60f549acb47850139fb64
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 22:49:06 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 22:51:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e381a8

sys-apps/dbus: restore multilib logic

These features only effect dbus-daemon, and should only be enabled for
the native ABI.

- selinux
- systemd
- x11_autolaunch
- elogind

Closes: https://bugs.gentoo.org/913532
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/dbus/dbus-1.15.8.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-apps/dbus/dbus-1.15.8.ebuild b/sys-apps/dbus/dbus-1.15.8.ebuild
index c783689b9742..e799412b6f57 100644
--- a/sys-apps/dbus/dbus-1.15.8.ebuild
+++ b/sys-apps/dbus/dbus-1.15.8.ebuild
@@ -116,16 +116,16 @@ multilib_src_configure() {
 
                $(meson_native_true tools)
 
-               $(meson_feature elogind)
-               $(meson_feature systemd)
+               $(meson_native_use_feature elogind)
+               $(meson_native_use_feature systemd)
                $(meson_use systemd user_session)
-               $(meson_feature X x11_autolaunch)
+               $(meson_native_use_feature X x11_autolaunch)
                $(meson_native_use_feature valgrind)
 
                # libaudit is *only* used in DBus wrt SELinux support, so 
disable it if
                # not on an SELinux profile.
-               $(meson_feature selinux)
-               $(meson_feature selinux libaudit)
+               $(meson_native_use_feature selinux)
+               $(meson_native_use_feature selinux libaudit)
 
                -Dsession_socket_dir="${EPREFIX}"/tmp
                -Dsystem_pid_file="${EPREFIX}${rundir}"/dbus.pid

Reply via email to