Adding metadata

17 files changed, 194 insertions, 601 deletions

diff --git a/x11-base/xorg-drivers/metadata.xml b/x11-base/xorg-drivers/metadata.xml
index 16aca1d058e1..fd6c7688e7d2 100644
--- a/x11-base/xorg-drivers/metadata.xml
+++ b/x11-base/xorg-drivers/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
+  <maintainer type="project">
     <email>x11@gentoo.org</email>
     <name>X11</name>
   </maintainer>
diff --git a/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
index 7355dd89f9d0..2c489dbcbd66 100644
--- a/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Meta package containing deps on all xorg drivers"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-else
-	PROPERTIES+=" live"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_INPUT_DEVICES="
@@ -31,10 +30,14 @@ IUSE_VIDEO_CARDS="
 	video_cards_fbdev
 	video_cards_freedreno
 	video_cards_geode
+	video_cards_glint
 	video_cards_i915
+	video_cards_i965
 	video_cards_intel
 	video_cards_mga
 	video_cards_nouveau
+	video_cards_nv
+	video_cards_omap
 	video_cards_qxl
 	video_cards_r128
 	video_cards_radeon
@@ -43,6 +46,9 @@ IUSE_VIDEO_CARDS="
 	video_cards_tegra
 	video_cards_vc4
 	video_cards_vesa
+	video_cards_via
+	video_cards_virtualbox
+	video_cards_vmware
 	video_cards_nvidia
 "
 
@@ -70,10 +76,14 @@ PDEPEND="
 	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
 	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
+	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
-	video_cards_intel?         ( >=x11-base/xorg-server-${PV}[-minimal] )
+	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[-minimal] )
+	video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
 	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
 	video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
+	video_cards_nv?            ( >=x11-drivers/xf86-video-nv-2.1.21 )
+	video_cards_omap?          ( >=x11-drivers/xf86-video-omap-0.4.5 )
 	video_cards_qxl?           ( x11-drivers/xf86-video-qxl )
 	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
 	video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
@@ -83,4 +93,7 @@ PDEPEND="
 	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
+	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
+	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
+	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 "
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1.1.ebuild
index 59bfda52520a..aa8bf3ee7bf0 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-21.1.1.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Meta package containing deps on all xorg drivers"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-else
-	PROPERTIES+=" live"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_INPUT_DEVICES="
@@ -31,10 +29,14 @@ IUSE_VIDEO_CARDS="
 	video_cards_fbdev
 	video_cards_freedreno
 	video_cards_geode
+	video_cards_glint
 	video_cards_i915
+	video_cards_i965
 	video_cards_intel
 	video_cards_mga
 	video_cards_nouveau
+	video_cards_nv
+	video_cards_omap
 	video_cards_qxl
 	video_cards_r128
 	video_cards_radeon
@@ -43,6 +45,9 @@ IUSE_VIDEO_CARDS="
 	video_cards_tegra
 	video_cards_vc4
 	video_cards_vesa
+	video_cards_via
+	video_cards_virtualbox
+	video_cards_vmware
 	video_cards_nvidia
 "
 
@@ -70,10 +75,14 @@ PDEPEND="
 	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
 	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
+	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
-	video_cards_intel?         ( >=x11-base/xorg-server-${PV}[-minimal] )
+	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[-minimal] )
+	video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
 	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
 	video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
+	video_cards_nv?            ( >=x11-drivers/xf86-video-nv-2.1.21 )
+	video_cards_omap?          ( >=x11-drivers/xf86-video-omap-0.4.5 )
 	video_cards_qxl?           ( x11-drivers/xf86-video-qxl )
 	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
 	video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
@@ -83,4 +92,7 @@ PDEPEND="
 	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
