gentoo resync : 25.11.2020

10 files changed, 60 insertions, 146 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 579b8f1619b2..79373784a80a 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 a31cfae7acbf..21aa2fda7633 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -21,9 +21,9 @@ 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.66.tar.gz 82963662 BLAKE2B 8b0e0993600b4b9b5fa1648444f677c5a9f27523cdd8e3edbd67d7cecf67a7bcc2b975dface68dfa16e7d31f2219b0283f9313f4bd37023344bb8c4515a85c0f SHA512 744e912d7433a8db2af27f91854361054cc0085067951c03278a0ca1c6daacc7f9e34ed6db5bd87d78932c0836b28e77a79f306d6b5d3b43c2d21288774fb9fe
 DIST NVIDIA-FreeBSD-x86_64-450.80.02.tar.gz 83040706 BLAKE2B d97bae80f6fdcec12fd12af0296f9ba44487cc83c86c14bc9f17d52e0e81107e1eaddd411d06d1bfd27c73bcf71300f7f49218d2a031540c0b42cd62998ef9aa SHA512 6dca92f20102a0432c6b92b7897a2ff5ec3da234af72907539026e18b1da55fc3ae01dc875be07ce9cae808ae4f9c08d2a2af1171db038c37bbba6ca9d03cf3a
-DIST NVIDIA-FreeBSD-x86_64-455.23.04.tar.gz 94602240 BLAKE2B ea9ea6904b0dd59c3f35d2c94a9bd80f06376119c601cb03abc2312b5a94f3c92269c9d5b55e8fe9cd1cb08c6a1929078ba7f88a1ae40e562078f26c5226fd00 SHA512 876b1b969bcd35801edf7d4dda7e6d8e65a61720d48884a6a4381b9f4b8838622582b9bd38e396d0a03dfd2ae9dfdc23e581722e95bdf7ac53c29ff95af4735a
+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-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
@@ -32,21 +32,21 @@ 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.66.run 141068918 BLAKE2B de8f76eade30bcd040d4a022edb96ab00be00190ed2a86b96584a4b147a2da935f8e83411f01d03f747c875a652f8e6f843bf273f905f1e8fa334e263bd941f3 SHA512 d4408cf2274602b7ee28f1056b8875468e8b9dae9f9e2dd8fe2dc505cbcdbb76eff2e2182252b8d5182008046ed5ca33c2fdc15d46e4c854b7ca46325724bc67
 DIST NVIDIA-Linux-x86_64-450.80.02.run 141055124 BLAKE2B bc4440bb65e4980863f4eb8aa2875a883cbe67f142c8afabe6023956ca2cb765666a5c8a308175c32162194ed821618d2595ad6e45188caf8813d8c8582dc6ea SHA512 ec5c57ed9ac897c671e4b29e0ef4f6a0c233fd4a04d1947a21c3646ddfce38322864cbc607e94e6a74506d99e7b9088cb497b562874a5837d94c000348c97823
-DIST NVIDIA-Linux-x86_64-455.23.04.run 167691811 BLAKE2B 6a3baf79f6cbada9bf7a21604a60657d88f3df477d308222f8a75e1e9e9bc51ccad4d7de8f32e6cab4c4c910abb65aff1e932a8118a732ce5ef98d9d272dc637 SHA512 96e8267ea76bf42f0c8be67d27b4d2a6f180cbea9348feb19c313805dc7957a945992d11ea4a1233d7cf96c75254b717d48153db0fe6aed8146bffd041f50a6e
+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-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.66.tar.bz2 1057263 BLAKE2B 8ec77f96bafec823b1e668cb695dfbe84ec31aa86310b0584bb416299dcf378324c97c4924112a89015bbbdeefb3c8556fc6fb5d76f973c29ce80766241af4db SHA512 82d20b479e5d11862b304dfa0b15e724b1f63692765237cb3d0fc4e5cd6f6d954a36f2c6872d0ccb2d29cfcd31b0c207f1172112a623b79a0e49b276223c7785
 DIST nvidia-settings-450.80.02.tar.bz2 1057306 BLAKE2B 8bd5e3b75c2941c49a6ae3d4e6c1eacd22fe63cf56aae2cc83d58e5be6d72ef58b5abbee757265e799c075d907e37f7d1bba389b8b912c53994c60eed2e71623 SHA512 1724bd5171eaa54d82c12e35890a4289e301b1a6c11c1a6c05ec0a6f0275cbf532011235d8121d7b5882a640cf42c32b3be3eb22ae036dd5a2b8a372c7b5b7f7
