Updating liguros repo21.1.2

16 files changed, 232 insertions, 116 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 1dfd6dc8ac58..8ead516762b4 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -4,10 +4,11 @@ DIST NVIDIA-FreeBSD-x86_64-390.132.tar.gz 64206643 BLAKE2B a95bc5bbb99c89b817692
 DIST NVIDIA-FreeBSD-x86_64-390.138.tar.gz 65280213 BLAKE2B 36d5651ceaf90cefcf9e844f8f5810ac42bebca2ca47318b27606c1401d8f343fc7b2619a5405dee9d5d64ec98379b0582f6d5fe5dd4df1269ba48332a6a5ec2 SHA512 fb61e19010826e5c2e403ecc12e19ee28517682599100804d74be92a9e3c6688b51dafa6c6703a5a0d080b0ca16495792fec3badf9cab959321cc401e72520a3
 DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
 DIST NVIDIA-FreeBSD-x86_64-440.100.tar.gz 82523267 BLAKE2B 9d8eddcf3a58787a03fab207c197d722ff047f8bc840ea41e8d38815fbfab9e54759b9fbeaa26e3d147f54cb4a510eec421708d3bbb21197922f4dc175ed6df5 SHA512 96f57e1f308f0e5f00ef09a128e91a68ac55033893000e84cf4ff1a910a88798743c911b3effcc26c3f27ae224b733d8c2f87e9ec0596149f65ad7bcd71edbc5
+DIST NVIDIA-FreeBSD-x86_64-450.102.04.tar.gz 83102763 BLAKE2B 178104973cf2b0afebd04445bfb9d155c1fd6891d6ee627a27951a53677b85a7106aa32514b51d38203642daec6927ff6c31eba5a2101e45bd73cf4022f79173 SHA512 86273a7ed926b59bdbc035d8b23adb27280b5a5b012699733aaf7f80ea31faf7b6278b7f159250bc27b3bd07a0a84107f0e0333ff9d50a0ca2ed8e1b63a78d6d
 DIST NVIDIA-FreeBSD-x86_64-450.80.02.tar.gz 83040706 BLAKE2B d97bae80f6fdcec12fd12af0296f9ba44487cc83c86c14bc9f17d52e0e81107e1eaddd411d06d1bfd27c73bcf71300f7f49218d2a031540c0b42cd62998ef9aa SHA512 6dca92f20102a0432c6b92b7897a2ff5ec3da234af72907539026e18b1da55fc3ae01dc875be07ce9cae808ae4f9c08d2a2af1171db038c37bbba6ca9d03cf3a
-DIST NVIDIA-FreeBSD-x86_64-455.28.tar.gz 94617354 BLAKE2B 8f98bd4a750ba4af84453e3d9722c133e27914a84574973b378b078c47395e29fa7194172d230888f6693626d1cc84ba2403a8bdd5d1de6601ce057437b13bfd SHA512 94ff49da3ee106884a1ed91b36e4d028c4f0c1042ae2b329db81e039aafba7fefafcacfac6cab4c07ed2ee244146c9496435fb59e53ae608b92034e196da185c
-DIST NVIDIA-FreeBSD-x86_64-455.38.tar.gz 97250268 BLAKE2B 30db23d2fd8a45877d265ebfd9fcfeaaf0dbd40884960fe44d02d7f6c15c198029a42f5aa55ff12ee7289904d82aacf7b4d4bea5531f8ae5b00d81b7ee26ff62 SHA512 0367a647c3cf3472a45af203538b5994954bbd8eb9bbc3dd69c3bbc2e8317546d7f5a653cddc35c90700545df312bfee59354ad2826eeed4e50df834e03b15c1
 DIST NVIDIA-FreeBSD-x86_64-455.45.01.tar.gz 116070033 BLAKE2B 4a724ce58fb7164d12b50d1388a2a471903f4aa834cf606adf572e667ef7c1fec7bc291310fdca2d271709fed017b8f361a39bc495d616e6056a4c0afa2443b5 SHA512 4999911944f76fa759126308ac48d0a770e57966c7783e02370f45d9451a50d6015642b385465d4fc800df8c35655b78d90f7c9a8df82bdf81db8be12eacbe87
