From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24FFC158094 for ; Mon, 4 Jul 2022 20:44:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0611EE0636; Mon, 4 Jul 2022 20:44:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4477E0636 for ; Mon, 4 Jul 2022 20:44:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB770341A7C for ; Mon, 4 Jul 2022 20:44:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43B644D3 for ; Mon, 4 Jul 2022 20:44:12 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1656967447.c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild sys-apps/systemd-utils/systemd-utils-251.2.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c X-VCS-Branch: master Date: Mon, 4 Jul 2022 20:44:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0435104-c786-4e18-a47a-bc59e6868b84 X-Archives-Hash: 40b41850d675352e1f836c99b70c5daa commit: c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c Author: Mike Gilbert gentoo org> AuthorDate: Mon Jul 4 20:42:46 2022 +0000 Commit: Mike Gilbert gentoo 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 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