From 32eec7440046151d9de01bee671186571f7cc32b Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 17 Apr 2022 13:47:59 +0100 Subject: virtual/libudev: keep transitional sys-fs/udev Portage may be inclined to try (and fail) to use systemd here instead of the new (for non-systemd systems) systemd-utils tools package, so let's include sys-fs/udev instead, which is a transitional package, below systemd-utils. Already seen one nasty such situation where Portage gets confused & can't resolve w/o this, and this sorts it out. Signed-off-by: Sam James --- virtual/libudev/libudev-232-r6.ebuild | 20 -------------------- virtual/libudev/libudev-232-r7.ebuild | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 virtual/libudev/libudev-232-r6.ebuild create mode 100644 virtual/libudev/libudev-232-r7.ebuild diff --git a/virtual/libudev/libudev-232-r6.ebuild b/virtual/libudev/libudev-232-r6.ebuild deleted file mode 100644 index aed453196d9b..000000000000 --- a/virtual/libudev/libudev-232-r6.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual for libudev providers" - -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="systemd" - -RDEPEND=" - !systemd? ( || ( - sys-apps/systemd-utils[udev,${MULTILIB_USEDEP}] - >=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP}] - ) ) - systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP}] ) -" diff --git a/virtual/libudev/libudev-232-r7.ebuild b/virtual/libudev/libudev-232-r7.ebuild new file mode 100644 index 000000000000..60120fb8bbda --- /dev/null +++ b/virtual/libudev/libudev-232-r7.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-build + +DESCRIPTION="Virtual for libudev providers" + +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="systemd" + +RDEPEND=" + !systemd? ( || ( + sys-apps/systemd-utils[udev,${MULTILIB_USEDEP}] + sys-fs/udev[${MULTILIB_USEDEP}] + >=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP}] + ) ) + systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP}] ) +" -- cgit v1.2.3-65-gdbad