From de65ca7b4a3f3a68b65b56e2dcaf6e511d3a3443 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 15 Jan 2025 23:33:28 +0000 Subject: [PATCH] Revert "sys-apps/systemd: drop hwids blocker" This reverts commit 70f80b10d72462b50cc1ba3ea66d7158fbacf672. I hit this today when updating an old chroot. It's pretty cheap to keep an old blocker and can be the difference between an emerge process falling over (possibly at a fragile step) or completing successfully - I had no other issues. Signed-off-by: Sam James --- sys-apps/systemd/systemd-254.17.ebuild | 1 + sys-apps/systemd/systemd-254.21.ebuild | 1 + sys-apps/systemd/systemd-255.11.ebuild | 1 + sys-apps/systemd/systemd-255.15.ebuild | 1 + sys-apps/systemd/systemd-255.16.ebuild | 1 + sys-apps/systemd/systemd-256.10.ebuild | 1 + sys-apps/systemd/systemd-9999.ebuild | 1 + 7 files changed, 7 insertions(+) diff --git a/sys-apps/systemd/systemd-254.17.ebuild b/sys-apps/systemd/systemd-254.17.ebuild index 27288f01db4d0..5bbb9673648a7 100644 --- a/sys-apps/systemd/systemd-254.17.ebuild +++ b/sys-apps/systemd/systemd-254.17.ebuild @@ -141,6 +141,7 @@ RDEPEND="${COMMON_DEPEND} ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev diff --git a/sys-apps/systemd/systemd-254.21.ebuild b/sys-apps/systemd/systemd-254.21.ebuild index d32eb9cf90672..68cb53d8ae344 100644 --- a/sys-apps/systemd/systemd-254.21.ebuild +++ b/sys-apps/systemd/systemd-254.21.ebuild @@ -141,6 +141,7 @@ RDEPEND="${COMMON_DEPEND} ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev diff --git a/sys-apps/systemd/systemd-255.11.ebuild b/sys-apps/systemd/systemd-255.11.ebuild index c7be7d18dd461..068165c7f0ba7 100644 --- a/sys-apps/systemd/systemd-255.11.ebuild +++ b/sys-apps/systemd/systemd-255.11.ebuild @@ -144,6 +144,7 @@ RDEPEND="${COMMON_DEPEND} ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev diff --git a/sys-apps/systemd/systemd-255.15.ebuild b/sys-apps/systemd/systemd-255.15.ebuild index 9f2c1c44f05d0..f45be4631e273 100644 --- a/sys-apps/systemd/systemd-255.15.ebuild +++ b/sys-apps/systemd/systemd-255.15.ebuild @@ -144,6 +144,7 @@ RDEPEND="${COMMON_DEPEND} ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev diff --git a/sys-apps/systemd/systemd-255.16.ebuild b/sys-apps/systemd/systemd-255.16.ebuild index 70f889b56636d..ba3ffac946319 100644 --- a/sys-apps/systemd/systemd-255.16.ebuild +++ b/sys-apps/systemd/systemd-255.16.ebuild @@ -144,6 +144,7 @@ RDEPEND="${COMMON_DEPEND} ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev diff --git a/sys-apps/systemd/systemd-256.10.ebuild b/sys-apps/systemd/systemd-256.10.ebuild index 323be45e828c2..b1d910074fdac 100644 --- a/sys-apps/systemd/systemd-256.10.ebuild +++ b/sys-apps/systemd/systemd-256.10.ebuild @@ -140,6 +140,7 @@ RDEPEND="${COMMON_DEPEND} ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 26f2f72f7977a..250d179e1c2af 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -140,6 +140,7 @@ RDEPEND="${COMMON_DEPEND} ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev