aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstefson <herrtimson@yahoo.de>2019-01-19 09:47:12 +0100
committerAnthony G. Basile <blueness@gentoo.org>2019-01-23 14:28:39 -0500
commit2c7df62f64eaaa29b20b3b68d41eca93ec2134de (patch)
tree2f3fb0f5e6a7845f006e0e6087bce00bb2d2db75 /x11-base
parentx11-base/xorg-server: drop old (diff)
downloadmusl-2c7df62f64eaaa29b20b3b68d41eca93ec2134de.tar.gz
musl-2c7df62f64eaaa29b20b3b68d41eca93ec2134de.tar.bz2
musl-2c7df62f64eaaa29b20b3b68d41eca93ec2134de.zip
x11-base/xorg-server: sync with tree
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.3.ebuild11
1 files changed, 6 insertions, 5 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 a057e05..6018177 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -13,8 +13,8 @@ if [[ ${PV} != 9999* ]]; then
KEYWORDS="arm"
fi
-IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!libressl? ( dev-libs/openssl:0= )
@@ -106,6 +106,7 @@ PDEPEND="
REQUIRED_USE="!minimal? (
|| ( ${IUSE_SERVERS} )
)
+ minimal? ( !glamor !wayland )
xephyr? ( kdrive )"
UPSTREAMED_PATCHES=(
@@ -162,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
@@ -198,7 +199,7 @@ src_install() {
insinto /usr/share/portage/config/sets
newins "${FILESDIR}"/xorg-sets.conf xorg.conf
- [ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die
+ find "${ED}"/var -type d -empty -delete || die
}
pkg_postinst() {