gentoo resync : 14.12.2020

12 files changed, 24 insertions, 48 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 6840d46b89aa..0c2e2c107124 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 b8123d0404c9..c7b2ae046500 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,6 +1,6 @@
 AUX xcb-proto-1.14-python3_9.patch 1615 BLAKE2B 3c2def81fc944619a4848e00b28252cd1835f7568c9aaf963b6134a433f4447e46f7db2911c37d01378a8ef845f01ee1ab6a470d1d27711a2659ee6f0ec6ef05 SHA512 a6a365a055c6cd4721665d8838dfb48c1436e2a9796f81fbd34230883c5e7d585de86f11125ba9aa367c353198a6d811bed3875af7653b549c44943154f0bba0
 DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
-EBUILD xcb-proto-1.14-r1.ebuild 1344 BLAKE2B 889cb5940342183312451a0fec195fda3b222ddc5c7189759cf286fc59c87d219c1cda9c49a2e844e801bc3c49f2ac04cd8b7a5a20d61de16d3a9acd2ed4e861 SHA512 f12b4868eeff69ea398dbe9ad57ef8b39596c7c62af3acc7623e361064480f8771eff3d590fcff3944bf2a363e6f0e7012b02d5ab0b869ef00135f367635cf11
-EBUILD xcb-proto-1.14.1.ebuild 1299 BLAKE2B 651d318fa72bd0b4b7327b2de26efc96753521ec0e5ff3c32c4963df1d32d60d73baec30d3a99671112d0e7490de4d052aa762966d8114e88c969110bbec0a80 SHA512 baa7706bade7a55b92206d966d566e7f4b1133794d0d2dc4c44f901ffeed2bf3d48d2d72e767b772108b1bba370c04010f90a72dfd53f522d7fd98b35df6f7d5
+EBUILD xcb-proto-1.14-r1.ebuild 1351 BLAKE2B 05306b6d20fb4d0e84ac11087170baab2180482ad5872bb9620f0e9774227b4745d1db532f3fef99840496d5b1a27616a35ab26b1c71f287ed013f075f6c89a6 SHA512 f34ba7f55d7bf8a2a9af286161319148565bb5e4d6e70b84e3e28ee779723840ef2a163055314439137672a922bd00cb6c97bf6b87b10c49e526dfd89b347aae
+EBUILD xcb-proto-1.14.1.ebuild 1293 BLAKE2B d8ea41ff108002300122226260418f8118f3c382bc3f9e6fb9deb7305f1851d0524d1288ceeec8ce60da33c2e44a128b10dda79d8c290aebe743a9de1af962f2 SHA512 37d10c80642839d16f082cdc66bb784b483539be94fc8c9c4895ad6f0cf9169b99b5d8ccf296051925c3516e79b76bae9cfb8844cf9c9b08213b93ff400898fd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
index c110c43bc101..94d4147e9083 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
@@ -15,7 +15,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 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
index 911a6583b181..226b8bc6da5e 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
@@ -15,7 +15,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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index cdda143c4346..b3aa0c7bd1a1 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,3 +1,3 @@
-EBUILD xorg-drivers-1.20-r2.ebuild 3654 BLAKE2B b1dc5bd4df23e6c71fb8dc677d718e5aca9fac1c84169b75120c2dbe0d42428e46b878b718c2a01c6b55053f88af1866c80a9c439bfe1c17f095757be81b0fd1 SHA512 bb2c0f495c0e36b8fc8ff0a1acc6cf5026effaff66d2cf1996a4f7bd5f240ebeb233e90790878e631985b1d7dd2f1cf5bb7c33d9001bfa2f091926aa468cb121
+EBUILD xorg-drivers-1.20-r2.ebuild 3661 BLAKE2B 3eb8db4bb8c9b5f7d94af5e6320c29db0f8348a7a025f24752c0b2378869e55ee2bc79fc69bfab31627609702a18173f2f15e1d4ab1af4cffb7dd0c5065603ee SHA512 3b70599ebe8e30424b993a9f67b74cfff7fe663e494878bbe8b652f4c3f39d6a7580233952dd60b505370a4442f0603446e6f7ee8115f41c9a3bb0412b6a20ca
 EBUILD xorg-drivers-9999.ebuild 3689 BLAKE2B 90c471e6925594be628396251f7a5d408fdc0068c0e1285a603b5f3a85e5647b68345e24efd23143a739482db5169f5cf274a443238301d3667c0ded59c1ff32 SHA512 74478e2ae3af50ca9594f92e214a011ac00780649dc45e3b64614193b7b524960fcd7bad42ce8894ba0dd23519d767d1a081b4ebb5ab4de4feae58d51f7ba364
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
index 58ea8551557b..5750ad332e59 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_INPUT_DEVICES="
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 8727e17ad97b..cc6ed62f05e5 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9
-EBUILD xorg-proto-2020.1.ebuild 753 BLAKE2B 04833bf3cc86366ca8531bf47d0d848a800c7f674485e199fb5cee3a17175e65dedc82018a7d9dff6836d439d36c2c386f734436fe7b10dafc317e6e21d53fd7 SHA512 d9cea847d178dfc3d5979feb6dd375e78d8c1f78807fd5fc4ec29c4ab86ae502c5c5cd07c7aabd1ab5e6fdd1a3b2a8ee3e49e5643fad7c878f85c20e6e6ed7d8
+EBUILD xorg-proto-2020.1.ebuild 760 BLAKE2B d5ee62b7f0fdf038006af93d7308c98768ab4a04567fb3a4eddde9230705105ac424de678b8499b8c5694a459b18f5fbda007b93f98958f16537531ccee3388a SHA512 63d593adb4886476c7f2abd99b309557fac32f23639a3094ab16fbb530e487a55f908576c285f747c27c743ed1c69b8461e465e59ca86543639dc8cdaa5fc74d
 EBUILD xorg-proto-9999.ebuild 762 BLAKE2B 96107b11d3dad0edd79ab67b513a3c1a0624aeb15514312f691546acbd9d9e9f2a6f4fc9b18cf0cd52a0fe5c99712e7181def059941fb0480fad9a2759c561ee SHA512 929ae7dc0cf21a197556c3e383a3ffc6bd631ef17a01ba9be4c08e47d80e49e8c4345dd3226abb38e8cc5d99a7c0c59e5c8a6911b937974134ce7f139215c57f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