-DIST nvidia-settings-455.23.04.tar.bz2 1056064 BLAKE2B b9ee7bd874d693f45eafa1dfa55fec9839147195b9d10db740392694304b54fd5e7482eb6d5084e72a74056101047a58f1251086e80421b9299b73f780dad3b5 SHA512 55b71944da62a529e7ba7776b7e584213cd97469e76183dde5e98723b276a33ba8ac0ee6052849001875902a101a0363408d5546e8327707ef4135775c98d6e3
-EBUILD nvidia-drivers-390.132-r4.ebuild 15528 BLAKE2B b8d3e510484899800e07116995a81623abe05cfb6366f2048bd7811b49e7593b5295052457b03a95cdf310f96867636470d7a2f9fa9fd971640fbefad01d7921 SHA512 10ac55a7cdbc27438dedb4b28f54380efd406f2bafea8ebb50d2a5fe7d02488076bec42a3f77ca4894995ec2713bfb4785c1cfa6e7c7dcbb76481a77dbf93ab8
-EBUILD nvidia-drivers-390.138-r4.ebuild 15706 BLAKE2B 93edf71d28d66dd4e3c5fb8f384d2bae8c556f8db155bfd4d17d80c9c2c70779400aca3d308992d3e14010ac2c5923bb384251acdcab2e72c1334b6fa04398fb SHA512 29906940593ad55d02937e42f8d8571172e5afc79c5c90cd21198d90a73a798df1982de3927af2d155e0d71952f24774bf0bbb6b4085528bf87ac10c4be818f4
-EBUILD nvidia-drivers-435.21-r6.ebuild 15462 BLAKE2B 844ceb5636602735e23d4e3008665fca7014eca635075563cd127a58dbe54793aaf0c9fc27f48ce51b4f42c225cdd21e2457426e14f341edcf9aabdb3fdda084 SHA512 2e6cd90a29e901c447f725248c8627661cf4770633d5d9d64f9f5264e7c7847dbf891ea40e038a3ba3c7326a7d61a3f3f28d8ce43f55d9ab089a5f2be65b89cb
-EBUILD nvidia-drivers-440.100-r2.ebuild 15404 BLAKE2B 4c22271efa3438e263ec4c10d8662b5fda625c484491caac65e80d292e35dc787a0be3ff769c05520803a9c3b7e35b5401a84642e3924e008eaf3309268d9e52 SHA512 ed7e5f550f594a1fbc455781f42a0bfb4a50af4bbe26d2946d8751d2c365350531db2b6bc23f4de7ae61edbd0e4900d7b98318f01c77814e043c015b391bbb57
-EBUILD nvidia-drivers-450.66.ebuild 15454 BLAKE2B 95da3fae4192aae3d97c666d60f43d21eaacc7e114c9d3fd46c527ba53dc1185013a1fe00ae78cff04683100e6b329ed52e46fb5fac3b7fa48ae7e50ba44ddb8 SHA512 58122879e51a15392cc6d2df376ccafaf725bf4148ea008cbd2125a3807f256d94ef51e1d091a630e61eb93564c5d13780e20c874f1f1727672460ad9e31e621
-EBUILD nvidia-drivers-450.80.02.ebuild 15455 BLAKE2B e3c0b70abe53659ceb7214dcc1f3130aaa8610dbc76c770bcc6e4f4c3c9f640978f84dd6c940f4bb1ca72edee44c117923e456e75f97fc101e74d317ec8f235a SHA512 c4064dfc6b039f2e4587b4802a41d1daed0534576a661536a7dcbf2f6a91d96721c6684a36b5e26674bb8afa23f1106dbe169e05ada51a99fc52b5c7a4cde184
-EBUILD nvidia-drivers-455.23.04-r1.ebuild 15455 BLAKE2B 1875335d20537efcf516419dcbfa53796564b29d10abaf6f9a76082ae9b63ecc3e0606bbc08984ac5eaf422607238d06bb7a6dc5b99b8c8b4a5945009fe1a28d SHA512 0d220aacb2f8d163544664521fadfb66af9398125ba8406fbc8b4f7e40399d1ee0550ed7090b9939fdaed03fc2972c9c1a216e9e206d4ea619c1b4dc66a2b4c2
-MISC metadata.xml 1284 BLAKE2B 0e13b2eae77fee75a4757da7ae80540093962b6e8ccc3b0950caa3a0957ff79c6b08c80ceeec8ffcde47b293c258159f8722a13334fe06868589a18802ec0434 SHA512 0a3c6679f7fc23bf87340145f3a97945c9e8c7fc9c8721fa4643fb662347af312b4b927635901e95acb9349a7b191ef088ff0e51bbbc0cbd333603bb60984020
+DIST nvidia-settings-455.28.tar.bz2 1056911 BLAKE2B b2a19fce197901b395bcf3e4c81e6d2589441e7da4297f1d5fb20ffd5ec8946428577d08f4500d9a1bcc92190ae9e7beaef5622921e74553b911f8c63b3f1231 SHA512 418a9cc7c98a6248b27aac5d39faeb89de537bfa04ae858e31ad362499042c02212ad6740b8b482aaae92ae7e4c038a305bab309a2caa2cc3f944c50160d033d
+DIST nvidia-settings-455.38.tar.bz2 1057087 BLAKE2B 81a287aecd2d0e788b0fe581c3dd10aa0f1fff19746b04a426a2ce9c7fa9dd9492cc5162c6bcd42496735c1b11482c3d9409aba5ec297e69afc19ddf11b1907c SHA512 56f5684ad3258c5449d747894a441aaef17403fc5406a3d61e0d7ffd983e908e3f909dc933b57dd9c98a47c4be7205c62157ce7097bf3937b3a8145e77fb354d
+EBUILD nvidia-drivers-390.132-r5.ebuild 15527 BLAKE2B 73a402d5602b0b61c62df54f30e17f1dc7cc796239c1f0c8dd058d99128831750d2373886e482ff0332c620f9c75daa724e2c7e97003be57864a7f435b22354f SHA512 c4169e856f449a35bfcab911547dfcc257eab221c440a6901091f904de824a7744808a600509ef745c08e38a5217c927c1e4126cd802658840779a083a8e3ce9
+EBUILD nvidia-drivers-390.138-r5.ebuild 15664 BLAKE2B 52f54b620f5f373f514fcb26c296771255c12431bb2340926fc92d5526d772069a9c94601824b3c5e6d7f6daac91e81e309548ecda542da53ad37e9aaa3c79b1 SHA512 94a65a2c8b0c0489651b8d62cdec24c88920ed95c6f6b77d883c4329f144c68757ee795b25e37f67ad6de95c7e57c13f9d4d2fd79b9aac1779d3813086aa12ac
+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.80.02-r1.ebuild 14987 BLAKE2B 0c0834b649b8aa938fd1c2e4398bea332fe99b8f57d3e2140b493af71758af123c2df2bbbafe7c286a5f9a9b00ecda5fcdc0d7091b17a4fa0bca37a31cb270ab SHA512 989c51c2659e64fcd39e19416c427fb6c29b74f990b17d62064a96bc6ce7d7962af5ce2ea28a59189d3270934ac0fad58b1df6e45da200eb71cdd7a8274c68f5
+EBUILD nvidia-drivers-455.28-r1.ebuild 14987 BLAKE2B b39b4f72f9fc4442ff041b1954444ed86a06228079ecef36d7051706b5a7202d5714e8cc3c91431dcc51c38b52ac90618945539961eb3f9c90969c1629f02f77 SHA512 e3fb02c1cd107b5f4bc960cbde69dcff6bb42f23bb5477300a6167dd7ca996bd1d3b5517c50a05fb68c1023abe7d52552af96d8edd26e47e5776270ea2fece8c
+EBUILD nvidia-drivers-455.38-r1.ebuild 14988 BLAKE2B c28c0dbd9d79065852baa84f802bd962ecbfc9c2431642d869d6953dd47ef9cfe8822a61ba21bca6a87c6780a2b3fa8b812e873816ceb752d18847bc0e78b2b2 SHA512 86ded1876e7d371ca410af4af4ca36f0c26613c6a6a4de7e0acf26aa94cd2a14f0de7d4884a2100ffe7645d49846c14ab5ca39d938318ffb49190b18f73ac7ac
+MISC metadata.xml 1321 BLAKE2B 32690f2762adc1b67058312ad0b9d1b89f78c9a0ebadf462d058aac46338aee05b877eee0a78e4a2a4de98a22544dbec2463f59026ba69dab7d380ca17315b65 SHA512 d146d8aed6c43e4dfac95143eff1c90bba30716e45f980d965582585f496841ed6307b58b26bf69afd905494e4afd15442632f2d85792bd0fe34d8b0a0166b7e
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 4bdb2f83abc8..b4924723a362 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
-<longdescription>
-Nvidia provides different branches of its drivers for different batches of its
-hardware. When maintaining these ebuilds or other ebuilds depending on them,
-you will need to keep in mind that the major versions represent these different
-branches.
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Nvidia provides different branches of its drivers for different batches of its
+		hardware. When maintaining these ebuilds or other ebuilds depending on them,
+		you will need to keep in mind that the major versions represent these different
+		branches.
 
