8 files changed, 33 insertions, 540 deletions
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 334ad008a5de..07a6f4442702 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 d7f4310e6184..67974821bc8d 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -16,48 +16,39 @@ AUX nvidia-settings-390.144-no-gtk2.patch 367 BLAKE2B 59a60b103df6b187009417dca2
 AUX nvidia-settings-390.144-raw-ldflags.patch 468 BLAKE2B bf4c00a76351e6c3d1587b4f71be61fac8cc516fa22da0a47538fede92b619eb77b1cc09222cd403175a2015eb2ca745e8cdca90c9dca1b938ca13a2e59810ba SHA512 1fc568bfd1faba1f7af4f4b07715912b7f1d8103626ec0c9fcbb465ded606059ca264f386fe415105ab9f95c4ab173bf4b784ea7380bf17ab6979f56fbd01757
 AUX nvidia-settings-530.30.02-desktop.patch 406 BLAKE2B 63f645d5c9f76349b405c61327bc4f6d44e0716b4ec4c2f1aa012505638be0a329bc9589812d1f164641e4725dd15ac652eed0992161e767325b1310d9cd0718 SHA512 ff0fed69d7d36b2f67f9382055490a031ef8e834119bb18b0f71d1265afe92fad44cb11d6fabc5e3750a434c51e4660cfaa3347d062036d975fd341967187494
 DIST NVIDIA-Linux-aarch64-525.125.06.run 263039228 BLAKE2B e25f9dd3807fcd3bc4d3d55b6b7f39969ee4140e2f6a60509b34494b5e29daa1c333edeeb966bfdf4397057c6b707830523c956e28e252ab6db1fc402ac8edbb SHA512 190a458810fa02c89eaeb4587b97463b2be86a9a5ba44ab4113a224d224cec69d8d706b4a3421bdc3a067e0c47a67e104c156bb5ddec6ecd109b655a3d4ef7d7
-DIST NVIDIA-Linux-aarch64-535.54.03.run 276543093 BLAKE2B 13db9a63a91f87a1d1f78d2283ab8fe001a8b2239e1b182cc2aa69249cc053ffb93f4d5bbaea56d80709cdf756d734bd0ca8bf87f390592e6a378231df1132a4 SHA512 57b06a6fa16838176866c364a8722c546084529ad91c57e979aca7750692127cab1485b5a44aee398c5494782ed987e82f66061aa39e802bc6eefa2b40a33bc3
 DIST NVIDIA-Linux-aarch64-535.86.05.run 268851579 BLAKE2B 9bf77ebde6343f44e977e664d8fcfa6d9922530b90e02b66de562922f72c6fbc518be8f84145c36d568ff43bd000c5b9850dd065cf04436b8f26b9dbfdd3082d SHA512 ea4ff354fc269475bcc20a8ac7eb0295a83e50581c6c939c2b1a3356e83addefdbcdac4af52537d8314c778f34cd4176cf9428bb9775ad2ce6497f9aa050a7ac
 DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb0105d29c11a2d408457835212a96519c9334ecf19278b36749d3ff7f498f5b0ae45a2efae2d428703dac21245c62f1efebe SHA512 dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.199.02.run 273256770 BLAKE2B 5ceca89da4b4c7de701602d3dbf26e71a1163be26e0e5eac65354ecd40bfc8d68c981a6ef75b13e95079835c95ef7f9e10e5f95a0ed09beffd5bc22cb81a5330 SHA512 e1265b6266473af652e9d7bf85dcd76e312af281c5f4f158ab322e34d378738acb87c30cfff7bf1f6e1b238883e7f665d9fc5151b1e0078dd9aece5a52655405
 DIST NVIDIA-Linux-x86_64-525.125.06.run 414318862 BLAKE2B 204c53bbf579edf6d88c9ab4efcf82983a2b58262df4748076de96f3d67b107949407ae0c5ffe9bf6747783b1bcb9a9efc4a3c60d7161427b1c85ecfc494171a SHA512 a5f13b633d111d9dc928e8522cd916a2b756fccbf2dc532649762a3f9bdc5503bd57c9c698da8205c49e82720b45789413a1afc26be77d741f823b49ae2f333d
 DIST NVIDIA-Linux-x86_64-525.47.35.run 414996410 BLAKE2B c061e9b3afdbafead834d3aa462da0c50a4b67208bf2dab1d796236d0ca7cda406a6f7d0846d222635e0e900a03fa1f01d213df96c0a33f3e39d3b286a75962b SHA512 234e18a46c19048522d328f5804785c46d9d47e6df0713852d3afd80726219187ac8b19b3e391af8b839fcdd99413c3d6bb98bad6ba589bcd5a4021b8ea55309
