summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2022-07-04 16:42:46 -0400
committerMike Gilbert <floppym@gentoo.org>2022-07-04 16:44:07 -0400
commitc547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c (patch)
treea2506d8dc14a56dec3b19d2259e056d0d960ed8b /sys-apps
parentdev-db/redis: drop 7.0.0, 7.0.0-r2 (diff)
downloadgentoo-c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c.tar.gz
gentoo-c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c.tar.bz2
gentoo-c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c.zip
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@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild (renamed from sys-apps/systemd-utils/systemd-utils-251.2.ebuild)14
1 files changed, 14 insertions, 0 deletions
diff --git a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild b/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