From 7ae087d1aca6e5e494b69825effe899cc0b7da82 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 13 Oct 2025 07:11:53 +0000
Subject: [PATCH] sys-apps/dbus: Sync with Gentoo

It's from Gentoo commit fe879f6dee043bf2afed53b4e6da897828e3e586.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
---
 .../files/dbus-1.15.8-enable-elogind.patch    | 65 -------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch
deleted file mode 100644
index 543eac5b30..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
-https://bugs.gentoo.org/599494
-
-Especially see https://bugs.gentoo.org/599494#c21 - this functionality isn't
-particularly required. The only known consumer at the moment is hplip.
---- a/dbus/dbus-userdb-util.c
-+++ b/dbus/dbus-userdb-util.c
-@@ -41,6 +41,9 @@
- #ifdef HAVE_SYSTEMD
- #include <systemd/sd-login.h>
- #endif
-+#ifdef HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#endif
- 
- /**
-  * @addtogroup DBusInternalsUtils
-@@ -67,7 +70,7 @@ dbus_bool_t
- _dbus_is_console_user (dbus_uid_t uid,
- 		       DBusError *error)
- {
--#ifdef HAVE_SYSTEMD
-+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
-   /* check if we have logind */
-   if (access ("/run/systemd/seats/", F_OK) >= 0)
-     {
---- a/dbus/meson.build
-+++ b/dbus/meson.build
-@@ -23,6 +23,7 @@ dbus_dependencies = [
-     threads,
-     network_libs,
-     systemd,
-+    elogind,
-     valgrind.partial_dependency(compile_args: true),
- ]
- 
---- a/meson.build
-+++ b/meson.build
-@@ -478,6 +478,10 @@ if use_launchd
-     endif
- endif
- 
-+elogind = dependency('libelogind', version: '>=209', required: get_option('elogind'))
-+use_elogind = elogind.found()
-+config.set('HAVE_ELOGIND', use_elogind)
-+
- systemd = dependency('libsystemd', version: '>=209', required: get_option('systemd'))
- use_systemd = systemd.found()
- config.set('HAVE_SYSTEMD', use_systemd)
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -244,6 +244,13 @@ option(
-   description: 'Systemd at_console support'
- )
- 
-+option(
-+  'elogind',
-+  type: 'feature',
-+  value: 'auto',
-+  description: 'elogind at_console support'
-+)
-+
- option(
-   'test_socket_dir',
-   type: 'string',