+DIST NVIDIA-FreeBSD-x86_64-460.27.04.tar.gz 103234112 BLAKE2B a631425c00240dabdd1bd4dcc18945c4216352667cdd0c01b465486024cea215ee2423773ead2e22246337a2387b54ae2e16775b0727d57304b53f7ce6648ad7 SHA512 1308f14ae1100471a5aabece85403772cdd1abac44a725c53d33d9f0ee27a83dbd2088c60662f44a6f7d1fe91b43311b767790dcc5787c50546ffbabb62ded1a
+DIST NVIDIA-FreeBSD-x86_64-460.32.03.tar.gz 108182001 BLAKE2B 9d151b5a19b1237cfd46aeaccc922e82fba9a1d25bb9aae5ccbf3212ec7739d543af3cc92c9d775645c07cb4b9e1a7477ee979093f977560527a85a9aa4adcfd SHA512 8f1c4222bf67bb676b2383bba1e1399f3fa775c01f79b04ee7f767d8d4963ab779e60673040cbe227c0ed5f35adf9eca6c46f94ba334e5f781d7a9b731bc93f0
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.132.run 29084574 BLAKE2B 4727627de610928f0808c0213c9d359c5566900972ab9fbd3d0c58b36c0a1331799ceea22b4defdcfb81c3132f6124d8a6357de8124921eef608938afdc1380d SHA512 2f78a722ec31ceda86afc1831cb42d0eab8f8698b94c7fbc8569a6d34693b50e74453d5aaf3c0180f1fc2511b8c237ac635aceb24bcbea468f2a092cb44f98ee
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.138.run 28540622 BLAKE2B 342852dd6fa371f86d19547d73edef582fe3f04cf4f6e9ec247767951180671ba46f3ed2ee7bab11b0cf2f8bb1eb846b1d7481d318789c14ce79b54fefe0f830 SHA512 e04b8aca202c1df305f7b67ec372322494fa7b77f27cbf04f240527dcac0ce3ffa5e0e9df36b52045ac13fbc2f84b5033784040884ed19072f66f41385d11b97
 DIST NVIDIA-Linux-x86-390.132.run 48152101 BLAKE2B f1e76c2796d12476a35701607226483a34ee3b50a0c7dc03e3626e8cab4250b07c0f5aa238a0d5d5b65b79dc504963f2723089108281668b2f4fae03f4bf25c5 SHA512 12b0f80b4bbaebc984c7dbacd365795646c7697606242b05095ac61d69d89ab89fded47d583b4b99793ebcea9e38ec1e7b63dda1c2fdce53ab697cafcdbb3a85
@@ -16,15 +17,17 @@ DIST NVIDIA-Linux-x86_64-390.132.run 82900057 BLAKE2B e94cc2493701e34c4dd2f0fc4f
 DIST NVIDIA-Linux-x86_64-390.138.run 83780873 BLAKE2B 5e6a9d77dd2b9de17d923198105a9227ffe2adbc1ed7c9dd5ef3cc810358f71ae47ce9615cbe04f36090f052082a2066772505fd763cbfdbce272f0fb7c25dc7 SHA512 2984fb8f5de598fd3031ebd928942ceb09fd26ae9e61b40b2d348e3174e172a932a1b2a5c2e5534f299b883ade323932be4fdcd26d6f7235a17f6f5a04fa792c
 DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
 DIST NVIDIA-Linux-x86_64-440.100.run 144653408 BLAKE2B a62e6324f5ac6033c1c4b59486c86a6d4f81b240e5a7ddf9f861f9cfec4daedbe08ef3af6556c1cd4260a5a6fcd1b8bfed886ae617677d87c3a900d0e313267b SHA512 274b3a8e4c801b67a3f71f11da93134bc1a16a48bc85a6bf63265c00bb3fd8caf935dd23c85c40285a162e83c146bd5e34bb0b1d74fc34e7122bfc4c3a8c81e7
