gentoo resync : 29.12.2022

18 files changed, 59 insertions, 282 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 9786871bf238..b81ccdeb1d51 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 165cd679c9ca..f6dcde211ef5 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,5 @@
-DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
+DIST xcb-proto-1.15.2.tar.xz 148108 BLAKE2B 0d6cc87ea0d2de594ba11b11255779e90d3c7507f0002453b3d1b2ac73fb604e5ee52e516bbcf76bce2a89027f8c8de6289d21aa2bb23d7d3e2ee77211b54946 SHA512 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d
 DIST xcb-proto-1.15.tar.xz 146628 BLAKE2B d7f38f1a415a7c70af372c64726e089ee454ffb981c031e4b8e93f345a1ada9dc40fb4e8b59adf553af8b4d9b7ef52730c9df56a0c24e53f98b3403346c7e810 SHA512 a333ac7c39f17ff2567419d09a9a77210c943a4e88d79eb152d416ae26bf6fb14e2446f9817abc806edd7aa3733bd4de5852b5ae90a25cbcc9d40e59c211aa36
-EBUILD xcb-proto-1.14.1.ebuild 1267 BLAKE2B d1c880832af5a8c6a774829d97fbd1b28c5cae334bc7a07ec3758f0624b20cc05cda6adb28decf3f8115e59410e49a263516d3a56fb1c244846f2a6fbf113079 SHA512 d1af50d1aacddb902f7bec51a765bdf569c3331ffccaaf2dc080af54bc01c31d2780aaf293364050d18814d8b620bbb9faabc9b89a142463655954fae53a277c
-EBUILD xcb-proto-1.15.ebuild 1282 BLAKE2B 3d45f1d315bbd6719e4d849f83b240cf666107b2c95fcf1baafbf55467696659070da4a8220e1c65d0dac6dc5d240e59c1f398bd70b7e17da5ab5ee16bb1a6d3 SHA512 4c5e2233d557410bb7d31de42faf896449ce387e118941e84b1917743b60e8e606d8c29593b9b2aa8028a9795235a8b7a848d96b5e909286233d75ffd2fae341
+EBUILD xcb-proto-1.15.2.ebuild 1212 BLAKE2B c5c1880bef3d50009d7dec6075282093f54e28bdcdf4dfc69e5cad8b2b476f464f35301cfa31f0ea1469b0cb9ad59149bb837b0d0315faa265e8b2302a6e2330 SHA512 c26abd6c262487baf6376fa4fe65803ddf8f1ca0db4f534f9dcb1e17ea10d566f53a7b4912711626b020cb32f05bfe2a2eab3529d8cf6b7ba12f586603fbb0a3
+EBUILD xcb-proto-1.15.ebuild 1274 BLAKE2B dacbfa8fd5b5db71b4820ddb6fc46d77099bce70f0df1415a30302a6447415cf4a96f1efcff27f22e460d6d8603ae171ed66aa26388bd33ba585982379bb9d59 SHA512 ee3bf836c669c92f76acebd8cd7bb29ebbd20ae940aa0ff52c99cd901091ff04311e9d0fcedbd1943dfc7dfb8d95dc8b237b0635933b03c7bcff5d3ca2b963a2
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
index 26b96ef6fdbb..40e67119e4ae 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 XORG_TARBALL_SUFFIX="xz"
 XORG_MODULE=proto/
-XORG_MULTILIB=yes
 
 inherit python-r1 xorg-3
 
@@ -14,8 +13,7 @@ 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 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
@@ -29,7 +27,7 @@ BDEPEND="
 
 ECONF_SOURCE="${S}"
 
