gentoo resync : 14.04.2018

4 files changed, 37 insertions, 33 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index ce214da95b93..3415defa4f83 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 a8a80fa35a22..23f345fc1f2a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -23,7 +23,6 @@ DIST NVIDIA-FreeBSD-x86-340.106.tar.gz 60296006 BLAKE2B e980bd75b35cc17379865a0f
 DIST NVIDIA-FreeBSD-x86-375.82.tar.gz 59566154 BLAKE2B b888b08cd434899ff73f04a855b47f9416ab247f63023f742dff55e9249d20b8da07bc5cd42e6d555cd9a8ecc62c97821ae09dce1986f0ac2384a16a70c7f181 SHA512 6747bf6d6278c6ed0828c6fdcad5353e516f28384609a3f0a885966707eebb096926a876c17843bfa7626a01a6d4e0ab12c781faf9ac0291771b195c9eb13d85
 DIST NVIDIA-FreeBSD-x86-378.13.tar.gz 59610253 BLAKE2B 723b392b869dd5cc9244cfe9df371fc6df6b4ebc4c1f01082fd79b2bbd0cbf4e670cfb69511f1773d28f6fc51a8801777dd6e3066f50fc96888a9efa467e459e SHA512 a0101201089df2bbf5bdc4ded2228dd989da6a47da31c3ec8d55916b1ff3457924555f82c7381934745fdc1b1f8f78e3fc10e5089279eb13423628dbfe560c6b
 DIST NVIDIA-FreeBSD-x86-381.22.tar.gz 60112159 BLAKE2B 4a61e9a09218eb7d259f82d0a43fee313754004c8716e921b9a83a3e87fff9a291450bef5d7304b2a7ddf5750a830fb7c5cc9dab890dac4a714354265ca25034 SHA512 ffe5882051fad081854e7b7fefe86a4da55b263b2ca217664991a7e0d84ff2f22d62a37c89afd578f3c99c12be897e5db7a3d1c71c747df655af8e220eb983fa
-DIST NVIDIA-FreeBSD-x86-384.111.tar.gz 63692297 BLAKE2B ae4bb643fd46afd14bf99f2ab5ceab1caf9ceed4e26b097814055495c5611a03ba731dd221d32a94b91bc5a4336ad64009b418e7fc814f621c473f6efb68942a SHA512 901f1e0414334e27d010cbb7f7bf1deb14d72ad6eaa154ec9b03fa82c370aa982f5dc691f72ec4dca7c555c34828479064192951981134ce1b40a32b70e6d58f
 DIST NVIDIA-FreeBSD-x86-384.130.tar.gz 63719036 BLAKE2B 971006aec05f5bb8f815420f5e1a62103119ae0192a275cc4df3034c20908ebcb8d5a886e030ec06a854102a79e2b31d53c2fcbf3450cb7fa0d9e1f64eeb835f SHA512 54d6d0776190d12f2562fe0ffdf82661fb8a0a4d3d575386a19f5dd5890a7ae4d2ad6704253e7cded62a9a0e1880f1bee9e6bf3aeeb8ce7a265a3d077b0c8018
 DIST NVIDIA-FreeBSD-x86-387.34.tar.gz 64228643 BLAKE2B 80011df5d037cd0a2a6faccf6c990e6019cb85c906c1410d4dde033a8a945ecd46e80a1315e46dc05fa47003eb328c6b8e8e41e18dce60942e645c0e6b813717 SHA512 875648459a149d506b20eb7105e73086e1fb51dddfbd8b484b8cc4793682c088ba16b3d374b0e807738f7aa7489dd9eab2449f70bc9feefeec0bf3a88025b9ef
 DIST NVIDIA-FreeBSD-x86-390.42.tar.gz 64258071 BLAKE2B 765b55676127ff64d90ee65bb3d4a400b1f15f741338a09b09a926fb465b47b6d7036c6c761d64b9dee76ad4cfacb97888a3053bbe62c769cfb3155e7c13d879 SHA512 1271e3bdf55b2c03e63083b3b867fa03d4d2e71ab2a8a0100bd137acedb1fef2416045079bbccd0fc48255496128c37ab619fa5a3e7b992b9d96cf288bc6e4b0
