8 files changed, 40 insertions, 8 deletions
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 6ed3a52878af..10cb86950215 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 f4aa8313a352..5dfda9faf5fe 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -49,9 +49,9 @@ DIST nvidia-xconfig-460.84.tar.bz2 108471 BLAKE2B cc3f100902778b66088bca3ff74df1
 DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769 SHA512 4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
 DIST nvidia-xconfig-470.57.02.tar.bz2 109072 BLAKE2B e3a8f98cb31ec323ae0055252611193669a26ff43184b42433b3089899f88b6baeb13d18ee9dd09807710601558ea1e4c6be54326bc59cbff448ec6dd30f425e SHA512 da4d5de04aadb4941837062ba28592135ee2e2344132c6f5561288e22448a40bb2467d39bd09e0bf838caaa178ccc36a0c2fdbdf80006f3769161aa15550e350
 EBUILD nvidia-drivers-390.143-r1.ebuild 11738 BLAKE2B 7812ee0aea4f6e80aa67a088c03f8f5192883e360d867a0c637f228663dc368ac5e1d4706ad8c02fbd2b3f4d3e0312785bf79c38aace63bc1e42aaef9e1717f3 SHA512 f895e434a013b444925876f90374f1ab254d7ae43b91e389ac60938eb904ce5c34be6b9754ceee5f686399c66f8b0ea2fbf55296ea9288c1f65193872cd88367
-EBUILD nvidia-drivers-390.144.ebuild 11605 BLAKE2B e7377375ad3b5e16eefebb3f12b75fe6320d8eec1d16efceccb3dfa04d24d319256cea2a7462b0a78cdd4fa65b97dace4351c1b8a830f377880203f37191e504 SHA512 b625b15f009560310629458bcc701754d16cdd8de1a8e4a0fdbfe7975f3cc74959b4126d967798cbd4cb8fe04c37887ae2833bb1221c26dea68c33b5d753aa71
+EBUILD nvidia-drivers-390.144.ebuild 11603 BLAKE2B 688f91af5e40040f653348a6f1006509cb55e3fbbccf4786326b291260cd193dbd4e910d13bd9389c41155fc245016209d18b7a962960fa1b45e0c50d2b71989 SHA512 2e9d5ce910e7f17c4370c4bc8c350c975bdd91a8a14100a15602a2c9299827efa3242db417dddb6ae176044eb74f86a49701f87f494620934c4e1b44d285e6c8
 EBUILD nvidia-drivers-460.67.ebuild 11237 BLAKE2B 0084f35297377161c1a96e11c2981641f21dedca2fa1eea6d04adc31558107cc1546def9b286e81d1a912993e9b29362c27479084cd5b1a3a3c6050488406a8a SHA512 5e294a7d73c9d5b49b9e8c9c7a98dc93f5cd38f27404ab0a22b4ee1d55f215c963b2edbb942aa6cef5fc856c3e44b5a13c55f4c5027308feb49e0c2e782b8188
 EBUILD nvidia-drivers-460.84.ebuild 11769 BLAKE2B 386291ff10db832ccc664d9b8b211eb7ef8d88ab1ceb349e47ce386aefeb0a960d100672655d23b5c26259e88653c360c54f62e27505b1d82f4a42f94d3890ac SHA512 d5aaceb43c0d25ea69123d8b613840550a92cf83e407a0ee4cf38e2e9b5ff9338effe8053d6caf3aab0e19e818c9a8fe993d9443e3ec37aef27a6319243fa8c5
-EBUILD nvidia-drivers-460.91.03.ebuild 11770 BLAKE2B 8fed287207f2c927feaf0e07654b3761a6f78feb029d4e57a7e4bc69136dcfb8e331f72182eb90299af3f19fc774fe1178b9eabfad8a0fd48faf5bf03846c8b7 SHA512 3b4bc6a406b706ba04a034cb98d2ea0f782af659ce1e9c27a896737c185bbf88e65d484aa8f91946c29b1acbad0920748aca6609a1a7aa51a15911dca0840183
-EBUILD nvidia-drivers-470.57.02.ebuild 13846 BLAKE2B f0403b95170aa6582ce30fa3bbf4ae94720f988da970dae09d9854956c9166f68c4b014a0c59f957b9092da1c427fe3e73c1558419c9dee7df077c17dbd90277 SHA512 3b9916ced8648175c9f70ce60e54792f967479806fcddd7b3a1d601c05576ecd5f2bc39a48b05cdbbf323d42cd59023cc20585d5dc098976c0e712a31fd6c258
-MISC metadata.xml 872 BLAKE2B 288b9c7801429c23f8f07780640c08d4108a55f79de091c6461c46524c6b1d46bf0927ad6ebb9621e587cefb59cbc18576756fd68d27b7e5bc2f8c19737bc652 SHA512 d940a03167959acb9e8c62efb8d47e3dee8c49c12ab281f419780346cbd4703d6f853cab8cd49e1680686378474d38aed8fa188e6d69ea58a404c84cb14a2e01
+EBUILD nvidia-drivers-460.91.03.ebuild 11774 BLAKE2B f1dbd1b2edfab144149437a7e7c33728da2a39829834926c80f297afdc075c8e15348079c068f423ceeac3d4ff24fc3d32e142d86297b1c1b0b0b59730ce0e17 SHA512 d9d79a51cdbfa1ce7af1478c05824e062885e98d01deab08b26baa9933d89536e30c2edb7109da1499277fe751091e9c792692572dabb28ff28db17baa9f44c7
+EBUILD nvidia-drivers-470.57.02.ebuild 13851 BLAKE2B d153b8b866985b9016c5d78c819a353657be298d242981410b3daae3d5912583774597854af74a0dae866bd20fa4a37f0f7e22624dc50574b59831a8dff2ce04 SHA512 98d03bc7641c4f9262e27de543020f9f7158359d4fcd851082e27585739366a6ca411b8ce34d2fec747a4580537837fd59e9532703b5774205a5f6e89e94d8bd
+MISC metadata.xml 901 BLAKE2B 00dda86ba59983764dd3c77d326ae6c33280ed6623d0cb1e6bc6bca03638763e067c2390669a4656b0f714d6b773b685c5f18f08bc9ce66ee13d7d212106e230 SHA512 bacdfaf46613050270b31874ec794953a8e988aca8c2d9f9cf5addad409dc619d95a0f0fc243a9f4c3e6e7c08307588c94de63a74b8a958d15af5ad30cb526b8
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 0624fc192269..09e3ff07b400 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
 	</maintainer>
 	<use>
 		<flag name="driver">Install kernel driver modules</flag>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
