[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

[Matt Turner]

commit:     1ff2b10d87b24961693bc23b97fafb46f8891c76
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Nov 11 17:32:35 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 17:44:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff2b10d

x11-base/xorg-server: Enable suid-wrapper if USE=suid

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.3.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.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index ee373ffae9f..ef1b59202ac 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -162,8 +162,8 @@ src_configure() {
                $(use_with doc xmlto)
                $(use_with systemd systemd-daemon)
                $(use_enable systemd systemd-logind)
-               $(use_enable systemd suid-wrapper)
-               $(use_enable suid install-setuid)
+               $(usex suid $(use_enable systemd suid-wrapper) 
'--disable-suid-wrapper')
+               $(usex suid $(use_enable !systemd install-setuid) 
'--disable-install-setuid')
                --enable-libdrm
                --sysconfdir="${EPREFIX}"/etc/X11
                --localstatedir="${EPREFIX}"/var

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild 
b/x11-base/xorg-server/xorg-server-9999.ebuild
index 6f158c57aac..54a0459e9f2 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -163,8 +163,8 @@ src_configure() {
                $(use_with doc xmlto)
                $(use_with systemd systemd-daemon)
                $(use_enable systemd systemd-logind)
-               $(use_enable systemd suid-wrapper)
-               $(use_enable suid install-setuid)
+               $(usex suid $(use_enable systemd suid-wrapper) 
'--disable-suid-wrapper')
+               $(usex suid $(use_enable !systemd install-setuid) 
'--disable-install-setuid')
                --enable-libdrm
                --sysconfdir="${EPREFIX}"/etc/X11
                --localstatedir="${EPREFIX}"/var