+DIST NVIDIA-Linux-x86_64-450.102.04.run 141391114 BLAKE2B 019f928464b23d2a86bfdd255b7651e3cfe2b0b6ebf58d1b4a6ba1f27990e1d050d1e2429ba4aa60b966b04e775939084a04d82d1dd3482a10b39375b17b1c31 SHA512 1d13de540da36274a360ea6bcd1ce01eaae103fe417b42aa8f9ac757c382b06da455a78cf6798310179f90e2afeadf3a8c9f3398186490c3c0f9079021e850ed
 DIST NVIDIA-Linux-x86_64-450.80.02.run 141055124 BLAKE2B bc4440bb65e4980863f4eb8aa2875a883cbe67f142c8afabe6023956ca2cb765666a5c8a308175c32162194ed821618d2595ad6e45188caf8813d8c8582dc6ea SHA512 ec5c57ed9ac897c671e4b29e0ef4f6a0c233fd4a04d1947a21c3646ddfce38322864cbc607e94e6a74506d99e7b9088cb497b562874a5837d94c000348c97823
-DIST NVIDIA-Linux-x86_64-455.28.run 168953614 BLAKE2B 7f6ef29932c73eaefdbe6c006a35f5f8baea05eb6b7beea129b9b5d77e9342e6a920af63a303f08fcabc136f8635bd6d122820712d77231df67505f46a40011f SHA512 1456ccf29461816ee4a7cdfabe8b5a3e021d4959e8ea8ee88e83f9058683baee4a2e7d31e02bbb22f1c0c6d25163bd2314385ebde1b8896159b6964878381720
-DIST NVIDIA-Linux-x86_64-455.38.run 170865030 BLAKE2B dfbe71be1cba6f95d86fb241428c0a1f201a16e9c577b19fa6cbbefa6fe5eeca483cf0f9d381968582ce7164628da4284feecf12aef5753867b4122fac089f8f SHA512 0430e201f34ed40afbd393274bedb855a680e1439e52d58435ec5dcfc4037f72dbefa9598af66ffac455af2289df07cfa3b7de92d5e541e6c70c93ebba93b146
 DIST NVIDIA-Linux-x86_64-455.45.01.run 183481072 BLAKE2B 5756c788cff136692f0d6de4b33d74ad698fcc75cf2fb6f0adc6381a0377bea18eae0f728151ac8b2efb5508c7420c2df3be3fd7d0035b4477e3e3c97e85ab5c SHA512 dd2743cd2304d7f3afc0c3761cf6c848561bcaabcbdc27157d091a89974aff81bcd28aa3e204d33d406abdbafd14e9162f3cbabc950309e06e6cad7b6fa8df69
+DIST NVIDIA-Linux-x86_64-460.27.04.run 171853284 BLAKE2B b94adebde82329ff29c5844821feb2f669805669b8a0bd0fa5dbc51b7c315615b63a171a03334a5f7a581e108b18c09e920e7384bbdf5c3d512fe8e5a580168f SHA512 8548649f363d7127b73dc04f8e039d21f39e604aa71a296153203e6c39e1d24b3e39a25c618e05e175d2c9b90bfc88766f7f4150d88d08016ce0f6fef34e51c2
+DIST NVIDIA-Linux-x86_64-460.32.03.run 178089544 BLAKE2B 35a2a0df1045418722e54d094599fb9af1548429261da23789ff6fb341d44f0db8939149c7d3d0368f7ec7a057498d38205cdeeb8247a2d89dffbdb77786397b SHA512 d3ad49ef5e50822df665d4e41f979383bb15aad4240ef23c6c91ddfc97ceb2e509785c2fd042c496e2fdbe7969d3d73788c7e85a79b9f36f9c52ad1036ed46ce
 DIST nvidia-settings-390.132.tar.bz2 1109373 BLAKE2B cec60b7409f6d352afe3845a2ec65db96183d1fe009340fa3601166718f21b43bb08b63c5eaaaf4c266c7b16e7d374f6ecc00691763d5ae1b6902c8002da5bea SHA512 12553edc1a1ba9c3f578e0e921b25ec7114cbc80a55621cbd612a1bd85c9a518e221b30809058e4df5da6ae75ea7a1cd5c3d9c8f02a0898bc8c08ac9c22ccee3
 DIST nvidia-settings-390.138.tar.bz2 1109175 BLAKE2B 4171c12de0a6fb97b655567d4cc8b4e6fb92e340aae6d65f0a0583db159478fb11f8d5c4cf0fa5ef87098ec1582ccb896fec9f2bf81e4c748b8ff5ee5d73af6b SHA512 6c54ff039840098c23f2091b4c33ab2b712ff90c16829c568bc39c9375cb2f4fb677bb5ab90efcf2034b15a1d93d13f1fbb40dde1d90092073af7d9f3c16de97
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
 DIST nvidia-settings-440.100.tar.bz2 1129171 BLAKE2B bc8b28ae5743df50177c51a9269ef2b5d11c69dd9f30441179d81e42e7f77c54f327c87a7a5c6a410540bed35eb1ba0cc289b5b98a046deda376dccb29a8206b SHA512 4fe8fbbca1f805652235d898e8451ba89263c81f53e78da471b13ba0668d0d528d04d098b276df6fd2bf7ea7a219a3aa3c4d0bada0a483767c00c0654a5a8818
