gentoo auto-resync : 15:11:2024 - 03:02:36

6 files changed, 391 insertions, 0 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 890b8ffe0d4b..8a2bf85b9614 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 0d713d1e290a..be7e277d6828 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -15,6 +15,9 @@ AUX elogind-252.9-musl-statx.patch 781 BLAKE2B 8d5ea4a9eaec8b25871ed381cc9ba8c24
 AUX elogind-252.9-musl-strerror_r.patch 3228 BLAKE2B dcc1d43af2c73e17da2cd0e22f60b98061c6fbaeba629abb969e130d7ef884c08341909ca01bdfc615aea147d6e6d8a3edea0cbf41ae981f270f23638478e491 SHA512 6b60da7b045a7004da09b910a192c3e9a00ef7507cb108d9639e18cc81e8bb56e37d3c8db1efee37334c15cddaca480f0cf25d7532cf2381f9981e9d2033bc44
 AUX elogind-252.9-nodocs.patch 870 BLAKE2B ea5a025554999f96c59ab88e3d7c54a331a82cd44ea268a6b131f81b9527939c1da1e2ba74b6635a02b1a0d4167d605614f49b46b39e4769f65eb4c6acfd706a SHA512 027f1d419f9d473835806b4d5da9b129677f23175ab332431260f63eebfd7d31657c3868442ac33798795f61136da2cf6912b1a61c7737fd458146284f35f5b2
 AUX elogind-252.9-py-exec.patch 690 BLAKE2B 9fbe18bd5a5d0a2f1e9906110dbf2208d602f61d06ec132b4623e567c74d6a78a2633e23aeec6644a51f85249558eff4654aaa2a27a6b2abc87a767ca96e7a6b SHA512 6eb54f9c629b29e65ea9d45fefe2cacb335f106d115a7a51f81628ec02e444ade2769253d1476cb587b9b82550bbcf3844054175ded3363704003f9fb22a5bd2
+AUX elogind-255.5-no-fchmod_and_chown-tty.patch 853 BLAKE2B 8aba5ee011881c410c646b04cc79b1d691c16202fa351a44c614101f8b2d6a0d68e8acd90e9a2d0e237439800e1412ce022338a5a62d9bd29621beab7bfb4ad5 SHA512 249b0be34cdc461bfa60e6d81f0cdc4b113bad09b2d6f81b5bff7d442c72357555e6a5b4f21f6453ccaa3261c33125e6ceb56d5b041d75500339609af6b2b610
+AUX elogind-255.5-part-revert-header-cleanup.patch 1055 BLAKE2B 4adde378e1e290b94cebc2c294d4537acaa1aa234e018221c1d84ac211b4e69e47c5aa6e80b55fc4d257ea904b76d36a3c128cf2a5054ef94d4dcc43e9e162af SHA512 5653d5eedfca7996448113139e335e990231dd5d6f88643a011ec5678747fd69adaba43ed072112a28052a97345365c5c6c3e3725100ae64ab4b472d96f4553e
+AUX elogind-255.5-revert-s2idle.patch 6089 BLAKE2B ad21048bd5a96f257d53a26731ff8c054817f32b9090089bf34ef1ee766277c7d21768755eac88deb744315e3e932e25e468bbce01f3f3eef87559c4539815cb SHA512 4685d4600c2a019178565bc2af0f2b8dc8eddebe6ac70f3c8d38bd8e2fbbbfb790685893fb91c053088b817c505e3f2a4bcd14375da6ba2d50bb65eb677f45da
 AUX elogind.conf 217 BLAKE2B ef4325ab66f7cc3c76d44f913c73f99ddf31b3c2248c3cc822e7be37886fdbdd4411974d6d6c139674a51f28f6c0dbca2f5091227e550b4747ed9b22837fa096 SHA512 7e9654deb46330ee17d5f7ba71332edcc86c1ab2ef0a54be8f722c409cdae5eedbbc818cc83350457891af39cde777b0390217fd6befb7d4e868ac41b569aed0
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
@@ -24,5 +27,6 @@ DIST elogind-252.9.tar.gz 1922777 BLAKE2B dd566125e407b3479a44b007890f97c9c87a32
 DIST elogind-255.5.tar.gz 2127126 BLAKE2B 395352fc24bc815d1e39c2d5722eb09c2e3378873e2ea4173d8c209cd66c28a9b94ebe62ab3efbd5dccd822d99b86a6c1a871620adefb1215cb6d4ceee78a9f9 SHA512 dd9494062ef18c3c4cddbaf70b394bf90f6da3ce49f85312e99eabde54b2fcdb5cfdde1bcbaa661031afc72853e9b138dae336e1caed72e927bfd61c8cb22895
 EBUILD elogind-246.10-r4.ebuild 4197 BLAKE2B dc12dddbecad6516e5566a73b5db4a64c97489dc3bf4abf8b1baf4d28b41361a7ad524199cff14791ac555c52b6909b471ebe5c458d16810ab3de515dc8cf099 SHA512 1673b33cd858ac7c9d3907284fbbd925db823db1a79e87ecae4ea1f0fdc21c23eba8e56c2b8ab81d0e497921737c4624665699615ea3e0dab95ab24f4bc1c4f3
 EBUILD elogind-252.9-r2.ebuild 5238 BLAKE2B 2531e7ea6a230dc615261f2f0b8741de33b6f89d6cff52b1c792564408dc0f2bbe17835a0a7f00bf8d21951b5e0f8ef82045d6f82652869c7ec62832f8e5ee43 SHA512 6a912423c866173f6c961b628eb08f3dd84201926724e15c0642371026b3ee9105d5e39b7ec445dd1a1225e08c01a6f81b55b7534e007f1786729b0548267a37