@@ -33,15 +32,14 @@ DIST NVIDIA-FreeBSD-x86_64-340.106.tar.gz 61169129 BLAKE2B 0a8e0deb883025d20df51
 DIST NVIDIA-FreeBSD-x86_64-375.82.tar.gz 58748290 BLAKE2B 629d65b71270d1c0d94c71e4215a72f0e49bb82e68ebb93fd4b14cd56a2031674458764f4c3e2e3dec7379ec0d5ed9212c8d09a64e4361f40352e52aa9b57de5 SHA512 5e2b42ff63e06219764db8187203ce1a2c3c8b478be31fc713ef396e8f8d46def9b2631d7989866740bd0c6a81bbf5d2ed083c14cfa7171c0d993553ca6f431c
 DIST NVIDIA-FreeBSD-x86_64-378.13.tar.gz 58779963 BLAKE2B d0a165dab740b25e1d97050e4dfc9f916ae17159eb4e4b79e068a4cd6ec3e2bc146d061abb4a411847cbb0d987253f86327e67ffd6efaf725c4fa4dce27e4fa9 SHA512 34cfc383ba196ecec2cd27fc12bf30dd58f8782b73414e7b4c182e832ae0dce1f8c017afbb2101d7525d4e321f80cac49d3b578a8fc0cf88be9310f4deb77057
 DIST NVIDIA-FreeBSD-x86_64-381.22.tar.gz 59284579 BLAKE2B 45703b5658c586fe2fbfaf84a54a591a7d25e836195c47c43375b74a730c1a7aa4dd7bd17d13e7194b37d51da0f11540da1bee564e1c27351ecc6915e65012d5 SHA512 51c5a87fabe87ec7f2589ed97d97447b127ecb5fe501c60bc7c9fce74141c127f4f9bb820d2a9b34fb56db436476d0cb18a73845ab4e7ec2315d4975c8ce4e32
-DIST NVIDIA-FreeBSD-x86_64-384.111.tar.gz 62886396 BLAKE2B d92cd0b96165450599100b1985fe1844d2e5eb4ee2f560a94445c1686e9701fbb0e30dd8b7f6f6f6cf329cea335f6f8f6bd3a75c7b583599420cf415de898eb5 SHA512 320315e7817474ccb026f9edf15572b445d71076a456fec59801959535ed1f92071f372c3284327b11e82a73d0efa46bacb907ea875f631c39bfd4217c1504bf
 DIST NVIDIA-FreeBSD-x86_64-384.130.tar.gz 62901704 BLAKE2B 50be9af398f88caa012a7af702ed3d150bd4d0e5aca862dab09f30038906d79254999079983fe242dfe8158549e25f3a49ea8ad07114d8d3bcd01c8a076e8c8f SHA512 ad1a32f8268003d165570137947f517c82074b0851b86a1928f016de95f3dacef4d48f4873f00d603d49b44fe2b99d65295ed4e655d4b16f71c284994a1ea148
 DIST NVIDIA-FreeBSD-x86_64-387.34.tar.gz 63387097 BLAKE2B 53689ba098b4a4de08dca056618ea533c92d17137ec954dea0ae71e1b2c825c021979871e4ff82c820be0a78d3c365f282b760940ebe2caa1ca5bfd2453e178e SHA512 0a905ee72ee6f4e9c941e5dd1f7cddf96bfb20c6da32fd05599258e1bb154f68463d775ba8ff4f67f0d4b8e637e9ed9624fc9a4873a1f2621dc86732f0d6d70d
 DIST NVIDIA-FreeBSD-x86_64-390.42.tar.gz 63578748 BLAKE2B ebae1724c8a8125c15dff5466677b4217586a2851bd8f8e831b55e236b00bd68ba421b21da87bf8389b17f59069482276c0ef923f85d47dfb701cd6e5fda8a6b SHA512 0fde34e642fb92d099166530cdf3eb6301f11068a4780decab33c68e046aea58904f1e8fd2189900a2b140e536933de418b27a2d40e1d7e486d3df1143370007
 DIST NVIDIA-FreeBSD-x86_64-390.48.tar.gz 63583858 BLAKE2B bce8b6b7c739b5aec98ff919f3b6171d73f70179d6af6d7883b574d815e69de7bad9f0d774e4176385bee31181ff9e6ea510115aebe912909ea86bd9cc825aef SHA512 7de36ad359a0640982467fe1178f33a4694cf5f8ec8385cc01ecd6947c5e83e4d603b7b3c90cb6ad96c4e78c1af1bab99e74f70690540dab3a22f4b77cf14434
