gentoo (valentine's day) resync : 14.02.2021

6 files changed, 1471 insertions, 0 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 3142b3f2b160..509907b5dcaa 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 95baaa5e5142..805af302371c 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -3,6 +3,7 @@ AUX 95-nvidia-settings-r1 54 BLAKE2B 598067babb48bd0f5680300cf3cbb37ac804edb3131
 AUX nvidia-169.07 639 BLAKE2B 00b279e3c338dc84258d8018fe80efc4b87f0fb1fcd61eda0ac2f698897605f4675a3ebb53d8baa3bdfa9f137aff214046464a642113a1b01a8c3e35bf5f99b8 SHA512 3af295c026280dc3a2b73c2cc7772254686b09cad15f1333ab0b4de8cb0ccf78e725ced2a399b10edcf8af6ba42ab1485dc0661af67461b0c3789f786357772f
 AUX nvidia-390.conf 199 BLAKE2B e7eabfb3a61cc0e95da78270964a6bb55ae71fdad81376d41c0ae0d38142f693511911ca8a9202e30f70efaa852b6b5c0ef776872e68597ed4ee14c4e9a86eed SHA512 0f691f5ba0aaedf1c670d3f2bfb632bdf253e94199fc2cf02277dbfae3055ef5887388af7922e65c39116bd0ed6ba13fc966145582933a5f35c3a1e9483a3c92
 AUX nvidia-430.conf 725 BLAKE2B 968f11d7954acf9f693ebfb811fa1fd8bd920720a9a00fe18d5170693c9e439bcb40921dbf7adf2a77a149170ce0973e26201ccef10efad4f2f47828c5c987d5 SHA512 04e1faa05208d565473ddb191ec13bc0c860ff3085e97b8032e1e8eb764c49aba608f4ca0ca1c6cfcb8be88657de5f683f77a12d9f85de075a7ce022b3d1ed20
+AUX nvidia-460.conf 723 BLAKE2B b5ce6a5766cfe821cbed24d12c514f2ca86a450d2e4a98022cbe6f31f67c1b7b503970c518cf62114f9428ffb20cbd7ecb0dd4aa308b6fdcd801c72824a915df SHA512 0d6da49e8bac452e7fa532a41c74f103edfe34df0fa4c70c503eea01af640bc5888b0b92f2fe4f39d43e47727552f0ac5d0a5657ac43467c555fcb49d7be7207
 AUX nvidia-drivers-440.26-locale.patch 299 BLAKE2B ad9065b968f1ad62c90e3aeddaa5af9fe007f89e5e80fc74f4c200c642b968196d8880511cc05d1f2fd04e5ab4f189cd2935eda993f9f174f0f0f4d58b7de711 SHA512 1723963b3e7562332909322ee28373dff83f253db4805d4c77c837abec04a73946afdd2837a699d0babd989090ddfcc33574993c2f8d3857eb24cf0e9ad4e6ce
 AUX nvidia-drivers-455.45.01-reduce-kmalloc-limit.patch 723 BLAKE2B 687e93eb7f48028b6167ac930efd63b85bd35c16c62e5a6a0437b83b9e61b7b203ac41de48752811a8f5e9253e1a808c8b2fb4e7661f2c8682842e73710c9b57 SHA512 6ddca039f97af24e8c94dc300531e96329a97c0fe45505172c1993d59f38c4116822300e348b09ffd83f750cfefa8cf407aaaf8a99de8d53dab956c8d7accb60
 AUX nvidia-persistenced.conf 250 BLAKE2B 8b3514f981d992d34c949011a25fda5737d85ade831f15481843db14f67494e6f271eb7947a459a28c7991cdeb86092a2a7920e6f40213bcded90b7f9f15dae0 SHA512 9c9562bb15bf4552754dd50a1b01dec5df76f7f5666fba2fff642a169f87e9ed421a260f2258ab469f7e4cd9ef8161653355795624387fe7ad5ae6a0d71e5f46
@@ -25,22 +26,32 @@ DIST NVIDIA-FreeBSD-x86_64-455.45.01.tar.gz 116070033 BLAKE2B 4a724ce58fb7164d12
 DIST NVIDIA-FreeBSD-x86_64-460.27.04.tar.gz 103234112 BLAKE2B a631425c00240dabdd1bd4dcc18945c4216352667cdd0c01b465486024cea215ee2423773ead2e22246337a2387b54ae2e16775b0727d57304b53f7ce6648ad7 SHA512 1308f14ae1100471a5aabece85403772cdd1abac44a725c53d33d9f0ee27a83dbd2088c60662f44a6f7d1fe91b43311b767790dcc5787c50546ffbabb62ded1a
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.138.run 28540622 BLAKE2B 342852dd6fa371f86d19547d73edef582fe3f04cf4f6e9ec247767951180671ba46f3ed2ee7bab11b0cf2f8bb1eb846b1d7481d318789c14ce79b54fefe0f830 SHA512 e04b8aca202c1df305f7b67ec372322494fa7b77f27cbf04f240527dcac0ce3ffa5e0e9df36b52045ac13fbc2f84b5033784040884ed19072f66f41385d11b97
 DIST NVIDIA-Linux-x86-390.138.run 49091672 BLAKE2B 465f025041aafdb03699babdb97380b73c2d7a0568bf2ffe4f3830974457d29eec28dbdf2742bfb1508f00eb6f5d4697f03726561b470b479eb9caa940113bdc SHA512 f6c1e388a6801f0557e34ce9094f99e1a87510c3c620f0ecd9959a6e3bb0a313a8b991c8da319d60531e6a1e2f098d94bc88b12b63c624930295f0e05bb4f9ae
+DIST NVIDIA-Linux-x86-390.141.run 49589744 BLAKE2B 304672806b89885adbf8459ea99ca872769e44a42ff041a5b79ef05d113d7717f505f543441e7a2fc6c569f6d66391f0380a4f23f3e68108c8de817bf251f850 SHA512 6dfde3b54520070954b45f6bc071251084e1741f55e582b1abd806eb367e4b9ce0015615bf6a887fa784d075b3db08b6940da4163b960969773d1bdc52b4961e
 DIST NVIDIA-Linux-x86_64-390.138.run 83780873 BLAKE2B 5e6a9d77dd2b9de17d923198105a9227ffe2adbc1ed7c9dd5ef3cc810358f71ae47ce9615cbe04f36090f052082a2066772505fd763cbfdbce272f0fb7c25dc7 SHA512 2984fb8f5de598fd3031ebd928942ceb09fd26ae9e61b40b2d348e3174e172a932a1b2a5c2e5534f299b883ade323932be4fdcd26d6f7235a17f6f5a04fa792c
+DIST NVIDIA-Linux-x86_64-390.141.run 85330901 BLAKE2B 7759d8cf6c9a75607b9a3ecd53cdd6f6a93f2f372d740a5a87d4d3f41a22f3bd953cc7dd6a0dc0e23a829ec86df8d65b9de499a76cfd4266a13b0aa3288aceb5 SHA512 5448d70e6e64a6403e61a004d83c69a442dd8ed0d61da3a31d3e3b7943c06c559a66b0f8d135982868ecbf209a965f60dae1a633367630b4d9287f725bbaa53c
 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.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.39.run 178310565 BLAKE2B 65931f34ff47de02933797f60128c66c8774f3b217b79e82f781cd50560835ec79c37b7e63fb50231a22646f0cd7cf968d1fbe1ec6c2b3732a1c565b68de7bcb SHA512 9275a58ff0e72c3ee033bd18fa9e9dbb0203d2961a63e7cc04444889118eb4029c60bb10c2af8f230c1aa4aa30769131ea8c01f3bc4e7453336ad9c03ba23b42
 DIST nvidia-settings-390.138.tar.bz2 1109175 BLAKE2B 4171c12de0a6fb97b655567d4cc8b4e6fb92e340aae6d65f0a0583db159478fb11f8d5c4cf0fa5ef87098ec1582ccb896fec9f2bf81e4c748b8ff5ee5d73af6b SHA512 6c54ff039840098c23f2091b4c33ab2b712ff90c16829c568bc39c9375cb2f4fb677bb5ab90efcf2034b15a1d93d13f1fbb40dde1d90092073af7d9f3c16de97
+DIST nvidia-settings-390.141.tar.bz2 1108755 BLAKE2B 210c33d4bb483dd9abe13275feb641a00d7c39a7222cbe828c925b9cfca6d4422f8fa3333dd77b73f2ba4071a7badf77625be88e02a1835177bda490c3c3c368 SHA512 44bf5f6b5bfbe3146f97d9ac82a75cc5653b6002002623ac6fa6cd233bbd3ef0d15f0b8091b59de5dbfdbde4fbe1b5212c9f9a1653ec98597c9049c9b137902e
 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.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.39.tar.bz2 1060391 BLAKE2B badfe9e5fa3ca7f5389369b01f839aa37b687e99bac47663b320602ada4d4e8dfb7c6fa4f64cee358a25ced7d9393ddfa4242147d9b645ae4fbd1b68310f3363 SHA512 a5f01d2a627695932399804776923a90050ec66b19c9d95ed34d11fc79e41604fe25474ed7b7bfec68b2115dd6fccb444b66427ce78c1d67b1b01f072bc8892a
 EBUILD nvidia-drivers-390.138-r5.ebuild 15664 BLAKE2B 52f54b620f5f373f514fcb26c296771255c12431bb2340926fc92d5526d772069a9c94601824b3c5e6d7f6daac91e81e309548ecda542da53ad37e9aaa3c79b1 SHA512 94a65a2c8b0c0489651b8d62cdec24c88920ed95c6f6b77d883c4329f144c68757ee795b25e37f67ad6de95c7e57c13f9d4d2fd79b9aac1779d3813086aa12ac
+EBUILD nvidia-drivers-390.141.ebuild 11743 BLAKE2B 7603a38904b48286d929b94b0c451db1ceb4c9806b2e6459c750c344dce3b8952dd58f7d363171a6776320a7d50203b30e102520c4240ba1d4e089f65638e4a4 SHA512 25e605ffc84c08a6c368b6304cb1131b80892436b14bc8bc35ba8b89ac52042bed017b2826ca8930eca5b40d9de263437a04decdcac4dd84a9a80595543860c9
 EBUILD nvidia-drivers-435.21-r7.ebuild 14994 BLAKE2B 8edcd621690a2e6523df182e2972ad4c1e31ad0daf3085ab578b7763c042799c80f9513e1112bdd43a9c66878a13d6b90a6b7019e726593efd62f88f5e241e61 SHA512 7946a3b085da05fa4794a5488f425c7dcda950849f99a8a04823342e533d6935def1243973054527b14f51d7b8bb6e815af2cdcdaa5a47717be6efe5f3b4634c
 EBUILD nvidia-drivers-440.100-r3.ebuild 14936 BLAKE2B ff1882768c2834e879ce938401f7f9de49d27bbc2bee21926c7cd7778a52db925b800ab29710b51750f5f92733cb3f486a6a2f1b1779613c117e39bb6ffdb5a1 SHA512 f31ea45c7e426fff912bb1d97794c06114a02a251310510c82b46ae1481b7848a97e2918a90fd28f02bab5f003b7e3e29dc89e553172e17e13dce5a30bc87594
+EBUILD nvidia-drivers-450.102.04.ebuild 12182 BLAKE2B a9e6d6be6617789b5c6e76a888464ca8c0ce4282c698e8f5993e387b45cd0e159a8c18e1df1ff880a2218b39acd8f974ba64ce4ce222c8ec9bc0e18add0a0f35 SHA512 95508ace030b9ad130275c0519be1165ef2f2fc4cb1c18b2d0a553f853601d2e1af3755e10835c3c627b3a3d16711bdad39e2fba11cb069530af8368e8882452
 EBUILD nvidia-drivers-450.80.02-r1.ebuild 14987 BLAKE2B 0c0834b649b8aa938fd1c2e4398bea332fe99b8f57d3e2140b493af71758af123c2df2bbbafe7c286a5f9a9b00ecda5fcdc0d7091b17a4fa0bca37a31cb270ab SHA512 989c51c2659e64fcd39e19416c427fb6c29b74f990b17d62064a96bc6ce7d7962af5ce2ea28a59189d3270934ac0fad58b1df6e45da200eb71cdd7a8274c68f5
 EBUILD nvidia-drivers-455.45.01-r1.ebuild 15045 BLAKE2B 2e3b5520a87d5c3a130f2f60eab44116709c98a582ac8bd0f640773cb9c059d5da1bceb8bb3e0b89b0351a7e9cb5f7157fd7e1c17cb280163e24a7c824f0d483 SHA512 53143410a94b6c8948c0bcae7af27232ef36a143e3f1bcd5bafd4b5fcbd2a4fd548ab457068efe237563cb171681b0115471cf61b8763b843fa1f6ca2a71dfc3
 EBUILD nvidia-drivers-460.27.04.ebuild 14986 BLAKE2B 77e397ff75bbb9816973d42727eb5cfb58d9415ea2ce03e016b5c45126ada0d346422827f849cbbca308c10664cecb7bf2998f9b772f1911293ca3acc8277410 SHA512 59066fb3affcfbd1d9aedab04e4122da6955bfebd06a4f24dc33089e0c73d8691f0ed99b89ac93bfd56862e06d0de8217ec8f499777a01efae6cced415b846f0
+EBUILD nvidia-drivers-460.39-r1.ebuild 12180 BLAKE2B fe6d627cb867574838b48cb1b4226e6ce2ca6cc4d5cd2631b04207376ea76744b20a41574632cf8b15066b6a1fa77e1b57f77ef9ba7e503cf31026b992e91be3 SHA512 45a98e95b3a064e1d8375a58875085f73c847fa5ea8c96ad804403b5026baf435e65659849d39263861976a1e9d2a7134bf4a4b2b745386e5531fd6f0bbda295
 MISC metadata.xml 1321 BLAKE2B 32690f2762adc1b67058312ad0b9d1b89f78c9a0ebadf462d058aac46338aee05b877eee0a78e4a2a4de98a22544dbec2463f59026ba69dab7d380ca17315b65 SHA512 d146d8aed6c43e4dfac95143eff1c90bba30716e45f980d965582585f496841ed6307b58b26bf69afd905494e4afd15442632f2d85792bd0fe34d8b0a0166b7e
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-460.conf b/x11-drivers/nvidia-drivers/files/nvidia-460.conf
new file mode 100644
index 000000000000..faf0243a8230
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-460.conf
@@ -0,0 +1,20 @@
+# Nvidia drivers support
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+
+# To tweak the driver the following options can be used, note that
+# you should be careful, as it could cause instability!! For more
+# options see /usr/share/doc/PACKAGE/README
+#
+# !!! SECURITY WARNING !!!
+# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
+# WHAT YOU ARE DOING.
+# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
+# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
+options nvidia \
+	NVreg_DeviceFileGID=VIDEOGID \
+	NVreg_DeviceFileMode=432 \
+	NVreg_DeviceFileUID=0 \
+	NVreg_ModifyDeviceFiles=1 \
+	NVreg_PreserveVideoMemoryAllocations=0 \
+	NVreg_TemporaryFilePath=/tmp
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141.ebuild
new file mode 100644
index 000000000000..fc28238ba9bc
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141.ebuild
@@ -0,0 +1,470 @@
+# Copyright 1999-2021 Gentoo 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 toolchain-funcs unpacker udev
+
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	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"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="compat +driver +kms multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )"
+
+COMMON="
+	driver? ( acct-group/video )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		app-misc/pax-utils
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${COMMON}
+	virtual/linux-sources
+	tools? ( sys-apps/dbus )"
+RDEPEND="
+	${COMMON}
+	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}]
+	)"
+
+QA_PREBUILT="opt/* usr/lib*"
+S="${WORKDIR}"
+NV_KV_MAX_PLUS="5.11"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM
+	~DRM_KMS_HELPER
+	~SYSVIPC"
+
+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
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+			SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+}
+
+src_prepare() {
+	gunzip *1.gz || die
+
+	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
+
+		# remove GTK2 support entirely (#592730)
+		sed -i \
+			-e '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+			nvidia-settings-${PV}/src/Makefile || die
+	fi
+
+	default
+
+	if ! [[ -f nvidia_icd.json ]]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+
+	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/nvidia-390.conf" \
+		> "${T}"/nvidia-390.conf || die
+}
+
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+	default
+}
+
+src_compile() {
+	pushd kernel >/dev/null || die
+	if use driver; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+	popd >/dev/null || die
+
+	if use tools; then
+		emake -C nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			build-xnvctrl
+
+		emake -C nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=1 \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ -n ${nv_DEST} ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ -n ${nv_SOVER} && ${nv_SOVER} != ${nv_LIBNAME} ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# 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
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia libnvidia-cfg.so.${PV}
+
+	# NVIDIA framebuffer capture library
+	donvidia libnvidia-fbc.so.${PV}
+
+	# NVIDIA video encode/decode <-> CUDA
+	donvidia libnvcuvid.so.${PV}
+	donvidia libnvidia-encode.so.${PV}
+
+	if use X; then
+		# Xorg DDX driver
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia libglx.so.${PV} \
+			/usr/$(get_libdir)/extensions/nvidia
+
+		# Xorg nvidia.conf
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins 10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins 10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+
+		insinto /etc/X11/xorg.conf.d
+		doins "${T}"/nvidia-390.conf
+	fi
+
+	doexe nvidia-cuda-mps-control
+	doexe nvidia-cuda-mps-server
+	doexe nvidia-debugdump
+	doexe nvidia-persistenced
+	doexe nvidia-smi
+
+	# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+	doexe nvidia-modprobe
+	fowners root:video /opt/bin/nvidia-modprobe
+	fperms 4710 /opt/bin/nvidia-modprobe
+	dosym ../../opt/bin/nvidia-modprobe /usr/bin/nvidia-modprobe
+
+	doman nvidia-cuda-mps-control.1
+	doman nvidia-modprobe.1
+	doman nvidia-persistenced.1
+	newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+	newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+
+	if use tools; then
+		emake -C nvidia-settings-${PV}/src/ \
+			DESTDIR="${ED}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=1 \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		doicon nvidia-settings.png
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(multilib_get_enabled_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	newdoc README.txt README
+	dodoc NVIDIA_Changelog
+	doman nvidia-smi.1
+	use X && doman nvidia-xconfig.1
+	use tools && doman nvidia-settings.1
+	doman nvidia-cuda-mps-control.1
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r html/.
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${S}"
+
+	if has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${S}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLX_nvidia.so.${PV} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${PV}"
+			"libnvcuvid.so.${PV}"
+			"libnvidia-compiler.so.${PV}"
+			"libnvidia-eglcore.so.${PV}"
+			"libnvidia-encode.so.${PV}"
+			"libnvidia-fatbinaryloader.so.${PV}"
+			"libnvidia-fbc.so.${PV}"
+			"libnvidia-glcore.so.${PV}"
+			"libnvidia-glsi.so.${PV}"
+			"libnvidia-ifr.so.${PV}"
+			"libnvidia-opencl.so.${PV}"
+			"libnvidia-ptxjitcompiler.so.${PV}"
+			"libvdpau_nvidia.so.${PV}"
+		)
+
+		if use wayland && [[ ${ABI} == "amd64" ]]; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.0.2"
+			)
+		fi
+
+		if [[ ${ABI} == "amd64" ]]; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${PV}"
+			)
+		fi
+
+		NV_GLX_LIBRARIES+=(
+			"libnvidia-ml.so.${PV}"
+			"tls/libnvidia-tls.so.${PV}"
+		)
+
+		local nv_lib
+		for nv_lib in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${nv_lib}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [[ -z ${videogroup} ]]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${ED}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	rm -rf "${EROOT}"/usr/lib/opengl/nvidia/* || die
+	# Make sure we nuke the old nvidia-glx's env.d file
+	rm -f "${EROOT}"/etc/env.d/09nvidia || die
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	use driver && linux-mod_pkg_postrm
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04.ebuild
new file mode 100644
index 000000000000..554a7a80f110
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2021 Gentoo 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 systemd toolchain-funcs unpacker udev
+
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM64_NV_PACKAGE="NVIDIA-Linux-aarch64-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)"
+
+EMULTILIB_PKG="true"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%%.*}"
+# TODO: for arm64, keyword virtual/opencl on arm64
+KEYWORDS="-* ~amd64"
+IUSE="compat +driver +kms multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )"
+
+COMMON="
+	driver? ( acct-group/video )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		app-misc/pax-utils
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${COMMON}
+	virtual/linux-sources
+	tools? ( sys-apps/dbus )"
+RDEPEND="
+	${COMMON}
+	net-libs/libtirpc
+	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}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)"
+
+QA_PREBUILT="opt/* usr/lib*"
+S="${WORKDIR}"
+NV_KV_MAX_PLUS="5.11"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM
+	~DRM_KMS_HELPER
+	~SYSVIPC"
+
+PATCHES=( "${FILESDIR}"/${PN}-440.26-locale.patch )
+
+pkg_pretend() {
+	nvidia-driver_check
+}
+
+pkg_setup() {
+	nvidia-driver_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+			SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+}
+
+src_prepare() {
+	gunzip *1.gz || die
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch \
+			|| die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+
+		# remove GTK2 support entirely (#592730)
+		sed -i \
+			-e '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+			nvidia-settings-${PV}/src/Makefile || die
+	fi
+
+	default
+
+	if ! [[ -f nvidia_icd.json ]]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+	default
+}
+
+src_compile() {
+	pushd kernel >/dev/null || die
+	if use driver; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+	popd >/dev/null || die
+
+	if use tools; then
+		emake -C nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=1 \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ -n ${nv_DEST} ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ -n ${nv_SOVER} && ${nv_SOVER} != ${nv_LIBNAME} ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		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
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia libnvidia-cfg.so.${PV}
+
+	# NVIDIA framebuffer capture library
+	donvidia libnvidia-fbc.so.${PV}
+
+	# NVIDIA video encode/decode <-> CUDA
+	donvidia libnvcuvid.so.${PV}
+	donvidia libnvidia-encode.so.${PV}
+
+	if use X; then
+		# Xorg DDX driver
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia libglxserver_nvidia.so.${PV} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins 10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins 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
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	use X && doexe nvidia-xconfig
+
+	doexe nvidia-cuda-mps-control
+	doexe nvidia-cuda-mps-server
+	doexe nvidia-debugdump
+	doexe nvidia-persistenced
+	doexe nvidia-smi
+
+	# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+	doexe nvidia-modprobe
+	fowners root:video /opt/bin/nvidia-modprobe
+	fperms 4710 /opt/bin/nvidia-modprobe
+	dosym ../../opt/bin/nvidia-modprobe /usr/bin/nvidia-modprobe
+
+	doman nvidia-cuda-mps-control.1
+	doman nvidia-modprobe.1
+	doman nvidia-persistenced.1
+	newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+	newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+
+	if use tools; then
+		emake -C nvidia-settings-${PV}/src/ \
+			DESTDIR="${ED}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=1 \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		doicon nvidia-settings.png
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin 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
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	newdoc README.txt README
+	dodoc NVIDIA_Changelog
+	doman nvidia-smi.1
+	use X && doman nvidia-xconfig.1
+	use tools && doman nvidia-settings.1
+	doman nvidia-cuda-mps-control.1
+
+	readme.gentoo_create_doc
+
+	dodoc supported-gpus.json
+
+	docinto html
+	dodoc -r html/.
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${S}"
+
+	if has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${S}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLX_nvidia.so.${PV} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${PV}"
+			"libnvcuvid.so.${PV}"
+			"libnvidia-compiler.so.${PV}"
+			"libnvidia-eglcore.so.${PV}"
+			"libnvidia-encode.so.${PV}"
+			"libnvidia-fbc.so.${PV}"
+			"libnvidia-glcore.so.${PV}"
+			"libnvidia-glsi.so.${PV}"
+			"libnvidia-glvkspirv.so.${PV}"
+			"libnvidia-ifr.so.${PV}"
+			"libnvidia-opencl.so.${PV}"
+			"libnvidia-ptxjitcompiler.so.${PV}"
+			"libvdpau_nvidia.so.${PV}"
+		)
+
+		if use wayland && [[ ${ABI} == "amd64" ]]; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.4"
+			)
+		fi
+
+		NV_GLX_LIBRARIES+=(
+			"libnvidia-ml.so.${PV}"
+			"libnvidia-tls.so.${PV}"
+		)
+
+		if [[ ${ABI} == "amd64" ]]; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${PV}"
+				"libnvidia-ngx.so.${PV}"
+				"libnvidia-rtcore.so.${PV}"
+				"libnvoptix.so.${PV}"
+			)
+		fi
+
+		local nv_lib
+		for nv_lib in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${nv_lib}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [[ -z ${videogroup} ]]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${ED}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	rm -rf "${EROOT}"/usr/lib/opengl/nvidia/* || die
+	# Make sure we nuke the old nvidia-glx's env.d file
+	rm -f "${EROOT}"/etc/env.d/09nvidia || die
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	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 "${EROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_postrm() {
+	use driver && linux-mod_pkg_postrm
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.39-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.39-r1.ebuild
new file mode 100644
index 000000000000..87e315b2413a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.39-r1.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2021 Gentoo 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 systemd toolchain-funcs unpacker udev
+
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM64_NV_PACKAGE="NVIDIA-Linux-aarch64-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)"
+
+EMULTILIB_PKG="true"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%%.*}"
+# TODO: for arm64, keyword virtual/opencl on arm64
+KEYWORDS="-* ~amd64"
+IUSE="compat +driver +kms multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )"
+
+COMMON="
+	driver? ( acct-group/video )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		app-misc/pax-utils
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${COMMON}
+	virtual/linux-sources
+	tools? ( sys-apps/dbus )"
+RDEPEND="
+	${COMMON}
+	net-libs/libtirpc
+	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}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)"
+
+QA_PREBUILT="opt/* usr/lib*"
+S="${WORKDIR}"
+NV_KV_MAX_PLUS="5.11"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM
+	~DRM_KMS_HELPER
+	~SYSVIPC"
+
+PATCHES=( "${FILESDIR}"/${PN}-440.26-locale.patch )
+
+pkg_pretend() {
+	nvidia-driver_check
+}
+
+pkg_setup() {
+	nvidia-driver_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+			SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+}
+
+src_prepare() {
+	gunzip *1.gz || die
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch \
+			|| die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+
+		# remove GTK2 support entirely (#592730)
+		sed -i \
+			-e '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+			nvidia-settings-${PV}/src/Makefile || die
+	fi
+
+	default
+
+	if ! [[ -f nvidia_icd.json ]]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+	default
+}
+
+src_compile() {
+	pushd kernel >/dev/null || die
+	if use driver; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+	popd >/dev/null || die
+
+	if use tools; then
+		emake -C nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=1 \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ -n ${nv_DEST} ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ -n ${nv_SOVER} && ${nv_SOVER} != ${nv_LIBNAME} ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-460.conf nvidia.conf
+
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia libnvidia-cfg.so.${PV}
+
+	# NVIDIA framebuffer capture library
+	donvidia libnvidia-fbc.so.${PV}
+
+	# NVIDIA video encode/decode <-> CUDA
+	donvidia libnvcuvid.so.${PV}
+	donvidia libnvidia-encode.so.${PV}
+
+	if use X; then
+		# Xorg DDX driver
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia libglxserver_nvidia.so.${PV} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins 10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins 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
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	use X && doexe nvidia-xconfig
+
+	doexe nvidia-cuda-mps-control
+	doexe nvidia-cuda-mps-server
+	doexe nvidia-debugdump
+	doexe nvidia-persistenced
+	doexe nvidia-smi
+
+	# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+	doexe nvidia-modprobe
+	fowners root:video /opt/bin/nvidia-modprobe
+	fperms 4710 /opt/bin/nvidia-modprobe
+	dosym ../../opt/bin/nvidia-modprobe /usr/bin/nvidia-modprobe
+
+	doman nvidia-cuda-mps-control.1
+	doman nvidia-modprobe.1
+	doman nvidia-persistenced.1
+	newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+	newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+
+	if use tools; then
+		emake -C nvidia-settings-${PV}/src/ \
+			DESTDIR="${ED}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=1 \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		doicon nvidia-settings.png
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin 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
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	newdoc README.txt README
+	dodoc NVIDIA_Changelog
+	doman nvidia-smi.1
+	use X && doman nvidia-xconfig.1
+	use tools && doman nvidia-settings.1
+	doman nvidia-cuda-mps-control.1
+
+	readme.gentoo_create_doc
+
+	dodoc -r supported-gpus
+
+	docinto html
+	dodoc -r html/.
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${S}"
+
+	if has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${S}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLX_nvidia.so.${PV} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${PV}"
+			"libnvcuvid.so.${PV}"
+			"libnvidia-compiler.so.${PV}"
+			"libnvidia-eglcore.so.${PV}"
+			"libnvidia-encode.so.${PV}"
+			"libnvidia-fbc.so.${PV}"
+			"libnvidia-glcore.so.${PV}"
+			"libnvidia-glsi.so.${PV}"
+			"libnvidia-glvkspirv.so.${PV}"
+			"libnvidia-ifr.so.${PV}"
+			"libnvidia-opencl.so.${PV}"
+			"libnvidia-ptxjitcompiler.so.${PV}"
+			"libvdpau_nvidia.so.${PV}"
+		)
+
+		if use wayland && [[ ${ABI} == "amd64" ]]; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.5"
+			)
+		fi
+
+		NV_GLX_LIBRARIES+=(
+			"libnvidia-ml.so.${PV}"
+			"libnvidia-tls.so.${PV}"
+		)
+
+		if [[ ${ABI} == "amd64" ]]; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${PV}"
+				"libnvidia-ngx.so.${PV}"
+				"libnvidia-rtcore.so.${PV}"
+				"libnvoptix.so.${PV}"
+			)
+		fi
+
+		local nv_lib
+		for nv_lib in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${nv_lib}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [[ -z ${videogroup} ]]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${ED}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	rm -rf "${EROOT}"/usr/lib/opengl/nvidia/* || die
+	# Make sure we nuke the old nvidia-glx's env.d file
+	rm -f "${EROOT}"/etc/env.d/09nvidia || die
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	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 "${EROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_postrm() {
+	use driver && linux-mod_pkg_postrm
+}