[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 20:42:46 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 20:44:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c547cecb

sys-apps/systemd-utils: do not install 70-power-switch.rules

In meson, this is gated behind enable_logind.

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

 ...md-utils-251.2.ebuild => systemd-utils-251.2-r1.ebuild} | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
similarity index 98%
rename from sys-apps/systemd-utils/systemd-utils-251.2.ebuild
rename to sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
index 6d6a29224efa..357c32eb616c 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
@@ -419,14 +419,19 @@ multilib_src_install() {
 			into /
 			dobin udevadm systemd-hwdb
 			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
 			exeinto /lib/udev
 			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
 			insinto /lib/udev/rules.d
 			doins rules.d/*.rules
+
 			insinto /lib/udev/hwdb.d
 			doins hwdb.d/*.hwdb
+
 			insinto /usr/share/pkgconfig
 			doins src/udev/udev.pc
+
 			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
 			newman man/systemd-udevd.service.8 systemd-udevd.8
 		fi
@@ -457,17 +462,26 @@ multilib_src_install_all() {
 	fi
 	if use udev; then
 		doheader src/libudev/libudev.h
+
 		insinto /etc/udev
 		doins src/udev/udev.conf
 		keepdir /etc/udev/{hwdb.d,rules.d}
+
 		insinto /lib/systemd/network
 		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
 		insinto /lib/udev/rules.d
 		doins rules.d/*.rules
 		doins "${FILESDIR}"/40-gentoo.rules
+
 		insinto /lib/udev/hwdb.d
 		doins hwdb.d/*.hwdb
+
 		dobashcomp shell-completion/bash/udevadm
+
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/_udevadm
 	fi