index 24a3a3618ea9..3868afcbfa88 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2 MIT NVIDIA-r2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="+X +driver static-libs +tools"
 
 COMMON_DEPEND="
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
index f244d91a9477..6d71ba06004b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="+X +driver static-libs +tools"
 
 COMMON_DEPEND="
@@ -91,7 +91,7 @@ pkg_setup() {
 		~!LOCKDEP
 		!DEBUG_MUTEXES"
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, so enable
 	options such as CONFIG_DRM_FBDEV_EMULATION instead."
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
index dc6c66192c96..de8316a2bc2d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
@@ -93,7 +93,7 @@ pkg_setup() {
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, so enable
 	options such as CONFIG_DRM_FBDEV_EMULATION instead."
 
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 98d1e42ae4e2..91f30aed7523 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,5 +1,7 @@
 AUX xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch 848 BLAKE2B a4f7b14f2c3568ea3b0a1d568e8a144b8e7a1872b8723ba4d452df2c75e814eae3aa9cb336ad0c4a44639f10ea6cc66a9bce6d0ad33b730fd45f50f7d77b6df4 SHA512 1f4e580a11ddee24114a5f7692ec8331eafe57492f7f59461f8043132a2fc48d71adce2f7a831b6394804161689c13023711178c25fb34c2d299a9dada603fe4
 DIST xf86-video-amdgpu-19.1.0.tar.bz2 441746 BLAKE2B 75906c9b2200174711360e8cf095b8537e62618747afe5ec13f5a36ad8b61001b94e9df675df2026a61e66b6ea05e0e022640d487851d62ca4ed5ce61dd5aae7 SHA512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173
+DIST xf86-video-amdgpu-21.0.0.tar.bz2 448400 BLAKE2B c7a90606b37b646b946f76d083b3d59755df331ffb7e83e4e65a821a8c0e556504b20207d6bb86e80ea98646184549b6388727df543e1e2cbab37600e243fa72 SHA512 44ccc8ddc36f09d1608cf58b6cf85dda090671c46c5643e9453f7d67f4d6850c3c9753eba43539d45773198b8042898a50153b5225780e4b2852410c5521314a
 EBUILD xf86-video-amdgpu-19.1.0.ebuild 629 BLAKE2B 1f93b25f75de10b7e3b71fd8d5a78370d6395978f5ef82695979ae9ff3ca6618c834e77acde34bffa6e92e30cb56267a8dc3a2045fbd4e1979c87084bd31d64a SHA512 fac323b81cc04858c3e000fecde83b660c20563bbfacf083f22dc56c7795a878e8aec03dd15928752bce19b5326480172fb89c4decf43350938f2376d7ce7fb6
+EBUILD xf86-video-amdgpu-21.0.0.ebuild 564 BLAKE2B db3dc75a28395ff27f91caac1265b5f3d425c55b9a4c0a388b5b4ebdae587c071def6f394ef7a689dc9a6e36abb193dcb648af05a947f3d8d27b5c65dedb0d11 SHA512 c3a37da2d616ddbdae98965bbd248b16f18b49cbed029c0d58bbe99f7dacbabee1e3adb130ce2fb0f88ad2a62a074e342500af876b8e89e052ac3b624199f834
 EBUILD xf86-video-amdgpu-9999.ebuild 557 BLAKE2B 4acc38d1587451eb60056590aa5a6f578f2a3b190ebe77c76e7807ff9ac7280bc88e428a2b980d06c396d3c82fad76b869961cb33852a2156a39605f3f3d135f SHA512 6456b7b9c1ec69d93455a5ab260baaa83412474d0cb9ec904138fc9e31ab3f9455bbe2fcdac4ecf1d1653d1fefcf3389ed7f9779fb5d5c1c70906a97a4455b14
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
new file mode 100644
index 000000000000..5dc34b7fecce
--- /dev/null
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_DRI="always"
+inherit xorg-3
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+
+IUSE="udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
+	x11-base/xorg-server[-minimal]
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--enable-glamor
+		$(use_enable udev)
+	)
+	xorg-3_src_configure
+}