commit: d46677fd864b30315423c8364ca44db2de98e2a1 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Sep 11 15:31:33 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Sep 11 15:34:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46677fd
sys-fs/mdadm: clean up udev/static logic Since eudev has been masked for removal, drop the related logic. Bug: https://bugs.gentoo.org/830485 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-fs/mdadm/{mdadm-4.2-r1.ebuild => mdadm-4.2-r2.ebuild} | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys-fs/mdadm/mdadm-4.2-r1.ebuild b/sys-fs/mdadm/mdadm-4.2-r2.ebuild similarity index 85% rename from sys-fs/mdadm/mdadm-4.2-r1.ebuild rename to sys-fs/mdadm/mdadm-4.2-r2.ebuild index fe1e3a8ea8aa..9dc8510225da 100644 --- a/sys-fs/mdadm/mdadm-4.2-r1.ebuild +++ b/sys-fs/mdadm/mdadm-4.2-r2.ebuild @@ -17,19 +17,13 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="static systemd +udev" -# Only sys-fs/eudev provides static-libs right now, so if you have systemd, -# you need to choose between static or udev, as your udev won't have static libs. -# bug #830485 -REQUIRED_USE="systemd? ( ?? ( static udev ) )" +REQUIRED_USE="static? ( !udev )" BDEPEND="app-arch/xz-utils virtual/pkgconfig" -DEPEND="udev? ( - static? ( !systemd? ( sys-fs/eudev[static-libs] ) ) - !static? ( virtual/libudev:= ) - )" -RDEPEND=">=sys-apps/util-linux-2.16 - udev? ( !static? ( virtual/libudev:= ) )" +DEPEND="udev? ( virtual/libudev:= )" +RDEPEND="${DEPEND} + >=sys-apps/util-linux-2.16" # The tests edit values in /proc and run tests on software raid devices. # Thus, they shouldn't be run on systems with active software RAID devices.