+DIST NVIDIA-FreeBSD-x86_64-396.18.tar.gz 59117684 BLAKE2B c282ccb4dcef8befa823efbcbcfe8cb5edddfbb96d38759aca62cf7e762b8ef1a013af8a38ab76440ea4ca08cb51aa3c6af4da67771fa98f62a91ada725cd813 SHA512 5c18a0ffc06d6898e7135aa568e13189160ca66ad904c42b3e0ae16a57241ea358d2e90a4307c117aea99a53c89053e6e56bbce1815b740e87b0f07ef2f7b261
 DIST NVIDIA-Linux-armv7l-gnueabihf-375.82.run 26650801 BLAKE2B 31446667065c56b48f6a3e737afe29a4517459d3462138136bffe383bc6fe514d6e80b49c391c27edc96b8abc3da3dd4d6ee3f3dca17f3c9a0f1cdf0e72cf099 SHA512 28554f1c24fe63c9257c0de3e84e4e739a45bf1c20ec7a53bc2c1b69b4e2355675061491ef5b03f3ae489cf623e553cfa68442f5536f137837327036d1c53d63
 DIST NVIDIA-Linux-armv7l-gnueabihf-378.13.run 26514235 BLAKE2B 2b3c540704496a290be7ae3f1ff378487c75af2298c12488da8b3a1814446e5df02a1ed99afd8ee7fc459d950aab472155359eae0bf56ac83389711d70638152 SHA512 253786a821df85fa926ae842114321b3c70502f887ea7c2b6790dfe3836039ee5d390e6722ca8785904ec6487e465916923d3042dc6191b3b4522c3161b80cb0
 DIST NVIDIA-Linux-armv7l-gnueabihf-381.22.run 26815484 BLAKE2B e5f0241b07d1e54edea2025dd30061d1018c68cc2c7136c507eb894bbad5be3d0724494e2b9f33d1f8f60da4904999bbb964e6f2e78d045d7cd86bcd46b7f6d0 SHA512 934cda37c7aed26243b5b661122e1c060de5b4df890aaf2295b6650dddea37cb4f0e3f0bebddb00b5d687b66ab5e028a203195c4d4ad3379593babda42febe77
-DIST NVIDIA-Linux-armv7l-gnueabihf-384.111.run 28892959 BLAKE2B 7cd07fe8fda8b98b7ee7841a0ecad51f0a90ace332fb5ebd4dbf7fc04e47b627fe005712fe19b05e0e7eb5208d2cf413a87ed69330e8bd9a6f87ac41f6919dc4 SHA512 af1d29c3aa6aad8c64d698ca2a725d267e7ff299d683e5307c82e7306834ce1716084c492d2604db0e5d33ba4228fbf85e5f6275bedfb17980e33b6318cb06c9
 DIST NVIDIA-Linux-armv7l-gnueabihf-384.130.run 28899034 BLAKE2B 4f104243e87d0688d5f234bcadeb501914394ca5ae29c0f7ca7ae8038982c7df14652a1b85fb62a3466a6d4f7cda95c9726367bfd8ab1bf0b73f3fa617418276 SHA512 bd7be99881295f4ddf92b8c6791c4315c7b8699cdd346247dd54dfeb48ee61a40597483379922f5e3d0b28c9b9b9e75dca91c535e4695ebe57734c26f1484f61
 DIST NVIDIA-Linux-armv7l-gnueabihf-387.34.run 29406773 BLAKE2B af27fb1bfa8e432c83220f88c57219d572dfab2d3624c8702759a747f25ff962dba7c39028af5746e04c913c9a53dfbec8a46801bfa7e38df65a8823c4858cca SHA512 cb631dc3b851d84881dfcabee776c68a935853d03f21595acfea84a3efbc85276070f9d0958c0bcced1e66f42f25ecf3fd7d615c715274130ca24426da678c2e
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.42.run 28680665 BLAKE2B 41ddd2870a6ac128b4988e724481fc43d1df902a6f87438170b39f299ab190e0facf61a53c9322f1f1ea3b9386b0df88c59beb600e44056c1c1217668f9bc9e1 SHA512 7c5ca46cce345d53f0991b6076ee62a2e777e5cb2b5b2612eaec88fb0d4f53e66d88b4978dfb15f23a80af57f1834dd9016daeb1d3b329cee1f4e0777afb5979
@@ -51,7 +49,6 @@ DIST NVIDIA-Linux-x86-340.106.run 38816967 BLAKE2B b3ab5613359b43eaace36de9a8ab7
 DIST NVIDIA-Linux-x86-375.82.run 44633335 BLAKE2B 55392ba748108b47994bf272829a6476dfc23f7756e0c18d56c8e4d827968196ee70e521c2e6307c134ca0c85d59715db777583fb07c8e06ae7325d586a8117b SHA512 cbd6edd7490e0e5ef9dd2020c18eb5f75412993e06b9c4f1919f49a8ffdc36131a96d868ab51691fb5c4a661e826b000ec93363c9b168304f6498014e300bf24
 DIST NVIDIA-Linux-x86-378.13.run 44397547 BLAKE2B 5b45bdceba75e214028b9f59a3655482ac1ac2b51cc0a6ea22927e5143b47c670db7078ed898e04663feb9fd495165954c90df5ee3afca00155dcc2ae6a97dc8 SHA512 b96d2558a1003a3c66cade3a1e16abd34d855c0e27cdebacdc0495e0ba3cd5c68bb84cc5f81bff1b9ddce36ac52e0dc125c56d868b77d7c8e2f606d559b13b4a
 DIST NVIDIA-Linux-x86-381.22.run 42931990 BLAKE2B cf1ae154854860557bf3e4a50216f1373ff66a45535e7beec67392b1cd1d40a02d758fa3e1cfa0462145b912430b0d1a3b6de3e6d6ede8aa1f484ea0ab46f816 SHA512 15723bfa25b0f39224ad5098c784a292abe4bf1daafaeb2f1df910bbab466e666b848b12e50b0bdd45f83e2d81957425a63501550b3dc5eb8fe3e576a8a10d22
