| 1 |
commit: 8122607bc6dc30365b46441412852c3cbdd613fd |
| 2 |
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 1 14:38:43 2021 +0000 |
| 4 |
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 1 14:38:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8122607b |
| 7 |
|
| 8 |
x11-base/xorg-server: conditionalize display-manager-init dependency |
| 9 |
|
| 10 |
This was discussed and ack'd by sam and epsilonKNOT on IRC. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/768024 |
| 13 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 14 |
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> |
| 15 |
|
| 16 |
x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild | 4 ++-- |
| 17 |
x11-base/xorg-server/xorg-server-9999.ebuild | 4 ++-- |
| 18 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index 4d2f85351b5..2522952f49c 100644 |
| 22 |
--- a/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild |
| 23 |
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2020 Gentoo Authors |
| 26 |
+# Copyright 1999-2021 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
@@ -100,7 +100,7 @@ DEPEND="${CDEPEND} |
| 31 |
)" |
| 32 |
|
| 33 |
RDEPEND="${CDEPEND} |
| 34 |
- gui-libs/display-manager-init |
| 35 |
+ !systemd? ( gui-libs/display-manager-init ) |
| 36 |
selinux? ( sec-policy/selinux-xserver ) |
| 37 |
" |
| 38 |
|
| 39 |
|
| 40 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 41 |
index 3452ef412c4..3859aea5e21 100644 |
| 42 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 43 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 44 |
@@ -1,4 +1,4 @@ |
| 45 |
-# Copyright 1999-2020 Gentoo Authors |
| 46 |
+# Copyright 1999-2021 Gentoo Authors |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
EAPI=7 |
| 50 |
@@ -101,7 +101,7 @@ DEPEND="${CDEPEND} |
| 51 |
)" |
| 52 |
|
| 53 |
RDEPEND="${CDEPEND} |
| 54 |
- gui-libs/display-manager-init |
| 55 |
+ !systemd? ( gui-libs/display-manager-init ) |
| 56 |
selinux? ( sec-policy/selinux-xserver ) |
| 57 |
" |
Archives