summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-01-03 07:45:55 +0000
committerSam James <sam@gentoo.org>2022-01-03 07:48:41 +0000
commit81a13f851b7502d547ff8c0434bf64a443877fb1 (patch)
treeeb9c71b1e41e7b0a61af7b5e2bc817fa60087b52
parentsys-fs/mdadm: drop extra line (diff)
downloadgentoo-81a13f85.tar.gz
gentoo-81a13f85.tar.bz2
gentoo-81a13f85.zip
sys-fs/mdadm: add REQUIRED_USE for systemd/udev/static
Bug: https://bugs.gentoo.org/830485 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--profiles/targets/systemd/package.use.force5
-rw-r--r--sys-fs/mdadm/mdadm-4.2-r1.ebuild9
2 files changed, 12 insertions, 2 deletions
diff --git a/profiles/targets/systemd/package.use.force b/profiles/targets/systemd/package.use.force
index 0abe8e8aadcc..ee209ac51ca1 100644
--- a/profiles/targets/systemd/package.use.force
+++ b/profiles/targets/systemd/package.use.force
@@ -1,6 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sam James <sam@gentoo.org> (2021-01-03)
+# Need systemd enabled here for depgraph: bug #830485
+# (only sys-fs/eudev supports static which isn't available on systemd profiles)
+sys-fs/mdadm systemd
+
# Mike Gilbert <floppym@gentoo.org> (2015-04-22)
# Force systemd to avoid depgraph breakage, bug 547360.
virtual/libudev systemd
diff --git a/sys-fs/mdadm/mdadm-4.2-r1.ebuild b/sys-fs/mdadm/mdadm-4.2-r1.ebuild
index c5fe5d5dfb8d..aff2ca081cb7 100644
--- a/sys-fs/mdadm/mdadm-4.2-r1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.2-r1.ebuild
@@ -15,12 +15,17 @@ LICENSE="GPL-2"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="static +udev"
+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 ) )"
BDEPEND="app-arch/xz-utils
virtual/pkgconfig"
DEPEND="udev? (
- static? ( sys-fs/eudev[static-libs] )
+ static? ( !systemd? ( sys-fs/eudev[static-libs] ) )
!static? ( virtual/libudev:= )
)"
RDEPEND=">=sys-apps/util-linux-2.16