index 18d16318e037..938908c713b4 100644
--- a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
@@ -19,7 +19,7 @@ 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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	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
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 86a756da0e88..c5583dbed63d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,9 +4,9 @@ AUX xdm.initd-11 6033 BLAKE2B 713aa81380124326f3dce3604c44e943578d37d0c83b60778b
 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-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
+DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
 DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
-DIST xorg-server-1.20.9.tar.bz2 6302902 BLAKE2B b5d78f38dcf6a9af980a8d5caab751bd7b159a4af5503f176c5af87cce371ecc71572af67f99f08b5794410d2e9a32379ed0d70ceda9f9e2ed3eb6de3bb5fb72 SHA512 d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6
-EBUILD xorg-server-1.20.8-r1.ebuild 5854 BLAKE2B eb32dc6bed38399d2ac5090676b8c2561a6878cdac863b0a52b908f5618baae55aa9f90e4caa5e485b8a0237d3b825127f74283694b75a368e3ef0b7c8a6b43e SHA512 c2c30312ceef3ae561c2f84db2c142a15d5fa2714be9971c6fbdcbbb33850873aea85b598893bee0975431e4486af114e91376bfbecd35865630a6f0b8568748
-EBUILD xorg-server-1.20.9.ebuild 5856 BLAKE2B 3637d521acf017fdddcb32bc1d8efc694b7eb332e7cc3390f3684b9e156f8034f119d67e1c3b22e8697c665eb9619a43f79ad0762a934145ce8870812a17dfe5 SHA512 b7006a75914d005a32aabc6638b0f869f1b10c1a3c3b9289eedb360bcdd50595b0d8375b7edfa7a52891162f35797991c0a8a9dd3ba2784ff2af231a92529189
-EBUILD xorg-server-9999.ebuild 5859 BLAKE2B f2099180e8c20d179f765287bb8e0534cf7ddb812ca877f1d861a1c8b5a13390c90209e80010078f6cedf1a93178e08bef5d2d796da983b21daa559fdcc62749 SHA512 56c6716463ac90322ac72790896f101f92fe62ae03ad55268a3fd0ed3a35d820525eea7ef974f9b1d231d502c68f0944fb94ac672a93e9fe9179e83a47fdb77d
+EBUILD xorg-server-1.20.10.ebuild 5556 BLAKE2B c385a2df5af966ba41692ff238c8c64c873f6c2f057e7856e6542dbbeb363cea924c59e1cffb5da927093e0694f6ec216a4ce64a93efd62c604253f1009999a4 SHA512 1a60f2906e9ae9347c4b617958ce4519d8f37569cca6e584b9e42f921ff740db7e90047a0aaccde13b8e7b5beb9020865dffef9ab10367b382000e11b653f14b
+EBUILD xorg-server-1.20.8-r1.ebuild 5861 BLAKE2B c74b36075e0912e90f4aa16495cd3e1493b2dd0c5feecf335ef2d34a2195a94db332fa88ad9c2c87298c7cb0e66f20b638e4767ae16d0b311bd24d97cc653d69 SHA512 17e76294b30d77a7dbb8d4c7e3aa1c06e8ebd3e3551ad030c03594f7b635a8be824119f24b51778d2f9854bc1d984b49e08ff74bab1873d60e83459595967b19
+EBUILD xorg-server-9999.ebuild 5560 BLAKE2B 74c8b0f4de73dbd51416d10c6b613b9cb6b1fcae96a0dbc2310a254ab311fe3ac3745b8f20535e9a6786536f77df1ea55dd92a31ce8f65bc4c130e4c22896655 SHA512 23b5b056aead208714911fa6a15f5b65e8a945c071c35ee1a0410e439ebae018dc691e180dc452a1e60d693a7bc9c498f29114f09f6e893681f0012defedc012
 MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198