-You can use http://www.nvidia.com/Download/Find.aspx to figure out which branch
-best matches your hardware.
-</longdescription>
-<use>
-<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
-<flag name="compat">Install non-GLVND libGL for backwards compatibility</flag>
-<flag name="driver">Install the kernel driver module</flag>
-<flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
-<flag name="kms">Enable support for kernel mode setting (KMS)</flag>
-<flag name="libglvnd">Use <pkg>media-libs/libglvnd</pkg> for dispatch</flag>
-<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>
+		You can use http://www.nvidia.com/Download/Find.aspx to figure out which branch
+		best matches your hardware.
+	</longdescription>
+	<use>
+		<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
+		<flag name="compat">Install non-GLVND libGL for backwards compatibility</flag>
+		<flag name="driver">Install the kernel driver module</flag>
+		<flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
+		<flag name="kms">Enable support for kernel mode setting (KMS)</flag>
+		<flag name="libglvnd">Use <pkg>media-libs/libglvnd</pkg> for dispatch</flag>
+		<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>
 </pkgmetadata>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild
index a52d05345629..dc837fe77a47 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild
@@ -45,7 +45,7 @@ COMMON="
 			x11-libs/gtk+:3
 		)
 		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
@@ -57,7 +57,7 @@ COMMON="
 	X? (
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
 		)
 		app-misc/pax-utils
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r5.ebuild
index 7945a6a20592..882ac5f16862 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r5.ebuild
@@ -45,7 +45,7 @@ COMMON="
 			x11-libs/gtk+:3
 		)
 		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
