gentoo resync : 13.10.2019

5 files changed, 8 insertions, 25 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 5b66c0eaff79..dce0c689f221 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -16,10 +16,6 @@ DIST NVIDIA-FreeBSD-x86-340.107.tar.gz 60305952 BLAKE2B b634bfd610653f1c546b68e8
 DIST NVIDIA-FreeBSD-x86-390.129.tar.gz 64565178 BLAKE2B d21aed3fffec9c0ed8618021594f7719c98928e4d916e1e668c03089beb9dd1deeebd7cdc9a594fee3d3d7f3eff3f6ef2cab7b6f61b25448bccb6e7339e6c025 SHA512 757761386ea57adb3377a8c3aa6aa3f572935bf5fd2b1cd0c66739d3bcb4535d7ae5d55f9e3790dee43e7567c773a8933738aabaf5d912ef6b392c2e7206cfa4
 DIST NVIDIA-FreeBSD-x86_64-340.107.tar.gz 61179967 BLAKE2B c12c7c07c090fd7bca78a30082890d0b0330dde07ce9beacdb94fad97d40e9ff9e1413fc36fd94116821137e74076d99a82ab85ecd0a8e16d52b47abeb747802 SHA512 661a4cc79a0adc9a1abebfb3567c26e69628266794b5b539c112112a0989760ea1ea2d8c35a5fe7539b579d4e9cef2685e3e1d12fc7031cd6d1b743c23eadc52
 DIST NVIDIA-FreeBSD-x86_64-390.129.tar.gz 63905694 BLAKE2B 7cde21e5b4a63dcf91b103c209222a9715de02e032501ace2bc9897230178a750d523eca4798041f4813b174ab3c7700818a09bdbafe62f217495ce6b4c465e5 SHA512 7485c9807e7d1684e3394a88f1129726fd1c97920e5a033b0c428f8f72daa87c6d210c17fdec0947f786ccaa633e14c8f6b2cc39083087e9989df8621b66918d
-<<<<<<< HEAD
-DIST NVIDIA-FreeBSD-x86_64-430.40.tar.gz 62712042 BLAKE2B 6791f5931c715888dc76a0e4d2d28deecce24fc7ab989eba6def0369c3f30ccb680dbc792a0a9c3df9194c21286612c9a02f3130e0db53e06a2071f7b3662097 SHA512 a8fd481bafaff2a5aa68a4b1bc57bed80eb794c2d2a35d26546e113610276d0aec79116fb31bd34283da9fae559eef6357e5639baf8a5ced63eb8af6c26fc7bc
-=======
->>>>>>> next
 DIST NVIDIA-FreeBSD-x86_64-430.50.tar.gz 62715888 BLAKE2B 8bb22ccf23054f5dae16f63775492a141ea69c540018a9f4dee358d6cb022d2ab8b7c32acc03f9632d9797b6eeeb6b5e76240b857906db28835240bcf8cede19 SHA512 c028262d67e3962ecce616d68e6d45c0ce8e3d1b38695c18b9b1d08506f848954a59831d99fa414fc09408134d0730e40766d74ac462cf322006b22c14a2124a
 DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.129.run 29102893 BLAKE2B 19f73b7ac4df7d0584f180492676eba65a42c527566175308ebb78bd10e0a43c3f300f013193cafc9eccf1cb32a58f8d6dc574073d4197d2d71d90f224e6a5c4 SHA512 9e7a10e0bbd856a7a630fb8d1660a3e5cd224a04243989dbd24f3cc2e869a817a1fabe98b4257e9e5870a96f8d6dbcf51312c960a4a185457cb011ac9a0246fc
@@ -27,27 +23,14 @@ DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 2632c8f257d0cf7c5b9294eb2c0b7
 DIST NVIDIA-Linux-x86-390.129.run 47560033 BLAKE2B e9b34c51d63dada2714c74cdb4ab199a141b1f5dd9f0d3222b1f5eec6a6a07dd2fdc2a609b9d0683b99c26078f4426082ea25b663c47f33fff4bb84599ac41e2 SHA512 b31d8f6b663fa7da1291fc25b4b08e17019476da521baea41201410a1d8a803b8ac9bad18485ff53589cea281ae4ece749118fa23a63e2c0720aafc60367255f
 DIST NVIDIA-Linux-x86_64-340.107.run 70233686 BLAKE2B 821a2672dcc3b546fbb3f826230fb06741503d75b06f72cb407dd3c9de4f2cbd150bff34e554dca8aa86e7f6bf64ce4f7f9b52976799a477c6c2659aaa5bb4d3 SHA512 51df9370526732db099a8a925d35cdf1317ae2b0ab2c130eaf82373f25186165b4af7d44f71e51e2a68f7d07c7ae3f441a6c6c4be8467003b15dc770c4f4e89b
 DIST NVIDIA-Linux-x86_64-390.129.run 82314424 BLAKE2B 46e648f413ac2b62dfa02ef63d4fafd87cf71e3c6035435a727a9079a545277efd57865f0a42cd6ea29f74b29955985f0f32e8ade4d5bb0a9cd5de663f2e3f2a SHA512 79e53177f8feb9480215e0bcc6a30896f70e39f55f81879eeb4539492c01ce55471d27ccb9af49040b96946836d387ff8c71d25d06f6b13bdb626b44ac7d4777
