gentoo auto-resync : 05:06:2023 - 21:37:49

22 files changed, 49 insertions, 791 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 631bbd67da5c..7dd8f93a2a8c 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 9353af28d5dd..e22a6b7ae3ae 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -61,11 +61,11 @@ DIST nvidia-xconfig-525.116.04.tar.bz2 110583 BLAKE2B 7fa42ffddee83dd6df0f3d8625
 DIST nvidia-xconfig-530.41.03.tar.bz2 110920 BLAKE2B c7b90382b0e42f9f0d839c40c53c613243314399c715c303d9221c1d9558bed4d159bc1b76c2ab8ff4831d32fc93b661650b9833ef7397559847c3a14763cdfa SHA512 72cb1b44ff2fd162fc76fa4993b24a2994545b2b5e8f23252729a55e2deb2d10cc9263dfbe6449a81e3e18beca0bd6506b295a7299696bb9fea628fd99dca555
 DIST nvidia-xconfig-535.43.02.tar.bz2 110594 BLAKE2B 2a72f408b3fe4acc21d5c1c9f266db6c0e79aefd25acad8237936bcbd204eefa73182cc950ab3c491efee712540a7a9480a06f4941d407ee7db1db03984f3e16 SHA512 e2078cf80c0bce8f3718917da4da5a1ac534e51b19b49780bdb6d7dcc0a8fe08d38177602b2f3a35fab64ecef65f04ed0a62fcbdd224c305fde493333f6a5cb9
 DIST open-gpu-kernel-modules-525.47.26.tar.gz 10323511 BLAKE2B 00d9dd7bef6cf8ce3aaa53bd8c5b756c40ad44bfc21d72118006e4ff1a91ec49e7cf784ad53a8e55b757c451c875d500527b15a904ddf590bca0cf357baf7737 SHA512 ac2ee2e8d32c8a37b000769742f4e242c40daba87e9fc5829e16acbba095e7cfcd05cae4127de6095a058c1b7c9b95ea64c012ef561cf165259db2cbc8b4c736