-DIST NVIDIA-Linux-x86-384.111.run 46999570 BLAKE2B bb2439fb12400e13a65f9dd3712f1a9030bf46fedc070aed0cda77365c62a06376604821adc53e6ea69ebf357f5243e7307d46a8ae14c0d8ef289f87e655f88f SHA512 59acc24ec534f69972604828231895df10cbd46951762ded6f0a1b11c8d0ce3c6fb82a60197dd04389bf6e27fcc45f80fd91a72acefb8ccf9d622a910ccfb736
 DIST NVIDIA-Linux-x86-384.130.run 47539521 BLAKE2B d0b84aa6e0a41d7202cce247a419adad5c94d0d98feb83594644d8e0a9426d0c07a5b5889297bc830c7456a4e8cc165a3b23c004e83cabad1000bf5a6e1a147a SHA512 0ed01818606eb7309811a3cb0ae71e9906e318d579dfd85bafcbae498a27f801836c1f1eefee6791ec5d9c6a4c41d244c43b8329583ae4991b45171cac99638d
 DIST NVIDIA-Linux-x86-387.34.run 47797853 BLAKE2B 4ae211ee00e09fe385f24e05cfac3af28447ec18e7a7f53e7f310c210ec22f60094be087aae45d0ea99c90214a07d3c46ce6867984ac0ff6e56559693fcdf148 SHA512 ba9362123a75f85a0a5a9dcc95c06bcb350a8dff2db864db30a73172db44006fa39eee8e23cf959ab2012b61b922d1f0d7ab225329815737819f27d1be300b95
 DIST NVIDIA-Linux-x86-390.42.run 47248228 BLAKE2B 1a9ca86c8e449627d68e474f0c4226d55839b27d06c630a059f1a36007b37328b7be2ecf12a94b82722e088b387ef943c4e117fd1a35743b053959160950e7a7 SHA512 079cfae9ce318e30d8699c7a1e9b8fc528382be68605ceea16b5cb671d11588098af001b6cb4c66c904a248193742efc450e18101f9dda73c1ca101ab8aca2ce
@@ -61,29 +58,29 @@ DIST NVIDIA-Linux-x86_64-340.106.run 69987642 BLAKE2B 9b5644a58169557bda2ca6b367
 DIST NVIDIA-Linux-x86_64-375.82.run 77461911 BLAKE2B e7f32bdf1672d98a1fe98c82d80a08dd6f63b3c859df4c60124977dae19520a21e4239ff7be6c272243d4af9416320b5e166d8f100979daa0d005ea2a44fc16d SHA512 6da63b807d6dd7cc8ac2b794d5c9ab8383e3c0ce6a47adc600941545509fb40b5f06344781afc895bd83f2780b2bce187994df5684db2890f50b41adfee8f910
 DIST NVIDIA-Linux-x86_64-378.13.run 76239469 BLAKE2B 0f2be330645f8d9d2828fa6d159f9e41ef09bb32805f94cf3fa255f088a8c6f4c25add584787bd1ed64756ef75821f7143c14330718cc5f5ac3cbcf8b7c3bae4 SHA512 2f6789aa0a400c035c0a074631dc5c26abb4f8a62efe928ca3a2865b89d29acfc09c27f23a664e438275e4bfd25c261745d4d495f9aca5f54ee6c53a389059d2
 DIST NVIDIA-Linux-x86_64-381.22.run 76581130 BLAKE2B fdb5912a775b56edf7dd784b640997fe683d0a32d57db6079dc5466a1a8dc1354cd31ff86aa1e993e0a33163e4c18f6a7aa990e334448ad069db3a5ffc4f1ffa SHA512 669a3dd0896d68ba8eef4689b01971b92ec1c54e6cf2a9ff8d3f281ae9f2fe402f079e76109b65e698d76798bcc7a9bb43da9d128fec59ac1fafafd1c4a1e42c
