From 3497dfa5c04b3da7179f02de8fcbcb65190f2eac Mon Sep 17 00:00:00 2001 From: Piotr Karbowski Date: Thu, 21 Mar 2019 21:11:21 +0100 Subject: [PATCH] x11-base/xorg-server: +elogind defaults, relax REQUIRED_USE. Changes after feedback on #gentoo-dev. Now elogind USE flag is enabled by default, and !suid does not enforces elogind or systemd. !suid still will work without any of those as long as login manager starts X as root. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Piotr Karbowski --- x11-base/xorg-server/xorg-server-1.20.4.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.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.4.ebuild index e5f0a8e00eee..d1fe2f091113 100644 --- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind +glamor ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) @@ -114,7 +114,7 @@ REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) elogind? ( udev ) - !suid? ( ^^ ( elogind systemd ) ) + ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive )" diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 37a691793700..3958ac822a37 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind +glamor ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) @@ -113,7 +113,7 @@ REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) elogind? ( udev ) - !suid? ( ^^ ( elogind systemd ) ) + ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive )" -- 2.26.2