-<<<<<<< HEAD
-DIST NVIDIA-Linux-x86_64-430.40.run 111258448 BLAKE2B 9782181d5044430b374305fc868dd753d0f27c3b2f1f6b4bd34b3a49226730c4cf34b1ea4f3ba2c4fce5739c0408c64cc79f1a2c5a312ff3e09a5d20a79ce625 SHA512 68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b
-=======
->>>>>>> next
 DIST NVIDIA-Linux-x86_64-430.50.run 110545029 BLAKE2B 01c87f7b1b71146e04d1310431227d125904e0475c7e9656fa2aea598b95952fed083024277607a5a06c6c6bf93df4e0a89051cf887f28c902c3d409c98fa807 SHA512 ccc70fc717e53365e340bc210d8817939eb2d798608190144a9a1d690d04eb140f0d01a85a427bf2223b6d12848177e2ab94cdb3902f5117950638dc1ef28fa2
 DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
 DIST nvidia-settings-390.129.tar.bz2 1109456 BLAKE2B cdce0bba52697e214ea26514467ea6f61fa06429f0a58ca549b74d8da1f7b07cbc52b1c9de6a13aed77545c2ba8c98b212a7865fdc5026dcd74f5565b73c4e1e SHA512 bf004608fbee6a12521fbcd9ab4e3d0333896b320c943ed9f2dc5373d8ffb2eb9cb4c6873a263acac87a9ab67a5f4589344d2bbd70bce36cf14242f4d57e1b87
