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 19E41158089 for ; Mon, 11 Sep 2023 15:35:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54A282BC0CF; Mon, 11 Sep 2023 15:35:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 3BCA02BC0CF for ; Mon, 11 Sep 2023 15:35:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 20D70335C34 for ; Mon, 11 Sep 2023 15:35:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93E1A1032 for ; Mon, 11 Sep 2023 15:35:11 +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: <1694446470.d46677fd864b30315423c8364ca44db2de98e2a1.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/mdadm/mdadm-4.2-r1.ebuild sys-fs/mdadm/mdadm-4.2-r2.ebuild X-VCS-Directories: sys-fs/mdadm/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: d46677fd864b30315423c8364ca44db2de98e2a1 X-VCS-Branch: master Date: Mon, 11 Sep 2023 15:35:11 +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: 437e7719-26cb-4653-82fe-44b2bc0dccd8 X-Archives-Hash: de7cd95a14ced6549dabc9398405e58c commit: d46677fd864b30315423c8364ca44db2de98e2a1 Author: Mike Gilbert gentoo org> AuthorDate: Mon Sep 11 15:31:33 2023 +0000 Commit: Mike Gilbert gentoo 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 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.