summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <zx2c4@gentoo.org>2021-02-01 15:38:43 +0100
committerJason A. Donenfeld <zx2c4@gentoo.org>2021-02-01 15:38:43 +0100
commit8122607bc6dc30365b46441412852c3cbdd613fd (patch)
tree3e9cea56600a0991f702d3f84456f30e5e025682
parentsys-auth/pambase: Add systemd-homed support (diff)
downloadgentoo-8122607b.tar.gz
gentoo-8122607b.tar.bz2
gentoo-8122607b.zip
x11-base/xorg-server: conditionalize display-manager-init dependency
This was discussed and ack'd by sam and epsilonKNOT on IRC. Closes: https://bugs.gentoo.org/768024 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild4
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild4
2 files changed, 4 insertions, 4 deletions
diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
index 4d2f85351b5c..2522952f49c7 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -100,7 +100,7 @@ DEPEND="${CDEPEND}
)"
RDEPEND="${CDEPEND}
- gui-libs/display-manager-init
+ !systemd? ( gui-libs/display-manager-init )
selinux? ( sec-policy/selinux-xserver )
"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 3452ef412c49..3859aea5e219 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -101,7 +101,7 @@ DEPEND="${CDEPEND}
)"
RDEPEND="${CDEPEND}
- gui-libs/display-manager-init
+ !systemd? ( gui-libs/display-manager-init )
selinux? ( sec-policy/selinux-xserver )
"