-DIST NVIDIA-Linux-x86_64-384.111.run 81005322 BLAKE2B f3359ee60d11e823981583669ed598f4dfb549c0cc208e34671af81ad4f88eb23581d86309442a5c6aa1f83a0fb9dc7376c171b7d09ef42ee3d26e67c6350f44 SHA512 ddfe787a37f2a0e5409b302b13da16bd32a4a018958aa6f3b046eae7bf06d140f8d8f496e04726c57057139ebfce40811240b13d6a4ac6412655af6b257a0c5e
 DIST NVIDIA-Linux-x86_64-384.130.run 82260837 BLAKE2B 55b6f3627680c881821f5d20f05cb6c7941b1deebf28f22f6712cac73d07e6202507c9f3b98eb8fc59ca8ed0c6aaa4819db5fc5a331f4505887dac6f31774335 SHA512 301fa7d9d73a0654e0090bf4bae98896388c1f52453f1b886e320e36765dc529f802c509a2d518714f2b348df59f9c9048e01b3874819bde4f53cf98aaa2cfff
 DIST NVIDIA-Linux-x86_64-387.34.run 82784271 BLAKE2B b7140d5d6a693892df50b3ad2e20387673dec6b5ac609cc0300bdc4b4a93ca94849255699126e4d55e67f10e488bfe6008e987197ea239b1a1b643b4ae5c7808 SHA512 6742768f1258a028c9ba56ad1d72f27d7eea4b6bfd324ba29c7f057ab5819816bd728aeaf2a8058031dadcd4c51bc6d08f0e0e0e26c68ed57955e90d68ac5a4b
 DIST NVIDIA-Linux-x86_64-390.42.run 81836210 BLAKE2B a72c581b3aadb234d8e5230fb8d1a4cdbb03aa43434320e6cb3ef7b409dcc299d64b21b7c822736760fc12193da2d603009b8353312573b2b2a16311a88fc96b SHA512 6cbf02630ac79a5cbb37f442f4def2a196b4a9d2a3600b0f5cdc3c148dd59d07994a2cee2efe0ac4139b6543698331c07f015c37b391d4f00acab7b2f033ad18
 DIST NVIDIA-Linux-x86_64-390.48.run 81341723 BLAKE2B 0b787e7f667bf1edb6e5c4c1bfc7c6bea2546208148f84f044c405a857bdbee5c8fbeb4ce325375acf32b4d27d8a10c7f18fbcd880afe1e1e06f31997642c092 SHA512 47f4bcc0d88d1e80ed0c03cacde96301b1c657bec88935ee2edf9b96726620f70c747a174f1a8725b56f4812961878c01df02c249ac4810dc4aedf62d1152a7f
+DIST NVIDIA-Linux-x86_64-396.18.run 85182255 BLAKE2B 41563a57c9f88ec24120eee3da9ec6b2648fb91effaa43d63d0b5b5622f8d62250edf921e91259bade04a65edc5ba21f052960fff100c69cfd4f558c8dc26aca SHA512 6c48284b51a20192c92175418a7ddde682af4413d1aee5da1eeeaa683d67c94aaedbb046ea2e43688cd8f6e1675457f89f2a29f4fce4c2f04d5584d435a3f083
 DIST nvidia-settings-304.137.tar.bz2 1481361 BLAKE2B cf52a55a34eeb03a685a683487af6a198ba467dd8ba9983cc75624a37a226373cd931d98e8448b7b8ed430c54be2118c7b240ed2a9100b19bec5e832e2f6cdad SHA512 676d1f70c9a78ee234f5f1a283412430a386fa604de211afba02806a45906c5e246a002989b724d74752178d28c92a268de1c98d4c87876797d991253f16b0cc
 DIST nvidia-settings-340.106.tar.bz2 1549841 BLAKE2B 3419467424bc05a4a36f588e326eac4214250686f54c6c440c9a46bab80b15dee77e65d5880ed4338c0fc421306844d20a4dda0d5151a8d49441ef5048ab9bf6 SHA512 670f8469d5127f0966794ed822492f16f7a84656530d0b96f1ccdc915e6c588e9f1417b7ce1cc741df256383292820affaa10784ab748575f4adf2f98f961a27
 DIST nvidia-settings-375.82.tar.gz 2114647 BLAKE2B 26413fde8397e748fae362984039286c53a7fe104228452f3188b5e77b084ff4bf00131e77359ff5e92dfc325680c1f662950175cf806403d2a524ba86158f51 SHA512 7a374be56c8be52767d73a048029d9e55dc2abcf2f6a97eb4931544c927c85a1103a206be9e8d1ffcef36fec2caf2416f33699ad4d51e7dca17e4e844c37a595
 DIST nvidia-settings-378.13.tar.gz 2112676 BLAKE2B 7e3e7c20986c184ddb08808706902f332451df1ab5b0cc295de70c6c26706b067ba6ef96c4e4a68c935ee704ed031cb829c25aa325c6dd2f1ed0423cf5c1aec5 SHA512 6f5fda9c54b067e21f2c869bcfb7c799c99f584d769020cb15e8764f59183e6a6469919ec48bce47be2144910d0004a9ca221df4a9e4fa9ab9f18710b36fa420
 DIST nvidia-settings-381.22.tar.gz 2127491 BLAKE2B 7721ed9df7c01671a56a720e75768c80debe8520aed5a838e1e1d365651db2ae42b0cd21801c60aa18944f8d4751fadac206a388f1cf107a03a25ccb8aeb5c5f SHA512 79cd41b9c0e63b69574caddb62437132810ecb4cd07b90899976ae8535948f28d72021fc9a6969559909cf0f7a5d411b0202782970d64a82c636e7738c9d5681