-EBUILD nvidia-drivers-390.157.ebuild 15897 BLAKE2B 3634a659af846259b1b7a6a1ad0bc920de9574aa67fcb5f13a6c03bc1182bd338cacd6454f58bff49cce81eccd1cdcf80a75103ec664028168fd12bfc35432fe SHA512 ae88783d860f9f2d7f0bc60852eeb4a1e863580fca84beb2f301ad883d13f4f1271ac4c95224cf1ef4c10138a6e3d2c0b67bca1e5e98c1cd0cb1bb30c389b136
-EBUILD nvidia-drivers-470.182.03-r1.ebuild 16705 BLAKE2B 2200f8ddb3c2ff8b19e35e2a0435e7e6d39dba8619ca8d603dfb7d23501dc6f200c983c90e7351325f96178e6156d4c29e0028d3c52ffe56d2c72d56e4e3956f SHA512 c99c1635931baf1093e7a34741ad5f5a0f1f9aa8bd18b316ce99ca444447f00ea3fb0fc0bafe36f5132468d96236f5b7e3d00325c01e1bef05774e8d6a6a00c3
-EBUILD nvidia-drivers-515.105.01-r1.ebuild 19243 BLAKE2B 22d070f747c84f8ccc549acf811c01ad4c91aca335932da55e179ab1bb2ae5eb8c36a89397eaf928f8b4fe261973b1b10d2064fcaffd9c71680f88fe530f44b6 SHA512 79f0fc2163f16877b7539415eb2824732b0cf3b66e31e5d7a5bc2e532666e113b017e05ca4531b610a131bba30c26a5406ef31285c58914557413fd53e2be858
-EBUILD nvidia-drivers-525.116.04-r1.ebuild 19121 BLAKE2B 25c779152febf6701d3999d5e7d3293541aab1d569b9e4b494a463965ee028d150d23e1cf0d670630af7c894f30aca5ed399d0afe9828e11bfc7eb39f7c79bfd SHA512 2464b8cc7bc336e728c922832fc8316a9c69f7593d3b908e891ce3c2033ae89434b5232a8c001d86ffc77baaf47f89c0296ade4eda30992fd9219a0e47706014
-EBUILD nvidia-drivers-525.47.26-r1.ebuild 19132 BLAKE2B 1977a4b2bc54167e0df506dc5c0f2772d3f41a4f05cef0d61502876beb6b8c49d99104fb233d5b00c4a400b35103d5c2fa5dfd9eb59808989c90e1dc8a40020a SHA512 326cd31ddf4641ae6847c5f032986b51b24d9c52728f91cbd0e86fd698a4d05c7173ba9ea5b301fc8c183683b152af8839e97e28d799510cbfebbae4c0b2d4da
-EBUILD nvidia-drivers-530.41.03-r1.ebuild 19124 BLAKE2B 9340c2c19bea68637315edab1c3b8ecf26a1502b35f5082156192d2c2fc4d60008fd5e4188885586481a26e9709c947aba2122bbc792fc1e09e381477d6034ee SHA512 48c66a92b150648a16ca311d4a0b319ba980082140490996c6ef0df6af24b26d915da11abacce6e9df9afbcdc22c2846632f4ed7a6572e9425b315e63c15e38f
-EBUILD nvidia-drivers-535.43.02-r1.ebuild 19674 BLAKE2B b3f1a8b9bdb915a143349bdb50c397a0274a039bf7d2556c0246328af6c324e0f37be5f7b5b5bf220e3cb0cb215cd6d0fd5ed3af62397eccae8309ad1857f063 SHA512 ae32361f3e65f95d419a70ce92e03cd4767c1f4738111cdc3062ef1299cafb7a9f89dab121b3d3a1cb8811c5f8b793831b696683b6c06437a96ebf034ccda0c5
+EBUILD nvidia-drivers-390.157.ebuild 16166 BLAKE2B b785c3b04403d588f77b8d6e4fa7b03f0e05547fa3b3ba01639517ce96cc14f472968dddce907bdcb5df6dc8011d611aa872647e9cd43c21989729a46e9cb6ee SHA512 a3bc58756ca718f83a1139578c32158aee65dae3fdf291dbf6fb76879f7c2c36ed500083504eaadd00af0bcf794490a9e09344a81b4ca07083413dc55c63333c
+EBUILD nvidia-drivers-470.182.03-r2.ebuild 16974 BLAKE2B f786d9c4309a3fd533a0950a9ec30d99dab382df9528c97246fcaee4cd0a1cb2d0643b5fe187e1eecaa15b090c8061d1fa13fd63036e63b467f4e51036584bf9 SHA512 3ae082f30df26f9aba86f3e9d2943518308395fa8ba0805d726277126e7ec2789fe70fc333560780981a87779e493a1c063c089c2ffd87d396bca87be47a928b
+EBUILD nvidia-drivers-515.105.01-r2.ebuild 19512 BLAKE2B 053b4ea3c99ab0becd75b60e478eaee00273ca873a00783fbdddefa59e369e40cb8a3f5d5e1fc8bd2a3e81bde05c6b5cde77b2253d22d6fb07d17d4f64057d83 SHA512 c30a7b726edd456c6f4b2b6011cfde6fc78599f51c1be58f3f01e6360c72740e5a61732910d5a7c39e0670496bb7ae8d1e6aaa215d50d3d00efe336cd1dd7232
+EBUILD nvidia-drivers-525.116.04-r2.ebuild 19390 BLAKE2B 89625f35cd92b9ddf803447e8afa5ff5e84c6773999b2ad003e93f19110b371952820ee42ff383d726980399b20effd10137e3a793574e8c6a060f38a60ec12e SHA512 6025ecbb0db541dca81cda4d1a14b02752899080ee751da7496b1a6601983410a4ab59ff4ddc4fd5a5f73ca4da641c47b63b64f7c81b68ada6efdfc2ef58be64
+EBUILD nvidia-drivers-525.47.26-r2.ebuild 19401 BLAKE2B e6be85daa83cb23fa57b5a63a75e93f019d1608fb6ba781fabd1ee688f8d8cb2c607c614a0fc635e874bdf6ac80f9c6a0367308ce79420591caa2af872d6eeb1 SHA512 ee3a34097ff5bbc4ef4c2ede15bf00ec7cd53a6fb4c3fa7c31e29c9a49d72e5b5c4a4442a505d06f31f07e5dd59a96ff7af9496c812ffd82916a4ac9ad614f2f
+EBUILD nvidia-drivers-530.41.03-r2.ebuild 19393 BLAKE2B cf358b578c67a0f6e1812629f7458c12252bfd75b53536db87d3176e6e6023e5678337ae636b734d42f4db837994ec050654125f801619ad44fb2eb3395976a7 SHA512 022f537abc9f54a441d8cd37c03fb6116792026a6692748c841a11f6bede0e73b5be37938899aa2c9e93dfae6fca35140c6bc8f0acbe1467b331aac5b01bd331
+EBUILD nvidia-drivers-535.43.02-r2.ebuild 19943 BLAKE2B 1689f850e6d148b0fe9dfca56ee6356ca3b95216d5f560fbf207c92e064ea91a5948db0f8344ca96f6f2658439b53d85527f65473d69f869e438f36682d9a2fa SHA512 dcfb1aa387ce015df7d08d36ce17eb8157165103e588d725ad5871a7d41b4482acbd930a298d813051fe17fcbd76e7ac00abeb527e21891e1ed3db7c6bf6642d
 MISC metadata.xml 1281 BLAKE2B 2d2dd88b6c8afbe3b8d4799813fcc65a7102dfaf47fd6266ebd627acce1dde00acdf69d9d85193886cdce3e6553e261987647d12737cdec701ea4f9ba865366b SHA512 00100ef8ec37c1703a2bae7de811ded281c5dcf373407e22e9b359a92feac3ceefb007ed2980ad05cfcc7a698e5434e4cc7e2fc5c6ab82a3d60b679d984963c4
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index 1b767ce1a0dd..4395ca7609bb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -457,7 +457,12 @@ pkg_postinst() {
 		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
 		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
 		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use modules && ewarn "The easiest way to fix this is usually to reboot."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
 	fi
 
 	ewarn
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r2.ebuild
index d6dc7317d635..f92cf1cc0973 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r2.ebuild
@@ -454,7 +454,12 @@ pkg_postinst() {
 		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
 		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
 		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use modules && ewarn "The easiest way to fix this is usually to reboot."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
 	fi
 
 	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r2.ebuild
index b8586f19f973..69acddc4ff35 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r2.ebuild
@@ -508,7 +508,12 @@ pkg_postinst() {
 		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
 		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
 		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use modules && ewarn "The easiest way to fix this is usually to reboot."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
 	fi
 
 	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild
index 783ecf862bca..b821ca109c90 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild
@@ -506,7 +506,12 @@ pkg_postinst() {
 		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
 		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
 		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use modules && ewarn "The easiest way to fix this is usually to reboot."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
 	fi
 
 	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r2.ebuild
index 1035ce287cd4..43bc207ec36d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r2.ebuild
@@ -507,7 +507,12 @@ pkg_postinst() {
 		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
 		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
 		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use modules && ewarn "The easiest way to fix this is usually to reboot."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
 	fi
 
 	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r2.ebuild
index b9a10a17cc75..377300e2f9df 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r2.ebuild
@@ -506,7 +506,12 @@ pkg_postinst() {
 		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
 		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
 		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use modules && ewarn "The easiest way to fix this is usually to reboot."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
 	fi
 
 	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r2.ebuild
index 1f3fc2044bc9..908c41c31895 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r2.ebuild
@@ -516,7 +516,12 @@ pkg_postinst() {
 		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
 		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
 		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use modules && ewarn "The easiest way to fix this is usually to reboot."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
 	fi
 
 	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 273eeca237fa..c79c02f188ae 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-wacom-1.1.0.tar.bz2 645948 BLAKE2B fccc81f49777b10527072bf4b30cb1a510e35d61f30fca96a68d05df55acc91f6c8dc44b2fad5d2b2f3f000646d85b2052841cbc8f933db51b668b1eb3e49dbe SHA512 d4ca8d5ea5e328c6e6b4bdb3d0ca23dee0bdb960e79f4422483d456330f9c88ea7579da4fba192fd250b23d7db1b7f40ad8ef0127f334c580030858edcbb9f4d
 DIST xf86-input-wacom-1.2.0.tar.bz2 647874 BLAKE2B c59e605bacb2694c2e322faba9b030112ffb57f916c816cbcb9a946fa063713c0590e1ea29273f73a84f4360b5bc5241c9768d7e61d77dfc9fb0af72b1a6f1cc SHA512 34817b87318d1fcf885e6427436a54d748a1c910026e6af0a22fafb461b227ca566cf06846f1f57c0d66412d5a3b20c95f014a71f8ef394ea8ca360a5f902318
-EBUILD xf86-input-wacom-1.1.0.ebuild 1918 BLAKE2B 9e0f2b9438782ff2894d576db4ed7e63b566961436ab49c471ee5658bbc852453b6f3faaa790766e645633438be13776887eac325686fdc3c5e6fea0d3489b3e SHA512 2a991e5afb0860baa6fafaa875cf192fdb936563ba6501cd131c8b20a59dd241ff18355634b8e752668c2c6866cecc433e5e1ebb0a1ca96b49af00ea57d16314
 EBUILD xf86-input-wacom-1.2.0.ebuild 1918 BLAKE2B 508aa3ec637806433278223879451b8b6eec906d4f1826ee6933961ea0bbf0438155bd8aad7b867bb941b3a5d4461ea2237beafb48b96a53fff67f43c06fbb1a SHA512 9be4d52b4478e20d165e6196a759218c8623bf9b64ca8b7e6ed38003f383a46893fc7879d79efbf80e4df9c08fc6f05c3b5ab2e0654fc2ac955d4b24b23d62d2
 MISC metadata.xml 337 BLAKE2B 4af5fa6cfa58ef6ecec60cbe9f316cc4adfa0b1eb304d2c1fe4525b916e1c347bd3b9a74c2e79a5bb88649aae92f00b624c619169fc8cb6ac81e359e58c53d2b SHA512 fba2d6d8bbfe90c65794dd1b831c6bad7dcd2b6e67036f46d629f4e85f926409b7fba0e99892ce7a2ce527fd080d5e75467d0ec38fee0ea2f7ecd311c2c49893
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.1.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.1.0.ebuild
deleted file mode 100644
index 1a8b5710751b..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.1.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd udev xorg-3 meson
-
-DESCRIPTION="Driver for Wacom tablets and drawing devices"
-HOMEPAGE="https://linuxwacom.github.io/"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libwacom-2:=
-	>=x11-base/xorg-server-1.13:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXinerama
-	virtual/libudev:="
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 3 17; then
-		if ! linux_config_exists \
-				|| ! linux_chkconfig_present TABLET_USB_WACOM \
-				|| ! linux_chkconfig_present INPUT_EVDEV; then
-			echo
-			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
-			ewarn "  Device Drivers --->"
-			ewarn "    Input device support --->"
-			ewarn "      <*>   Event interface"
-			ewarn "      [*]   Tablets  --->"
-			ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
-			echo
-		fi
-	else
-		if ! linux_config_exists \
-				|| ! linux_chkconfig_present HID_WACOM; then
-			echo
-			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
-			ewarn "  Device Drivers --->"
-			ewarn "    HID support  --->"
-			ewarn "      Special HID drivers  --->"
-			ewarn "        <*> Wacom Intuos/Graphire tablet support (USB)"
-			echo
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	xorg-3_flags_setup
-
-	local emesonargs=(
-		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
-		-Dudev-rules-dir="$(get_udevdir)/rules.d"
-		$(meson_feature test unittests)
-		-Dwacom-gobject=disabled
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 4e528cfccdff..144d489b6518 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,8 +1,4 @@
-AUX xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch 991 BLAKE2B 30fab6591259a5fa2eeb917543b5ac91c632d9e21bb5271662f36619513582c26a8a4797e2b20491dbe1c384ca81098f3f5ef10ef4a673cc2442b0e4739dc47c SHA512 4022480caca968578ba62ac2a439b21f335b779e326df7d1838b3276e988dd3675bd225921beed08995f0a95df6989588bd673ab11828d0eb3a7132fc9271569
-AUX xf86-video-ati-19.1.0-xserver-21-build-fixes.patch 14203 BLAKE2B 20cbd16568b8e5b32e8cd806db689cc8ce6c18e3749030dc5d107e735f208303583359aec581f4e44cf525b9ff0ae1088466790eb517d12f39b670d137026fc9 SHA512 c0c77c571cfd4a18ca4363fe52c8a188281a7be533a41fbd4265d30b0098442a0626aa5af0e8d8c60c89157b4dff6a60262eb0ba5ff0cee8e79703287ea0aa87
-DIST xf86-video-ati-19.1.0.tar.bz2 904558 BLAKE2B 424e8b3c6fa14fa4f0bc00940bdf1008400f25ce7103b13ecefdbda9e629239c5ab011952d19c305251e9c0008650da3db0eb91055d5585e2b1c3dd108a74d86 SHA512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6
 DIST xf86-video-ati-22.0.0.tar.xz 755812 BLAKE2B 97349eca2b01e714a44bcfc9489251d175eab2ca622ac5f475797d0d862e082cf9f2bc49d996bc4a8ef39d13f4474953542bd5c5cfa495877b280aff218e4fe2 SHA512 fba9ffc7b0eeb0c369eb1a6f8ef0bb3061cfeca26bc269baf6e3d16dcd943fbf4092f1e37adfb1bc71051cee0b7a0e6fb253f0b8bcd210732ccaf99e8f2356fe
-EBUILD xf86-video-ati-19.1.0-r1.ebuild 1045 BLAKE2B 20e78608219b1463b50a29c8d4c2029977f88f0384edc4654fa13b3cf426d91a764a13962564caf8781fd130ce786a61e5183c1d203c80b499d073567768b599 SHA512 2b4ce75a42df2b4834a3757fda81c6574d5f1f96bfb73fc0114730c158b2a83958b386cc88681ed505073c8a2f937f7ed0dfe8542bec8f0b636020270b0dd3f6
 EBUILD xf86-video-ati-22.0.0.ebuild 972 BLAKE2B 065a5159e45137106a7ff3363b19f99e1016d9fd18b072bc027d7bb88a03ca7fbc51ea3c9a849d6c6b805022c594ce5268af5ba2de8def1b3abef04478381fa5 SHA512 832d976a7825be534a86de9fe952d410e223b529e48703e564e253662ce26b612f5bf969c1d0071b3a5e0a13cb7a6340df45467726625f6de60acaaf93e96555
 EBUILD xf86-video-ati-9999.ebuild 978 BLAKE2B f321df606838674140d11866790ab4c6847edc2a38a682f227bd7154c972dee06d6259f84cada64decfbcb5c7e63558ce0378525f02b88edf598ed9c5cc71eb0 SHA512 084912585b0f2b17cac6fe82d95c14abe6ec2b5fc8e771db8f77a05f423437b5fae5c0e0f18f4129e2570702159afbfbae5a1303f789b894f4c049a31942ea58
 MISC metadata.xml 348 BLAKE2B 0ed12610bdc3e8f9c2e7003dd1bf16205d93eadd4cfc351372d4de3c171f73aed35f6c4414dec5b7b4b74f6e76dce856db29444ec87c0107e93f6b371e80b318 SHA512 e7855c0f6284d91f98075c9d33eeb7b783f2a9d94cc1cd4b3218f95ea1202585c5a40cac212f33b927815a90ef29f4ec36cf186529db50da7d076f305effba81
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch
deleted file mode 100644
index e0375b0826c7..000000000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f223035f4ffcff2a9296d1e907a5193f8e8845a3 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 4 Feb 2020 16:38:06 -0500
-Subject: [PATCH] Fix link failure with gcc 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without the 'extern' this looks like a definition not just a
-declaration, in every file that includes the header. gcc 10 is stricter
-about this kind of multiple definition.
-
-Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
----
- src/drmmode_display.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/drmmode_display.h b/src/drmmode_display.h
-index 96eaef0a..8cd8a0a6 100644
---- a/src/drmmode_display.h
-+++ b/src/drmmode_display.h
-@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type,
- 			 uint64_t *ust, uint32_t *result_seq);
- 
- 
--miPointerSpriteFuncRec drmmode_sprite_funcs;
-+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
- 
- 
- #endif
--- 
-2.26.2
-
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch
deleted file mode 100644
index 6666e0af6916..000000000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-From 8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 13 Jul 2020 09:11:28 +1000
-Subject: ati: cleanup terminology to use primary/secondary
-
-The X server changed some API/ABIs here.
-
-Based on amdgpu patch by Michel
----
- man/radeon.man        |  2 +-
- src/compat-api.h      |  6 +++++
- src/drmmode_display.c |  4 +--
- src/evergreen_state.h |  2 +-
- src/r600_state.h      |  2 +-
- src/radeon.h          | 10 +++----
- src/radeon_exa.c      |  2 +-
- src/radeon_glamor.c   |  2 +-
- src/radeon_kms.c      | 74 +++++++++++++++++++++++++--------------------------
- 9 files changed, 55 insertions(+), 49 deletions(-)
-
-diff --git a/man/radeon.man b/man/radeon.man
-index dcebf537..247dcdb7 100644
---- a/man/radeon.man
-+++ b/man/radeon.man
-@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off'
- accordingly. If this option isn't set, the default value of the property is
- .B auto,
- which means that TearFree is on for rotated outputs, outputs with RandR
--transforms applied and for RandR 1.4 slave outputs, otherwise off.
-+transforms applied and for RandR 1.4 secondary outputs, otherwise off.
- .TP
- .BI "Option \*qAccelMethod\*q \*q" "string" \*q
- Chooses between available acceleration architectures.  Valid values are
-diff --git a/src/compat-api.h b/src/compat-api.h
-index f4e7524f..def6d3e4 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -34,4 +34,10 @@
- #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
- #endif
- 
-+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
-+#define current_primary current_master
-+#define primary_pixmap master_pixmap
-+#define secondary_dst slave_dst
-+#endif
-+
- #endif
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 72f96a0c..3099a729 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
- 		xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
- 					 ent) {
- 			if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
--				dirty->slave_dst =
-+				dirty->secondary_dst =
- 					drmmode_crtc->scanout[scanout_id].pixmap;
- 				break;
- 			}
-@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
- 
- 	xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
- 		if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
--			PixmapStopDirtyTracking(dirty->src, dirty->slave_dst);
-+			PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst);
- 			break;
- 		}
- 	}
-diff --git a/src/evergreen_state.h b/src/evergreen_state.h
-index 7e54e1c7..34ba87b6 100644
---- a/src/evergreen_state.h
-+++ b/src/evergreen_state.h
-@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
- 				    int *new_pitch);
- extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
- extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
--extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
-+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
- extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
- 
- #endif
-diff --git a/src/r600_state.h b/src/r600_state.h
-index 34345996..567c3ca2 100644
---- a/src/r600_state.h
-+++ b/src/r600_state.h
-@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
- 				    int *new_pitch);
- extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
- extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
--extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
-+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
- extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
- #endif
-diff --git a/src/radeon.h b/src/radeon.h
-index e4a2ba66..68d7756a 100644
---- a/src/radeon.h
-+++ b/src/radeon.h
-@@ -182,18 +182,18 @@ typedef enum {
- 
- 
- static inline ScreenPtr
--radeon_master_screen(ScreenPtr screen)
-+radeon_primary_screen(ScreenPtr screen)
- {
--    if (screen->current_master)
--	return screen->current_master;
-+    if (screen->current_primary)
-+	return screen->current_primary;
- 
-     return screen;
- }
- 
- static inline ScreenPtr
--radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
-+radeon_dirty_primary(PixmapDirtyUpdatePtr dirty)
- {
--    return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
-+    return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen);
- }
- 
- static inline DrawablePtr
-diff --git a/src/radeon_exa.c b/src/radeon_exa.c
-index 268155ed..320ff992 100644
---- a/src/radeon_exa.c
-+++ b/src/radeon_exa.c
-@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
-     free(driverPriv);
- }
- 
--Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
-+Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
- {
-     struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
- 
-diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
-index f1098381..ccf99941 100644
---- a/src/radeon_glamor.c
-+++ b/src/radeon_glamor.c
-@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
- 
- 
- static Bool
--radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
-+radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
- 				   void **handle_p)
- {
- 	ScreenPtr screen = pixmap->drawable.pScreen;
-diff --git a/src/radeon_kms.c b/src/radeon_kms.c
-index b3db7c41..62962d61 100644
---- a/src/radeon_kms.c
-+++ b/src/radeon_kms.c
-@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
- 	if (dirty->rotation != RR_Rotate_0) {
- 		dstregion = transform_region(damageregion,
- 					     &dirty->f_inverse,
--					     dirty->slave_dst->drawable.width,
--					     dirty->slave_dst->drawable.height);
-+					     dirty->secondary_dst->drawable.width,
-+					     dirty->secondary_dst->drawable.height);
- 	} else
- #endif
- 	{
-@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
- 
- 	    dstregion = RegionDuplicate(damageregion);
- 	    RegionTranslate(dstregion, -dirty->x, -dirty->y);
--	    PixmapRegionInit(&pixregion, dirty->slave_dst);
-+	    PixmapRegionInit(&pixregion, dirty->secondary_dst);
- 	    RegionIntersect(dstregion, dstregion, &pixregion);
- 	    RegionUninit(&pixregion);
- 	}
-@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
- 	if (RegionNil(region))
- 		goto out;
- 
--	if (dirty->slave_dst->master_pixmap)
--	    DamageRegionAppend(&dirty->slave_dst->drawable, region);
-+	if (dirty->secondary_dst->primary_pixmap)
-+	    DamageRegionAppend(&dirty->secondary_dst->drawable, region);
- 
- #ifdef HAS_DIRTYTRACKING_ROTATION
- 	PixmapSyncDirtyHelper(dirty);
-@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
- #endif
- 
- 	radeon_cs_flush_indirect(src_scrn);
--	if (dirty->slave_dst->master_pixmap)
--	    DamageRegionProcessPending(&dirty->slave_dst->drawable);
-+	if (dirty->secondary_dst->primary_pixmap)
-+	    DamageRegionProcessPending(&dirty->secondary_dst->drawable);
- 
- out:
- 	DamageEmpty(dirty->damage);
-@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
- void
- radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
- {
--    ScreenPtr master_screen = radeon_dirty_master(dirty);
-+    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
-     PixmapDirtyUpdatePtr ent;
-     RegionPtr region;
- 
--    xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
--	if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
-+    xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) {
-+	if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
- 	    continue;
- 
- 	region = dirty_region(ent);
-@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
- #if HAS_SYNC_SHARED_PIXMAP
- 
- static Bool
--master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
-+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
- {
--    ScreenPtr master_screen = radeon_dirty_master(dirty);
-+    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
- 
--    return !!master_screen->SyncSharedPixmap;
-+    return !!primary_screen->SyncSharedPixmap;
- }
- 
- static Bool
--slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
-+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
- {
--    ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
-+    ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
- 
--    return !!slave_screen->SyncSharedPixmap;
-+    return !!secondary_screen->SyncSharedPixmap;
- }
- 
- static void
- call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
- {
--    ScreenPtr master_screen = radeon_dirty_master(dirty);
-+    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
- 
--    master_screen->SyncSharedPixmap(dirty);
-+    primary_screen->SyncSharedPixmap(dirty);
- }
- 
- #else /* !HAS_SYNC_SHARED_PIXMAP */
- 
- static Bool
--master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
-+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
- {
--    ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty));
-+    ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty));
- 
--    return master_scrn->driverName == scrn->driverName;
-+    return primary_scrn->driverName == scrn->driverName;
- }
- 
- static Bool
--slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
-+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
- {
--    ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
-+    ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
- 
--    return slave_scrn->driverName == scrn->driverName;
-+    return secondary_scrn->driverName == scrn->driverName;
- }
- 
- static void
-@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
- static xf86CrtcPtr
- radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty)
- {
--    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
-+    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
-     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-     int c;
- 
--    /* Find the CRTC which is scanning out from this slave pixmap */
-+    /* Find the CRTC which is scanning out from this secondary pixmap */
-     for (c = 0; c < xf86_config->num_crtc; c++) {
- 	xf86CrtcPtr xf86_crtc = xf86_config->crtc[c];
- 	drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
-@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
- 	if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
- 	    RegionPtr region;
- 
--	    if (master_has_sync_shared_pixmap(scrn, dirty))
-+	    if (primary_has_sync_shared_pixmap(scrn, dirty))
- 		call_sync_shared_pixmap(dirty);
- 
- 	    region = dirty_region(dirty);
-@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
- 		radeon_cs_flush_indirect(scrn);
- 		RegionCopy(&drmmode_crtc->scanout_last_region, region);
- 		RegionTranslate(region, -crtc->x, -crtc->y);
--		dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap;
-+		dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap;
- 	    }
- 
- 	    redisplay_dirty(dirty, region);
-@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u
- static void
- radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
- {
--    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
-+    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
-     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
-     xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty);
-@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
- static void
- radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
- {
--    ScreenPtr screen = ent->slave_dst->drawable.pScreen;
-+    ScreenPtr screen = ent->secondary_dst->drawable.pScreen;
-     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
-     xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent);
-@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn)
- 		if (screen->isGPU) {
- 			PixmapDirtyUpdatePtr region_ent = ent;
- 
--			if (master_has_sync_shared_pixmap(scrn, ent)) {
--				ScreenPtr master_screen = radeon_dirty_master(ent);
-+			if (primary_has_sync_shared_pixmap(scrn, ent)) {
-+				ScreenPtr primary_screen = radeon_dirty_primary(ent);
- 
--				xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
--					if (radeon_dirty_src_equals(ent, region_ent->slave_dst))
-+				xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) {
-+					if (radeon_dirty_src_equals(ent, region_ent->secondary_dst))
- 						break;
- 				}
- 			}
-@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
- 
- 			RegionDestroy(region);
- 		} else {
--			if (slave_has_sync_shared_pixmap(scrn, ent))
-+			if (secondary_has_sync_shared_pixmap(scrn, ent))
- 				continue;
- 
- 			region = dirty_region(ent);
-@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
-     (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
-     pScreen->BlockHandler = RADEONBlockHandler_KMS;
- 
--    if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema)
-+    if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
- 	return;
- 
-     if (!pScreen->isGPU)
-@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
-     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-     int c;
- 
--    if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema)
-+    if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema)
- 	return 0;
- 
-     /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After
--- 
-cgit v1.2.1
-
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
deleted file mode 100644
index 07a7e42694b1..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DRI=always
-inherit linux-info xorg-3
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-fi
-
-DESCRIPTION="ATI video driver"
-HOMEPAGE="https://www.x.org/wiki/ati/"
-
-IUSE="udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
-	>=x11-libs/libpciaccess-0.8.0
-	x11-base/xorg-server[-minimal]
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
-	"${FILESDIR}"/${P}-xserver-21-build-fixes.patch
-)
-
-pkg_pretend() {
-	if use kernel_linux; then
-		if kernel_is -ge 3 9; then
-			CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
-		else
-			CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
-		fi
-	fi
-	check_extra_config
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--enable-glamor
-		$(use_enable udev)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index d82b3bb045bc..879085d2a0d6 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-dummy-0.4.0.tar.xz 258452 BLAKE2B 8364a705bac5bc0bf2767be30b23a67753cb9232a58819c5b3ea3fa91769049e38cb04a5504b34e4aa5978f45a17617b999541333e3a1ee66d30892f281d7cc8 SHA512 1150a84c4f17215b9c579d8ce9399d547a01970bf7b5396653f14beb13a62deefe3008bf3ad6a2c5c0f46da4cbc0b840c18a7dff339e3b882d108183fa1d30d9
 DIST xf86-video-dummy-0.4.1.tar.xz 262496 BLAKE2B a75a24f2e81713bdee9249d72df45877790c85fa3ba3d25214e46bd552f896df56d71bda8e68a389a93a0ee06c8e85b0a3ee5aaa8909d16125d406a5e04129e9 SHA512 ff7fd8b668e5e9f40a5d27f82599b7a455a8162fc1a247195335c17980f00ce10ae6b2c062239cbaa67d8684c86174f85b398dd7f7065d36f69294bd6f2469de
-EBUILD xf86-video-dummy-0.4.0.ebuild 353 BLAKE2B 593760020e7b31e7c9f314c86d1ed70d51c9f81f16e6c83b6b051c8b6ea85ab6fea68500ab7824a84b4d52e59e5dde9104c143b63752c7c9fe18de26ad56cc6f SHA512 dc5e4bb32114cc12ab37a6b4a883f64edd02051e764a79d6ddc24e62aac956623496bdf6b7114ba2316edc61bbf3fcc26ef42c3119986289042bc8177a4e42f5
 EBUILD xf86-video-dummy-0.4.1.ebuild 352 BLAKE2B 086ea45a314498b5b951afe04ea0389227df46d58e35c93ad883b7e780ecd32f6a1f9893c3d5aae409ec60c221ab6492fc84d02ce093339267e8d622c920f2ec SHA512 dd54bf8efb3d281bf4065f5de2765fb1d75bd2e4f913f6ee568f1b63972b3fd9d61aa17be562492077698d9dedd67d40e7f301e1859a592ac899c6176293c900
 MISC metadata.xml 350 BLAKE2B 6e7491587fe71ad22e66f26a3e0b8b37efac4ef09a4fb29945b165b690ab6ae23458433c8b8ba6909d614a7b343dbf817b0fcae9b32712c3b6a8f1770ae052ca SHA512 fb031e2d52510f1c690a0caceb0b81ac5ab0cbc443d456261b802a96694e34411012272becd765bc2291b42ec036372cb5e4c6ed11c548e922c0002b269e49ba
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
deleted file mode 100644
index 74a8f32f592e..000000000000
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-DESCRIPTION="X.Org driver for dummy cards"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-DEPEND="x11-base/xorg-proto"
diff --git a/x11-drivers/xf86-video-geode/Manifest b/x11-drivers/xf86-video-geode/Manifest
index 8f4e6701cc5c..60c30241040a 100644
--- a/x11-drivers/xf86-video-geode/Manifest
+++ b/x11-drivers/xf86-video-geode/Manifest
@@ -1,6 +1,3 @@
-AUX xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch 2211 BLAKE2B ad3228a6c1d88f985949cd04940da5b3f45f2c284443c0bb538a44f75f8d479be1d64e8ed19a8953942c2ccb7996a55d6a490c1a1ab0f7f96bade79562dd16a5 SHA512 69d25f08a11c7897c7d870ae7f16977a55b7b678b0b3240d1626fe98638c7f76cfbb3f4d091436d4a984aeb3098e1635131c97be2025345bd18a90b82e3fb934
-DIST xf86-video-geode-2.11.20.tar.bz2 699973 BLAKE2B ed5c96a4ac41bb908239d89a49ef833a56fdeab62e441ddf36e32be1704a0850a2466a5538aafad87c83d3850339b0bdf0610851a17e3f4ace5eefab20c82296 SHA512 a67376ec174c544256aef693590d515742199c2acf1a54117207f599e1d9f70a3fb70c9c811ebc3f907dfa795e0e662a1c1f18673774660f0d5f3c757e848f0d
 DIST xf86-video-geode-2.11.21.tar.xz 582492 BLAKE2B a6a970284033497dbf359b1d9735d143476e96eca68560b68a49477af704ee9c9ef952b8ee144fc545cc88baf95cc4b34b8eb8a76efb3b9282bec1799d986f19 SHA512 e12f74268ab7d16b57644a9465b4be1ca28d250625a31b8810e19a1f94a17e47e0a258455155fd8f336fa59fd78160cdf3763aa94b85c6ccc2c42edf3b65bc61
-EBUILD xf86-video-geode-2.11.20.ebuild 451 BLAKE2B 0674b9fb9d56a57b003e54d23e3e27e341b5ec2dab7456da826c9dcedb1c06e4e9045ba400d5012f38634270991bb189666f03bc7f2a10a5f735c47181f5126d SHA512 28573ca325743a0552c19fc6ab3aa7d7b81a20bc70febf6f518e0b9d9aa0aeb150fa4e86356f7913274785c9334d9facb563f6f41ca5bf4a2206b300b9c68866
 EBUILD xf86-video-geode-2.11.21.ebuild 396 BLAKE2B e2f8815a9b1033b027e89d7dc34de13fd2f5e1a01a6d6bd34b797f17a891a017765b4c435538c393d1d4861f83130f1ad6dec9b2fb7960d0b7f34136b85f4005 SHA512 cb0d309f52cbd060c0bc9c3e449b1a6d8f6b1a02b12f200c372b43784e72a98133934639b87fde9c624d3a184e356b76604d279a70f1b3f5d77b602a6ca3f8c8
 MISC metadata.xml 511 BLAKE2B 194193137efc8f608a9fd5be7d991b34c46c46f54e9c01fc1e2cb19e607f3784442095724cdd3aaa1914da2c8ceae55ad8e78b8549f32fbd9ff1588b75bedc3e SHA512 a7c3f53f29d7a8f89b79c748d84a6d69bc3f4ea58827d6b708d8dec29e02055792eb096d10bb236c5072e16e4f961a88a998845123486ffee96f0817af2bfb63
diff --git a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
deleted file mode 100644
index 5bacc0cfbc8d..000000000000
--- a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From ba63bf6821c40707237ad2e7a13352a537e5b588 Mon Sep 17 00:00:00 2001
-From: Christian Gmeiner <christian.gmeiner@gmail.com>
-Date: Thu, 3 Dec 2020 14:22:23 +0100
-Subject: [PATCH] fix 'multiple definition of' linker error
-
-Fix for FTBFS due to -fno-common on GCC 10.
-
-Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
----
- src/geode.h     | 8 ++++----
- src/gx_driver.c | 2 +-
- src/gx_video.c  | 2 +-
- src/lx_driver.c | 2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/geode.h b/src/geode.h
-index eb61c28..1b144ff 100644
---- a/src/geode.h
-+++ b/src/geode.h
-@@ -343,7 +343,7 @@ typedef struct _geodeRec {
- 
- /* option flags are self-explanatory */
- #ifdef HAVE_LX
--enum {
-+enum LX_GeodeOpts {
-     LX_OPTION_SW_CURSOR,
-     LX_OPTION_HW_CURSOR,
-     LX_OPTION_NOCOMPRESSION,
-@@ -357,11 +357,11 @@ enum {
-     LX_OPTION_FBSIZE,
-     LX_OPTION_PANEL_MODE,
-     LX_OPTION_DONT_PROGRAM
--} LX_GeodeOpts;
-+};
- #endif
- 
- #ifdef HAVE_GX
--enum {
-+enum GX_GeodeOpts {
-     GX_OPTION_SW_CURSOR,
-     GX_OPTION_HW_CURSOR,
-     GX_OPTION_NOCOMPRESSION,
-@@ -378,7 +378,7 @@ enum {
-     GX_OPTION_FBSIZE,
-     GX_OPTION_PANEL_GEOMETRY,
-     GX_OPTION_DONT_PROGRAM
--} GX_GeodeOpts;
-+};
- #endif
- 
- /* geode_dcon.c */
-diff --git a/src/gx_driver.c b/src/gx_driver.c
-index 4de336e..188828c 100644
---- a/src/gx_driver.c
-+++ b/src/gx_driver.c
-@@ -78,7 +78,7 @@
- 
- extern OptionInfoRec GX_GeodeOptions[];
- 
--unsigned char *XpressROMPtr;
-+extern unsigned char *XpressROMPtr;
- 
- static inline void
- gx_enable_dac_power(void)
-diff --git a/src/gx_video.c b/src/gx_video.c
-index 0d3e1c5..7964d17 100644
---- a/src/gx_video.c
-+++ b/src/gx_video.c
-@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int height,
- 
- extern void GXAccelSync(ScrnInfoPtr pScrni);
- 
--int DeltaX, DeltaY;
-+extern int DeltaX, DeltaY;
- 
- unsigned long graphics_lut[256];
- static int lutflag = 0;
-diff --git a/src/lx_driver.c b/src/lx_driver.c
-index 47f6875..9cb8889 100644
---- a/src/lx_driver.c
-+++ b/src/lx_driver.c
-@@ -74,7 +74,7 @@
- 
- extern OptionInfoRec LX_GeodeOptions[];
- 
--unsigned char *XpressROMPtr;
-+extern unsigned char *XpressROMPtr;
- 
- static Bool
- LXSaveScreen(ScreenPtr pScrn, int mode)
--- 
-2.26.2
-
diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
deleted file mode 100644
index be974bd039dd..000000000000
--- a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="AMD Geode GX2 and LX video driver"
-
-KEYWORDS="x86"
-IUSE="ztv"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	ztv? (
-		sys-kernel/linux-headers
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-multiple-definition-of-linker-error.patch
-)
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ztv)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 2a265aa63421..abe69a4d2eb3 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,6 +1,4 @@
-DIST xf86-video-intel-2.99.917_p20201215.tar.bz2 1250622 BLAKE2B ddcbd84ee125528fe82f0a369f8e768d218eb0d9c4fc00cbe4a921d6267a846eccc001e3dd765f8cdaf7a38c461357831cd9675acfdfd3cc6ac282ec4b6f4b67 SHA512 29526fe191a95c2df5a3e168150b8c7f759dfdc9a4912e28887ec51be05304a9f552d21c990a37a90d6299e64df4bb1fba051c1d0ad25606dc52f801cd30b60d
 DIST xf86-video-intel-2.99.917_p20230201.tar.bz2 1250201 BLAKE2B f41aa429079b60b06a4f78289c5d94de9203c55756bcc3f1ff016a9226e7fa01b3559305ea3328acbc88063c8a5a96289a0ba9954e011c4eaeb7ac5d8fc3e240 SHA512 5f37bfead71ca5a671640919c357912d15b809fe8f55f572119927b218e58bbd75f3ec4370a80d74d454debb09c678105b3120f8d7eced3f9ed858878ba9128c
-EBUILD xf86-video-intel-2.99.917_p20201215.ebuild 2028 BLAKE2B 85d72fc92f7f1ccf2769b1fda93a6de553f3b172b00e116bdfac20ac3afba823a4bc247d243a9f15111f8bf96245574a6aed074f0464857c517b515e77da4e17 SHA512 8ec6a8b5a588bf34a1c309811bd9c3e845739bf18136e0a292d16979186d7566baced46c3da7ebe712dd09bfc74fe5c8f207785abc21957e7d7c6ef45529f298
 EBUILD xf86-video-intel-2.99.917_p20230201.ebuild 2098 BLAKE2B b9f5bd6a2641a94522a22f88d65c8ac3ebb4827b1e2842420518db44070f7980f9458ba9eec8457654a1bbadab96c8303cde45a8d8a3752b114065c4651327fe SHA512 f4869d69314e1b12066e7d8f68a873f44ff02de9a54e91e54bc02ff869c9aafbaeca6f83a1fe02f7049c8fb57be59f0c5d4051d2808e1efbdbcda6c28a7b0af8
 EBUILD xf86-video-intel-9999.ebuild 2060 BLAKE2B f648aecb4cb1d962551f45b0d227bf237a86e5f7c2e6152ee9d74b0fd29228a4cf4361aa93b9fb8697e4c4c1aa81059c7ea9f1f0c1ccfdc80d4472228285aaaf SHA512 d8ae6c3a9ad916dcc486683a03cbc736048a9bad88a7eb623d37749ed4df06c53c1e0f565ce2f34ea3e52b90178fa8ea148198a29f8dcb23dd090a4b66e65d60
 MISC metadata.xml 684 BLAKE2B 38aa4bdc4d0cef985f16a1580083839a7866b6a423ca0046f12142f187ac32009ce4163bf86f0688e6c9566f5822c9e8dd801224ba06a1ea39f08ebfce97f077 SHA512 fa9a5cf8cfa205f89019c298a6064efc2800b265a60f55c461d7e34faa0129978404507e4ce96ac629a6ea20a9e9b6eb29103b565f9758ce7b0f9e7656794fba
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
deleted file mode 100644
index 68a2e71503ee..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DRI=dri
-XORG_EAUTORECONF=yes
-inherit linux-info xorg-3 flag-o-matic
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="amd64 x86"
-	COMMIT_ID="a511f22cdec56504913b457a2e60dafee8e2b570"
-	SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
-	S="${WORKDIR}/${PN}-${COMMIT_ID}"
-fi
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-IUSE="debug +sna tools +udev uxa xvmc"
-
-REQUIRED_USE="
-	|| ( sna uxa )
-"
-RDEPEND="
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXScrnSaver
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.52[video_cards_intel]
-	>=x11-base/xorg-server-1.18
-	tools? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxshmfence
-		x11-libs/libXtst
-	)
-	udev? (
-		virtual/libudev:=
-	)
-	xvmc? (
-		>=x11-libs/libXvMC-1.0.12-r1
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	# bug #582910
-	replace-flags -Os -O2
-
-	local XORG_CONFIGURE_OPTIONS=(
-		--disable-dri1
-		$(use_enable debug)
-		$(use_enable dri)
-		$(use_enable dri dri3)
-		$(usex dri "--with-default-dri=3")
-		$(use_enable sna)
-		$(use_enable tools)
-		$(use_enable udev)
-		$(use_enable uxa)
-		$(use_enable xvmc)
-	)
-	xorg-3_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists && \
-		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}