diff --git a/x11-base/xorg-server/xorg-server-1.20.9.ebuild b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
index e7dc1b76401c..bcd42d84a2d4 100644
--- a/x11-base/xorg-server/xorg-server-1.20.9.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
@@ -10,18 +10,14 @@ 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 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity"
 
-CDEPEND="libglvnd? (
-		media-libs/libglvnd[X]
-		!app-eselect/eselect-opengl
-		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
-	)
-	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
+CDEPEND="
+	media-libs/libglvnd[X]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	>=x11-apps/iceauth-1.0.2
@@ -87,7 +83,8 @@ CDEPEND="libglvnd? (
 		sys-auth/elogind[pam]
 		sys-auth/pambase[elogind]
 	)
-	"
+	!!x11-drivers/nvidia-drivers[-libglvnd(-)]
+"
 
 DEPEND="${CDEPEND}
 	sys-devel/flex
@@ -212,15 +209,6 @@ src_install() {
 	find "${ED}"/var -type d -empty -delete || die
 }
 
-pkg_postinst() {
-	if ! use minimal; then
-		# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-		if ! use libglvnd; then
-			eselect opengl set xorg-x11 --use-old
-		fi
-	fi
-}
-
 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
diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
index 8154b59da1aa..5f18e7ec8ed7 100644
--- a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
@@ -10,7 +10,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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index e6b07abb3bb3..ed1a5f6c51e6 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,14 +15,10 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity"
 
-CDEPEND="libglvnd? (
-		media-libs/libglvnd[X]
-		!app-eselect/eselect-opengl
-		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
-	)
-	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
+CDEPEND="
+	media-libs/libglvnd[X]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	>=x11-apps/iceauth-1.0.2
@@ -88,7 +84,8 @@ CDEPEND="libglvnd? (
 		sys-auth/elogind[pam]
 		sys-auth/pambase[elogind]
 	)
-	"
+	!!x11-drivers/nvidia-drivers[-libglvnd(-)]
+"
 
 DEPEND="${CDEPEND}
 	sys-devel/flex
@@ -212,15 +209,6 @@ src_install() {
 	find "${ED}"/var -type d -empty -delete || die
 }
 
-pkg_postinst() {
-	if ! use minimal; then
-		# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-		if ! use libglvnd; then
-			eselect opengl set xorg-x11 --use-old
-		fi
-	fi
-}
-
 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