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

[Matt Turner]

commit:     eb3514d8750cfa4f367f40dc0cb313cd74e50941
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 19:58:21 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 20:13:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3514d8

x11-base/xorg-server: Propagate changes to -9999

And trim trailing whitespace.

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

 x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild |  4 ++--
 x11-base/xorg-server/xorg-server-9999.ebuild      | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
index a7268b80795..8aae610d6d0 100644
--- a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
@@ -176,13 +176,13 @@ pkg_setup() {
        )
 
        if use systemd || use elogind; then
-               XORG_CONFIGURE_OPTIONS+=( 
+               XORG_CONFIGURE_OPTIONS+=(
                        "--enable-systemd-logind"
                        "--disable-install-setuid"
                        "$(use_enable suid suid-wrapper)"
                )
        else
-               XORG_CONFIGURE_OPTIONS+=( 
+               XORG_CONFIGURE_OPTIONS+=(
                        "--disable-systemd-logind"
                        "--disable-suid-wrapper"
                        "$(use_enable suid install-setuid)"

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild 
b/x11-base/xorg-server/xorg-server-9999.ebuild
index 252ce275e86..347f504c887 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux 
+suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux 
suid systemd +udev unwind xcsecurity"
 
 CDEPEND="libglvnd? (
                media-libs/libglvnd[X]
@@ -162,10 +162,7 @@ pkg_setup() {
                $(use_enable udev config-udev)
                $(use_with doc doxygen)
                $(use_with doc xmlto)
-               $(usex !elogind $(use_enable systemd systemd-logind) 
'--enable-systemd-logind')
                $(use_with systemd systemd-daemon)
-               $(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
@@ -177,6 +174,20 @@ pkg_setup() {
                --without-fop
                --with-sha1=libcrypto
        )
+
+       if use systemd || use elogind; then
+               XORG_CONFIGURE_OPTIONS+=(
+                       "--enable-systemd-logind"
+                       "--disable-install-setuid"
+                       "$(use_enable suid suid-wrapper)"
+               )
+       else
+               XORG_CONFIGURE_OPTIONS+=(
+                       "--disable-systemd-logind"
+                       "--disable-suid-wrapper"
+                       "$(use_enable suid install-setuid)"
+               )
+       fi
 }
 
 src_install() {