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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AD7641382C5 for ; Mon, 1 Feb 2021 14:39:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BC51E092C; Mon, 1 Feb 2021 14:39:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 424C2E092C for ; Mon, 1 Feb 2021 14:39:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C288C33E55B for ; Mon, 1 Feb 2021 14:39:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FD9BB9 for ; Mon, 1 Feb 2021 14:39:52 +0000 (UTC) From: "Jason A. Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason A. Donenfeld" Message-ID: <1612190323.8122607bc6dc30365b46441412852c3cbdd613fd.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: 8122607bc6dc30365b46441412852c3cbdd613fd X-VCS-Branch: master Date: Mon, 1 Feb 2021 14:39:52 +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: 507ab86f-a3e9-4a11-a431-bdfd78482aab X-Archives-Hash: 5cfe0665d3bd3b50160e9b7c97ff1e55 commit: 8122607bc6dc30365b46441412852c3cbdd613fd Author: Jason A. Donenfeld gentoo org> AuthorDate: Mon Feb 1 14:38:43 2021 +0000 Commit: Jason A. Donenfeld gentoo 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 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 ) "