+DIST nvidia-settings-450.102.04.tar.bz2 1057126 BLAKE2B 4e27ac75441d455122860b3834f2584e4736fff1f641e9a1d3ced4a354cb0e0e35c4e7a71e7bc05940d585e0ceca576f726fdfffbb84aae8057d06355b91293f SHA512 33f27b9a2832f7f24603d3a741b6c34cdd3f27a7075b523f8b98ae89325f810e13c134fcc7503e72d44a6f6c7a0d8587bfdad898a4ab5fa252bd9c7360a32341
 DIST nvidia-settings-450.80.02.tar.bz2 1057306 BLAKE2B 8bd5e3b75c2941c49a6ae3d4e6c1eacd22fe63cf56aae2cc83d58e5be6d72ef58b5abbee757265e799c075d907e37f7d1bba389b8b912c53994c60eed2e71623 SHA512 1724bd5171eaa54d82c12e35890a4289e301b1a6c11c1a6c05ec0a6f0275cbf532011235d8121d7b5882a640cf42c32b3be3eb22ae036dd5a2b8a372c7b5b7f7
-DIST nvidia-settings-455.28.tar.bz2 1056911 BLAKE2B b2a19fce197901b395bcf3e4c81e6d2589441e7da4297f1d5fb20ffd5ec8946428577d08f4500d9a1bcc92190ae9e7beaef5622921e74553b911f8c63b3f1231 SHA512 418a9cc7c98a6248b27aac5d39faeb89de537bfa04ae858e31ad362499042c02212ad6740b8b482aaae92ae7e4c038a305bab309a2caa2cc3f944c50160d033d
-DIST nvidia-settings-455.38.tar.bz2 1057087 BLAKE2B 81a287aecd2d0e788b0fe581c3dd10aa0f1fff19746b04a426a2ce9c7fa9dd9492cc5162c6bcd42496735c1b11482c3d9409aba5ec297e69afc19ddf11b1907c SHA512 56f5684ad3258c5449d747894a441aaef17403fc5406a3d61e0d7ffd983e908e3f909dc933b57dd9c98a47c4be7205c62157ce7097bf3937b3a8145e77fb354d
 DIST nvidia-settings-455.45.01.tar.bz2 1057571 BLAKE2B d5a92a920421b19213547269788ccd8c52b59e058ff19acc3b32b188be8648f0152d2cdfa5facf3a601530975350986ea9d188a5a2adf00d49155f8ab7d688a9 SHA512 9199e75475c6c1aaed444676cf5bd12a9818fe5e23e81e06c556229a44a07353cdbc0f3fbb4f818c21d5f6cc4aa62a37e96b5af6689b0d98d01a3709bc045ce3
+DIST nvidia-settings-460.27.04.tar.bz2 1060365 BLAKE2B c0b804c770fc7201fc3fba61c47812fb324acee708857e209f2473054fa6b518b5187f08687b67909dbe7c4bb3989f39a88a5ad1c879da73b591f42fec34fa29 SHA512 32e3e954cbdfabfbd6dd635d3b6b807f93ff7da70579cbca248b2b058719c8e0c216f181e58f6d98d1d9911f488caf1e9364bf218985f812d7941070e7ca5269
+DIST nvidia-settings-460.32.03.tar.bz2 1060644 BLAKE2B dddb174e590e2425274f453ee7f511e9a32e69964f537f3940c770ff6cbe21293836464b9459cf3f794bc7e3e79e9721630ceb35297b821165b925948a0eb52e SHA512 58620f6f600c4e11ff3756463f2e40ab24a54841002a957bef86d75badde0e6cf76edee2d57165ad57a6d317250247812ca713befa08a5d0d99250471185e8e8
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 27a31440b5f2..769b7d0553c3 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -23,5 +23,5 @@
 		<flag name="tools">Install additional tools such as nvidia-settings</flag>
 		<flag name="uvm">Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
 	</use>