-DIST NVIDIA-Linux-x86_64-535.54.03.run 347109768 BLAKE2B 6fce56e4e840b3719b835cc72a749ed807d604ae5cbec63cc42b6ee32fbfa273507029190ed1198ad1f54fd53096dfa0573d043aaa59ffd07cf1607ae6c7943b SHA512 45b72b34272d3df14b56136bb61537d00145d55734b72d58390af4694d96f03b2b49433beb4a5bede4d978442b707b08e05f2f31b2fcfd9453091e7f0b945cff
 DIST NVIDIA-Linux-x86_64-535.86.05.run 340652483 BLAKE2B ce9aeb902ef6826383d076b828bab31349b72625f9b193ae05a45944e14f5fc87bc086c0caa232d94b215a595bc695b94e1c95c1507d9cf3a060595bf5f65db6 SHA512 92c3052f2fe206012853eef9462a6c58d055098e045e305c34a2e912e5b8542ae839a947c54ffc98d889a0c5cf1cecb6e3ad0e5907370926926cb1b50b53c336
 DIST NVIDIA-kernel-module-source-525.125.06.tar.xz 10100204 BLAKE2B 1a7a9f56be4533b8106df25ddf65cd7756cde11fd3e01f96f1f34c7d18af764fcfefc1cf980fed6c0e586e614ccacef9e2cddbabb87c7d7f06a1b27d94f63466 SHA512 1319a2333988795f5b0850cfe769ab0f4c4364bdb516147b85890abb4695aea2553ca0febf9cfcf2f8eafb4c05c3e21f56356ad75e64416c9782b027495028e6
-DIST NVIDIA-kernel-module-source-535.54.03.tar.xz 12653208 BLAKE2B 4f7f4787d407d5508b664dd725685e477e113b34cc18f93308096872d490d67394be827eddf2ce11b291cb5878adef56652c5f1cf066f19f77ed86d04c3fdead SHA512 51e04293ba52ae3041c4bb3a1f41d1cee99918e06eb4c5cc994209ff4e6d602c77a6a1faf2823366b48eeff881969bce4bb792e3f69d3ee36569ec0d3dc9286e
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
 DIST nvidia-installer-470.199.02.tar.bz2 146367 BLAKE2B 0b49350a884c1e2e39fbb3a393aec0e00678ba84d8f15b3a031628593724ec2a91b162075bcb282d2d2efdc199f8c58bbd0a3c2657592bc548d4c0ec35101518 SHA512 e3a2bca22dfc8618a52e5b188bc76718bce0d5a09a136154fbc664aae32c54a6bebaab279f7830e36116bb93e514e81b845f5a7e745dbbdaa0cc6f9284dcc3c3
 DIST nvidia-installer-525.125.06.tar.bz2 147696 BLAKE2B 67d9539dca006b11585e51d3c431e7f60770cdf0a06809f007b53f418afe1f8ee7412946ff68f2c60a1dd5353eaf377087507ae82a1a480801a7f33d458b48a4 SHA512 d29564b91b8e4c4ff6c2d0480d84738e8376e93b0efecd541bbb64258514e28833317147d091ca929238f315a227e7db03eaa6be1846abc660bb25bcd1c50302
-DIST nvidia-installer-535.54.03.tar.bz2 148051 BLAKE2B accd10d3fef1461dd2816d1dbc9379e6da310c292776d43947ccfa18aa7a9d8ac4de4760fe772cf6919670af17ceae63d18d199e2146565352f31630d60f17d4 SHA512 41db0545d7c7d051aec9f0b73c9d00c7aa7d78d45f898627e2694c35fc539fa1ee2492ddea6c236cc19e4dcd5713adf62670aa57f46f39c41f368730d2f191ac
 DIST nvidia-installer-535.86.05.tar.gz 205106 BLAKE2B 4372abe58a00f4d4899efd21c91dc3d188c783b135fc4e29d7da3cbaa42827d54adc77d608249b3ee3090f994303106bd6a2428b3a33c417056178051af29d48 SHA512 5edc53b241796d895ef097bb8f18cc500bf899ba5029237a6a76f27404b45147c88831529c9905b500400f0fcf0395f0a708493a9a40938ce09097296b760292
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
 DIST nvidia-modprobe-470.199.02.tar.bz2 38786 BLAKE2B e72ea8d97f94c804411bcd8ad52653bf4a00114c4c65822a006a28076a51803a39b7168273c46cd0391c094837593ff8bd415357541fe73222c9c87b554e0798 SHA512 f66707d1e754d55ebc109d0d03f21143f5702d42ab56785c451b93aa577007de99526d453d732e32ddd273647e041bfe4cd5f4305c7535f2420bac17878c843d
 DIST nvidia-modprobe-525.125.06.tar.bz2 40428 BLAKE2B bafe72592680ee75868c794f1442ce283fe7376a6997ad85c6fbb269cf111fdac0c86bc0474c8a4496796bc519ec975bf8569cfd5c366535260aad4d845aa096 SHA512 d673ab4f23eb72acdbcc4f5786fe0c35d4d3e0816dcb117937441cb41fe9414bc0ce35ff8be8bd7a28d3dbae5e69a57f891cbc985dc73570c7d06d462548d721
