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

[Piotr Karbowski]

commit:     d4eecca2664a2ffd5e6afd2df2a339a6ffd85f1e
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  1 19:16:50 2021 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sun Aug  1 19:18:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4eecca2

x11-base/xorg-server: 1.20.13-r1 and 9999 wayland USE drop.

Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 .../{xorg-server-1.20.13.ebuild => xorg-server-1.20.13-r1.ebuild}     | 4 +---
 x11-base/xorg-server/xorg-server-9999.ebuild                          | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.13.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
similarity index 97%
rename from x11-base/xorg-server/xorg-server-1.20.13.ebuild
rename to x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
index e1f219414a3..93c416de760 100644
--- a/x11-base/xorg-server/xorg-server-1.20.13.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test 
+udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
@@ -96,7 +96,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
        !systemd? ( gui-libs/display-manager-init )
        selinux? ( sec-policy/selinux-xserver )
-       wayland? ( x11-base/xwayland )
 "
 BDEPEND="
        sys-devel/flex
@@ -109,7 +108,6 @@ REQUIRED_USE="!minimal? (
        )
        elogind? ( udev )
        ?? ( elogind systemd )
-       minimal? ( !wayland )
        xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild 
b/x11-base/xorg-server/xorg-server-9999.ebuild
index e1f219414a3..93c416de760 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test 
+udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
@@ -96,7 +96,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
        !systemd? ( gui-libs/display-manager-init )
        selinux? ( sec-policy/selinux-xserver )
-       wayland? ( x11-base/xwayland )
 "
 BDEPEND="
        sys-devel/flex
@@ -109,7 +108,6 @@ REQUIRED_USE="!minimal? (
        )
        elogind? ( udev )
        ?? ( elogind systemd )
-       minimal? ( !wayland )
        xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(