+EBUILD elogind-255.5-r1.ebuild 4996 BLAKE2B 0a895444386f10c2e5507e9e284cc8e0ceb171432ecd5c8aabc0c402ab2830e381cf64f65235f49d606e7f22c5832349842d939ead7e54abc41fea49818ed119 SHA512 67663cdde583104d50dfbb323023ea431b38a1ae51b7609066d72223704c20dde5f61026847b60b1f2babcd29849e46e447947be40cbb247a3637b0bfbebb0d9
 EBUILD elogind-255.5.ebuild 4472 BLAKE2B aa2a9458dd8734deb7a4af7a1e79bd7e82d0ae69bef9547d8694d178aae4e4b5c8c01e7f3949fb4dd5decc04ad2838f1617951a9ba60afd29caa4e9f9b3a38e7 SHA512 2703ab66d69a6f8a45d39d721f9cc8feec86a81d62ce6ae20c365ae59e19b2b8988d17968731521c22721b9e3cde44d9914240e6b4a57ff8bea8230ec646cbfb
 MISC metadata.xml 416 BLAKE2B 5cce321b2ee1ee2893240ecc14b2e3578068e8ae7b94b4fcc641cef0298f7010492a66f4395d5811c62bf32d1b3b939e46bf8c9a7109f185f8bbb84d9ce9d607 SHA512 6f85a23ab09a92c489890397049fcff546be538b4484b5116cd4e5b0a4982a4cc0c587f47ca18c150bcbc5911ef879292fbd142ca1f381254d6ecea41358de6b