-DIST nvidia-modprobe-535.54.03.tar.bz2 40422 BLAKE2B 1964aee27e9d4cda3e636c739df73d6dc8219c60f25ecca64f0281b2b6f4d57ebfaa7eb97877f39926d87c8a198a14fc73c458d831d479e958315d0b2766cda7 SHA512 edf06cbd892e53c2f04aaf6533d2bda70b92d4770f1d7f056c88c767e1fb3907bf1b18e8f071c430a57a8c00c5f7fb6f00ff57f114e984470ba241210f76cfcf
 DIST nvidia-modprobe-535.86.05.tar.gz 45994 BLAKE2B 55fe27d00007a6523d69b78ef30f9a6112008c1bd40230161c74ca73907f78de5ade4713bf65476ef9a7054f1b4d134a5392aa820e454788d0da19d303280c5d SHA512 b37b20e22d9ede5714d4b9f237ef4212cecd3a224d3f21117491114aec0f45388a1c165e198aa6776721f5f891db1eefe479fb57b67622a9ef14323a3dc33b09
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
 DIST nvidia-persistenced-470.199.02.tar.bz2 46558 BLAKE2B 67cf26b1915d29898769ffe91399c5204e61a71a0bd205d35daae4516bfe06b978323aea5a8af3341dfd497ac6bf7bb7519e33030a3d622d84f3f8f70e5d510f SHA512 8c4ac45954db02311f323d2dd79cbfeb7d6724e96b881069f1dd2d156be089ad2b3723cdc43c83d5a65bee28d45558fc55ebdc74f971abc4640cc5be0444f5e4
 DIST nvidia-persistenced-525.125.06.tar.bz2 48050 BLAKE2B b7e91a5cbd00cf3f553aa06cb576740ece2025d27291e64271b77dca0c81c4a4ba9450c05db037a1f517e92cfb50019fe63548cde80753c2f0ab6852380ef30d SHA512 736f8a016e3b65b44d59db4f13eaa366c41e0fc6b3adde3f1bf8bb5362948115152016f78b89306c20311a7d70ce12329bbfa5e11eff24a3621cef17c5fa1566
-DIST nvidia-persistenced-535.54.03.tar.bz2 48749 BLAKE2B f4bb2eea418dafc770724c9658ea6e3a67a89f8997de632aa4635ed65b6340e75e35efbf20286552aed29f149edab468a55f75be7399151c2be9a67f9f33f5cc SHA512 e68d5ccd17482c8a2eee63cb6591c936ace48b22fdb46e91d26a5c1d7c4a305c990371b26c74ac6af396a05f53c40f41c62de4282e98c6e5da60266c6d4a2235
 DIST nvidia-persistenced-535.86.05.tar.gz 56416 BLAKE2B ea6004542a534eafbee13d8a59c85d69770c6341cb103e3070804439203764f74bfc3f97f447ccceba38a9999c40c7a28346f5337c73a2643b4ebcb0bf244359 SHA512 66040823dc2e3c995c188513daf1bd402b74250297cf426908d159f8eb05c7abacb261cdc14494e3b0ddacdbce3d3c9a323482f3558eee9776d2761cdb025885
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
 DIST nvidia-settings-470.199.02.tar.bz2 1062171 BLAKE2B d247b4a9e8d836b3e37116b51e8dfc36fa23ffc45bf4e21e84d6174adbc45ea8605675b146cf109311412e736995a51d0d0503d182a35507690f384e87202005 SHA512 0a2794e795ddf579f6bc27de2795119e62c6b9cc8e1641ada3e4954a89ef2a7796e88e3299cea113f269838b5bf084ed3c07304d5d34d410c5483c135b13b356
 DIST nvidia-settings-525.125.06.tar.bz2 1087893 BLAKE2B 0aa44617be40469ca43d325436f2dbc6af1a7c813c5da189bd727130bd8c7013bc0bbd45abd0df7eb64c4ec2ec17ca651188014005a8ea4ae63070619c956ce3 SHA512 b3503e821ab84a7fc8361ea5e7277b03048397f188faf3c277455920aefdb194b6cd99cc179b67d64042427a0d4685bbb740463466e6d6f8fc143af2f9af55b2