-multilib_src_configure() {
+src_configure() {
 	# Don't use Python to find sitedir here.
 	PYTHON=true default
 }
@@ -44,8 +42,8 @@ xcbgen_install() {
 	python_optimize
 }
 
-multilib_src_install() {
+src_install() {
 	# Restrict SUBDIRS to prevent xcbgen with empty sitedir.
 	emake install DESTDIR="${D}" SUBDIRS=src
-	multilib_is_native_abi && python_foreach_impl xcbgen_install
+	python_foreach_impl xcbgen_install
 }
diff --git a/x11-base/xcb-proto/xcb-proto-1.15.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
index 4c7003b79e92..be888b602cd4 100644
--- a/x11-base/xcb-proto/xcb-proto-1.15.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
@@ -14,7 +14,7 @@ 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 597fe6a8b625..44dc4b278123 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,4 @@
-DIST xorgproto-2021.5.tar.gz 1132811 BLAKE2B 3fe288cf8a848436dacc0ebf437b6a1d2c81878abaf8c542ff45e70389643cb2bc25bdab5ab6ff9d44a4f9bbdbd24757d21617c2c6a0754870afcd9f60ccbb05 SHA512 9c9ec62f0af68fd0dff24010986326a2b201be2b56b8b94abfe7258bf66b3c4c37088596c43a234aae63b1d781f7797caf408e434c98e8805803bc890b8aacb0
 DIST xorgproto-2022.1.tar.gz 1107316 BLAKE2B b7c60d77978f95b62208c5c5974c7310a9b6197c8b14218ba319eb44660f20c5eb33ef106beccae16f79a0530a20bd38b6aa2de81329c4b48a2da285ab903c31 SHA512 e34404eb9f7edfebdecbf38c66491fbca91929c59b5762d3266b2808cdae3f4e65589001d29bf5374effc56173a5467f5a107bf4fe05acae69839b841e83f72c
-EBUILD xorg-proto-2021.5.ebuild 1184 BLAKE2B 7129e8ed1e437e04359d2d61612f808715f2639f0ae6846343d4f844556b570c9d5fd240597a408d2295ea6c76a88bc582c3d6cd388c12f8e93019cb3e1a3822 SHA512 32a3cef52319fbe9c15aa31fd2378e743b8a1ea8b6c366aed9bb97f3882252e3eeb0d4b340d6f69a45a87cc3587be937b5cf223bc3f60049bb34600f53a03613
-EBUILD xorg-proto-2022.1.ebuild 1195 BLAKE2B 0d0bf5591ce5efca4b2c455f3cac50ec614dfd8b9694d4f9b24cddaafb339f5a6f82b14fd91237d9dc66428f3d16c290e11517acf41671fabf360aed1c2cacc4 SHA512 cb24388d618a14bede3e82a6d51d9c32928c5afab8d5e3afaa95a50271e808939a2187a8adca813072c807d3f1e1ce9df3c4408eede8524900a9fdcc7a96d33e
+EBUILD xorg-proto-2022.1.ebuild 1191 BLAKE2B 9567169384ee96cc76657454bcf694b3e16bae60cb70c5be5e546583ba5bce6e165d4e22bb4e4a7149a0d6d0a22c574c222c0d5fbbde94f4827c3fd40b785e4f SHA512 fee1de9b17ea8d5f1c7266cf8ae1166bd526b3a77032b6e4aa265f3dfbb9752072209b6dc4c861ebe8a05247973dabba59ad9397753837549577bde46944fdfa
 EBUILD xorg-proto-9999.ebuild 1192 BLAKE2B db4567f72fd74372e3b7b1e1af421cd18ecc209bba232e9ce9fddbf5a0fa5c3f0a9aeedcc5505dca752f8f227a72444beadd3c35f5c0889eb9f9b449bbc461d8 SHA512 a32f16a207591f291b07be006349486068da9dae00f05c4028a4ffa67a9cf9840c788d37148554ca622d25689cb7108e67aa1bcfa830e8d74fe85291a999750a
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-base/xorg-proto/xorg-proto-2021.5.ebuild b/x11-base/xorg-proto/xorg-proto-2021.5.ebuild
deleted file mode 100644
index 6bd2e9b7da19..000000000000
--- a/x11-base/xorg-proto/xorg-proto-2021.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-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
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND=""
-
-python_check_deps() {
-	has_version -b "dev-python/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-2022.1.ebuild b/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
index f3386fafb33d..cdf53c6454cf 100644
--- a/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 0e35419bfb1d..0b13cc978e73 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,11 +1,12 @@
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-server-21.1.3-gcc12.patch 4223 BLAKE2B f38d002068286d8feae49ecc64640765f29bfbd95352835dd1dd908663515e5bc4febcfbe3b0f01605cca6919e816174a7f8f1f545e427d2d7a83be95012fd2f SHA512 7608d63af6f4ddce888be7e4a9997d816bcb289fb827671060b75af30810dabc866fd7b329bd5b70958dfdc0eb236434a71ea7a21cc87f057d2981a57bb4f72c
+AUX xorg-server-21.1.3-present-null-check.patch 1059 BLAKE2B 4702229922d575ed93d6b2f1545e7ab61cf8376edc6be5e29eeade32a4fa74b7cfa4e48c756ae0d6e5d149bcfab8ca8cc1d7385cf7d86c50a2231b0cec6bfc0d SHA512 2073221b5bd4226ac08a860081e332802139714dc4348cbdda3dc3909f9bdbdbb9e07aa75a4d7a5e568c334c81ff230ea0a82b343eaf0bd992b58253b6e9dfb5
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963
 DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b
 EBUILD xorg-server-1.20.14-r1.ebuild 5195 BLAKE2B 845754526068efc9d3e98256ce1d9a947a1533429416acd94b6025a86d7c4de4737177b8786a3238aee42e3f10314c42a00445dcad29caad6c94253fcfb9a1e0 SHA512 9615fbd48424508cec887368ed589857f80ad2087f63887529b3fa569a781c70aa7e1fa5a7d253c3731ca25db6da2f7cd9c9f9fd65f2eff66378412731dfcdc9
-EBUILD xorg-server-21.1.3-r1.ebuild 4445 BLAKE2B b8c7a20bb4a1d812305e16a4cd83e6ba0893ac447c9c84cfe802f1f2f2b61c307d5482690c59cc5e375b15a53014e89524425da7d59c88cd24731b536a1d5b14 SHA512 42f7029d9f3b5014bbd61369c417cfb97f59b1cc73193f52d3b0ef1453eede6e9bf8db570d8b9a97e16ac447c90bc649b18c14b3c839e740d48ac51ac6aafdd7
-EBUILD xorg-server-21.1.3-r2.ebuild 4488 BLAKE2B e394002ccdc67e4cd0a0e987d6d87e05d72551eee824f7b3691fecaf36177825fe311d47306d1ad1ff8e5348b9026fdeb76f608ad4350c4bb7f1fa77af075159 SHA512 8033a8744836b167c027aed3bcbf8ba40e2e9a04467aad940c41a098d05df5824fb0f63a6c6ac2389176f8aebe357c7dc7e1b06159ab086930d7919db46699ee
+EBUILD xorg-server-21.1.3-r2.ebuild 4484 BLAKE2B 95ac43670df395fbd1c6ee31e7cc85d9b467be934e159eeab08e3b2638e16f7b4470065a6e20f4aa1829fc116882826e7252742a99c23038411dabeb097eee88 SHA512 0f180a3ec665f29436d978352846015a8046b1aca9717692aa9458ec22f9d36794b3cb98d6f29d9857f7f2d1159c2f9663a4ae8af5249b19882bd0003d9fa7cd
+EBUILD xorg-server-21.1.3-r3.ebuild 4530 BLAKE2B 8358f69ad5fd9b84d3f8d7b3cfc5f58f006c24ec5e4ebb3411202585f486665151dd405149808485998b228f7044adbb86e17c934875c31efe887fe9573c93bf SHA512 9959c03c2795c8ee83f043ecc659dc08f47245d013f433a8fa1da7b3b8c6be60268faecf8441b78ee3f810a002d222a52fe8ca095fdec79922dbdd11ba974528
 EBUILD xorg-server-9999.ebuild 4454 BLAKE2B 0ca1c606ecbc7f47cdc8d13273141ce29d80130000eb7e00b5a24a069b599f276d4ff2b4583a6206b636137977d0a38b3559d3a6ab8843908c3e2691e9c7ef0b SHA512 d4daa9b356ab4a2044cb0ea88e63eada448b2cf75882f6e6c0639b06543f804dad8d52353035caac5f12ec001f95a468f6a25416ce4e500039e1728a0e4d6f88
 MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch b/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch
new file mode 100644
index 000000000000..15d653320708
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/22d58188
+https://bugs.gentoo.org/830482
+
+From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
+Date: Thu, 13 Jan 2022 00:47:27 +0100
+Subject: [PATCH] present: Check for NULL to prevent crash
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
+Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
+Tested-by: Aaron Plattner <aplattner@nvidia.com>
+--- a/present/present_scmd.c
++++ b/present/present_scmd.c
+@@ -158,6 +158,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
+     if (!screen_priv->info)
+         return NULL;
+ 
++    if (!screen_priv->info->get_crtc)
++        return NULL;
++
+     return (*screen_priv->info->get_crtc)(window);
+ }
+ 
+@@ -196,6 +199,9 @@ present_flush(WindowPtr window)
+     if (!screen_priv->info)
+         return;
+ 
++    if (!screen_priv->info->flush)
++        return;
++
+     (*screen_priv->info->flush) (window);
+ }
+ 
+GitLab
diff --git a/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild b/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
index 4663a46b58ef..774aa6cf5f64 100644
--- a/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
@@ -11,7 +11,7 @@ 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.3-r3.ebuild
index 6b140fe486f3..7e002dc7081c 100644
--- a/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.3-r3.ebuild
@@ -11,7 +11,7 @@ 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 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
@@ -93,6 +93,8 @@ REQUIRED_USE="!minimal? (
 	?? ( elogind systemd )"
 
 UPSTREAMED_PATCHES=(
+	"${FILESDIR}"/${P}-gcc12.patch
+	"${FILESDIR}"/${P}-present-null-check.patch
 )
 
 PATCHES=(
diff --git a/x11-base/xorg-sgml-doctools/Manifest b/x11-base/xorg-sgml-doctools/Manifest
index 7ed6a1fe8d66..587006a75824 100644
--- a/x11-base/xorg-sgml-doctools/Manifest
+++ b/x11-base/xorg-sgml-doctools/Manifest
@@ -1,5 +1,3 @@
-DIST xorg-sgml-doctools-1.11.tar.bz2 120356 BLAKE2B 55a6e89675dff17bb873e187325255a3da0a431a49950dfb3aea353efa6335a01118512edc0a24b0690f2d2d8b2ddda49bd84e71064574048e06c0a4923cf0ba SHA512 64bf561bc7a6855f96d9df8b062860deb3b9967203339ae2fc02404ad29c05272f7ead3aa792b149811ecfc7af786567e0b8a66a2bf112d33ec7385dd1398e7e
 DIST xorg-sgml-doctools-1.12.tar.bz2 131356 BLAKE2B 555faf50f2e83b689566c7033669bd6e2e93294b9b6895d07110497392387f60b821fe570063e34d8089dc1a9f273eefb5ea0d0556d5965bf893756279e8688f SHA512 5c4f8506992abcc3d98b99d33b60ac770f039c3ffa11ad49005942bc9b7497367842a57967cee51b0e8e9095a660879af9a243abddf6b1af88741dbb882b3a4a
-EBUILD xorg-sgml-doctools-1.11.ebuild 406 BLAKE2B df22ff8918a192ac1044b55d63a031271a896b7c2edaa31bfbb305aeb21e7b1f1c25e03c581871128b19c8de07939fea102fda2da8ee0acd50da98349144dbe2 SHA512 9e992185a735469e4baf7d7def7a46d5399ccf564b5ad0fe33abdf9fea7d82a8cdf4ea7c0802e07bc949f3104e7892f1a9b66733e4f4b064c4b46f21c7ddca68
 EBUILD xorg-sgml-doctools-1.12.ebuild 411 BLAKE2B 64bc330961fc85110336ae852aefc9dbf55def2f60e3ebaa59e7d21241ff098826ab9a22a70b13548fa7f55bd5c6ad6ab1ad292809c09b5685327f335f4c1ca0 SHA512 bc88ec4fdc74fef2329a17462f2ba665fc5832bf502b1991311421ebf61847e01a0137a0e4cc397f776ba02e9ddb9326f737660f3106c83b02a3bbf4d3559748
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild
deleted file mode 100644
index 79f67580decb..000000000000
--- a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="x11-misc/util-macros"
-RDEPEND=""
-BDEPEND=""
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index faf8c79018fd..32079d886412 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,10 +1,6 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
-DIST xwayland-21.1.4.tar.xz 1261712 BLAKE2B 698886d450f340c4a275f583d27382a5ee22c09255d907bbe2babc6794da1827bd5bf3e575b9da77ff3b3c5c4cd3e30cc10b89d14e0f6365d2a71f8ade61e410 SHA512 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525
-DIST xwayland-22.1.0.tar.xz 1271896 BLAKE2B bd090032a31a2872d3e1095ca2f73d8945eb9f29801ea5164b867132c98e4195eb84adc404048b294e148181b38b9172453e276f78a1a9575889fbc77c31d740 SHA512 01306d2127e9d02e457d86208d6fb285379ed8fab2837febe56aaee4b236bc052ad65ca8ec35555b983d15f0d8dd01d20526a17b40225d2a4b91c53202ec10b5
-DIST xwayland-22.1.1.tar.xz 1272176 BLAKE2B 5dabf9d6cf6ed217cdf5694dba9c63059bcc43e2bb413c1edcd5d8775a906270b28e9dddb90bedacdefe27bd792339c346782511102b42250e2a940aa664e9cb SHA512 435cdf59f2be1ff7cb3dbb04e7a8920d9c48471fbeffca96c9dab2be400b168bfdb73b9e818829c555ab5d6fd83345eb693b3ba785d4ef701bdb27c8344077b5
-EBUILD xwayland-21.1.4.ebuild 1889 BLAKE2B 084f95eb85009e95da761a339a84cd0645ba0d0fa0c298722e3bcf56a8adc2f4433816be8bb2d9c8f6dce67d2cfc6ace08538d1111bbf5671e842fe2cd5ff451 SHA512 7612a13407450e6655ff958bcc316f40a5c180a9f3dbae8550a65abae12f341748471868592e26b01ca078bc894735cc80b9d1c59628509308a28cdf2c120405
-EBUILD xwayland-22.1.0.ebuild 2023 BLAKE2B 7d13e6cfd08c2f70907a69a540adebb3a110ff944467a8521d4bd827b9543fa207fe052cd193967a205801f8bd6bf4ce9ea60062efba311a5c198321b8636fb1 SHA512 ac69ec3176db6bc3b04d194fe7f661c7aadbe310801ad49ded1614a887ed8250a71b7e1251e9115ccec95a0d95e116d6dd31b856744116ecce71c54738721705
-EBUILD xwayland-22.1.1.ebuild 2020 BLAKE2B 5bfaee8325d95e711a921a5c67700482d8e8ff4e0405fb0d8e45a532e65236e73dadaeb3c8f561e583f4e196ebe970adf6366d17df8ebd2867cfb6e1be45567d SHA512 c5c9ef260b037b2235daecea81100c9c875e85106bbaa337b34e47a0057bae399f7cf0ccca125de337bdddae8b2bdfcded7281e4fbbdee67daded6ff4b823c99
-EBUILD xwayland-9999.ebuild 2214 BLAKE2B 012d454ca5547cb16ba1ef9d358977f8cf97767ac41f38bf91d5046fa23dde83b14979aada7b7a3e86e5437cec21a1c1dbeda17d31995ab4a76130df94ef63c3 SHA512 89e54178b77c31a822610dc9d50c5b3a371167e00f1ea3afcb461a5d764a9805d3174c9f44d40f8f4c66c2dee0a31dfb626b7acf72fc3423ce79f00d1e1a7221
+DIST xwayland-22.1.2.tar.xz 1271848 BLAKE2B 2efb3111396e1ed6ae6a4489c6d8612d511daea95edf456e60136185db9a69f937f0ab838e3c3095b76f9221d3b84ec0a1a7424f849e69d26eada0b988ebb675 SHA512 c8620169f16c2bbd592dbe77bc1f7a2c27a78f49a89bf966d8a449b7faacd69f5ea4aac7adb5b75e06dcc5efca26a2141c9b5d4cf6a592ec7882bad5e235bce4
+EBUILD xwayland-22.1.2.ebuild 2024 BLAKE2B 303818387b24dcda4732e955da2198a1644d58bf8db85663d81644a0fd2bb1bbab88f4880f6dd6f1e169f88fec87d1161144829c01b54bc34e9c25a28c5be291 SHA512 9adb330f7818976f4bded0141ac3c4c3f1aa22668effaeebc29e781162574ff6dbf925b1cd82cab8cedc6bbf7b69b86c377d9525428b921bc3be8ab49835d529
+EBUILD xwayland-9999.ebuild 2221 BLAKE2B 7e7383bfa79c1aa60274d44068f63cd06f59c5e4f1c93b78660989068fbea140e2e9ed294a78466bcaa22fd43bae7c7d085f82d498180e7b8f1a08b905c204c7 SHA512 b3cfdae1ada3028a22afc4ffaf1165a8cfbaba345055afea7a4a35649c1900f9f12def59956309eb1c0f80304ce1f00b21566096743d41abd5f2032f367e070f
 MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
diff --git a/x11-base/xwayland/xwayland-21.1.4.ebuild b/x11-base/xwayland/xwayland-21.1.4.ebuild
deleted file mode 100644
index 3f95543af791..000000000000
--- a/x11-base/xwayland/xwayland-21.1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=x11-libs/pixman-0.27.2
-	dev-libs/libbsd
-	>=x11-libs/libXfont2-2.0.1
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libdrm-2.4.89
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/libXau-1.0.4
-	media-libs/libglvnd[X]
-	unwind? ( sys-libs/libunwind )
-	>=dev-libs/wayland-protocols-1.18
-	media-fonts/font-util
-	x11-libs/libxkbfile
-	>=x11-libs/xtrans-1.3.5
-	x11-base/xorg-proto
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=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
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-22.1.0.ebuild b/x11-base/xwayland/xwayland-22.1.0.ebuild
deleted file mode 100644
index 242b2daef28f..000000000000
--- a/x11-base/xwayland/xwayland-22.1.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	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.89
-	>=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
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-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
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-22.1.1.ebuild b/x11-base/xwayland/xwayland-22.1.2.ebuild
index 88e906cd045b..641cf14cc35b 100644
--- a/x11-base/xwayland/xwayland-22.1.1.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.2.ebuild
@@ -13,7 +13,7 @@ IUSE="selinux video_cards_nvidia unwind xcsecurity"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/libbsd
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index dae6cf880e98..50b847ca3553 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"