-DIST nvidia-settings-384.111.tar.bz2 1631841 BLAKE2B 32c102c77234d3c9ad84ac6d343e01230747e824ee7f627f3638543aa6e37a3e652fb6d654b4bd39715d23c2b1b4da0a9f611920cddd893e34d8093ea4b3c3cf SHA512 4e0672858a13e22a4806b135db8c450a01bf2dd401f102837dd1a43496e38a2b4cbd518ce551fa549810a1b8959668b4f7aaa0f71302302501f226902e262c6d
 DIST nvidia-settings-384.130.tar.bz2 1633217 BLAKE2B ffc1381e680e94aee95752074c39163e48082615f92c6184c01fc7d21e20bf18308d30960db0db602baf89b34fdd295a715692446d21fb2491056ec707e8b844 SHA512 3d878552a78234347f4e51920e8358e56b42d595375e8fd2b0520c3495b02d6fc3877d4346354145c420acd79ff1e9607c312330b2a2e27781a3a576f8860939
 DIST nvidia-settings-387.34.tar.gz 1267616 BLAKE2B 62d2fd329417f54bf384918889603921065e0ef6d4fb691e914534a75ab0062a17d8f886c593cf772d29bb6b56ce30aaf7b1548191b2f9ad5fbee71770ed5308 SHA512 559c859c0740575ab93edce013587250b98d7d2cd55198b5103fe97423d31ed9f113d83c240c402404de88074c285a07e46342538610d3d5dade7bed59d60090
 DIST nvidia-settings-390.42.tar.bz2 1109291 BLAKE2B 34eb3712286c5dccf268cc478a90f37d0fe41a32d39226973c913bb50f1f9d4943f7c49c5b3d3a5f4726209f1b6ec0a6b0a8df25a33155c4fce1b71f563b06be SHA512 5907aa76cbcd136593c0b517c0a6c08764d9b14a90fa0951278fdbaa6c44c8d3149a902bace1f8203ba621af376030bcf7c51f3579edb1cb3152a97eb443134a
 DIST nvidia-settings-390.48.tar.bz2 1109673 BLAKE2B 5aae2556185cc3a1fdb0f0bf051108661c53868a41d38b46223e4e63447c57971bc565059f107e8a4474356bffecce359966621f463d529c6fc59b5d6706cf26 SHA512 8252f5258e0a3533645d78b8be6c08c5362421423bf4c8e648a4c11ecc1ea2ab56eca07e51e5064dcfa1e4d61b64f837728091bf3ce244526baef58eaf20f1b9