-<<<<<<< HEAD
-DIST nvidia-settings-430.40.tar.bz2 1131627 BLAKE2B da55a08d3a4d096afe5aec5fc7faf36b10d814cf135a444f06a115b225d94fe20046a266e6afee3660b588561c4fadb1581e6f9ab9196fe19eb171140f05ba9c SHA512 9273887c2487476fc004839320b66726a766b0378dfd81d030386918d67e6a25ec6b26bed1db5c07634347e8cd6782f826c75e9ba8977b06e37880e4b55a1b9f
-=======
->>>>>>> next
 DIST nvidia-settings-430.50.tar.bz2 1132111 BLAKE2B 3b95957f8737ebefb14d01db03929835dc0b58ba4c539f153a5d0278bf11f3b10b189cd529f7e65fac339a2660c2aac1df16e79b61bd13749ffdd0a17db6792f SHA512 02dd870021333825da8eff3b27c3414a8c4f6e0af14a07ffe1616466e80338daf33d6085d23690d71898b2219ca0f83ebbabbe176b40909ac7556b8a0184eaf1
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
-EBUILD nvidia-drivers-340.107-r1.ebuild 14337 BLAKE2B 9d69d838adcbb2bcc20d69ae60156cb99baa4b5030c9f895def311f561b1fe8066936aa9d4fe7863e55077fdc00a7d136e51c463edb4472431e15d046f77f118 SHA512 ff1bd377e6eef99415eb245a1027ad6c2645edaa8a341305884147d36a7d0347c40baa5053bb807237d28c6ce25d8d130f3f00e062333f3c1397e97ccf8cc46c
-EBUILD nvidia-drivers-390.129.ebuild 16279 BLAKE2B da4b18fb4d5b176e1f05b657f84630061ca4464d6722cee61cf4dc2714278e69c70f41c072c927eef48170957c8de3de086cf314bac83db64b1669658c7c6c50 SHA512 465df3c846024ed3a54d2d93d0189ba249ced3611479bf4b8b2ee3693887a9c00c247874e7aad61894ec7479d89e0877d6008c9e5cababbe367be1586ba3a7d7
-<<<<<<< HEAD
-EBUILD nvidia-drivers-430.40.ebuild 15841 BLAKE2B 1b18946c96999a975c1356f14b14be1c89b92ef218291553fe893fbc84eba4c8e3faf739f291a06433adbd0fbbe0a0957d1d46bbd265b5a53486a03fc1ffc332 SHA512 092c0b41af44315f149074c089c660b022a7851c7bab17add8aeb588da6e9e4fb975fe6e60554c8c3fce3bf0e9eab6bbcc675c35463ec939a0717f0b5867f9b7
-EBUILD nvidia-drivers-430.50.ebuild 15842 BLAKE2B 45fc74905d0e757ca6d631bb748576941cd2d2d91e5e9653d8092b911a7a5b54ebae52db87215eed6d2159af8092ff15db28f16b450e9d1a008eabdea4994a2d SHA512 5da8a3ed34a9cbf73f70a50dc3db20e329ce970d9a1e4c569bf81fd94f215bc8ced14aa404f6296209880f98ac15c2878db89284f1e467e3c171486658d7ce94
-=======
-EBUILD nvidia-drivers-430.50.ebuild 15841 BLAKE2B d5c9a30a84e3c183625e84ebb08efe2f251af843171f63acf69cb097a2fc64479f5adee7639c0331c7813fe1483e44e1edb114fa13a2d9aa016257f2566df743 SHA512 1d05a9f257aa8f04e8965189d6b5e0cff743fefde7516dd775009048adeda8bf50a7f8144a9e611b203333c693f797012b4977c454f879d2d2340664b50fd283
->>>>>>> next
-EBUILD nvidia-drivers-435.21.ebuild 16199 BLAKE2B 522a60cf101b0f9f6b41674fce0402e7d29dd64439ee3b28e5fabf7b67426ee14f6e95c328c09b7a16b0510fe4edaeabc9de83edd98dde88708e919c7d90ad0e SHA512 2d152d463af1e0a1629969cd502f534fa789b86d51516986ee4661926521db7028fa63f5b9ab8e7bef858ffc38da8511c8e5c0d933015e3001a6c89b60a5282e
+EBUILD nvidia-drivers-340.107-r1.ebuild 14315 BLAKE2B d87704e57b0a9a430cbe69fcc5efcd58b57dcca8adf66f9360b5999b2c1b756735b4c1d73753b27b44c65f09ac7408923285e939b7419bff98e01bce8353f397 SHA512 d3c7bb40d3fe4f51d3a6258db40bd93a802c5604176d7febd28c79c65e4d709c626ee0375fad14a0da8322c852ac2206b4180d31d72dccd21ee94f39c1abad2e
+EBUILD nvidia-drivers-390.129.ebuild 16257 BLAKE2B 39f6615f10f85d7071b4649647cfff4d8f68516e2c8c85792e492f912d20d8e4d0cea5de434952260d3eca42cb71f36237e0e45592bc798e59df3b56926b67da SHA512 42d82810a7c91b35da28f0b6fa6984ad8efcc9501d79f0a33be1b3af5cfed3d8013e75d17051a6f104676cef5a3453a2094849ce2f6a6dda71762e11856e2502
+EBUILD nvidia-drivers-430.50.ebuild 15829 BLAKE2B 807ab540766125157d5bbac39f34cb6c304171f9bbf18f88b24bf37da808a94edb6cd0084f43d0a8a8f513bb33c9db47f1f5b33210ea4633444e30e17d9641ff SHA512 b32b24d4a30bdccddc0776eb303bb6a0e5b24b654b42b818b47582978e6ed3a1ae09a5e07cfda002e23beb5cd96ad8be791ba5c41074d59ed083e4f8e67af8b2
+EBUILD nvidia-drivers-435.21.ebuild 16187 BLAKE2B 2d49a4915a353eb15b34b6b3f2e4e7760a6479b208d815445cbcef80921e84bfc3f97c40d285bd844d31aef1277c61a96cd8769be2574dd9249395b968e57704 SHA512 8b65b9009c82a6572dd5281bacaed5976988d66de6c839398539ccd16c87feb4a1dc864b07963104e95eedc1bdbdd034fe79e21ed14e70e8d7afbc25e71938f1
 MISC metadata.xml 1284 BLAKE2B 0e13b2eae77fee75a4757da7ae80540093962b6e8ccc3b0950caa3a0957ff79c6b08c80ceeec8ffcde47b293c258159f8722a13334fe06868589a18802ec0434 SHA512 0a3c6679f7fc23bf87340145f3a97945c9e8c7fc9c8721fa4643fb662347af312b4b927635901e95acb9349a7b191ef088ff0e51bbbc0cbd333603bb60984020
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild
index 8569c823af5c..4f9c8bd7f174 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux static-libs +tools +X"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild
index 524af62ae8f6..2f3591b34f4c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.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"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.50.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.50.ebuild
index 1d5d28b03bd1..3c32f8cb729d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.50.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.50.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* amd64 ~amd64-fbsd"
+KEYWORDS="-* amd64"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
index 84b29cb6f8fb..ef8a7105ca31 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* amd64 ~amd64-fbsd"
+KEYWORDS="-* amd64"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"