@@ -57,7 +57,7 @@ COMMON="
 	X? (
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
 		)
 		app-misc/pax-utils
@@ -70,7 +70,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r7.ebuild
index 4c34eee7c731..cd439460cca3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r7.ebuild
@@ -40,7 +40,7 @@ COMMON="
 			x11-libs/gtk+:3
 		)
 		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
@@ -50,10 +50,8 @@ COMMON="
 		x11-libs/pango[X]
 	)
 	X? (
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
 		app-misc/pax-utils
 	)
@@ -65,7 +63,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
@@ -541,11 +538,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
@@ -575,15 +567,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 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/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r3.ebuild
index a25f1dee5338..f9b8f8b34862 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r3.ebuild
@@ -40,7 +40,7 @@ COMMON="
 			x11-libs/gtk+:3
 		)
 		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
@@ -50,10 +50,8 @@ COMMON="
 		x11-libs/pango[X]
 	)
 	X? (
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
 		app-misc/pax-utils
 	)
@@ -65,7 +63,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
@@ -544,11 +541,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
@@ -578,15 +570,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 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/nvidia-drivers/nvidia-drivers-450.66.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02-r1.ebuild
index a6cfef61e6cd..3574dc2ad2db 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.66.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02-r1.ebuild
@@ -40,7 +40,7 @@ COMMON="
 			x11-libs/gtk+:3
 		)
 		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