+DIST nvidia-settings-396.18.tar.bz2 1115898 BLAKE2B c4668b1198549c8963369cae3df041e3e9cf205b955e1d72209d03766e9296c74d446ebd933af27ab3e127eaac53b5e314697ccdc9d7d7d351f15703b3aec501 SHA512 78e3725e5348041ec1813459ea21affab597d8e1ac3148e4833568f0e55d65e156e8a63b7ed7c4227d68a0fa97288d951ce2d0b0b580d2b427309b1787990466
 EBUILD nvidia-drivers-304.137.ebuild 13647 BLAKE2B ff0bc9bc9d98a5f38ebd791c696291d6c88d0e10ab68509c73ae7b9e1f8b3188027627dd02b99329b551c77819a4bf2d77625762d6ff2bbe25c3bbe14afdd0e5 SHA512 617d92a8eca878b7a69b7bedead069b672d827c48e7531da49d985a913d4295039d8f5d9e2566c9ee9192cc5191bd3c70400310ea682b71c479df6082692e70c
 EBUILD nvidia-drivers-340.106.ebuild 14791 BLAKE2B cbe7e324b524cd4ab712ab62f71790b8e79094775a406338678a10a639b39430643f36b130d13d93a17bc5304b5b8d7a728cc510e6c9bd88acf4a4c62e8d4734 SHA512 719ba37fc9ca738aa84718071266a90efd3186a66898cf3b0c695f180927d8ca876bec817916e3476c82b49718f5cceeb6c0b1dd6c95c20ae66e40ef0d27dbcf
 EBUILD nvidia-drivers-375.82.ebuild 15848 BLAKE2B f89ad536d15a0df282744c7c26c995dc1d94b8af60e2a7fe3d40a06134526b8eba96c06ae999ae55efca4a21655893a4e53498d0f729f1b35affe891b81438cb SHA512 4778befb48304ed07f9e47174eaf0e519dcdc261906151246e54f3fb8383c5fb5c45b45e42165d69523057007ab44a9c7b400a907ddd167dfdd29dc422995f93
 EBUILD nvidia-drivers-378.13-r1.ebuild 15877 BLAKE2B 91ea0f5d3bf4c9a21ebd082456ffd0cd288531775afaefad6df7d17cc857a435f4c2ef54d349accdbe27a7a32672e2bdc73df8557d5b7f4adfd57601a1b45629 SHA512 ef457a07ff7188c4f0980e62e73f736f0bb41fd33184cb09161245f6f2b9d42f5923e106673207683c1c713b50396c750d22757bf0d0a6cfb02ae8488f644c3b
 EBUILD nvidia-drivers-381.22-r1.ebuild 15903 BLAKE2B 5801973844001f824db6e85d379a8567b879d6ff82ade650142049ee993952d17750ce4ff473ded81695e4ffa59b6ac71c9cabe7cd8c20b1e5e4976eeaa3981d SHA512 8c08570ac6487367948ff166e26a2ce9f1ff8d8f808fff6c0cba2780886f69de538e09699ec05974e98b99137dd3eb68ba47b6a875a356d09453ad61a25c9d3d
-EBUILD nvidia-drivers-384.111.ebuild 16057 BLAKE2B d3efa622963a9c6f9461c247917b66d52f87bd8a2623d5a42dd42d292f7fd3ee1f71f83caba6cc5da31d58aa7b485e7d40a8079c1cf9912c519424589f16a779 SHA512 6df8cb1f1d6bf7b3b4318ac9386b8c4ea662fa5891cee87b83f698fc73d088b30161076e4014a1ef892be29300b4645aaddc576cde710d1c4faebbda5552fa07
-EBUILD nvidia-drivers-384.130.ebuild 16124 BLAKE2B 5c4b961b6626f39e4341fe820172eb4e58372dc809bc5a8e64f6c5fddb8a8079836034df9a3d87112287d42ed0d81b15ce7152ce0cbe432c8427ccffe45ec951 SHA512 9ba1103b36f92dca7c08d6c1544bdc5425989ed4d6b115d0625ff2f57ee4cb63e11e11cd29c065d79db7e5b80903fc6261c36d06c2396c9c42dc8c356467480e
+EBUILD nvidia-drivers-384.130.ebuild 16122 BLAKE2B 24a59ab053d40caa6bace34cf34c4db8917a84b0e87efb463a9651d2d152dc497e8170421574a6be9b482a4af622c2e876c342921350ddf860d4c739fb87e15e SHA512 0820948df0d87a780bf9b281f89ac6413b259239ca1d476908e77aac60552171417a0a83d4233ba162dd72b7bb0ebe584a0e534308023eedb0855bba72606992
 EBUILD nvidia-drivers-387.34.ebuild 16295 BLAKE2B 0e6e77ed5654425bf03e358d5d8c539dd302d8ea1566f2ccd0604818dae31825127779a1bc735b28ab994db0e947afa32985f145c793bfc5a4f00b4bfafeb484 SHA512 15e1fc883e77bebf8e4642dbb3575f2a5f016083624491bd3b4b047d6fd02d5cc4c6987529819f19dbfc3dd741bcf73dc1a6143c7ea5fd64aa8429aefc97b8cb
 EBUILD nvidia-drivers-390.42.ebuild 16294 BLAKE2B f382b9931bd1713c2ccdb8b13cf3c29d0141c56963b4e77be149dc756805f5fa48add582b0046a4fa0d1518aca9da7dfe1fa43c1c59df73280c40feaacf00d07 SHA512 b2eb4c69a145747b196eae24bb7666284ac2117d0a2dcfe875ac90e4eb677c57be1e573089f00e3defe266d13be3e74a2d7a2c7a7fae4aa24355f654b7fc43da
 EBUILD nvidia-drivers-390.48.ebuild 16295 BLAKE2B dd1034da5571b9394ac1aae26d232ac16023558c01537924c58ba230456c472e41e7c3408cf2f65cefe7f0391bcfeaaf4995b78cf8df728c6f18830eb2c1ce90 SHA512 3d9811373b44054e8404450c1117279dd07b6176d988704d40fe869ff55fdedb478a140035a6b4527a7b1835df784ce35ad0b014ba59b9ba337f65adf5991e3a