-	<origin>gentoo-staging</origin>
+	<origin>kit-fixups</origin>
 </pkgmetadata>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-455.28-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04.ebuild
index 98ada6ee050e..d6de09b3de29 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-455.28-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020-2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
 	nvidia-driver portability systemd toolchain-funcs unpacker udev
@@ -481,7 +480,7 @@ src_install-libs() {
 		if use wayland && [[ ${ABI} == "amd64" ]];
 		then
 			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.5"
+				"libnvidia-egl-wayland.so.1.1.4"
 			)
 		fi
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-455.38-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.27.04.ebuild
index 836ce3fa1243..b00ab3af9879 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-455.38-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.27.04.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
 	nvidia-driver portability systemd toolchain-funcs unpacker udev
@@ -425,7 +424,7 @@ src_install() {
 
 	readme.gentoo_create_doc
 
-	dodoc supported-gpus.json
+#	dodoc supported-gpus.json
 
 	docinto html
 	dodoc -r ${NV_DOC}/html/*
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.32.03.ebuild
index dc837fe77a47..588e5af81ad2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.32.03.ebuild
@@ -1,30 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 20202021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-	nvidia-driver portability toolchain-funcs unpacker udev
+	nvidia-driver portability systemd toolchain-funcs unpacker udev
 
 AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
 ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 
 NV_URI="https://us.download.nvidia.com/XFree86/"
 SRC_URI="
 	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
 	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	arm? ( ${NV_URI}Linux-x86-ARM/${PV}/${ARM_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
 	tools? (
 		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
 	)
 "
 
 EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64"
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%%.*}"
 
@@ -55,12 +49,11 @@ COMMON="
 		x11-libs/pango[X]
 	)
 	X? (
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		app-misc/pax-utils
 		libglvnd? (
 			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
 		)
-		app-misc/pax-utils
 	)
 "
 DEPEND="
@@ -70,22 +63,25 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
 		<x11-base/xorg-server-1.20.99:=
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)
+	kernel_linux? ( net-libs/libtirpc )
 "
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
-NV_KV_MAX_PLUS="5.5"
+PATCHES=(
+	"${FILESDIR}"/${PN}-440.26-locale.patch
+)
+NV_KV_MAX_PLUS="5.10"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
+	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
 	~DRM
 	~DRM_KMS_HELPER
@@ -93,12 +89,10 @@ CONFIG_CHECK="
 "
 
 pkg_pretend() {
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
 	nvidia-driver_check
 }
 
 pkg_setup() {
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
 	nvidia-driver_check
 
 	# try to turn off distcc and ccache for people that have a problem with it
@@ -131,7 +125,6 @@ pkg_setup() {
 
 	# set variables to where files are in the package structure
 	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
 		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
 		NV_DOC="${S}/doc"
 		NV_OBJ="${S}/obj"
@@ -151,6 +144,12 @@ pkg_setup() {
 	fi
 }
 
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+
+	default
+}
+
 src_prepare() {
 	local man_file
 	for man_file in "${NV_MAN}"/*1.gz; do
@@ -158,14 +157,11 @@ src_prepare() {
 	done
 
 	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
 		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
 		sed -i \
 			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-fno-common.patch \
 			"${WORKDIR}"/nvidia-settings-linker.patch \
 			|| die
-		eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
 		eapply "${WORKDIR}"/nvidia-settings-linker.patch
 	fi
 
@@ -178,10 +174,6 @@ src_prepare() {
 }
 
 src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
 	cd "${NV_SRC}"
 	if use kernel_FreeBSD; then
 		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
@@ -193,28 +185,23 @@ src_compile() {
 	fi
 
 	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
+		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
 			DO_STRIP= \
-			LD="$(tc-getCC)" \
 			LIBDIR="$(get_libdir)" \
 			NVLD="$(tc-getLD)" \
 			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			build-xnvctrl
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
 
 		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			OBJCOPY="$(tc-getOBJCOPY)" \
 			DO_STRIP= \
 			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
 			LIBDIR="$(get_libdir)" \
 			NVLD="$(tc-getLD)" \
 			NVML_ENABLED=0 \
 			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
 	fi
 }
 
@@ -263,7 +250,8 @@ src_install() {
 		# This file is tweaked with the appropriate video group in
 		# pkg_preinst, see bug #491414
 		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
+
 		if use uvm; then
 			doins "${FILESDIR}"/nvidia-rmmod.conf
 			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
@@ -305,13 +293,8 @@ src_install() {
 		doins ${NV_X11}/nvidia_drv.so
 
 		# Xorg GLX driver
-		if use libglvnd; then
-			local extensions_dir="/usr/$(get_libdir)/extensions/nvidia"
-		else
-			local extensions_dir="/usr/$(get_libdir)/opengl/nvidia/extensions/"
-		fi
-		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
-			"${extensions_dir}"
+		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/extensions
 
 		# Xorg nvidia.conf
 		if has_version '>=x11-base/xorg-server-1.16'; then
@@ -328,6 +311,12 @@ src_install() {
 		doins ${NV_X11}/10_nvidia_wayland.json
 	fi
 
+	insinto /etc/vulkan/icd.d
+	doins nvidia_icd.json
+
+	insinto /etc/vulkan/implicit_layer.d
+	doins nvidia_layers.json
+
 	# OpenCL ICD for NVIDIA
 	if use kernel_linux; then
 		insinto /etc/OpenCL/vendors
@@ -339,9 +328,6 @@ src_install() {
 
 	if use X; then
 		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
 	fi
 
 	if use kernel_linux; then
@@ -368,12 +354,13 @@ src_install() {
 	if use tools; then
 		emake -C "${S}"/nvidia-settings-${PV}/src/ \
 			DESTDIR="${D}" \
+			DO_STRIP= \
 			GTK3_AVAILABLE=$(usex gtk3 1 0) \
 			LIBDIR="${D}/usr/$(get_libdir)" \
 			NV_USE_BUNDLED_LIBJANSSON=0 \
 			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
 			PREFIX=/usr \
-			DO_STRIP= \
 			install
 
 		if use static-libs; then
@@ -402,6 +389,11 @@ src_install() {
 
 	dobin ${NV_OBJ}/nvidia-bug-report.sh
 
+	systemd_dounit *.service
+	dobin nvidia-sleep.sh
+	exeinto /lib/systemd/system-sleep
+	doexe nvidia
+
 	if has_multilib_profile && use multilib; then
 		local OABI=${ABI}
 		for ABI in $(multilib_get_enabled_abis); do
@@ -432,6 +424,8 @@ src_install() {
 
 	readme.gentoo_create_doc
 
+#	dodoc supported-gpus.json
+
 	docinto html
 	dodoc -r ${NV_DOC}/html/*
 }
@@ -462,10 +456,10 @@ src_install-libs() {
 			"libnvidia-compiler.so.${NV_SOVER}"
 			"libnvidia-eglcore.so.${NV_SOVER}"
 			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
 			"libnvidia-fbc.so.${NV_SOVER}"
 			"libnvidia-glcore.so.${NV_SOVER}"
 			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
 			"libnvidia-ifr.so.${NV_SOVER}"
 			"libnvidia-opencl.so.${NV_SOVER}"
 			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
@@ -473,8 +467,8 @@ src_install-libs() {
 		)
 		if ! use libglvnd; then
 			NV_GLX_LIBRARIES+=(
-				"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
-				"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
+				"libGL.so.1.7.0 ${GL_ROOT}"
 				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
 				"libGLESv2.so.2.1.0 ${GL_ROOT}"
 				"libGLX.so.0 ${GL_ROOT}"
@@ -486,27 +480,30 @@ src_install-libs() {
 		if use wayland && [[ ${ABI} == "amd64" ]];
 		then
 			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.0.2"
+				"libnvidia-egl-wayland.so.1.1.5"
 			)
 		fi
 
-		if use kernel_linux && [[ ${ABI} == "amd64" ]];
-		then
+		if use kernel_FreeBSD; then
 			NV_GLX_LIBRARIES+=(
-				"libnvidia-wfb.so.${NV_SOVER}"
+				"libnvidia-tls.so.${NV_SOVER}"
 			)
 		fi
 
-		if use kernel_FreeBSD; then
+		if use kernel_linux; then
 			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
 				"libnvidia-tls.so.${NV_SOVER}"
 			)
 		fi
 
-		if use kernel_linux; then
+		if use kernel_linux && [[ ${ABI} == "amd64" ]];
+		then
 			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"tls/libnvidia-tls.so.${NV_SOVER}"
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-ngx.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.so.${NV_SOVER}"
 			)
 		fi
 
@@ -546,11 +543,6 @@ pkg_preinst() {
 pkg_postinst() {
 	use driver && use kernel_linux && linux-mod_pkg_postinst
 
-	# Switch to the nvidia implementation
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	fi
-
 	readme.gentoo_print_elog
 
 	if ! use X; then
@@ -569,17 +561,17 @@ pkg_postinst() {
 		elog "media-video/nvidia-settings"
 		elog
 	fi
-}
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
+	elog "To enable nvidia sleep services under systemd, run these commands:"
+	elog "	systemctl enable nvidia-suspend.service"
+	elog "	systemctl enable nvidia-hibernate.service"
+	elog "	systemctl enable nvidia-resume.service"
+	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
+	elog "suitable path in case the default of /tmp does not work for you"
+	elog "For more information see:"
+	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
 pkg_postrm() {
 	use driver && use kernel_linux && linux-mod_pkg_postrm
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
 }
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
index 074ebe955e09..c1de00c12f99 100644
--- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
+++ b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-XORG_STATIC="no"
 inherit xorg-3
 
 DESCRIPTION="Elographics input driver"
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
index bc216855779b..7d85cca0f2b7 100644
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 875f82df9700..8e5734ab79f7 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,2 +1,3 @@
 DIST xf86-video-intel-2.99.917_p20200310.tar.bz2 1249330 BLAKE2B 7ba7566b946cf2c4ce60170912fe517f8c004a477a0edc2a1a9c4dbc476f3bdbea5b39a3ade4d15854cda2cc1146eca47d5fe8b311dfe36cd5ac39cf390142ea SHA512 764517e2413937ec8486d473e0cb0b98146fbaa2cff15cb01757f2263c29a2fa9279338fc801bdafe4e6b38428f8e771a7ee14fa223ba5711a4369e719258cd0
 DIST xf86-video-intel-2.99.917_p20200515.tar.bz2 1250303 BLAKE2B 81fca6a4ccfd01c49f70b741e80080e410044bcc51345ff886ec1d74e9ed1020263927ec1a67052ddcfded0f4027369a87b47ebcdbbf5066d813a7e82fae290f SHA512 29fea01332438ad7616bae56a926f5c6fa08f93f67c23a0bb38f775719f12b15fba5bcb096c0665948f80d3ff6b7c108f360e44aae008192ef6c9b21187b4bbb
+DIST xf86-video-intel-2.99.917_p20201215.tar.bz2 1250622 BLAKE2B ddcbd84ee125528fe82f0a369f8e768d218eb0d9c4fc00cbe4a921d6267a846eccc001e3dd765f8cdaf7a38c461357831cd9675acfdfd3cc6ac282ec4b6f4b67 SHA512 29526fe191a95c2df5a3e168150b8c7f759dfdc9a4912e28887ec51be05304a9f552d21c990a37a90d6299e64df4bb1fba051c1d0ad25606dc52f801cd30b60d
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
new file mode 100644
index 000000000000..88500f06f4bf
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 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
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_configure() {
+	replace-flags -Os -O2
+	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
+}
diff --git a/x11-drivers/xf86-video-omap/files/xf86-video-omap-0.4.5-null-dereference.patch b/x11-drivers/xf86-video-omap/files/xf86-video-omap-0.4.5-null-dereference.patch
new file mode 100644
index 000000000000..8345a53105b5
--- /dev/null
+++ b/x11-drivers/xf86-video-omap/files/xf86-video-omap-0.4.5-null-dereference.patch
@@ -0,0 +1,13 @@
+https://sources.debian.org/patches/xf86-video-omap/0.4.5-1.1/null-dereference.patch/
+https://bugs.gentoo.org/707358
+--- a/src/omap_driver.c
++++ v/src/omap_driver.c
+@@ -542,7 +542,7 @@ OMAPPreInit(ScrnInfoPtr pScrn, int flags
+ 	}
+ 
+ 	if (!pScrn->chipset) {
+-		ERROR_MSG("Unknown chipset: %s", pScrn->chipset);
++		ERROR_MSG("Unknown chipset");
+ 		goto fail;
+ 	}
+ 
diff --git a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
index 778cdcfeccc9..a28ec1b05d23 100644
--- a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
+++ b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,3 +12,7 @@ KEYWORDS="arm"
 RDEPEND=">=x11-base/xorg-server-1.3
 	>=x11-libs/libdrm-2.4.36[video_cards_omap]"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.5-null-dereference.patch"
+)
diff --git a/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.6.0-fno-common.patch b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.6.0-fno-common.patch
new file mode 100644
index 000000000000..78f3ca9a6cc9
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.6.0-fno-common.patch
@@ -0,0 +1,45 @@
+--- a/src/via_driver.h
++++ b/src/via_driver.h
+@@ -393,9 +393,6 @@ typedef struct
+ } VIAEntRec, *VIAEntPtr;
+ 
+ 
+-/* In via_display.c. */
+-const xf86CrtcFuncsRec iga1_crtc_funcs;
+-const xf86CrtcFuncsRec iga2_crtc_funcs;
+ 
+ /* In via_exa.c. */
+ Bool viaInitExa(ScreenPtr pScreen);
+--- a/src/via_sii164.h
++++ b/src/via_sii164.h
+@@ -47,7 +47,7 @@ typedef struct _viaSiI164 {
+ } viaSiI164Rec, *viaSiI164RecPtr;
+ 
+ 
+-const xf86OutputFuncsRec via_sii164_funcs;
++extern const xf86OutputFuncsRec via_sii164_funcs;
+ 
+ Bool viaSiI164Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
+ 
+--- a/src/via_ums.h
++++ b/src/via_ums.h
+@@ -260,6 +260,8 @@ void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
+ void viaIGA2Save(ScrnInfoPtr pScrn);
+ void viaIGA2Restore(ScrnInfoPtr pScrn);
+ void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
++extern const xf86CrtcFuncsRec iga1_crtc_funcs;
++extern const xf86CrtcFuncsRec iga2_crtc_funcs;
+ 
+ /* via_analog.c */
+ void via_analog_init(ScrnInfoPtr pScrn);
+--- a/src/via_vt1632.h
++++ b/src/via_vt1632.h
+@@ -44,7 +44,7 @@ typedef struct _viaVT1632Rec {
+ } viaVT1632Rec, *viaVT1632RecPtr;
+ 
+ 
+-const xf86OutputFuncsRec via_vt1632_funcs;
++extern const xf86OutputFuncsRec via_vt1632_funcs;
+ 
+ Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
+ 
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
index 0dce180b8afd..b2f2a36914b7 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,8 @@ DEPEND="
 
 DOCS=( ChangeLog NEWS README )
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable debug)
diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index 97aa7078fd6d..b8f5910c27d7 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,2 +1 @@
-DIST xf86-video-vesa-2.4.0.tar.bz2 324599 BLAKE2B ddaa7a54d439b1afb1152e15e0d436cade79c51a61e78837a066e3e0c04d4a2ea6b079e68eca917e618aae125ed4eab7734009a337018460e771265b8daef443 SHA512 4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de
 DIST xf86-video-vesa-2.5.0.tar.bz2 304322 BLAKE2B aee8b59d769a72fb2890bbadde7fb87e2f527fb58eaf8b2ef515b0a1b7dc591c6afaf1d8692caaaefb741f475ed77bc0ed069be43a752103260bc85314a7a830 SHA512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
deleted file mode 100644
index 8c2a494bb987..000000000000
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info xorg-2
-
-DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.6
-	>=x11-libs/libpciaccess-0.12.901"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists || ! linux_chkconfig_present DEVMEM; then
-		echo
-		ewarn "This driver requires /dev/mem support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Character devices  --->"
-		ewarn "      [*] /dev/mem virtual device support"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
index 610d74713018..2f085947bfdd 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit linux-info xorg-3
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 ~x86"
+KEYWORDS="-* ~alpha amd64 x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6