summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <commendsarnex@gmail.com>2017-10-21 11:27:22 -0400
committerMatt Turner <mattst88@gentoo.org>2017-10-21 10:12:05 -0700
commitca17c5f407cb5264369aafd39ead709e46777dc4 (patch)
tree217c32061c8dd14626e65588fcd5a96a48a80794 /x11-base/xorg-server/xorg-server-9999.ebuild
parentdev-libs/librelp: stable 1.2.14 for sparc, bug #627718 (thanks to Rolf Eike B... (diff)
downloadgentoo-ca17c5f407cb5264369aafd39ead709e46777dc4.tar.gz
gentoo-ca17c5f407cb5264369aafd39ead709e46777dc4.tar.bz2
gentoo-ca17c5f407cb5264369aafd39ead709e46777dc4.zip
x11-base/xorg-server: Remove suid and suid-wrapper USEs, and build suid-wrapper by default
suid-wrapper does the right thing Signed-off-by: Nick Sarnie <commendsarnex@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/5999
Diffstat (limited to 'x11-base/xorg-server/xorg-server-9999.ebuild')
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild6
1 files changed, 2 insertions, 4 deletions
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index fcd0924e2e2..adbcb3477a0 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -12,7 +12,7 @@ SLOT="0/${PV}"
KEYWORDS=""
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid suid-wrapper systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!libressl? ( dev-libs/openssl:0= )
@@ -132,7 +132,6 @@ PDEPEND="
REQUIRED_USE="!minimal? (
|| ( ${IUSE_SERVERS} )
)
- ^^ ( suid suid-wrapper )
xephyr? ( kdrive )"
#UPSTREAMED_PATCHES=(
@@ -171,8 +170,6 @@ src_configure() {
$(use_enable dmx)
$(use_enable glamor)
$(use_enable kdrive)
- $(use_enable suid install-setuid)
- $(use_enable suid-wrapper)
$(use_enable unwind libunwind)
$(use_enable wayland xwayland)
$(use_enable !minimal record)
@@ -191,6 +188,7 @@ src_configure() {
$(use_with systemd systemd-daemon)
$(use_enable systemd systemd-logind)
--enable-libdrm
+ --enable-suid-wrapper
--sysconfdir="${EPREFIX}"/etc/X11
--localstatedir="${EPREFIX}"/var
--with-fontrootdir="${EPREFIX}"/usr/share/fonts