+EBUILD nvidia-drivers-396.18-r1.ebuild 16128 BLAKE2B 91c34fc1663e605a4847b64e55df47b9d908ed20b5752eb8be508fe13342c5f893298dd75035b57eebfd1e9b2ec2f12d88b69bb484cac36b3561c1aba6222efe SHA512 861802e81439dc58520e4725c94b35316164528b42c5b6b7b57f4f20c183a4275df6b29ccb46a2a8a180a3f2404e2a65889699f0a2ebb33618c6321901502292
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-384.130.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-384.130.ebuild
index bc0b31a4f6c6..faeaa5a85ff1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-384.130.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-384.130.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-384.111.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.18-r1.ebuild
index 93691a0315cc..a262278534c0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-384.111.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-396.18-r1.ebuild
@@ -5,21 +5,19 @@ EAPI=6
 inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
 	portability toolchain-funcs unpacker user udev
 
-NV_URI="http://http.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
 ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
 X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+NV_URI="http://us.download.nvidia.com/XFree86/"
 SRC_URI="
 	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
 	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	arm? ( ${NV_URI}Linux-32bit-ARM/${PV}/${ARM_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
 	tools? (
 		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
 	)
@@ -27,7 +25,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* ~amd64 ~amd64-fbsd"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
@@ -80,9 +78,7 @@ RDEPEND="
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)
 "
-
 QA_PREBUILT="opt/* usr/lib*"
-
 S=${WORKDIR}/
 
 nvidia_drivers_versions_check() {
@@ -92,11 +88,11 @@ nvidia_drivers_versions_check() {
 		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
 	fi
 
-	if use kernel_linux && kernel_is ge 4 15; then
+	if use kernel_linux && kernel_is ge 4 16; then
 		ewarn "Gentoo supports kernels which are supported by NVIDIA"
 		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.15"
-		ewarn "<sys-kernel/vanilla-sources-4.15"
+		ewarn "<sys-kernel/gentoo-sources-4.16"
+		ewarn "<sys-kernel/vanilla-sources-4.16"
 		ewarn ""
 		ewarn "You are free to utilize epatch_user to provide whatever"
 		ewarn "support you feel is appropriate, but will not receive"
@@ -190,8 +186,15 @@ src_prepare() {
 		gunzip $man_file || die
 	done
 
-	# Allow user patches so they can support RC kernels and whatever else
-	eapply_user
+	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
+	fi
+
+	default
 
 	if ! [ -f nvidia_icd.json ]; then
 		cp nvidia_icd.json.template nvidia_icd.json || die
@@ -216,21 +219,24 @@ src_compile() {
 		emake -C "${S}"/nvidia-settings-${PV}/src \
 			AR="$(tc-getAR)" \
 			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			LD="$(tc-getCC)" \
 			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
 			NV_VERBOSE=1 \
 			RANLIB="$(tc-getRANLIB)" \
-			DO_STRIP= \
 			build-xnvctrl
 
 		emake -C "${S}"/nvidia-settings-${PV}/src \
 			CC="$(tc-getCC)" \
+			DO_STRIP= \
 			GTK3_AVAILABLE=$(usex gtk3 1 0) \
 			LD="$(tc-getCC)" \
 			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
 			NVML_ENABLED=0 \
 			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			DO_STRIP=
+			NV_VERBOSE=1
 	fi
 }
 
@@ -454,12 +460,12 @@ src_install-libs() {
 
 	if use X; then
 		NV_GLX_LIBRARIES=(
-			"libEGL.so.$(usex compat ${NV_SOVER} 1) ${GL_ROOT}"
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
 			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1 ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
 			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2 ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
 			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
 			"libGLX.so.0 ${GL_ROOT}"
 			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
@@ -475,6 +481,7 @@ src_install-libs() {
 			"libnvidia-fbc.so.${NV_SOVER}"
 			"libnvidia-glcore.so.${NV_SOVER}"
 			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
 			"libnvidia-ifr.so.${NV_SOVER}"
 			"libnvidia-opencl.so.${NV_SOVER}"
 			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
@@ -484,7 +491,7 @@ src_install-libs() {
 		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
 		then
 			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.0.1"
+				"libnvidia-egl-wayland.so.1.0.3"
 			)
 		fi