-DIST nvidia-settings-535.54.03.tar.bz2 1093436 BLAKE2B b3cf57b318fe057918ae65288cf55f57851c043c1e360849143a10f021fa18e83fc20cf96151b080b8f5dc2b8ad009b79d43d9de733bf87910ec3b5b37842caa SHA512 58ed2d57cecb82f077e8912186ded16974fb6400f6d5f4b08d5b66be16290efa348631ce2f48401d1e504edda41701bf39d01e205112803ca8bb5c70a84a54d8
 DIST nvidia-settings-535.86.05.tar.gz 1271750 BLAKE2B 45ce25679397d497be268d616557d4fc44caa62c7efd1e9b257337f803335a8b2353cd2257bb3d4399f8b15b5f81c8942a606c840d4e7eae89eeb342d1c50011 SHA512 cca61aef4447510eb04d46385ed45a0f30241a5b0e45b0b33a24b6824ffabdbdd8c70e1ab0c8df6910625bed3286a867eee42ed65431db43d27b0a16d7a81dfe
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
 DIST nvidia-xconfig-470.199.02.tar.bz2 108683 BLAKE2B 80e5b356f1b2a10b2f0d1a139b511fa79af925d5cdac80ebd04fe53b4ec26df599985a3ee4be1cb466415ec8fb292e3b8b85013aaa21226a9301351490ddb28b SHA512 0c1d18af896b8cb3a4992025ed207c9bcf2211e6a8e904755d51ce1d3791db89c0baa4571f9eb5198a5fcd13ffd41deec416c622f8207bb7dd23decd9864ad89
 DIST nvidia-xconfig-525.125.06.tar.bz2 111119 BLAKE2B bd9ef08c361e969775522911a931a25b4512a59d9aa2f90ab1be1696161cd127f20c526b31173d0226408c74da14b5cb381c717d6b8b8b3975b2449e5beb7d9c SHA512 7595f88004aa23595364dd25db35986abb802de80c9e70c9f22367184859057140271dcfd8688ec9d686ca67ae85740c21300ddebd1dbd78af5660896154f3b4
-DIST nvidia-xconfig-535.54.03.tar.bz2 110606 BLAKE2B 99af140f7742e23db430fdf392ce985c035c7669f619bff709987a4739e4872ff03991f2324ffbf40f53259906832464f02baf0ba485a16ecdea52af66ab958b SHA512 5927ba6514d25cd0c4a05e42533ea082d5c91c0e05f8cdadedc6fbb5c0b6f0e424d057cee0dfd4dec937514a85f1d28e81c5ea7e2aa8ee374476ba376255d035
 DIST nvidia-xconfig-535.86.05.tar.gz 145139 BLAKE2B 2f2af0d0975a483cfbdb922e6d15add620eb1575653a54a1f4916895b2e9450a4f9a7ac2af31ad6286fab76953e567c01f0430b901cb397019673c87a1f35f7b SHA512 384f4a23e356099d7e96da3b79f55de66061d8efd7ec8a016e84c76429ac9769e73927944b3e9e281b858690751406b2964eafd9fe71e74a0bf33e0f67c5e05a
 DIST open-gpu-kernel-modules-525.47.35.tar.gz 10323862 BLAKE2B 2b3bc18c14755b8ad424d38356fc0f10e2b4b081b034a86ea7a6510529eb7ac08b7c947a0ef5c00adb55b51086dff85e9e5614dc5911a97cbaadeae320339644 SHA512 72201beacf236aad8dd78bc8b73a794f98eaf2c0b60792bbae4f1466c42315d32e0486714d10aaaf28d0748464f95ddc63ab26b9b9f18ee2604690b31053b868
 DIST open-gpu-kernel-modules-535.86.05.tar.gz 12698016 BLAKE2B d0534a2e6b966065f15526c9c699fc4f47cbc12e4bcdba5b5e9d34a920e12aab994009aef158b336ad59ec0cde98bd5686fe606d8bec25ac2aaab49492d37e77 SHA512 da1964921f2f0a07e136ad5301b633c01d1e045b5fbb4ebb32f5d57471a89e649a1b653bbbb62e97755d070ce911c442ceaac2fb3d81baa53af75f4123075308