+	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
+	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
+	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 "
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a95f824e7573..587b3822f6fb 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,2 +1,2 @@
+DIST xorg-server-21.1.21.tar.xz 5052804 BLAKE2B c77eb6e0405c38f23c61567fc9dce03165fdf657109ec0b1deb954028a9a1ea275d9e687db746d8306085d0c5e422402ec25e4ddbefe77ddc6b41eb4e323304e SHA512 bb2eb4e6756eb9e38b61bd47c017da44bcf5f45f2b7a906b4bb3a56b3d791cec64abb9bf37b224efe1e4fab9cc296f3672c9b2f8e00e1cdfc54337bef63cd16c
 DIST xorg-server-21.1.22.tar.xz 5063808 BLAKE2B e1e23734fdc3468139ade1638e6321ac464fadb6926dfc0bfa59c706fe88d6280c25f6d186694defe9dc237f431a44b66acf7881fdfa91b4829a23b70f82f029 SHA512 6cb37ff971e10eb4a7dfcb3e8071afd769c7632d50e4ad8bc948b810dc4847e152b8a05ec135f55e0695b35908abd07e7728ef85dd3135456fd532e919f440f4
-DIST xorg-server-21.1.23.tar.xz 5069780 BLAKE2B af5ae442d02ff02c6fe0d25dc8d534b1896d725f882e55348078fa6c5a71fced29ddcbe87bf245db49672bd46be78cc474987262f1d79666d6f62d10e640dde1 SHA512 7eae854af1b5db1f5d1e59cb9d26b86d98fa176d4f80f70935c707f17982d0446a0a8ad8d29c922edbd208435f995b027604fbb72e62a7bf3ba79f2f570aa0bb
diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4
new file mode 100644
index 000000000000..880d4635f117
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -0,0 +1,10 @@
+# We always try and start X on a static VT. The various DMs normally default
+# to using VT7. If you wish to use the xdm init script, then you should ensure
+# that the VT checked is the same VT your DM wants to use. We do this check to
+# ensure that you haven't accidentally configured something to run on the VT
+# in your /etc/inittab file so that you don't get a dead keyboard.
+CHECKVT=7
+
+# What display manager do you use ?  [ xdm | gdm | sddm | gpe | lightdm | entrance ]
+# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
+DISPLAYMANAGER="xdm"
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index 623e8be714b6..5783cddc0cc3 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -2,11 +2,20 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
+  <maintainer type="project">
     <email>x11@gentoo.org</email>
     <name>X11</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
+  </upstream>
   <use>
+    <flag name="dmx">Build the Distributed Multiheaded X server</flag>
     <flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag>
+    <flag name="kdrive">Build the kdrive X servers</flag>
     <flag name="unwind">Enable libunwind usage for backtraces</flag>
     <flag name="xcsecurity">Build Security extension</flag>
     <flag name="xephyr">Build the Xephyr server</flag>
@@ -14,8 +23,5 @@
     <flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
     <flag name="xvfb">Build the Xvfb server</flag>
   </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
-  </upstream>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/x11-base/xorg-server/xorg-server-21.1.23.ebuild b/x11-base/xorg-server/xorg-server-21.1.21.ebuild
index 3cc7bf65e4f5..f1e0e0590d0d 100644
--- a/x11-base/xorg-server/xorg-server-21.1.23.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.21.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit flag-o-matic xorg-meson
+XORG_TARBALL_SUFFIX="xz"
+XORG_EAUTORECONF="no"
+inherit flag-o-matic xorg-3 meson
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
@@ -20,7 +19,9 @@ CDEPEND="
 	media-libs/libglvnd[X]
 	dev-libs/libbsd
 	dev-libs/openssl:0=
+
 	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
 	x11-apps/xkbcomp
 	>=x11-libs/libdrm-2.4.89
@@ -49,6 +50,8 @@ CDEPEND="
 		x11-libs/xcb-util-wm
 	)
 	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
 		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
 		>=media-libs/libepoxy-1.5.4[X,egl(+)]
 	)
@@ -92,11 +95,7 @@ REQUIRED_USE="!minimal? (
 	elogind? ( udev )
 	?? ( elogind systemd )"
 
