Revert "Adding metadata"

This reverts commit f716a9fe6455d39eef01e718aae68dae61c19704.

33 files changed, 1468 insertions, 0 deletions

diff --git a/x11-base/metadata.xml b/x11-base/metadata.xml
new file mode 100644
index 000000000000..3279f04db672
--- /dev/null
+++ b/x11-base/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The x11-base category contains various X11 base implementations.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-base enthält verschiedene X11 Implementierungen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-base contiene varias implementaciones base de X11.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-baseカテゴリーには様々なX11を基本とした実行環境が含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De x11-base categorie bevat verschillende implementaties van X11.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm x11-base chứa các bản cài đặt X11 cơ sở.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria x11-base contiene varie implementazioni base di X11.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria x11-base contém várias implementações de base de
+		X11.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria x11-base zawiera podstawowe implementacje X11.
+	</longdescription>
+</catmetadata>
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
new file mode 100644
index 000000000000..348b9c385db6
--- /dev/null
+++ b/x11-base/xcb-proto/Manifest
@@ -0,0 +1 @@
+DIST xcb-proto-1.17.0.tar.xz 151748 BLAKE2B 0f46d040062fca4f6b598bdb7ab7a254b9aefce198812af82fd2112e06e88277e3c9e0a3bab161930b56688e71e1848bb859d4f33588f9496fe7399f9758b9a7 SHA512 34c3795e5a48a66d89b72ee1777fb0bede489d5ec07018e6c9ef3c13bdd60b0358fc2c04a1f0ed0acb5b681aeeb92033db579036e4f5edd967fe56714c03acdf
diff --git a/x11-base/xcb-proto/metadata.xml b/x11-base/xcb-proto/metadata.xml
new file mode 100644
index 000000000000..161789742636
--- /dev/null
+++ b/x11-base/xcb-proto/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/proto/xcbproto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
new file mode 100644
index 000000000000..31ea63d430f8
--- /dev/null
+++ b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+XORG_MODULE=proto/
+
+inherit python-r1 xorg-3
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# DEPEND=""
+RDEPEND="
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2
+"
+
+ECONF_SOURCE="${S}"
+
+src_configure() {
+	# Don't use Python to find sitedir here.
+	PYTHON=true default
+}
+
+src_compile() {
+	:
+}
+
+xcbgen_install() {
+	# Use eclass to find sitedir instead.
+	emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)"
+	python_optimize
+}
+
+src_install() {
+	# Restrict SUBDIRS to prevent xcbgen with empty sitedir.
+	emake install DESTDIR="${D}" SUBDIRS=src
+	python_foreach_impl xcbgen_install
+}
diff --git a/x11-base/xorg-apps/metadata.xml b/x11-base/xorg-apps/metadata.xml
new file mode 100644
index 000000000000..2a95a1e26c99
--- /dev/null
+++ b/x11-base/xorg-apps/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/x11-base/xorg-apps/xorg-apps-3.ebuild b/x11-base/xorg-apps/xorg-apps-3.ebuild
new file mode 100644
index 000000000000..91ac15149b6c
--- /dev/null
+++ b/x11-base/xorg-apps/xorg-apps-3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="X11 Applications (meta package)"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
+
+RDEPEND="
+	x11-apps/appres
+	x11-apps/bdftopcf
+	x11-apps/beforelight
+	x11-apps/bitmap
+	x11-apps/editres
+	x11-apps/fonttosfnt
+	x11-apps/fslsfonts
+	x11-apps/fstobdf
+	x11-apps/iceauth
+	x11-apps/ico
+	x11-apps/listres
+	x11-apps/luit
+	x11-apps/mkfontscale
+	x11-apps/oclock
+	x11-apps/rgb
+	x11-apps/rstart
+	x11-apps/sessreg
+	x11-apps/setxkbmap
+	x11-apps/showfont
+	x11-apps/smproxy
+	x11-apps/transset
+	x11-apps/viewres
+	x11-apps/x11perf
+	x11-apps/xauth
+	x11-apps/xbacklight
+	x11-apps/xbiff
+	x11-apps/xcalc
+	x11-apps/xclipboard
+	x11-apps/xclock
+	x11-apps/xcmsdb
+	x11-apps/xconsole
+	x11-apps/xcursorgen
+	x11-apps/xditview
+	x11-apps/xdm
+	x11-apps/xdpyinfo
+	x11-apps/xdriinfo
+	x11-apps/xedit
+	x11-apps/xev
+	x11-apps/xeyes
+	x11-apps/xfd
+	x11-apps/xfontsel
+	x11-apps/xgamma
+	x11-apps/xgc
+	x11-apps/xhost
+	x11-apps/xinit
+	x11-apps/xinput
+	x11-apps/xkbcomp
+	x11-apps/xkbevd
+	x11-apps/xkbprint
+	x11-apps/xkbutils
+	x11-apps/xkill
+	x11-apps/xload
+	x11-apps/xlogo
+	x11-apps/xlsatoms
+	x11-apps/xlsclients
+	x11-apps/xlsfonts
+	x11-apps/xmag
+	x11-apps/xman
+	x11-apps/xmessage
+	x11-apps/xmodmap
+	x11-apps/xmore
+	x11-apps/xpr
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xrdb
+	x11-apps/xrefresh
+	x11-apps/xrestop
+	x11-apps/xset
+	x11-apps/xsetroot
+	x11-apps/xsm
+	x11-apps/xstdcmap
+	x11-apps/xvidtune
+	x11-apps/xvinfo
+	x11-apps/xwd
+	x11-apps/xwininfo
+	x11-apps/xwud
+"
diff --git a/x11-base/xorg-drivers/metadata.xml b/x11-base/xorg-drivers/metadata.xml
new file mode 100644
index 000000000000..05f28d338190
--- /dev/null
+++ b/x11-base/xorg-drivers/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/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>
+ 
+ <origin>ports</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
new file mode 100644
index 000000000000..2c489dbcbd66
--- /dev/null
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
@@ -0,0 +1,99 @@
+# 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 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_INPUT_DEVICES="
+	input_devices_elographics
+	input_devices_evdev
+	input_devices_joystick
+	input_devices_libinput
+	input_devices_vmmouse
+	input_devices_void
+	input_devices_synaptics
+	input_devices_wacom
+"
+IUSE_VIDEO_CARDS="
+	video_cards_amdgpu
+	video_cards_ast
+	video_cards_dummy
+	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
+	video_cards_radeonsi
+	video_cards_siliconmotion
+	video_cards_tegra
+	video_cards_vc4
+	video_cards_vesa
+	video_cards_via
+	video_cards_virtualbox
+	video_cards_vmware
+	video_cards_nvidia
+"
+
+IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
+
+PDEPEND="
+	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
+	input_devices_evdev?       (
+								 >=x11-base/xorg-server-${PV}[udev]
+								 >=x11-drivers/xf86-input-evdev-2.10.6
+							   )
+	input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
+	input_devices_libinput?    (
+								 >=x11-base/xorg-server-${PV}[udev]
+								 >=x11-drivers/xf86-input-libinput-0.27.1
+							   )
+	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
+	input_devices_void?        ( x11-drivers/xf86-input-void )
+	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
+	input_devices_wacom?       ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 )
+
+	video_cards_amdgpu?        ( >=x11-drivers/xf86-video-amdgpu-18.0.1 )
+	video_cards_ast?           ( x11-drivers/xf86-video-ast )
+	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
+	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_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 )
+	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
+	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
+	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
+	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-21.1.1.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1.1.ebuild
new file mode 100644
index 000000000000..aa8bf3ee7bf0
--- /dev/null
+++ b/x11-base/xorg-drivers/xorg-drivers-21.1.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2021 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+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 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_INPUT_DEVICES="
+	input_devices_elographics
+	input_devices_evdev
+	input_devices_joystick
+	input_devices_libinput
+	input_devices_vmmouse
+	input_devices_void
+	input_devices_synaptics
+	input_devices_wacom
+"
+IUSE_VIDEO_CARDS="
+	video_cards_amdgpu
+	video_cards_ast
+	video_cards_dummy
+	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
+	video_cards_radeonsi
+	video_cards_siliconmotion
+	video_cards_tegra
+	video_cards_vc4
+	video_cards_vesa
+	video_cards_via
+	video_cards_virtualbox
+	video_cards_vmware
+	video_cards_nvidia
+"
+
+IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
+
+PDEPEND="
+	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
+	input_devices_evdev?       (
+								 >=x11-base/xorg-server-${PV}[udev]
+								 >=x11-drivers/xf86-input-evdev-2.10.6
+							   )
+	input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
+	input_devices_libinput?    (
+								 >=x11-base/xorg-server-${PV}[udev]
+								 >=x11-drivers/xf86-input-libinput-0.27.1
+							   )
+	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
+	input_devices_void?        ( x11-drivers/xf86-input-void )
+	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
+	input_devices_wacom?       ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 )
+
+	video_cards_amdgpu?        ( >=x11-drivers/xf86-video-amdgpu-18.0.1 )
+	video_cards_ast?           ( x11-drivers/xf86-video-ast )
+	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
+	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_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 )
+	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
+	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
+	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
+	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-fonts/metadata.xml b/x11-base/xorg-fonts/metadata.xml
new file mode 100644
index 000000000000..2a95a1e26c99
--- /dev/null
+++ b/x11-base/xorg-fonts/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/x11-base/xorg-fonts/xorg-fonts-3.ebuild b/x11-base/xorg-fonts/xorg-fonts-3.ebuild
new file mode 100644
index 000000000000..9806e4fbb81e
--- /dev/null
+++ b/x11-base/xorg-fonts/xorg-fonts-3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="X11 fonts (meta package)"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
+
+RDEPEND="
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-adobe-75dpi
+	media-fonts/font-adobe-utopia-100dpi
+	media-fonts/font-adobe-utopia-75dpi
+	media-fonts/font-adobe-utopia-type1
+	media-fonts/font-arabic-misc
+	media-fonts/font-bh-100dpi
+	media-fonts/font-bh-75dpi
+	media-fonts/font-bh-lucidatypewriter-100dpi
+	media-fonts/font-bh-lucidatypewriter-75dpi
+	media-fonts/font-bitstream-100dpi
+	media-fonts/font-bitstream-75dpi
+	media-fonts/font-bitstream-type1
+	media-fonts/font-cronyx-cyrillic
+	media-fonts/font-cursor-misc
+	media-fonts/font-daewoo-misc
+	media-fonts/font-dec-misc
+	media-fonts/font-ibm-type1
+	media-fonts/font-isas-misc
+	media-fonts/font-jis-misc
+	media-fonts/font-micro-misc
+	media-fonts/font-misc-cyrillic
+	media-fonts/font-misc-ethiopic
+	media-fonts/font-misc-meltho
+	media-fonts/font-misc-misc
+	media-fonts/font-mutt-misc
+	media-fonts/font-schumacher-misc
+	media-fonts/font-screen-cyrillic
+	media-fonts/font-sony-misc
+	media-fonts/font-sun-misc
+	media-fonts/font-winitzki-cyrillic
+	media-fonts/font-xfree86-type1
+"
+
+pkg_postinst() {
+	optfeature "Bigelow & Holmes Luxi fonts (non-free)" \
+		media-fonts/font-bh-ttf media-fonts/font-bh-type1
+}
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
new file mode 100644
index 000000000000..b7f431c621f7
--- /dev/null
+++ b/x11-base/xorg-proto/Manifest
@@ -0,0 +1 @@
+DIST xorgproto-2025.1.tar.xz 766932 BLAKE2B 4202efbfe560afccb5a742f3c64973a4936878ed7ec4259bc31b7317e5cde505666fee2855dd0b6ff169a8da87d0f980dfa65ff58d2ead0aad39f3a94e053903 SHA512 dbbee3aa1bc62721d64309e1d98807d403609d8129944b2e23e48f95d30c6448718c2842362994d67647908645bafc757c710070c5dcdca96d191fd2689d023a
diff --git a/x11-base/xorg-proto/metadata.xml b/x11-base/xorg-proto/metadata.xml
new file mode 100644
index 000000000000..403bdb59286e
--- /dev/null
+++ b/x11-base/xorg-proto/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/proto/xorgproto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-base/xorg-proto/xorg-proto-2025.1.ebuild b/x11-base/xorg-proto/xorg-proto-2025.1.ebuild
new file mode 100644
index 000000000000..6e70337532e1
--- /dev/null
+++ b/x11-base/xorg-proto/xorg-proto-2025.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{13..14} )
+
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/libevdev[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/libevdev[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
+}
diff --git a/x11-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild
new file mode 100644
index 000000000000..b4d65409fd0f
--- /dev/null
+++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{13..14} )
+
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/libevdev[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/libevdev[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
+}
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
new file mode 100644
index 000000000000..587b3822f6fb
--- /dev/null
+++ b/x11-base/xorg-server/Manifest
@@ -0,0 +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
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/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
new file mode 100644
index 000000000000..57c7349da6a7
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
@@ -0,0 +1,53 @@
+diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
+--- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c	2012-09-05 18:26:42.000000000 +0200
++++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c	2012-09-05 18:28:54.000000000 +0200
+@@ -1109,39 +1109,38 @@
+ static void
+ RemoveChild(ModuleDescPtr child)
+ {
+     ModuleDescPtr mdp;
+     ModuleDescPtr prevsib;
+     ModuleDescPtr parent;
+ 
+     if (!child->parent)
+         return;
+ 
+     parent = child->parent;
+     if (parent->child == child) {
+         parent->child = child->sib;
+-        return;
+-    }
+-
+-    prevsib = parent->child;
+-    mdp = prevsib->sib;
+-    while (mdp && mdp != child) {
+-        prevsib = mdp;
+-        mdp = mdp->sib;
++    }
++    else {
++        prevsib = parent->child;
++        mdp = prevsib->sib;
++        while (mdp && mdp != child) {
++            prevsib = mdp;
++            mdp = mdp->sib;
++        }
++        if (mdp == child)
++            prevsib->sib = child->sib;
+     }
+-    if (mdp == child)
+-        prevsib->sib = child->sib;
+     child->sib = NULL;
+-    return;
+ }
+ 
+ void
+ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
+ {
+     const char *msg;
+     MessageType type = X_ERROR;
+ 
+     switch (errmaj) {
+     case LDR_NOERROR:
+         msg = "no error";
+         break;
+     case LDR_NOMEM:
diff --git a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
new file mode 100644
index 000000000000..0a611456a1f7
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
@@ -0,0 +1,53 @@
+See http://lists.x.org/archives/xorg-devel/2015-February/045755.html
+
+diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
+index 849bf92..5cc3ec7 100644
+--- a/hw/xfree86/parser/Files.c
++++ b/hw/xfree86/parser/Files.c
+@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = {
+ #define CLEANUP xf86freeFiles
+ 
+ XF86ConfFilesPtr
+-xf86parseFilesSection(void)
++xf86parseFilesSection(XF86ConfFilesPtr ptr)
+ {
+     int i, j;
+     int k, l;
+     char *str;
+     int token;
+ 
+-    parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec)
++    if (!ptr) {
++	if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) {
++		return NULL;
++	}
++    }
+ 
+         while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
+         switch (token) {
+diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
+index 171f8e8..e8199fe 100644
+--- a/hw/xfree86/parser/configProcs.h
++++ b/hw/xfree86/parser/configProcs.h
+@@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr);
+ int xf86validateDevice(XF86ConfigPtr p);
+ 
+ /* Files.c */
+-XF86ConfFilesPtr xf86parseFilesSection(void);
++XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr);
+ void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr);
+ void xf86freeFiles(XF86ConfFilesPtr p);
+ 
+diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c
+index 327c02a..e0d6139 100644
+--- a/hw/xfree86/parser/read.c
++++ b/hw/xfree86/parser/read.c
+@@ -110,7 +110,7 @@ xf86readConfigFile(void)
+             if (xf86nameCompare(xf86_lex_val.str, "files") == 0) {
+                 free(xf86_lex_val.str);
+                 xf86_lex_val.str = NULL;
+-                HANDLE_RETURN(conf_files, xf86parseFilesSection());
++                HANDLE_RETURN(conf_files, xf86parseFilesSection(ptr->conf_files));
+             }
+             else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) {
+                 free(xf86_lex_val.str);
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.10-c99.patch b/x11-base/xorg-server/files/xorg-server-21.1.10-c99.patch
new file mode 100644
index 000000000000..12a48e611329
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.10-c99.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/885763
+https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1114
+https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1222
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7
+
+From f3cb68d274c4536130683d28182620fbbf1b287d Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 13 Apr 2023 15:45:58 +0200
+Subject: [PATCH] fb: Declare wfbFinishScreenInit, wfbScreenInit for
+ !FB_ACCESS_WRAPPER
+
+xf86-video-nouveau calls wfbScreenInit without defining
+FB_ACCESS_WRAPPER (which has other unintended side effects).
+Presently, this compiles and links because compilers still support
+implicit function declarations, but this is going to change fairly
+soon.  This seems to be the most straightforward change to keep
+the driver building.
+
+(cherry picked from commit 34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7)
+--- a/fb/fb.h
++++ b/fb/fb.h
+@@ -1027,7 +1027,6 @@ extern _X_EXPORT Bool
+                int dpiy, int width,     /* pixel width of frame buffer */
+                int bpp);        /* bits per pixel of frame buffer */
+ 
+-#ifdef FB_ACCESS_WRAPPER
+ extern _X_EXPORT Bool
+ wfbFinishScreenInit(ScreenPtr pScreen,
+                     void *pbits,
+@@ -1049,7 +1048,6 @@ wfbScreenInit(ScreenPtr pScreen,
+               int width,
+               int bpp,
+               SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
+-#endif
+ 
+ extern _X_EXPORT Bool
+ fbFinishScreenInit(ScreenPtr pScreen,
+-- 
+GitLab
diff --git a/x11-base/xorg-server/files/xorg-sets.conf b/x11-base/xorg-server/files/xorg-sets.conf
new file mode 100644
index 000000000000..5cd8112f583c
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-sets.conf
@@ -0,0 +1,6 @@
+# Rebuild all X11 modules (mostly useful after xorg-server ABI change).
+[x11-module-rebuild]
+class = portage.sets.dbapi.VariableSet
+world-candidate = false
+variable = CATEGORY
+includes = x11-drivers
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
new file mode 100644
index 000000000000..456ee36848bc
--- /dev/null
+++ b/x11-base/xorg-server/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/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>
+  <flag name="xnest">Build the Xnest server</flag>
+  <flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
+  <flag name="xvfb">Build the Xvfb server</flag>
+ </use>
+ <origin>ports</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/x11-base/xorg-server/xorg-server-21.1.21.ebuild b/x11-base/xorg-server/xorg-server-21.1.21.ebuild
new file mode 100644
index 000000000000..f1e0e0590d0d
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.21.ebuild
@@ -0,0 +1,186 @@
+# Copyright 2021-2025 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+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}"
+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"
+RESTRICT="!test? ( test )"
+
+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
+	>=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? (
+		>=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(+)]
+	)
+	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-2021.4.99.2
+	>=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=(
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+	# pending upstream backport, bug #885763
+	"${FILESDIR}"/${PN}-21.1.10-c99.patch
+)
+
+src_configure() {
+	# bug #835653
+	use x86 && replace-flags -Os -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 emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+		--sysconfdir "${EPREFIX}/etc/X11"
+		-Dbuildtype=$(usex debug debug plain)
+		-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
+		-Dsecure-rpc=false
+		-Dsha1=libcrypto
+		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
+	)
+
+	if use systemd || use elogind; then
+		emesonargs+=(
+			-Dsystemd_logind=true
+			$(meson_use suid suid_wrapper)
+		)
+	else
+		emesonargs+=(
+			-Dsystemd_logind=false
+			-Dsuid_wrapper=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	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/xorg-server/xorg-server-21.1.22.ebuild b/x11-base/xorg-server/xorg-server-21.1.22.ebuild
new file mode 100644
index 000000000000..0d4fc8f26f57
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.22.ebuild
@@ -0,0 +1,186 @@
+# Copyright 2021-2026 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+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}"
+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"
+RESTRICT="!test? ( test )"
+
+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
+	>=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? (
+		>=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(+)]
+	)
+	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-2021.4.99.2
+	>=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=(
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+	# pending upstream backport, bug #885763
+	"${FILESDIR}"/${PN}-21.1.10-c99.patch
+)
+
+src_configure() {
+	# bug #835653
+	use x86 && replace-flags -Os -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 emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+		--sysconfdir "${EPREFIX}/etc/X11"
+		-Dbuildtype=$(usex debug debug plain)
+		-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
+		-Dsecure-rpc=false
+		-Dsha1=libcrypto
+		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
+	)
+
+	if use systemd || use elogind; then
+		emesonargs+=(
+			-Dsystemd_logind=true
+			$(meson_use suid suid_wrapper)
+		)
+	else
+		emesonargs+=(
+			-Dsystemd_logind=false
+			-Dsuid_wrapper=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	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/xorg-sgml-doctools/Manifest b/x11-base/xorg-sgml-doctools/Manifest
new file mode 100644
index 000000000000..679bd1348e77
--- /dev/null
+++ b/x11-base/xorg-sgml-doctools/Manifest
@@ -0,0 +1 @@
+DIST xorg-sgml-doctools-1.12.1.tar.xz 107832 BLAKE2B 5fc7b3e1b02cb650655831196c26cd1ec9f2b3b8ef32cecc2d4657a0358bc23a7e2be2bfbcbfc2a400cfbc821f4602279655c8e31968c5f3f41be15e560799a3 SHA512 82a202a97da4d705d70e3a1865c5cc47f1007d32a239513f52e6e63912ce0363fbeafabbec36ad008d3f7df15f03c27a4f004e9b1da93eed0f7e5b3f27f7c4cf
diff --git a/x11-base/xorg-sgml-doctools/metadata.xml b/x11-base/xorg-sgml-doctools/metadata.xml
new file mode 100644
index 000000000000..6e09f0a3025a
--- /dev/null
+++ b/x11-base/xorg-sgml-doctools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/doc/xorg-sgml-doctools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild
new file mode 100644
index 000000000000..fa97dcb59de8
--- /dev/null
+++ b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MODULE=doc/
+
+inherit xorg-3
+
+DESCRIPTION="SGML entities and XML/CSS stylesheets used in X.Org docs"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="x11-misc/util-macros"
+# RDEPEND=""
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
new file mode 100644
index 000000000000..c873aaaed44b
--- /dev/null
+++ b/x11-base/xwayland/Manifest
@@ -0,0 +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
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
new file mode 100644
index 000000000000..9a5f87d156e1
--- /dev/null
+++ b/x11-base/xwayland/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/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>
+ <origin>ports</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/x11-base/xwayland/xwayland-24.1.10.ebuild b/x11-base/xwayland/xwayland-24.1.10.ebuild
new file mode 100644
index 000000000000..bae511ba47cf
--- /dev/null
+++ b/x11-base/xwayland/xwayland-24.1.10.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2022-2026 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Standalone X server running under Wayland"
+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"
+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.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.109
+	>=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 )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=x11-base/xorg-proto-2024.1
+	>=x11-libs/xtrans-1.3.5
+"
+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
+"
+
+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 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 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
+}
diff --git a/x11-base/xwayland/xwayland-24.1.11.ebuild b/x11-base/xwayland/xwayland-24.1.11.ebuild
new file mode 100644
index 000000000000..bae511ba47cf
--- /dev/null
+++ b/x11-base/xwayland/xwayland-24.1.11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2022-2026 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Standalone X server running under Wayland"
+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"
+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.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.109
+	>=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 )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=x11-base/xorg-proto-2024.1
+	>=x11-libs/xtrans-1.3.5
+"
+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
+"
+
+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 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 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
+}