diff --git a/sys-auth/elogind/elogind-255.5-r1.ebuild b/sys-auth/elogind/elogind-255.5-r1.ebuild
new file mode 100644
index 000000000000..22ad55a76fc2
--- /dev/null
+++ b/sys-auth/elogind/elogind-255.5-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_BRANCH="v255-stable"
+	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit linux-info meson pam python-any-r1 udev xdg-utils
+
+DESCRIPTION="The systemd project's logind, extracted to a standalone package"
+HOMEPAGE="https://github.com/elogind/elogind"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+IUSE="+acl audit cgroup-hybrid debug doc +pam +policykit selinux test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-util/gperf
+	virtual/pkgconfig
+	$(python_gen_any_dep 'dev-python/jinja2[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+DEPEND="
+	audit? ( sys-process/audit )
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/libudev:=
+	acl? ( sys-apps/acl )
+	pam? ( sys-libs/pam )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${DEPEND}
+	!sys-apps/systemd
+"
+PDEPEND="
+	sys-apps/dbus
+	policykit? ( sys-auth/polkit )
+"
+
+DOCS=( README.md )
+
+PATCHES=(
+	# all downstream patches:
+	"${FILESDIR}/${PN}-252.9-nodocs.patch"
+	"${FILESDIR}/${P}-part-revert-header-cleanup.patch" # bug 939673
+	# See also:
+	# https://github.com/elogind/elogind/issues/285
+	"${FILESDIR}/${P}-revert-s2idle.patch" # bug 939042
+	# See also: https://github.com/systemd/systemd/issues/10103
+	"${FILESDIR}/${P}-no-fchmod_and_chown-tty.patch" # thx to Devuan
+)
+
+python_check_deps() {
+	python_has_version "dev-python/jinja2[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
+
+	use kernel_linux && linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# don't cleanup /dev/shm/ on logout on logout
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949698
+	sed -e "s/#RemoveIPC=yes/RemoveIPC=no/" \
+		-i src/login/logind.conf.in || die
+}
+
+src_configure() {
+	if use cgroup-hybrid; then
+		cgroupmode="hybrid"
+	else
+		cgroupmode="unified"
+	fi
+
+	python_setup
+
+	EMESON_BUILDTYPE="$(usex debug debug release)"
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
+		--libexecdir="lib/elogind"
+		--localstatedir="${EPREFIX}"/var
+		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
+		-Dman=auto
+		-Dsmack=true
+		-Dcgroup-controller=openrc
+		-Ddefault-hierarchy=${cgroupmode}
+		-Ddefault-kill-user-processes=false
+		-Dacl=$(usex acl enabled disabled)
+		-Daudit=$(usex audit enabled disabled)
+		-Dhtml=$(usex doc auto disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dpamlibdir="$(getpam_mod_dir)"
+		-Dselinux=$(usex selinux enabled disabled)
+		-Dtests=$(usex test true false)
+		-Dutmp=$(usex elibc_musl false true)
+		-Dmode=release
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/elogind
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	udev_reload
+	if ! use pam; then
+		ewarn "${PN} will not be managing user logins/seats without USE=\"pam\"!"
+		ewarn "In other words, it will be useless for most applications."
+		ewarn
+	fi
+	if ! use policykit; then
+		ewarn "loginctl will not be able to perform privileged operations without"
+		ewarn "USE=\"policykit\"! That means e.g. no suspend or hibernate."
+		ewarn
+	fi
+	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
+		elog "elogind is currently started from boot runlevel."
+	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
+		ewarn "elogind is currently started from default runlevel."
+		ewarn "Please remove elogind from the default runlevel and"
+		ewarn "add it to the boot runlevel by:"
+		ewarn "# rc-update del elogind default"
+		ewarn "# rc-update add elogind boot"
+	else
+		elog "elogind is currently not started from any runlevel."
+		elog "You may add it to the boot runlevel by:"
+		elog "# rc-update add elogind boot"
+		elog
+		elog "Alternatively, you can leave elogind out of any"
+		elog "runlevel. It will then be started automatically"
+		if use pam; then
+			elog "when the first service calls it via dbus, or"
+			elog "the first user logs into the system."
+		else
+			elog "when the first service calls it via dbus."
+		fi
+	fi
+
+	for version in ${REPLACING_VERSIONS}; do
+		if ver_test "${version}" -lt 252.9; then
+			elog "Starting with release 252.9 the sleep configuration is now done"
+			elog "in the /etc/elogind/sleep.conf. Should you use non-default sleep"
+			elog "configuration remember to migrate those to new configuration file."
+		fi
+	done
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-auth/elogind/files/elogind-255.5-no-fchmod_and_chown-tty.patch b/sys-auth/elogind/files/elogind-255.5-no-fchmod_and_chown-tty.patch
new file mode 100644
index 000000000000..9a88c8d27c83
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-255.5-no-fchmod_and_chown-tty.patch
@@ -0,0 +1,29 @@
+From 04354be1094d2010349700932327aa5cb965fc0a Mon Sep 17 00:00:00 2001
+From: Mark Hindley <mark@hindley.org.uk>
+Date: Thu, 9 Nov 2023 18:37:54 +0000
+Subject: [PATCH] Don't chown and chmod tty on VT reset.
+
+Elogind doesn't allocate VTs and shouldn't change those setup by login(1).
+
+Fixes: https://github.com/systemd/systemd/issues/10103
+---
+ src/basic/terminal-util.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/src/basic/terminal-util.c
++++ b/src/basic/terminal-util.c
+@@ -1487,12 +1487,14 @@
+                         q = -errno;
+         }
+ 
++#if 0 /// UNNEEDED by elogind
+         r = fchmod_and_chown(fd, TTY_MODE, 0, GID_INVALID);
+         if (r < 0) {
+                 log_debug_errno(r, "Failed to chmod()/chown() VT, ignoring: %m");
+                 if (q >= 0)
+                         q = r;
+         }
++#endif // 0
+ 
+         return q;
+ }
diff --git a/sys-auth/elogind/files/elogind-255.5-part-revert-header-cleanup.patch b/sys-auth/elogind/files/elogind-255.5-part-revert-header-cleanup.patch
new file mode 100644
index 000000000000..385042792cdd
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-255.5-part-revert-header-cleanup.patch
@@ -0,0 +1,41 @@
+From fe9e67ac72039cf5482a1f40b4b3016610ac84b6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Nov 2024 20:04:16 +0100
+Subject: [PATCH] Partially revert "Comment out all unused includes in shared/"
+
+Gentoo-Bug: https://bugs.gentoo.org/939673
+
+This reverts commit e1827812fc8f5b9a1aab6ed9bc056df0a2c74c48.
+---
+ src/shared/reboot-util.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/shared/reboot-util.c b/src/shared/reboot-util.c
+index 079db294a..c5eba45cb 100644
+--- a/src/shared/reboot-util.c
++++ b/src/shared/reboot-util.c
+@@ -1,8 +1,8 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ 
+ #include <errno.h>
+-//#include <stdint.h>
+-//#include <sys/ioctl.h>
++#include <stdint.h>
++#include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <unistd.h>
+ 
+@@ -14,8 +14,8 @@
+ #endif
+ 
+ #include "alloc-util.h"
+-//#include "errno-util.h"
+-//#include "fd-util.h"
++#include "errno-util.h"
++#include "fd-util.h"
+ #include "fileio.h"
+ #include "log.h"
+ //#include "proc-cmdline.h"
+-- 
+2.47.0
+
diff --git a/sys-auth/elogind/files/elogind-255.5-revert-s2idle.patch b/sys-auth/elogind/files/elogind-255.5-revert-s2idle.patch
new file mode 100644
index 000000000000..a429d374729b
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-255.5-revert-s2idle.patch
@@ -0,0 +1,138 @@
+From 2b522bb0cd3872107335459d82b92f73f6a50bf7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 12 Nov 2024 23:43:16 +0100
+Subject: [PATCH 1/2] Revert "Re-Add sleep mode configuration"
+
+This reverts commit 7707a30dfb2496a4c9c5939f0dd8bb39baebfecd.
+---
+ src/shared/sleep-config.c | 8 --------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
+index 053e908e6..5ddcb006f 100644
+--- a/src/shared/sleep-config.c
++++ b/src/shared/sleep-config.c
+@@ -42,11 +42,7 @@ static char* const* const sleep_default_state_table[_SLEEP_OPERATION_CONFIG_MAX]
+ };
+ 
+ static char* const* const sleep_default_mode_table[_SLEEP_OPERATION_CONFIG_MAX] = {
+-#if 0 /// elogind supports suspend modes (deep s2idle) so we need defaults, too
+         /* Not used by SLEEP_SUSPEND */
+-#else // 0
+-        [SLEEP_SUSPEND]      = STRV_MAKE("s2idle", "deep"),
+-#endif // 0
+         [SLEEP_HIBERNATE]    = STRV_MAKE("platform", "shutdown"),
+         [SLEEP_HYBRID_SLEEP] = STRV_MAKE("suspend"),
+ };
+@@ -172,11 +168,7 @@ int parse_sleep_config(SleepConfig **ret) {
+                 { "Sleep", "AllowHybridSleep",          config_parse_tristate,    0,               &allow_hybrid_sleep          },
+ 
+                 { "Sleep", "SuspendState",              config_parse_strv,        0,               sc->states + SLEEP_SUSPEND   },
+-#if 0 /// elogind does support suspend modes
+                 { "Sleep", "SuspendMode",               config_parse_warn_compat, DISABLED_LEGACY, NULL                         },
+-#else // 0
+-                { "Sleep", "SuspendMode",               config_parse_sleep_mode,  0,               sc->modes + SLEEP_SUSPEND    },
+-#endif // 0
+ 
+                 { "Sleep", "HibernateState",            config_parse_warn_compat, DISABLED_LEGACY, NULL                         },
+                 { "Sleep", "HibernateMode",             config_parse_sleep_mode,  0,               sc->modes + SLEEP_HIBERNATE  },
+-- 
+2.47.0
+
+
+From 10a451df4259113738f0839e09041742dd8ccbc2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 12 Nov 2024 23:47:19 +0100
+Subject: [PATCH 2/2] Revert "Re-add elogind additions to sleep.conf loading
+ and split those into sleep.donf.d/10-elogind.conf"
+
+This reverts commit c5e7ba0c47ae95e2cf6fd48dc9353e8f333200c4.
+---
+ src/shared/sleep-config.c |  9 ---------
+ src/sleep/10-elogind.conf | 22 ----------------------
+ src/sleep/meson.build     |  4 ----
+ src/sleep/sleep.conf      |  9 +++++++++
+ 4 files changed, 9 insertions(+), 35 deletions(-)
+ delete mode 100644 src/sleep/10-elogind.conf
+
+diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
+index 5ddcb006f..097c203ca 100644
+--- a/src/shared/sleep-config.c
++++ b/src/shared/sleep-config.c
+@@ -153,15 +153,6 @@ int parse_sleep_config(SleepConfig **ret) {
+ #endif // 0
+ 
+         const ConfigTableItem items[] = {
+-#if 1 /// Additional options for elogind
+-                { "Sleep", "AllowPowerOffInterrupts",     config_parse_bool, 0, &sc->allow_poweroff_interrupts },
+-                { "Sleep", "BroadcastPowerOffInterrupts", config_parse_bool, 0, &sc->broadcast_poweroff_interrupts },
+-                { "Sleep", "AllowSuspendInterrupts",      config_parse_bool, 0, &sc->allow_suspend_interrupts },
+-                { "Sleep", "BroadcastSuspendInterrupts",  config_parse_bool, 0, &sc->broadcast_suspend_interrupts },
+-                { "Sleep", "HandleNvidiaSleep",           config_parse_bool, 0, &sc->handle_nvidia_sleep },
+-                { "Sleep", "SuspendByUsing",              config_parse_strv, 0, &sc->suspend_by_using },
+-                { "Sleep", "HibernateByUsing",            config_parse_strv, 0, &sc->hibernate_by_using },
+-#endif // 1
+                 { "Sleep", "AllowSuspend",              config_parse_tristate,    0,               &allow_suspend               },
+                 { "Sleep", "AllowHibernation",          config_parse_tristate,    0,               &allow_hibernate             },
+                 { "Sleep", "AllowSuspendThenHibernate", config_parse_tristate,    0,               &allow_s2h                   },
+diff --git a/src/sleep/10-elogind.conf b/src/sleep/10-elogind.conf
+deleted file mode 100644
+index b8b3350b1..000000000
+--- a/src/sleep/10-elogind.conf
++++ /dev/null
+@@ -1,22 +0,0 @@
+-#  This file is part of elogind.
+-#
+-#  elogind is free software; you can redistribute it and/or modify it under the
+-#  terms of the GNU Lesser General Public License as published by the Free
+-#  Software Foundation; either version 2.1 of the License, or (at your option)
+-#  any later version.
+-#
+-# Entries in this file show the compile time defaults specific to eloging.
+-# Local configuration should be created here with a higher leading number so
+-# they are parsed later overriding the defaults.
+-#
+-# See sleep.conf(5) for details.
+-
+-[Sleep]
+-#AllowPowerOffInterrupts=no
+-#AllowSuspendInterrupts=no
+-#BroadcastPowerOffInterrupts=yes
+-#BroadcastSuspendInterrupts=yes
+-#HandleNvidiaSleep=no
+-#HibernateByUsing=
+-#SuspendByUsing=
+-#SuspendMode=s2idle deep
+diff --git a/src/sleep/meson.build b/src/sleep/meson.build
+index c711a1b5c..3b06a6e91 100644
+--- a/src/sleep/meson.build
++++ b/src/sleep/meson.build
+@@ -28,8 +28,4 @@ sleep_files = files(
+ if install_sysconfdir_samples
+         install_data('sleep.conf',
+                      install_dir : pkgconfigfiledir)
+-#if 1 /// elogind comes with a first drop-in representing its defaults
+-        install_data('10-elogind.conf',
+-                     install_dir : pkgconfigfiledir / 'sleep.conf.d' )
+-#endif // 1
+ endif
+diff --git a/src/sleep/sleep.conf b/src/sleep/sleep.conf
+index ea048892b..b71790711 100644
+--- a/src/sleep/sleep.conf
++++ b/src/sleep/sleep.conf
+@@ -23,3 +23,12 @@
+ #HibernateMode=platform shutdown
+ #HibernateDelaySec=
+ #SuspendEstimationSec=60min
++
++# elogind additions
++#AllowPowerOffInterrupts=no
++#BroadcastPowerOffInterrupts=yes
++#AllowSuspendInterrupts=no
++#BroadcastSuspendInterrupts=yes
++#SuspendByUsing=
++#HibernateByUsing=
++#HandleNvidiaSleep=no
+-- 
+2.47.0
+