-EBUILD nvidia-drivers-390.157.ebuild 13886 BLAKE2B 44ae48cf1b82457584fc1c41b835fc041cd4707b31d7d03cbf45e1673e876646dfa69331e6f239532892648344312611b17f2148b920381e0a6fb9b97740ba6e SHA512 452c0962f8a818015eae7201c68af050207aec8b30dbcfd9eeb0b17a978b61c95a5c41a1690ab128be9a960263ddbe143851762ef7d2950e79cb77654a959516
-EBUILD nvidia-drivers-470.199.02.ebuild 14580 BLAKE2B 7e5375290df72ace55c6c343a534b14e9d404cfe3b77cf19fd7048bb6058e844c5cff3565e00a6d2b6832bf2b53d42c9291b8929abf095895501c31706697a1d SHA512 3362dc20826874af6d8c0382244c732c73ee6fae6616c5fb01482d1e394335fdc3d7f6bd49b977ea4fabb350cbb22e1a598ccf1fb28ac3aa6c7717a82965a542
-EBUILD nvidia-drivers-525.125.06.ebuild 17066 BLAKE2B 86f556a1409188a1c38f340b2e7202def54c0a4092ee86030e7b410f11de873eba78bbc456eeec0023d7f22250ce1e4e8345e7329224685f40b891e3c69e4184 SHA512 d631dbad857ac68021cceb9bb6351119cccd4c68c599dd983aa8fcc56d19ea6a648713736a9cb68aeef87d5e59d609e9bc49209827c83292a75e864211abfe3e
-EBUILD nvidia-drivers-525.47.35.ebuild 17077 BLAKE2B 18675324536ebe1fb32443b2e24d04f3849da3f16fa45604a2a00e311d5549e61c23ab184e8b053f1e5ad068d76547f70a1f62e1389ab3486d33189e5ff6c515 SHA512 16dcb11dc4531a88261e2401818b7421b2b462392043b2d2b9d973faa57674633eba6d3cc8a4fb23aa3f82ebeef0b889d1e1a3e1451afed69776fce58a46743c
-EBUILD nvidia-drivers-535.54.03.ebuild 17569 BLAKE2B 55a55905edfb29eb5e05aa5379213fa28525e7f089809c23f32a6b590202f265c45633f4c67c6b224c83ecfd101c5ecab70332889292783d8464eea0aa4dfb3e SHA512 e1864c7103d7cf7705149bacb0cfaf3db527726e0e8c2e6444ee32466893567b77dfcaeb9d859c78b23e433e95ebe43942053e29c3334565f5eb2a8cde7e6a41
-EBUILD nvidia-drivers-535.86.05.ebuild 17819 BLAKE2B 0f453c05da293fd9fdf741bfb6f072172a6e100d0442b663e95ec0631c10b28739d6be3e91e91e256b3690b712663ac6bd57c96e1c5a6aa982e31d1114032722 SHA512 1acd2f3e7d14230f6ffa6454bb96deb86edc58b31ab1e9c5dfd31053035246d7f32a3a841d37316f51103ac799ae78fc00367776a8be0bcd5ca43ab89a4ded76
+EBUILD nvidia-drivers-390.157.ebuild 13945 BLAKE2B 3403da811e763ba22cc72089f581b76602a3c582943e5e38a9ee3801099dd6e11914ddca91db8f31489291c3f74e9fdea362de254b1c64f9325af7058a02c908 SHA512 4f6ce07e4e9c84b37e75fc5219cf1727c10c4a24983cce98bfd772e99489768bcc90661d55453d866518d2116a61de9964b2f9c90b759a8bb1020ae58bebb763
+EBUILD nvidia-drivers-470.199.02.ebuild 14599 BLAKE2B b2e78a03b8a7a0de6c2680450edf2771d479a1c540be5b882748c2da8753aafd739122a239c3f9cbdb90f0b4147c38993517d5b9122c304c75e4b276e9bf438d SHA512 95cc5b50725f82252ecd19bc3cea4a29459a0c20911b1b1c3d77a3de5c00858bea75d78a9ce22fde2dd724bf52261a3a73a779381bfd9faf5ed523996ee0cdbd
+EBUILD nvidia-drivers-525.125.06.ebuild 17120 BLAKE2B ae795a1d15273a11826653df54670d7d8119657fb49f930fc70661dfe61c692678c7202988ff567e36304ff63bf6e24bf486095750c5850ebdfcdd11e0fa6054 SHA512 fffe6a9ee3300c91567e6b6bb327d33872f1926ea0af05da7ff6c6f745019bd4c9235a99703a37f805aaa99a7ff5ebadabb90097df1d0858916297b1d198d014
+EBUILD nvidia-drivers-525.47.35.ebuild 17131 BLAKE2B 3a079321f016198b1bce72834b15e02cf50f319eb3e3fca3a94bad75bea8effd2ea334eed5d851522deac30bb605b65647b0e565c1ca6f302b456388b3127810 SHA512 3487b1c26bf834db7a46c3386de152aac1ff51cb67eb702cd99bcdd29761015fdf6949d5e9a6ada43435368f3e15b923e2c3add2b1f454d5940f97ea5185efe3
+EBUILD nvidia-drivers-535.86.05.ebuild 17873 BLAKE2B 16d90996175f680e69d057838817e95b43e5b7d937372ca4c71522405518283f514ad3681cfab1c4195dae976d25aa27555f8ee5f9c876a9c2898d06c5ec75b0 SHA512 4654f7663b8f0f95fe51c6ef81d3ba82af740b2cc3decf16add87e770949f2c945031135da21d4167a7862296e9541b5f9b6e8532a0fe1c9f9d1b5e10a5854e0
 MISC metadata.xml 1281 BLAKE2B 2d2dd88b6c8afbe3b8d4799813fcc65a7102dfaf47fd6266ebd627acce1dde00acdf69d9d85193886cdce3e6553e261987647d12737cdec701ea4f9ba865366b SHA512 00100ef8ec37c1703a2bae7de811ded281c5dcf373407e22e9b359a92feac3ceefb007ed2980ad05cfcc7a698e5434e4cc7e2fc5c6ab82a3d60b679d984963c4
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index ef9ad02b96d9..41901b039ab5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -93,14 +93,17 @@ pkg_setup() {
 		~!LOCKDEP
 		~!X86_KERNEL_IBT
 		!DEBUG_MUTEXES"
+
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and optional nvidia-drm.modeset=1.
 	With 390.xx drivers, also used by a GLX workaround needed for OpenGL.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
-	If run into problems, either unset or try to pass ibt=off to the kernel."
+
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, *if* modules fail to load with ENDBR
+	errors, then try to either unset or pass ibt=off to the kernel
+	(default if no CPU support). Ignore this otherwise." # bug 911142
 
 	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
index 9236174320c5..176d15df8cfa 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
@@ -95,14 +95,16 @@ pkg_setup() {
 		~!SLUB_DEBUG_ON
 		~!X86_KERNEL_IBT
 		!DEBUG_MUTEXES"
+
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, this should be fine and is supposed
-	to be fixed but, *if* modules fail to load, then try to either unset
-	or pass ibt=off to the kernel (ignore this message otherwise)"
+
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, should be fine but *if* modules
+	fail to load with ENDBR errors, then try to either unset or pass ibt=off
+	to the kernel (default if no CPU support). Ignore this otherwise." # bug 911142
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
index 270d42f08bfc..b11185284175 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
@@ -97,16 +97,18 @@ pkg_setup() {
 		~SYSVIPC
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
-		~!X86_KERNEL_IBT
 		!DEBUG_MUTEXES"
+
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, this should be fine and is supposed
-	to be fixed but, *if* modules fail to load, then try to either unset
-	or pass ibt=off to the kernel (ignore this message otherwise)"
+
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, should be fine but *if* modules
+	fail to load with ENDBR errors, then try to either unset or pass ibt=off
+	to the kernel (default if no CPU support). Ignore this otherwise." # bug 911142
+	use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild
index 76ec64976572..8421427a0a25 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild
@@ -98,16 +98,18 @@ pkg_setup() {
 		~SYSVIPC
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
-		~!X86_KERNEL_IBT
 		!DEBUG_MUTEXES"
+
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, this should be fine and is supposed
-	to be fixed but, *if* modules fail to load, then try to either unset
-	or pass ibt=off to the kernel (ignore this message otherwise)"
+
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, should be fine but *if* modules
+	fail to load with ENDBR errors, then try to either unset or pass ibt=off
+	to the kernel (default if no CPU support). Ignore this otherwise." # bug 911142
+	use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.54.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.54.03.ebuild
deleted file mode 100644
index 66b37eefdede..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.54.03.ebuild
+++ /dev/null
@@ -1,509 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_IUSE=+modules
-inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1
-inherit systemd toolchain-funcs unpacker user-info
-
-MODULES_KERNEL_MAX=6.4
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
-	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
-REQUIRED_USE="kernel-open? ( modules )"
-
-# wrt openssl, can only use exactly :0/1.1 *or* :0/3 (prebuilt) but depend on
-# a simple >=1.1 given a || ( ) block confuses portage with subslot "rebuilds"
-# TODO: change to a hard dependency on exactly :0/3 when :0/1.1 loses relevance
-COMMON_DEPEND="
-	acct-group/video
-	sys-libs/glibc
-	>=dev-libs/openssl-1.1:=
-	X? ( x11-libs/libpciaccess )
-	persistenced? (
-		acct-user/nvpd
-		net-libs/libtirpc:=
-	)
-	tools? (
-		>=app-accessibility/at-spi2-core-2.46:2
-		dev-libs/glib:2
-		dev-libs/jansson:=
-		media-libs/harfbuzz:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,abi_x86_32(-)?]
-		x11-libs/libX11[abi_x86_32(-)?]
-		x11-libs/libXext[abi_x86_32(-)?]
-	)
-	wayland? (
-		gui-libs/egl-gbm
-		>=gui-libs/egl-wayland-1.1.10
-		media-libs/libglvnd
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
-	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
-)
-
-pkg_setup() {
-	use modules && [[ ${MERGE_TYPE} != binary ]] || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!SLUB_DEBUG_ON
-		~!X86_KERNEL_IBT
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, this should be fine and is supposed
-	to be fixed but, *if* modules fail to load, then try to either unset
-	or pass ibt=off to the kernel (ignore this message otherwise)"
-
-	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
-	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of another option that requires it such as CONFIG_KVM."
-
-	linux-mod-r1_pkg_setup
-}
-
-src_prepare() {
-	# make patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-		-i kernel{,-module-source/kernel-open}/conftest.sh || die
-
-	# adjust service files
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
-
-	# use alternative vulkan icd option if USE=-X (bug #909181)
-	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
-
-	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
-
-	# makefile attempts to install wayland library even if not built
-	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
-		nvidia-settings/src/Makefile || die
-
-	# temporary option, nvidia will remove in the future
-	use !kernel-open ||
-		sed -i '/blacklist/a\
-\
-# Enable using kernel-open with workstation GPUs (experimental)\
-options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
-}
-
-src_compile() {
-	tc-export AR CC CXX LD OBJCOPY OBJDUMP
-	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
-
-	local xnvflags=-fPIC #840389
-	# lto static libraries tend to cause problems without fat objects
-	is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
-
-	NV_ARGS=(
-		PREFIX="${EPREFIX}"/usr
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_LD="$(tc-getBUILD_LD)"
-		BUILD_GTK2LIB=
-		NV_USE_BUNDLED_LIBJANSSON=0
-		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-		WAYLAND_AVAILABLE=$(usex wayland 1 0)
-		XNVCTRL_CFLAGS="${xnvflags}"
-	)
-
-	if use modules; then
-		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
-
-		local modlistargs=video:kernel
-		if use kernel-open; then
-			modlistargs+=-module-source:kernel-module-source/kernel-open
-
-			# environment flags are normally unused for modules, but nvidia
-			# uses it for building the "blob" and it is a bit fragile
-			filter-lto
-			CC=${KERNEL_CC} CXX=${KERNEL_CXX} strip-unsupported-flags
-		fi
-
-		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
-		local modargs=(
-			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
-			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
-		)
-
-		linux-mod-r1_src_compile
-		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe
-	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
-
-	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
-		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-			emake "${NV_ARGS[@]}" -C nvidia-settings
-	elif use static-libs; then
-		# pretend GTK+3 is available, not actually used (bug #880879)
-		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
-			-C nvidia-settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-	local -A paths=(
-		[APPLICATION_PROFILE]=/usr/share/nvidia
-		[CUDA_ICD]=/etc/OpenCL/vendors
-		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-		[FIRMWARE]=/lib/firmware/nvidia/${PV}
-		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-		[OPENGL_DATA]=/usr/share/nvidia
-		[VULKAN_ICD_JSON]=/usr/share/vulkan
-		[WINE_LIB]=/usr/${libdir}/nvidia/wine
-		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-	)
-
-	local skip_files=(
-		$(usev !X "libGLX_nvidia libglxserver_nvidia")
-		$(usev !wayland libnvidia-vulkan-producer)
-		libGLX_indirect # non-glvnd unused fallback
-		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
-		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
-		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-	)
-	# TODO: hard-depend on openssl:0/3, drop this, and add pkcs11.so above
-	has_version 'dev-libs/openssl:0/3' &&
-		skip_files+=( libnvidia-pkcs11.so ) ||
-		skip_files+=( libnvidia-pkcs11-openssl3.so )
-	local skip_modules=(
-		$(usev !X "nvfbc vdpau xdriver")
-		$(usev !modules gsp)
-		installer nvpd # handled separately / built from source
-	)
-	local skip_types=(
-		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
-		OPENCL_WRAPPER.\* # virtual/opencl
-		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
-	)
-
-	local DOCS=(
-		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-	)
-	local HTML_DOCS=( html/. )
-	einstalldocs
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usev modules "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
-$(use amd64 && usev !abi_x86_32 "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For additional information or for troubleshooting issues, please see
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers and NVIDIA's own
-documentation that is installed alongside this README."
-	readme.gentoo_create_doc
-
-	if use modules; then
-		linux-mod-r1_src_install
-
-		insinto /etc/modprobe.d
-		doins "${T}"/nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-	fowners :video /usr/bin/nvidia-modprobe #505092
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	if use persistenced; then
-		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
-		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
-		systemd_dounit "${T}"/nvidia-persistenced.service
-	fi
-
-	if use tools; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-	# mimic nvidia-installer by reading .manifest to install files
-	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
-	local m into
-	while IFS=' ' read -ra m; do
-		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
-			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
-			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
-
-		case ${m[2]} in
-			MANPAGE)
-				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
-				continue
-			;;
-			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
-			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
-		esac
-
-		if [[ -v 'paths[${m[2]}]' ]]; then
-			into=${paths[${m[2]}]}
-		elif [[ ${m[2]} == EXPLICIT_PATH ]]; then
-			into=${m[3]}
-		elif [[ ${m[2]} == *_BINARY ]]; then
-			into=/opt/bin
-		elif [[ ${m[3]} == COMPAT32 ]]; then
-			use abi_x86_32 || continue
-			into=/usr/${libdir32}
-		elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then
-			into=/usr/${libdir}
-		else
-			die "No known installation path for ${m[0]}"
-		fi
-		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
-		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
-
-		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
-			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
-			dosym ${m[4]} ${into}/${m[0]}
-			continue
-		fi
-		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
-			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
-
-		printf -v m[1] %o $((m[1] | 0200)) # 444->644
-		insopts -m${m[1]}
-		insinto ${into}
-		doins ${m[0]}
-	done < .manifest || die
-	insopts -m0644 # reset
-
-	# MODULE:installer non-skipped extras
-	: "$(systemd_get_sleepdir)"
-	exeinto "${_#"${EPREFIX}"}"
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	dobin nvidia-bug-report.sh
-
-	# MODULE:powerd extras
-	if use amd64; then
-		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
-	fi
-
-	# symlink non-versioned so nvidia-settings can use it even if misdetected
-	dosym nvidia-application-profiles-${PV}-key-documentation \
-		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# don't attempt to strip firmware files (silences errors)
-	dostrip -x ${paths[FIRMWARE]}
-
-	# sandbox issues with /dev/nvidiactl (and /dev/char wrt bug #904292)
-	# are widespread and sometime affect revdeps of packages built with
-	# USE=opencl/cuda making it hard to manage in ebuilds (minimal set,
-	# ebuilds should handle manually if need others or addwrite)
-	insinto /etc/sandbox.d
-	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/char"'
-}
-
-pkg_preinst() {
-	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
-
-	use modules || return
-
-	# set video group id based on live system (bug #491414)
-	local g=$(egetent group video | cut -d: -f3)
-	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	linux-mod-r1_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		if use modules; then
-			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
-			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
-			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
-			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
-		fi
-	fi
-
-	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
-		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
-		ewarn "this may lead to system instability/freezes with this version of"
-		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
-	fi
-
-	if [[ -v NV_LEGACY_MASK ]]; then
-		ewarn
-		ewarn "***WARNING***"
-		ewarn
-		ewarn "You are installing a version of ${PN} known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
-		ewarn "are available or fully functional, may need to consider nouveau[2])."
-		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
-		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
-	fi
-
-	if use kernel-open; then
-		ewarn
-		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
-		ewarn "and only usable with Turing / Ampere and later GPUs, aka GTX 1650+."
-		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
-		ewarn
-		ewarn "Many features are not yet implemented in the drivers and limitations are"
-		ewarn "to be expected. Please do not report non-build/packaging bugs to Gentoo."
-		ewarn "Switch back to USE=-kernel-open to restore functionality if needed for now."
-	fi
-
-	if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
-		elog
-		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
-		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
-		elog "experimental but is required for wayland."
-		elog
-		elog "If you experience issues, either disable wayland or edit nvidia.conf."
-		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild
index 27398ab95124..a029fdff14f9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild
@@ -102,16 +102,18 @@ pkg_setup() {
 		~SYSVIPC
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
-		~!X86_KERNEL_IBT
 		!DEBUG_MUTEXES"
+
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, this should be fine and is supposed
-	to be fixed but, *if* modules fail to load, then try to either unset
-	or pass ibt=off to the kernel (ignore this message otherwise)"
+
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, should be fine but *if* modules
+	fail to load with ENDBR errors, then try to either unset or pass ibt=off
+	to the kernel (default if no CPU support). Ignore this otherwise." # bug 911142
+	use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764