commit:     8122607bc6dc30365b46441412852c3cbdd613fd
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 14:38:43 2021 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 14:38:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8122607b

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 <AT> gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-9999.ebuild       | 4 ++--
 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 4d2f85351b5..2522952f49c 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 3452ef412c4..3859aea5e21 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 )
 "
 

Reply via email to