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

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

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 ee373ffae9fc872cdca67b8a3be6e89489fd10c9..ef1b59202acf78e5b57a68fa76a9664004192c18 100644 (file)
--- 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 6f158c57aacd9552c9bbefd9201f75fd5ea94e51..54a0459e9f285927b224a002c98adff83ec95eaf 100644 (file)
--- 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