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

[Anthony G. Basile]

commit:     2c7df62f64eaaa29b20b3b68d41eca93ec2134de
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sat Jan 19 08:47:12 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 19:28:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=2c7df62f

x11-base/xorg-server: sync with tree

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.3.ebuild | 11 ++++++-----
 1 file 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() {