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 e1f219414a3f1..93c416de7606b 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 e1f219414a3f1..93c416de7606b 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=(