-UPSTREAMED_PATCHES=(
-)
-
 PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 	# needed for new eselect-opengl, bug #541232
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
@@ -107,12 +106,11 @@ PATCHES=(
 src_configure() {
 	# bug #835653
 	use x86 && replace-flags -Os -O2
-	use x86 && replace-flags -Oz -O2
 
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh
 	# sysconfdir is used for the xorg.conf location; same applies
-	local XORG_CONFIGURE_OPTIONS=(
+	local emesonargs=(
 		--localstatedir "${EPREFIX}/var"
 		--sysconfdir "${EPREFIX}/etc/X11"
 		-Dbuildtype=$(usex debug debug plain)
@@ -143,28 +141,23 @@ src_configure() {
 		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
 	)
 
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		XORG_CONFIGURE_OPTIONS+=( -Dxwayland=false )
-	fi
-
 	if use systemd || use elogind; then
-		XORG_CONFIGURE_OPTIONS+=(
+		emesonargs+=(
 			-Dsystemd_logind=true
 			$(meson_use suid suid_wrapper)
 		)
 	else
-		XORG_CONFIGURE_OPTIONS+=(
+		emesonargs+=(
 			-Dsystemd_logind=false
 			-Dsuid_wrapper=false
 		)
 	fi
 
-	xorg-meson_src_configure
+	meson_src_configure
 }
 
 src_install() {
-	xorg-meson_src_install
+	meson_src_install
 
 	# The meson build system does not support install-setuid
 	if ! use systemd && ! use elogind; then
diff --git a/x11-base/xorg-server/xorg-server-21.1.22.ebuild b/x11-base/xorg-server/xorg-server-21.1.22.ebuild
index e370b8263704..0d4fc8f26f57 100644
--- a/x11-base/xorg-server/xorg-server-21.1.22.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.22.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit flag-o-matic xorg-meson
+XORG_TARBALL_SUFFIX="xz"
+XORG_EAUTORECONF="no"
+inherit flag-o-matic xorg-3 meson
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
@@ -20,7 +19,9 @@ CDEPEND="
 	media-libs/libglvnd[X]
 	dev-libs/libbsd
 	dev-libs/openssl:0=
+
 	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
 	x11-apps/xkbcomp
 	>=x11-libs/libdrm-2.4.89
@@ -49,6 +50,8 @@ CDEPEND="
 		x11-libs/xcb-util-wm
 	)
 	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
 		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
 		>=media-libs/libepoxy-1.5.4[X,egl(+)]
 	)
@@ -92,11 +95,7 @@ REQUIRED_USE="!minimal? (
 	elogind? ( udev )
 	?? ( elogind systemd )"
 
-UPSTREAMED_PATCHES=(
-)
-
 PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 	# needed for new eselect-opengl, bug #541232
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
@@ -107,12 +106,11 @@ PATCHES=(
 src_configure() {
 	# bug #835653
 	use x86 && replace-flags -Os -O2
-	use x86 && replace-flags -Oz -O2
 
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh
 	# sysconfdir is used for the xorg.conf location; same applies
-	local XORG_CONFIGURE_OPTIONS=(
+	local emesonargs=(
 		--localstatedir "${EPREFIX}/var"
 		--sysconfdir "${EPREFIX}/etc/X11"
 		-Dbuildtype=$(usex debug debug plain)
@@ -143,28 +141,23 @@ src_configure() {
 		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
 	)
 
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		XORG_CONFIGURE_OPTIONS+=( -Dxwayland=false )
-	fi
-
 	if use systemd || use elogind; then
-		XORG_CONFIGURE_OPTIONS+=(
+		emesonargs+=(
 			-Dsystemd_logind=true
 			$(meson_use suid suid_wrapper)
 		)
 	else
-		XORG_CONFIGURE_OPTIONS+=(
+		emesonargs+=(
 			-Dsystemd_logind=false
 			-Dsuid_wrapper=false
 		)
 	fi
 
-	xorg-meson_src_configure
+	meson_src_configure
 }
 
 src_install() {
-	xorg-meson_src_install
+	meson_src_install
 
 	# The meson build system does not support install-setuid
 	if ! use systemd && ! use elogind; then
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
deleted file mode 100644
index 50536a7f36ea..000000000000
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic xorg-meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	media-libs/libglvnd[X]
-	dev-libs/libbsd
-	dev-libs/openssl:0=
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	xorg? (
-		>=x11-libs/libxcvt-0.1.0
-	)
-	xnest? (
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libX11-1.1.5
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	selinux? (
-		sys-process/audit
-		sys-libs/libselinux:=
-	)
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind[pam]
-		sys-auth/pambase[elogind]
-	)
-	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2024.1
-	>=x11-libs/xtrans-1.3.5
-	media-fonts/font-util
-	test? ( >=x11-libs/libxcvt-0.1.0 )
-"
-RDEPEND="${CDEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-	selinux? ( sec-policy/selinux-xserver )
-	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
-	app-alternatives/lex
-"
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )"
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-)
-
-src_configure() {
-	# bug #835653
-	use x86 && replace-flags -Os -O2
-	use x86 && replace-flags -Oz -O2
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	local XORG_CONFIGURE_OPTIONS=(
-		--localstatedir "${EPREFIX}/var"
-		--sysconfdir "${EPREFIX}/etc/X11"
-		-Db_ndebug=$(usex debug false true)
-		$(meson_use !minimal dri1)
-		$(meson_use !minimal dri2)
-		$(meson_use !minimal dri3)
-		$(meson_use !minimal glamor)
-		$(meson_use !minimal glx)
-		$(meson_use udev)
-		$(meson_use udev udev_kms)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		$(meson_use xephyr)
-		$(meson_use xnest)
-		$(meson_use xorg)
-		$(meson_use xvfb)
-		-Ddocs=false
-		-Ddrm=true
-		-Ddtrace=false
-		-Dipv6=true
-		-Dhal=false
-		-Dlinux_acpi=false
-		-Dlinux_apm=false
-		-Dsha1=libcrypto
-		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
-	)
-
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		XORG_CONFIGURE_OPTIONS+=( -Dxwayland=false )
-	fi
-
-	if use systemd || use elogind; then
-		XORG_CONFIGURE_OPTIONS+=(
-			-Dsystemd_logind=true
-			$(meson_use suid suid_wrapper)
-		)
-	else
-		XORG_CONFIGURE_OPTIONS+=(
-			-Dsystemd_logind=false
-			-Dsuid_wrapper=false
-		)
-	fi
-
-	xorg-meson_src_configure
-}
-
-src_install() {
-	xorg-meson_src_install
-
-	# The meson build system does not support install-setuid
-	if ! use systemd && ! use elogind; then
-		if use suid; then
-			chmod u+s "${ED}"/usr/bin/Xorg
-		fi
-	fi
-
-	if ! use xorg; then
-		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x || die
-	fi
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index a64b167260c9..c873aaaed44b 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,3 +1,2 @@
 DIST xwayland-24.1.10.tar.xz 1305612 BLAKE2B ab561520eed146f0a4111a115ef8a8f68594221c065599ffa71a08eadeff4af0973a7e8e454bf6aff0aa0a1cc2d01fb6cbd536dc845be9c16392922e2dd7193a SHA512 bceba1db7f4d7ac92d2b2a3c8f6f7ab0cc093f396fe89406f8dba25e32ffc3edfa552df246cbfb3b0708c1d28b3e179694d11870b063d5b8f9ab2db9fb861a8f
 DIST xwayland-24.1.11.tar.xz 1305372 BLAKE2B a7938f1fe88bffe8e2273f4ddeaccec793b0253dd12abb86c7ad36b5fdc8c06da7b6a4a6e1c60ecf3465c167d1e5c85b1e0c4914179cce267357986b2e430e6c SHA512 586d7e60c8bf0d92cec66451284c6c43b960010f14a1e204b5de722c610dc067481fd6ece0ffae615ca53ca2d0262e2a3dbb916d04811b8d57c1085bc363f5e9
-DIST xwayland-24.1.12.tar.xz 1306052 BLAKE2B 971878808f249f5b702a4c192b3cec2ff1c843e5588574384d6ca2acfd62294de1bb425c3a0074928700050d2e537d70c1534d402d2ef0f8a1c40a1869c4eaad SHA512 b4ee41761c2caa7332573be07d9143b60015bb4a7910c90b6ae079dde0a1bf6b0b4773ff4e6fba48279cdee83b4de5eb4a19b9369b5753e4147b94fa2deece96
diff --git a/x11-base/xwayland/files/file_collissions.patch b/x11-base/xwayland/files/file_collissions.patch
new file mode 100644
index 000000000000..e8059237ec31
--- /dev/null
+++ b/x11-base/xwayland/files/file_collissions.patch
@@ -0,0 +1,32 @@
+diff -urN xwayland-24.1.0.orig/dix/meson.build xwayland-24.1.0/dix/meson.build
+--- xwayland-24.1.0.orig/dix/meson.build	2024-05-16 13:31:42.673433359 +0200
++++ xwayland-24.1.0/dix/meson.build	2024-05-16 13:32:49.474438170 +0200
+@@ -58,7 +58,7 @@
+     dependencies: common_dep,
+ )
+ 
+-install_data(
+-    'protocol.txt',
+-    install_dir: serverconfigdir,
+-)
++#install_data(
++#    'protocol.txt',
++#    install_dir: serverconfigdir,
++#)
+diff -urN xwayland-24.1.0.orig/man/meson.build xwayland-24.1.0/man/meson.build
+--- xwayland-24.1.0.orig/man/meson.build	2024-05-16 13:31:42.680433359 +0200
++++ xwayland-24.1.0/man/meson.build	2024-05-16 13:33:08.540439543 +0200
+@@ -24,8 +24,8 @@
+ manpage_config.set('bundle_id_prefix', '...')
+ manpage_config.set('default_font_path', default_font_path)
+ 
+-install_man(configure_file(
+-    input: 'Xserver.man',
+-    output: 'Xserver.1',
+-    configuration: manpage_config,
+-))
++#install_man(configure_file(
++#    input: 'Xserver.man',
++#    output: 'Xserver.1',
++#    configuration: manpage_config,
++#))
diff --git a/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch b/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
new file mode 100644
index 000000000000..173daa3c6265
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
@@ -0,0 +1,36 @@
+From d5ef57f1efc967fbc88dfa0f0177be354caf039b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
+Date: Tue, 26 Sep 2023 17:23:32 +0200
+Subject: [PATCH xserver] test: Skip Xwayland test early if PIGLIT_DIR /
+ XTEST_DIR isn't set
+
+No point starting weston and waiting for it to start up in that case.
+---
+ test/scripts/xwayland-piglit.sh | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/test/scripts/xwayland-piglit.sh b/test/scripts/xwayland-piglit.sh
+index 97a1759d9..9d6e54d01 100755
+--- a/test/scripts/xwayland-piglit.sh
++++ b/test/scripts/xwayland-piglit.sh
+@@ -1,5 +1,17 @@
+ #!/bin/bash -e
+ 
++if test "x$XTEST_DIR" = "x"; then
++    echo "XTEST_DIR must be set to the directory of the xtest repository."
++    # Exit as a "skip" so make check works even without xtest.
++    exit 77
++fi
++
++if test "x$PIGLIT_DIR" = "x"; then
++    echo "PIGLIT_DIR must be set to the directory of the piglit repository."
++    # Exit as a "skip" so make check works even without piglit.
++    exit 77
++fi
++
+ # this times out on Travis, because the tests take too long.
+ if test "x$TRAVIS_BUILD_DIR" != "x"; then
+     exit 77
+-- 
+2.43.2
+
diff --git a/x11-base/xwayland/metadata.xml b/x11-base/xwayland/metadata.xml
index afe3587ee20e..586331394e85 100644
--- a/x11-base/xwayland/metadata.xml
+++ b/x11-base/xwayland/metadata.xml
@@ -2,17 +2,21 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
+  <maintainer type="project">
     <email>x11@gentoo.org</email>
     <name>X11</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
+  </upstream>
   <use>
     <flag name="unwind">Enable libunwind usage for backtraces</flag>
     <flag name="xcsecurity">Build Security extension</flag>
     <flag name="libei">Enable emulated input using <pkg>dev-libs/libei</pkg>
     </flag>
   </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
-  </upstream>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/x11-base/xwayland/xwayland-24.1.10.ebuild b/x11-base/xwayland/xwayland-24.1.10.ebuild
index 9656dddd36d2..bae511ba47cf 100644
--- a/x11-base/xwayland/xwayland-24.1.10.ebuild
+++ b/x11-base/xwayland/xwayland-24.1.10.ebuild
@@ -1,37 +1,30 @@
-# Copyright 2021-2026 Gentoo Authors
+# Copyright 2022-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
 inherit meson
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
 DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+
+IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
 
 LICENSE="MIT"
 SLOT="0"
-
-IUSE="libei selinux systemd test unwind xcsecurity"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/libbsd
 	dev-libs/openssl:=
+
 	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.34
+	>=dev-libs/wayland-protocols-1.36
 	media-fonts/font-util
 	>=media-libs/libepoxy-1.5.4[X,egl(+)]
 	media-libs/libglvnd[X]
 	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.116
+	>=x11-libs/libdrm-2.4.109
 	>=x11-libs/libXau-1.0.4
 	x11-libs/libxcvt
 	>=x11-libs/libXdmcp-1.0.2
@@ -44,15 +37,12 @@ COMMON_DEPEND="
 	libei? ( dev-libs/libei )
 	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
 "
 DEPEND="
 	${COMMON_DEPEND}
 	>=x11-base/xorg-proto-2024.1
 	>=x11-libs/xtrans-1.3.5
-	test? (
-		x11-misc/rendercheck
-		x11-libs/libX11
-	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -66,18 +56,14 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
+	"${FILESDIR}"/file_collissions.patch
+)
 
 src_configure() {
 	local emesonargs=(
 		$(meson_use selinux xselinux)
-		$(meson_use systemd systemd_notify)
 		$(meson_use unwind libunwind)
 		$(meson_use xcsecurity)
 		-Ddpms=true
@@ -93,7 +79,7 @@ src_configure() {
 		-Dxace=true
 		-Dxdmcp=true
 		-Dxinerama=true
-#		-Dxvfb=true
+		-Dxvfb=true
 		-Dxv=true
 		-Dxwayland-path="${EPREFIX}"/usr/bin
 		-Dlibdecor=false
@@ -102,15 +88,6 @@ src_configure() {
 		-Ddocs-pdf=false
 	)
 
-	if [[ ${PV} == "9999" ]]; then
-		emesonargs+=(
-			-Dxorg=false
-			-Dxnest=false
-			-Dxvfb=false
-			-Dxwayland=true
-		)
-	fi
-
 	if use libei; then
 		emesonargs+=( -Dxwayland_ei=portal )
 	else
@@ -124,10 +101,4 @@ src_install() {
 	dosym ../bin/Xwayland /usr/libexec/Xwayland
 
 	meson_src_install
-
-	# Remove files installed by x11-base/xorg-xserver
-	rm \
-		"${ED}"/usr/share/man/man1/Xserver.1 \
-		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
-		|| die
 }
diff --git a/x11-base/xwayland/xwayland-24.1.11.ebuild b/x11-base/xwayland/xwayland-24.1.11.ebuild
index 8b34b78b6d48..bae511ba47cf 100644
--- a/x11-base/xwayland/xwayland-24.1.11.ebuild
+++ b/x11-base/xwayland/xwayland-24.1.11.ebuild
@@ -1,37 +1,30 @@
-# Copyright 2021-2026 Gentoo Authors
+# Copyright 2022-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
 inherit meson
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
 DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+
+IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
 
 LICENSE="MIT"
 SLOT="0"
-
-IUSE="libei selinux systemd test unwind xcsecurity"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/libbsd
 	dev-libs/openssl:=
+
 	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.34
+	>=dev-libs/wayland-protocols-1.36
 	media-fonts/font-util
 	>=media-libs/libepoxy-1.5.4[X,egl(+)]
 	media-libs/libglvnd[X]
 	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.116
+	>=x11-libs/libdrm-2.4.109
 	>=x11-libs/libXau-1.0.4
 	x11-libs/libxcvt
 	>=x11-libs/libXdmcp-1.0.2
@@ -44,15 +37,12 @@ COMMON_DEPEND="
 	libei? ( dev-libs/libei )
 	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
 "
 DEPEND="
 	${COMMON_DEPEND}
 	>=x11-base/xorg-proto-2024.1
 	>=x11-libs/xtrans-1.3.5
-	test? (
-		x11-misc/rendercheck
-		x11-libs/libX11
-	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -66,18 +56,14 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
+	"${FILESDIR}"/file_collissions.patch
+)
 
 src_configure() {
 	local emesonargs=(
 		$(meson_use selinux xselinux)
-		$(meson_use systemd systemd_notify)
 		$(meson_use unwind libunwind)
 		$(meson_use xcsecurity)
 		-Ddpms=true
@@ -93,7 +79,7 @@ src_configure() {
 		-Dxace=true
 		-Dxdmcp=true
 		-Dxinerama=true
-#		-Dxvfb=true
+		-Dxvfb=true
 		-Dxv=true
 		-Dxwayland-path="${EPREFIX}"/usr/bin
 		-Dlibdecor=false
@@ -102,15 +88,6 @@ src_configure() {
 		-Ddocs-pdf=false
 	)
 
-	if [[ ${PV} == "9999" ]]; then
-		emesonargs+=(
-			-Dxorg=false
-			-Dxnest=false
-			-Dxvfb=false
-			-Dxwayland=true
-		)
-	fi
-
 	if use libei; then
 		emesonargs+=( -Dxwayland_ei=portal )
 	else
@@ -124,10 +101,4 @@ src_install() {
 	dosym ../bin/Xwayland /usr/libexec/Xwayland
 
 	meson_src_install
-
-	# Remove files installed by x11-base/xorg-xserver
-	rm \
-		"${ED}"/usr/share/man/man1/Xserver.1 \
-		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
-		|| die
 }
diff --git a/x11-base/xwayland/xwayland-24.1.12.ebuild b/x11-base/xwayland/xwayland-24.1.12.ebuild
deleted file mode 100644
index 8b34b78b6d48..000000000000
--- a/x11-base/xwayland/xwayland-24.1.12.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server"
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="libei selinux systemd test unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.34
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.116
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	libei? ( dev-libs/libei )
-	systemd? ( sys-apps/systemd )
-	unwind? ( sys-libs/libunwind )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2024.1
-	>=x11-libs/xtrans-1.3.5
-	test? (
-		x11-misc/rendercheck
-		x11-libs/libX11
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-
-	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	app-alternatives/lex
-	dev-util/wayland-scanner
-"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use systemd systemd_notify)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-#		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	if [[ ${PV} == "9999" ]]; then
-		emesonargs+=(
-			-Dxorg=false
-			-Dxnest=false
-			-Dxvfb=false
-			-Dxwayland=true
-		)
-	fi
-
-	if use libei; then
-		emesonargs+=( -Dxwayland_ei=portal )
-	else
-		emesonargs+=( -Dxwayland_ei=false )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-
-	# Remove files installed by x11-base/xorg-xserver
-	rm \
-		"${ED}"/usr/share/man/man1/Xserver.1 \
-		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
-		|| die
-}
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
deleted file mode 100644
index 8625a92ecb6e..000000000000
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server"
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="libei selinux systemd test unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.34
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.116
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	libei? ( dev-libs/libei )
-	systemd? ( sys-apps/systemd )
-	unwind? ( sys-libs/libunwind )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2024.1
-	>=x11-libs/xtrans-1.3.5
-	test? (
-		x11-misc/rendercheck
-		x11-libs/libX11
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-
-	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	app-alternatives/lex
-	dev-util/wayland-scanner
-"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use systemd systemd_notify)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	if [[ ${PV} == "9999" ]]; then
-		emesonargs+=(
-			-Dxorg=false
-			-Dxnest=false
-			-Dxvfb=false
-			-Dxwayland=true
-		)
-	fi
-
-	if use libei; then
-		emesonargs+=( -Dxwayland_ei=portal )
-	else
-		emesonargs+=( -Dxwayland_ei=false )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-
-	# Remove files installed by x11-base/xorg-xserver
-	rm \
-		"${ED}"/usr/share/man/man1/Xserver.1 \
-		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
-		|| die
-}