From 06ca014dde80a8aeeb22d8fdd2257ea4be4b08c7 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 28 Jan 2025 11:41:14 -0500 Subject: [PATCH] sys-auth/elogind: override paths for several binaries This ensures consistent behavior on merged-usr and split-usr systems. Closes: https://bugs.gentoo.org/945965 Signed-off-by: Mike Gilbert --- .../{elogind-255.5-r1.ebuild => elogind-255.5-r2.ebuild} | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) rename sys-auth/elogind/{elogind-255.5-r1.ebuild => elogind-255.5-r2.ebuild} (94%) diff --git a/sys-auth/elogind/elogind-255.5-r1.ebuild b/sys-auth/elogind/elogind-255.5-r2.ebuild similarity index 94% rename from sys-auth/elogind/elogind-255.5-r1.ebuild rename to sys-auth/elogind/elogind-255.5-r2.ebuild index 0e69dbb71e5c0..b772cb31090f1 100644 --- a/sys-auth/elogind/elogind-255.5-r1.ebuild +++ b/sys-auth/elogind/elogind-255.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -116,6 +116,13 @@ src_configure() { -Dtests=$(usex test true false) -Dutmp=$(usex elibc_musl false true) -Dmode=release + + # Ensure consistenct between merged-usr and split-usr (bug 945965) + -Dhalt-path="${EPREFIX}/sbin/halt" + -Dkexec-path="${EPREFIX}/usr/sbin/kexec" + -Dnologin-path="${EPREFIX}/sbin/nologin" + -Dpoweroff-path="${EPREFIX}/sbin/poweroff" + -Dreboot-path="${EPREFIX}/sbin/reboot" ) meson_src_configure