From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1017867-garchives=archives.gentoo.org@lists.gentoo.org>
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 061BF1382C5
	for <garchives@archives.gentoo.org>; Sun, 15 Apr 2018 23:07:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 272CEE0809;
	Sun, 15 Apr 2018 23:07:22 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 014F3E0809
	for <gentoo-commits@lists.gentoo.org>; Sun, 15 Apr 2018 23:07:21 +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 B5102335C84
	for <gentoo-commits@lists.gentoo.org>; Sun, 15 Apr 2018 23:07:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E211279
	for <gentoo-commits@lists.gentoo.org>; Sun, 15 Apr 2018 23:07:19 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1523832974.39fdaceded21ebd4c6665ec6147ab65f263ac564.mattst88@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-9999.ebuild
X-VCS-Directories: x11-base/xorg-server/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 39fdaceded21ebd4c6665ec6147ab65f263ac564
X-VCS-Branch: master
Date: Sun, 15 Apr 2018 23:07:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6ed806d4-9fcf-480f-b7f6-906075fe49b6
X-Archives-Hash: 3b21594bde71461cef1762f55c2b524e

commit:     39fdaceded21ebd4c6665ec6147ab65f263ac564
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 22:56:14 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 22:56:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39fdaced

x11-base/xorg-server: Install setuid without systemd

When using systemd, the Xserver does not need to run with root
privileges. Without systemd... I'm not sure.

Bug: https://bugs.gentoo.org/635102
Bug: https://bugs.gentoo.org/635582

 x11-base/xorg-server/xorg-server-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 04dd3ce9336..7af80e32dab 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -161,8 +161,9 @@ src_configure() {
 		$(use_with doc xmlto)
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
+		$(use_enable systemd suid-wrapper)
+		$(use_enable !systemd install-setuid)
 		--enable-libdrm
-		--enable-suid-wrapper
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
 		--with-fontrootdir="${EPREFIX}"/usr/share/fonts