@@ -50,12 +50,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[${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
-		app-misc/pax-utils
 	)
 "
 DEPEND="
@@ -65,14 +64,12 @@ 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 )
@@ -82,7 +79,7 @@ S=${WORKDIR}/
 PATCHES=(
 	"${FILESDIR}"/${PN}-440.26-locale.patch
 )
-NV_KV_MAX_PLUS="5.9"
+NV_KV_MAX_PLUS="5.10"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
 	~!I2C_NVIDIA_GPU
@@ -547,11 +544,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
@@ -581,15 +573,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 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/nvidia-drivers/nvidia-drivers-450.80.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-455.28-r1.ebuild
index ff32bf7fafa9..98ada6ee050e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-455.28-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%%.*}"
 
@@ -40,7 +40,7 @@ COMMON="
 			x11-libs/gtk+:3
 		)
 		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
@@ -50,12 +50,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[${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
-		app-misc/pax-utils
 	)
 "
 DEPEND="
@@ -65,14 +64,12 @@ 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 )
@@ -82,7 +79,7 @@ S=${WORKDIR}/
 PATCHES=(
 	"${FILESDIR}"/${PN}-440.26-locale.patch
 )
-NV_KV_MAX_PLUS="5.9"
+NV_KV_MAX_PLUS="5.10"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
 	~!I2C_NVIDIA_GPU
@@ -484,7 +481,7 @@ src_install-libs() {
 		if use wayland && [[ ${ABI} == "amd64" ]];
 		then
 			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.4"
+				"libnvidia-egl-wayland.so.1.1.5"
 			)
 		fi
 
@@ -547,11 +544,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
@@ -581,15 +573,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 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/nvidia-drivers/nvidia-drivers-455.23.04-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-455.38-r1.ebuild
index cc07abf0b33e..836ce3fa1243 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-455.23.04-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-455.38-r1.ebuild
@@ -40,7 +40,7 @@ COMMON="
 			x11-libs/gtk+:3
 		)
 		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
@@ -50,12 +50,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[${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
-		app-misc/pax-utils
 	)
 "
 DEPEND="
@@ -65,14 +64,12 @@ 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 )
@@ -82,7 +79,7 @@ S=${WORKDIR}/
 PATCHES=(
 	"${FILESDIR}"/${PN}-440.26-locale.patch
 )
-NV_KV_MAX_PLUS="5.9"
+NV_KV_MAX_PLUS="5.10"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
 	~!I2C_NVIDIA_GPU
@@ -547,11 +544,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
@@ -581,15 +573,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 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
 }