--- xorg-server-1.20.3.ebuild	2018-10-25 13:52:36.098226072 -0600
+++ xorg-server-1.20.3-r1.ebuild	2018-10-25 14:24:38.701105805 -0600
@@ -15,7 +15,7 @@
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +setuid systemd +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	!libressl? ( dev-libs/openssl:0= )
@@ -133,6 +133,9 @@
 }
 
 src_configure() {
+	if use setuid && ! use systemd ; then
+		INSTALL_SETUID='--enable-install-setuid'
+	fi
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh
 	# sysconfdir is used for the xorg.conf location; same applies
@@ -163,7 +166,7 @@
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
 		$(use_enable systemd suid-wrapper)
-		$(use_enable !systemd install-setuid)
+		$INSTALL_SETUID
 		--enable-libdrm
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var