gentoo resync : 13.10.2019

44 files changed, 76 insertions, 63 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 6053899c0cee..529814a2ca77 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 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"
 
diff --git a/x11-drivers/xf86-input-elographics/Manifest b/x11-drivers/xf86-input-elographics/Manifest
index 473ae94a941c..fa39e122ced3 100644
--- a/x11-drivers/xf86-input-elographics/Manifest
+++ b/x11-drivers/xf86-input-elographics/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-elographics-1.4.2.tar.bz2 306167 BLAKE2B 1bd32ece8e1b3465542af539e5a83c75e23023125b8a21018a4e59b5eb9585e349371b346aa042f2ffcf4ce92d7a8616fa5d2a50224298f928e72a726df6ce22 SHA512 90e9eb3441a78288fbfbb2b108f212b8cfa3d5aaf25a0e88a5e40783cd36bc2d60e02ba390a5f0071eaa37f77e61f0d7ce6d9dbde4f6db21a86ca3294decff97
-EBUILD xf86-input-elographics-1.4.2.ebuild 283 BLAKE2B acd2161fd731b0c3ccae7b8660a9dcff497950d1f6cec6a9d1e47c258bec8b4a2198ca4feaa01b9aa29427057d03aadf0a771d5c5b1d8b19300f963e88f9583e SHA512 3ca6fe8782408bfb9fbaf78a08145e64a46ae7abd5b84817b3140b1f171cb84ffea778b2850ed5b0baa03a34f3c3bbf37d339f9d45a82e39c8a59b453469be93
+EBUILD xf86-input-elographics-1.4.2.ebuild 261 BLAKE2B d4c0bef647ce46c1e3e655c42e3b5dd35771871f7b286cae245460802477b786fa83598cd634e1fe9711f4f1ff937b41edc38fc40d3d4325d8941035d5990928 SHA512 b2dcf0434bdaeb78de6a1e1e18d2a63b47eb05aa6987d26a0adf1a3bc08bfc1a1d216908eaed983a718b102eafca284ff1cb1919cf8292941c69c7e705a23c44
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
index 30ccd4c8806a..623bc1195d23 100644
--- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
+++ b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
@@ -7,5 +7,5 @@ XORG_STATIC="no"
 inherit xorg-3
 
 DESCRIPTION="Elographics input driver"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/x11-drivers/xf86-input-joystick/Manifest b/x11-drivers/xf86-input-joystick/Manifest
index bce9a67982c0..047a94e3b26f 100644
--- a/x11-drivers/xf86-input-joystick/Manifest
+++ b/x11-drivers/xf86-input-joystick/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-joystick-1.6.3.tar.bz2 351846 BLAKE2B 3cbba17066cce241d6ed1a04ae26d4a875b994b47eb2d1078704d9dd109c9477ca367aebfec15b3358a7c857b91a8e751a83c2c4bab28f26b7aa6c02119463d8 SHA512 541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5
-EBUILD xf86-input-joystick-1.6.3.ebuild 474 BLAKE2B c10194bd17385a5ef8fb2823aef64f0d7b0a89d7f6564356efcda19a361c56e36839c6e3816766ce0a331259a505b89cbce51524cb1a3941935a201e33939a4b SHA512 e0c181d5ef1883f27597744995e8575203aa1b2b6bdf370cd2751b6883bac1b824289e17dde5966c03feffd7d8f7f63a34ece40841a89b3f04f52fb2ff80772a
+EBUILD xf86-input-joystick-1.6.3.ebuild 452 BLAKE2B d555f0689f9dd61b4f46fec1013e76d18bf119233c3ec2c99081af3301754630d5cc345242f254453aca370f85ac59bb4d828bf3ee59164865befee9882eac24 SHA512 32134d800b50416087c589ceb085a5b4f2330949a0fc6b23276dcbb2a0845a7498f72c7d229140e854e02f829510e189931ce664bec277a0a6750bc9403689f2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
index 2f4f181bd409..2afd96bfa2d4 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org driver for joystick input devices"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-input-keyboard/Manifest b/x11-drivers/xf86-input-keyboard/Manifest
index b9e9af7ac969..3d689f1c2b7c 100644
--- a/x11-drivers/xf86-input-keyboard/Manifest
+++ b/x11-drivers/xf86-input-keyboard/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-keyboard-1.9.0.tar.bz2 341693 BLAKE2B 05c011de8875ccbd15c25f455575b6674c24225bce9c3ec4587463f1ddf764a325898ba6f2690123e6f985ed080ad25f182fb0dac5e0210aeb9c4aca88523ef0 SHA512 d1a52d10039096d0d5e09750b6a8c2388345748331615af93e5be499646c3bc5fbbfc897fcebdeada5efaafff94f26a2ab84d6e35f01a875b8b9956a42015df9
-EBUILD xf86-input-keyboard-1.9.0.ebuild 351 BLAKE2B f034cb00dc1f7b7246211f854387f1b897bb20f318087e4c70b0f855967ab99d35c867396e9c7ee22f7677d2e34354b73353dbb70bfbed5d0714d6bd781d3801 SHA512 4cfa5f5f4f9ce696fd5e4f8e91d3d5bd951eee7f5455ec2b4bea1ad21a87b723c00eb400221e8debe29a9e284661e6b474c8fe46985a1dda5937e9ffe8e2dbbc
+EBUILD xf86-input-keyboard-1.9.0.ebuild 329 BLAKE2B 679b1e57623618ecad1f531f0226818fdbf34e74f02c7a22982e1df3bd6f7e35e66f1797aaed48f07f90227167ca6d573f2f7972437fed7f432fc9694b568420 SHA512 376f2bfd22d557a37b0af643260f391689c1fc44b2f8e145cf570ff163f0779090cc1fedf9bc3967ad33ef09a9388e3a739eaaac30750e37da6eeebc3f024469
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild
index f0303913d120..2d83116d3912 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="Keyboard input driver"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-input-mouse/Manifest b/x11-drivers/xf86-input-mouse/Manifest
index dc9f07540ae9..b866b0ddba7f 100644
--- a/x11-drivers/xf86-input-mouse/Manifest
+++ b/x11-drivers/xf86-input-mouse/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-mouse-1.9.3.tar.bz2 382013 BLAKE2B d4b9b006c7f8d12fd460677020031dc0957cb1f31af7cef81eeb051a5e0375ddc5a5094a5d28a14a49a00bb1166a79ff832c42652fd4084904313f3e72abd61d SHA512 d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f
-EBUILD xf86-input-mouse-1.9.3.ebuild 365 BLAKE2B 72cd0d48dfcec48f8e90c87765aa42e6a1d9f8f3ccbc1e80bc3ca0f50a342125f39b7791c5bca8668b172fc324b2baf7fe31bf6d516d95515eeb8cd564204c63 SHA512 257087af269e6825afd0b3f6f5437520dec97bd54dcfb89da3df0e77f131b143951132705ff97318d77ecfdbb89b24dc64e4d579f6b179b54504698b2704942c
+EBUILD xf86-input-mouse-1.9.3.ebuild 343 BLAKE2B 264458bc48d31b4a029ffde140ed607ca5cd0aee56688fbaf8ce173c7720a30dac0a42bb1561238ed2ca4cfea4ad9c2b45df4c4992e00d0ce01139e4d8d2873e SHA512 d5d2b8dbffe7796a95c24b32596cde52737a011b615c87e7f864e2fb4317aee1e4f70b8f92de4a360ed1e5d3559ef6ba9a3190d2891fc68c3504b34233184ce5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
index a0f97f1229a2..fc1d24bd6477 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org driver for mouse input devices"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.7"
diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
index e82ca42c82f6..2df87de96d6d 100644
--- a/x11-drivers/xf86-input-vmmouse/Manifest
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-input-vmmouse-13.1.0.tar.bz2 319188 BLAKE2B dddcee47a0d667555ba8a85a4a86c9f922a68ff716f836ac38bb0dbc643011debfbbd2d2054bb8df2f04cc94f2da95cfff7b0ccfb30879e07ca571a9b3aa840a SHA512 38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4
-EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 539 BLAKE2B 8367fd8e68a3f2d7d960400affe54cd130c3115da9884522dfcf76dcf9f1e0c543938b6a848ba55dfb8c725148c002f224f240600ebc6c82ee085069272e90c2 SHA512 1623286c3f63ddf7879949af7b8cb7da8110d6ff05fa67cd56138cf5db92988fd66ca7a7f584fdc3ff71a4c53f835f16e8fe50efc694db164527ec47ba007973
+EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 517 BLAKE2B d96def911d53d97abc9a80eef56837e6100e870fa4b1503925af23ae1da1ac00e64f001ee8f504933bd2795bec4bbb295f7a147c946662ff47dcd573935437d3 SHA512 e178ae8060b25a4ce5593777bd360094d0850ff658bcfca464e71e2559e9ed24d831bed57e81fb39f052d32f31b3161b246982a6fcee29a78806f6333d9b437f
 EBUILD xf86-input-vmmouse-9999.ebuild 508 BLAKE2B 9c9cea76552985d31d1467e3e38b2341b18829d34c9103800ba7653bab53de176fe1fc16535a282c7546507c01496cfb66ffd7cedd1079a4a1039b5d293075d8 SHA512 4f89a2e60ec6c0862caaa0912889d07103cc45e8a291650722d87df256b014818ead6e1954292cc96974425362fc3c755fd711e44b785c42cbf3324df73cb0f4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
index 5a2712bde4e6..5729c0d5e63d 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit udev xorg-2
 
 DESCRIPTION="VMWare mouse input driver"
 IUSE=""
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-drivers/xf86-input-void/Manifest b/x11-drivers/xf86-input-void/Manifest
index 20002e301e41..44c9e86b213e 100644
--- a/x11-drivers/xf86-input-void/Manifest
+++ b/x11-drivers/xf86-input-void/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-void-1.4.1.tar.bz2 271597 BLAKE2B c78d829dfc9aed788fc2e527f796c697546dfa9687189f5f36043fb017515307303d1bc419458e909107fdb30f6f534e9086e86708d4b8bf2447ed941d223011 SHA512 3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a
-EBUILD xf86-input-void-1.4.1.ebuild 351 BLAKE2B b3e5c701947ce21cfe4f8a3a8c8dd35012899813b42b5ff63336ac25bba392ed1019f67905130f7ba418bffb56c72afdea78718d09e26060c5b5b67de150eaca SHA512 a9132fb2e300b2106d16a3cebaa9e109cf5d52d04e185d166cc02c7b2ce19acb7dd4a171475bbe7cab9aeb998e2270f3ab6b6d6b661f5c11a60d4104818233bf
+EBUILD xf86-input-void-1.4.1.ebuild 329 BLAKE2B b0618ec0d724ed2b45e35bbbc433a97f1c74f38414bbf542f3f5746b46cb510f86cd1bf8a1352dcb347545af02526f59db3d30f46e9c03eff357e07f36d6d1e2 SHA512 a4d5039ea3f7b20389f701bcc90eccdeac89543edd5f7ef19790abae0f20b253065294577f64d8a3516e3c5fca987ed79be491dd8197abc9f7b1f13b4317496a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
index 2f000c8e7a41..5a5f84c70044 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="null input driver"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.9.99.1"
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 21fe772fc410..2f5de0d4ec2c 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,4 +1,6 @@
 DIST xf86-video-amdgpu-19.0.1.tar.bz2 440534 BLAKE2B d0baadc195ba22d443ed0b07d0d3bab6d1a954606b0a6c66f23bfc0bd814afc4227d48be4a4b2fa9c80713ffd300aa3f6be0254fca6de78fa496bbb68d037c44 SHA512 dda04e3ccee140354f59e04895cf50cd7dc06a105c40ce35069613c5b5fbe083cab6833fd293d96334f64dde1a0c4af6154d473594a144f37404188ae7f37dd5
+DIST xf86-video-amdgpu-19.1.0.tar.bz2 441746 BLAKE2B 75906c9b2200174711360e8cf095b8537e62618747afe5ec13f5a36ad8b61001b94e9df675df2026a61e66b6ea05e0e022640d487851d62ca4ed5ce61dd5aae7 SHA512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173
 EBUILD xf86-video-amdgpu-19.0.1.ebuild 524 BLAKE2B 094b81d22fd7684c008078ab1928d3be79fe46b8c2416f736d70810fcb25c23a73dcd3de03f1055b9afecba145de196ea8e3c9c9cd2323ed4b86e3a76c180d52 SHA512 98e22f96ec5f9db6334ea7b45e7ed0dae62f6673be2f7c83e60f81f4f6d555cc27f3080c412c4282f04cd3e7cfa6ba3c9a4c992a68ae4cbe9ea17b6702a99c51
+EBUILD xf86-video-amdgpu-19.1.0.ebuild 526 BLAKE2B 158fc181615bb00ceeae5d1a51a83ef1255fccafbe46631daec36f8a4b8486d3e56b7e29c2005aa42a31d1cd79a0eb987619bd35363924243c4837d679181605 SHA512 e32bdd24f6ce7fa68958dd0ebe2571b2571fc88f3f936dd248273f9fda43ebd3b586fee65bdbe1026b916add95ffdf29598d1c63a62f89fc8bc35e1bf68ce49e
 EBUILD xf86-video-amdgpu-9999.ebuild 526 BLAKE2B 158fc181615bb00ceeae5d1a51a83ef1255fccafbe46631daec36f8a4b8486d3e56b7e29c2005aa42a31d1cd79a0eb987619bd35363924243c4837d679181605 SHA512 e32bdd24f6ce7fa68958dd0ebe2571b2571fc88f3f936dd248273f9fda43ebd3b586fee65bdbe1026b916add95ffdf29598d1c63a62f89fc8bc35e1bf68ce49e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild
new file mode 100644
index 000000000000..dc1d719f2898
--- /dev/null
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_DRI="always"
+inherit xorg-3
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+
+IUSE="udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
+	x11-base/xorg-server[glamor(-)]
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-glamor
+		$(use_enable udev)
+	)
+}
diff --git a/x11-drivers/xf86-video-ast/Manifest b/x11-drivers/xf86-video-ast/Manifest
index a7d349de95ae..effaf67cf4d1 100644
--- a/x11-drivers/xf86-video-ast/Manifest
+++ b/x11-drivers/xf86-video-ast/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-ast-1.1.5.tar.bz2 339848 BLAKE2B 48ebb8f54307a467eb952ff57dce4cc9da11b627354c54e11426133dee029765390c8c61f0b724bfc66c2f86aa5938ddad49707847b50648d875dccf5c4be9fd SHA512 067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e
-EBUILD xf86-video-ast-1.1.5.ebuild 254 BLAKE2B cd00a687bbd7b8d5e456ac436a342ca68ef7b2796439d07c7b5d27307dfaa76c61deeda657a37274e7d3510544347400e0c16fc8470b64ce87a8aa1a3f97fbbc SHA512 d44ae32196519485e2155173a62c63c1eac6d1bca0ce68959fead260cc031b8a32c646d9d33875df574076d07ecf1980079b1b2003e5c94355985ca3f03fea77
+EBUILD xf86-video-ast-1.1.5.ebuild 232 BLAKE2B 2c5d387a994ee7738cc1668523840b473308fe6ecd944f39c15683e1804b2d0d95c1d86e3e3d4d023ecd7655efc5ac2d73010d985b1475d9d700b2aacf738312 SHA512 ece1fce1781510fd5aceb45d914716490e9e9d1c1ea7087250bf06b571004fe699b526622bb121f1371651e9e2999bdd1161c596cfbccc67ec995e0966c5b203
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
index 0c589f6e47f5..cd4ac3b9a303 100644
--- a/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
+++ b/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
@@ -6,6 +6,6 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for ASpeedTech cards"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 LICENSE="MIT"
 IUSE=""
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index fbd8737cfd1a..375d973bda67 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-video-ati-19.0.1.tar.bz2 902825 BLAKE2B 8f66ee5e465c9997d356593c58e4861ad749ba1d2a7f2520e8aea871ed71d2295ac1fba75f97ca30a7dd4cfe63f775838c5a925251331e1cd1e58b9186b3ca03 SHA512 e04c5395e3a49d81b8f7a4b0e11fe8c9ebd17af056a4eab4541873796dce05b103c93fb185f3a00873010df0655cd7311e6d27e177aeb7345c4c8017bbd1eb17
-EBUILD xf86-video-ati-19.0.1.ebuild 853 BLAKE2B cd5d912462b66f9a26536892fb90cebdfdf9fa66fb82d9b852b0ae290976306c0233bf6e7fb79072276b0ab581f987f78ae3020303c30e1a1f2c6c3639a6091c SHA512 79caa25b8043daf0c7a14edc28fab732a565bc0821c15d21cc96bf816f72ca9795ed01c78c1103e66c290a56c77348f8bf9e35414e31534d6e36c679ea86fea6
-EBUILD xf86-video-ati-9999.ebuild 860 BLAKE2B 7cfc2e6c0865b774e6a8ad4ea320e77d92d8ab2d35a0f0631e065ac8086b90ad40e34eaf6aad12d65ad87f1af8033f6ec2380d485032d422d42c6c86a2e9a798 SHA512 4850f59267108c29c2846b1b465c08e15a2d7717bb8b71267a67c236baa7e7a0d9941ceef442f9d419fcee99a60af2d64c70723a9a61d65818a02982736aae7d
+EBUILD xf86-video-ati-19.0.1.ebuild 841 BLAKE2B 688da2bf3e3d35dccfbc345e9f65bf3b5c864d67301e2d72b4b7335d6a9858f747a7af0cbac8aefe422e57c07deaa4179397a2fbe17b6cb56b2ba5a55b04923f SHA512 70343ddce9d91a8127fb5ce449c840228f5aad2290eb24911574874e47bafac2a6db77c119bee70752892619416e0d0e9c782d39706764d5ca56f6c9392d066c
+EBUILD xf86-video-ati-9999.ebuild 848 BLAKE2B 63dcd38fbffea4784136568569303df6e0d98c64e7739908191897c70c03de3403e1fb220f0c8967b7ae700d5d820bfd083fb4700eb29c31ddf2f52800bf468f SHA512 e47cdf4172b5c9b731848eea53eede497fe982b2e14b993481ca69573a62bf623530031d150e5277c55c92478614a885307e1022bb0805a7d5285df3d8e81d6a
 MISC metadata.xml 308 BLAKE2B b9e4150ed35f39b333f5ba4de65f52d82c50e5a5d1b3ca46f14b8a9a5d0ae12ad461f0f376a93d7312a7e4b2ec7a7529e137b0eada1b85f1db643739083cf20c SHA512 2f2c9a682e7aa5c413561df59a02c5dc7f77da6eae4513e93196b7c76d0ca9d76dffc5c644e77396afaa86f922947ed1cccdd133d161f1c441a28554eec68708
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild
index e8f70b1cf51f..489c9927db8a 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild
@@ -9,7 +9,7 @@ inherit linux-info xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="ATI video driver"
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
index bcca1714ec2f..252dd5e7f9c1 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -9,7 +9,7 @@ inherit linux-info xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="ATI video driver"
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index 10b7bcba1e2a..869944e28397 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-dummy-0.3.8.tar.bz2 302353 BLAKE2B 1327db3aeec2ff7e3ff0876b25eace6fcdc7fc428967dee9f0b8ee4c22dd7904dcb47d5433bdc14ab56638225b2d33f3a26543dc9e6041c60af4135c1555f798 SHA512 f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80
-EBUILD xf86-video-dummy-0.3.8.ebuild 483 BLAKE2B eeecd69406496ccbf81335ffb22b5133405932f1c5bfab3a4c424bd958f4b975c99de080b17fc5e16e4411d66ecd7f72d7c37de77007cd7a8ed3371f128df49e SHA512 475658c6b85b93230720b51e0f14849637bd6a96e620ae5ce1907daeaf0f51e4ec122532a6482e327b91de11ac2c2a217f3fe6399940b35daa10d298d2db7b46
+EBUILD xf86-video-dummy-0.3.8.ebuild 461 BLAKE2B 096315d9dc6fb7741111ccbcd22333e9d7c41604a89c0658216f189500e397226c4ec7f792759b73b2f278589d52de39ecf622a0620566643534b443b3acd18d SHA512 6d5d9afc279f160cb24173027a954aeb058a83303a414d1256283598a3a2a1d21167b340d534b7cb46fc69c410fdd375beafdb5faa3317a2524d61d89beb9826
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
index 30849d8768ad..10f379634b4a 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org driver for dummy cards"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-fbdev/Manifest b/x11-drivers/xf86-video-fbdev/Manifest
index 0f437186bb3a..674de3f74056 100644
--- a/x11-drivers/xf86-video-fbdev/Manifest
+++ b/x11-drivers/xf86-video-fbdev/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-fbdev-0.5.0.tar.bz2 295102 BLAKE2B f3696662e782f35eeae66a755761b8f5d6f1304321976ef7e17758576da014091c0dce9046c4fde6b0ec4cfa1dce998b4b9130e646911d4d1dad983bd530d06b SHA512 c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448
-EBUILD xf86-video-fbdev-0.5.0.ebuild 359 BLAKE2B e62bbc0e75cf6f9d63785b0de8f8d1fe06605ceb28838095a371557fe734ea7e3a56cd9dd3d233e528f8447aa9dbb2164f07570bba3d52f141d8296e624a5626 SHA512 a0f879b991c8ba2ea65af475bc508dcdc4f08e8080f150a73ab88a54a7492860f2c0f0dd0482d339b49ccb92be9e7f2d7191c96da8e4dd4e9f1edd8fdb025581
+EBUILD xf86-video-fbdev-0.5.0.ebuild 337 BLAKE2B dd391eb3860e152288658d9d4f7a041af06709c28fefadf58101ab0faab5e5c60ff1aef4b142efd826dbdc7a7c4949ba3d5150b69b90333eb9bbf5e4b789399d SHA512 1ee993343ead28f10c65a3cc64aca22e01787fa0656ae6c659e95bed956cbc2131d3fd08ffc6bd5eb80a2180749a079cd2842d82d14657f6f3ece33c4ccc0cdd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
index bb8b9243f0c9..9da1025bacbb 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="video driver for framebuffer device"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-base/xorg-server"
diff --git a/x11-drivers/xf86-video-glint/Manifest b/x11-drivers/xf86-video-glint/Manifest
index 5c7e4ffd612e..9dc7019c64fd 100644
--- a/x11-drivers/xf86-video-glint/Manifest
+++ b/x11-drivers/xf86-video-glint/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-glint-1.2.9.tar.bz2 419524 BLAKE2B 3ec8b4f3187832e1f2a624e578b07c2e9e6ac6a7c48cac4a67ee59f6c479995977e7f6cf903650c52c5e49c0ea321ddec78d0be4969c27584b8e9655b6a08ec4 SHA512 29b573abc2c77992562ab72ea99dfac5fa4baee99404747c53494680fe750b9c096833cd6c8013aa85f7fb5db5bdbee2a9b26dff633a6a4fe2dc8cd9f0adff12
-EBUILD xf86-video-glint-1.2.9.ebuild 329 BLAKE2B e22a87c1d96ac71f73597a54bd616564ebd2b7461b71bce26a709692ea00b5ba2dc1a94aee040c3ff195e2e5e0d337dd7b0457d616723137bc66d70c83192784 SHA512 90555b1e2d357fa7c54e955ba75677a8fc8014200d6b2e5c2fd2e3e2c80576ae57ab9963c465166603aa5416560839af29bc57ad338209601bfcd48f142eb5cd
+EBUILD xf86-video-glint-1.2.9.ebuild 307 BLAKE2B 191944092ab1916db812caef9d57f9c4415985639f0e13416c1feea1f7e3b5c5767358bea7ab016b03ec6d6bc774841fbbece887b1d005009e6c2797dd74de3e SHA512 8df4651bd2176406a507961ccd053bf752d1950cdd0b3e5605ded9ef7f37b5f69caee840f436cb25fc6de1563ef4761bab5fe0502682087b48ec9a52803c359b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
index c0b237805622..85e0651db91f 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="GLINT/Permedia video driver"
 
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index a20bf5426b74..d392582cbde4 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-mga-1.6.5.tar.bz2 478350 BLAKE2B 6446da393214921fd35802df387f200856c0900d42a81b28bbde55dbc453752c06f3ed7abf936b5fa693833d8a5f56767e440a37cd4b7035db0abb5736cf4020 SHA512 e1a624cb5d98796e9138bfc512b62d5130885140b1751c01f29a8eff96f66a2b57cb5abe23c1fa2b55188acabd6554c5897190a4e1aee1ec09245d53b88f69d8
 DIST xf86-video-mga-2.0.0.tar.bz2 452486 BLAKE2B e3c0d3d6ee3c1651f96fa2353d94d5f9f19ebf97b121a87749fdb8ba6d8d3bf7066c39c454910a2b1ad9d7e3d44dd3c31bbd432490855df4676bd4fcdafe71c9 SHA512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540
-EBUILD xf86-video-mga-1.6.5.ebuild 369 BLAKE2B 69761d156a2eae4d4133f2d049db0e27ad42f1e184334a3e1d1736f9157981f2a1eeb7c85e1b4a4b23bc19bd9da83601933e74d36ee9418c8bf94824971dabcb SHA512 920a5a64c4e180aee22da1e7f1954c2d3a4acee22aca8dae1581f06187f2a45024ed5d5f5fc563df2c25422460fec2654385798a0d6272d592244d118f7ad285
-EBUILD xf86-video-mga-2.0.0.ebuild 366 BLAKE2B efa27aa6b41ab1bb73d1973ea4cb9e35887690dcddb64015d182e4fc062237a57da4b2b3fdb19c1ac4049d487a3010da32af7b9befb83781b55a5e617e511ebd SHA512 4b8e7b04b4de4f2389433088e4b03cb9c577a480c7e96de26ba38c12ce3f1f3696604de872cd7574874ce0531e5fd8f2f271e3eff0f553b22f4dc4bb232c0d0f
+EBUILD xf86-video-mga-1.6.5.ebuild 347 BLAKE2B fa3ecb1686d8bac7c44473adf466001e3e0dfdbb3db2b8b80c28fc9aafe1c3c30e2117229ccdcb15d23c9557b0d18ea3a20263743455bd5f1895c52fdfdec6df SHA512 622cbe18f80a9ce82e8bfb93fc3c13681cc7c90fbfd84fbb72f1ad86b03be3a6445e429a3b849bb8a25e537c4cf4c12a34fb194516ba867c795787e44dc6a510
+EBUILD xf86-video-mga-2.0.0.ebuild 344 BLAKE2B b69e9b6211935fb07cd4a46edba6e1e206ba30440750546e51ab8da941246a0c3636d8ff557ffc3ec623d45dda544106e4f5c27a8732b4a6e211fb3b718e2068 SHA512 4d928cbaa83edca9e8158d0e166e8ac07490cfff6e5d96dafd346710b1def740865e5e609cf9e5e668692d945380d0b60c17f87761888f95ed12f04d27809e56
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild
index 17f7976e4801..d4936079ca8d 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="Matrox video driver"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
index d8b008e7c875..634ebc62261a 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="Matrox video driver"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
diff --git a/x11-drivers/xf86-video-nv/Manifest b/x11-drivers/xf86-video-nv/Manifest
index 20e5c904994a..1a0de5f8619b 100644
--- a/x11-drivers/xf86-video-nv/Manifest
+++ b/x11-drivers/xf86-video-nv/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-nv-2.1.21.tar.bz2 424091 BLAKE2B 3ef69d23672c0d65d1117ec1c4906a47d34878ed20f7c07d044be3b9d74c848162d80fe9cc7a11797fd9f94dedcda3b5e76d8386f2b7208e432497ef50838422 SHA512 97cec43100b00609d43cf45937bafea387fd656cb5e321fcbed426973320097ba6601e4e548026618b3cf0c480f58956874a201791dc0cc39297b5fd54979ca7
-EBUILD xf86-video-nv-2.1.21.ebuild 330 BLAKE2B d2f8bf25ab6349da1d503dab7fc03076651b9b41ddcff15be33db137b61aaf00f5333bbea5229a20b61b50e1a6255ec3594b70f05be4f121c0c4739033e33d41 SHA512 267115ee8631c363aa277a94e1ff42b09aca6128bf667126962e0d919c7df7f8828e9676b415a3c61ec4bffe7808a8c485908fc670d12f8fa07018872d2253d8
+EBUILD xf86-video-nv-2.1.21.ebuild 308 BLAKE2B 28c499deabe06928cfe58aadb0077de828d873a7919514fd9b2ffe93f4b1255b3bd70b382bc0ab8ec263cb8a5ab3e752b015a4a420df862bd8755ac600356081 SHA512 c3b4e99a4266bf7eca1f6beb27f06e958bb119de02b5f9d302a2821bbdbd922e035ee525b21fd15ffa6f93165383b5be670fe3429a155477b605e1de61526926
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
index 599dfe6212bb..5792a0406823 100644
--- a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
+++ b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="Nvidia 2D only video driver"
 
-KEYWORDS="alpha amd64 ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-base/xorg-server
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index 0e4fe09001b4..49b424247180 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-r128-6.12.0.tar.bz2 483999 BLAKE2B f3433ce0289a7c356b69871ad4acb9ce9b0a947c1bf6ee9bf436a5d27ad1324fc81bb2d3c9be16ddf588f286ae092091dafd161c39ce8bc1bf20b6cb36ffdb72 SHA512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38
-EBUILD xf86-video-r128-6.12.0.ebuild 522 BLAKE2B 1fb442f7c95ecee6486f1979634534eb31c235e7dd76951f8a33107727a5f675fe0942a64db7a8752e2adc96e3f164ce522000876349c30b47229516715a2132 SHA512 c16dde432a1dee46901aa171183a0a277314063a2126a704be35c1b2fa3764de7630d14261049d54ee8222ccfab644e7157e375f81fb47c4babd1c0de48ba9d7
+EBUILD xf86-video-r128-6.12.0.ebuild 500 BLAKE2B cf48a243c483c5633c209beb84f0cb4ea0d2eb743a5dcb044d5682882931bafe76d883e3fbf6758c0669a9b880a635e77581328bc30da3ee5a8739fa97ec5027 SHA512 7cc44fefed3b934c571b7088f74aebcf5a19ecdff836374a00602023b12119038f520326e88c5d5784b7491267a3f87c71f52624315109971453d7096ce3f6ad
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
index a59508f6b49e..4ec08362c9a0 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic xorg-2
 
 DESCRIPTION="ATI Rage128 video driver"
 
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.2"
diff --git a/x11-drivers/xf86-video-siliconmotion/Manifest b/x11-drivers/xf86-video-siliconmotion/Manifest
index 8d2205d1d6c8..2ab5bba7cc08 100644
--- a/x11-drivers/xf86-video-siliconmotion/Manifest
+++ b/x11-drivers/xf86-video-siliconmotion/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-siliconmotion-1.7.9.tar.bz2 416351 BLAKE2B 8832c4de662871b373fdd2a1ac395454bbcf3ab3ac81416aab23c9a282a18cf46be5d98aaaa15213f394d0d7ac8b407c39aa0b9e3692495e36ef800077ec3f19 SHA512 13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63
-EBUILD xf86-video-siliconmotion-1.7.9.ebuild 292 BLAKE2B 247cc63ac8598718fa6d1a84caf850c42325ae87478127925830e89aa42d64a9afe40bfee65a67a412f6de63aa39e23d08f06926655e81f68a97a079d398fdda SHA512 751d78bd96365998624a9b9c2b2500c5bab8971790d2a7a13fc4d60c13bee6633a073f7d4758e7ff64fb22f3b2f92f870a891d874079171f95b56f3a98fdd0e5
+EBUILD xf86-video-siliconmotion-1.7.9.ebuild 270 BLAKE2B 61add873071d87c2e3895812d23143671ab5e0d633287a63640fdd4d76e30190ddd491505a8bd75bcaa465a4da5e43251fb4a4f07f3290c47f1670059a735937 SHA512 426665c7c5a36c654e64c3a400cc2360c28b53dd5eb3c5e20e79aca72dbb914e84e7636e84c8d858b6bcf0916d87ca0111089c44b33a8b412640d2cfce6ca3e4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
index a09667c578e0..9a9a7cda10df 100644
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
+++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="Silicon Motion video driver"
 
-KEYWORDS="amd64 ~mips x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~mips x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index 279adfcbae44..db64f7eca555 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vesa-2.4.0.tar.bz2 324599 BLAKE2B ddaa7a54d439b1afb1152e15e0d436cade79c51a61e78837a066e3e0c04d4a2ea6b079e68eca917e618aae125ed4eab7734009a337018460e771265b8daef443 SHA512 4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de
-EBUILD xf86-video-vesa-2.4.0.ebuild 647 BLAKE2B aa8ae1407f03c7fe44b691c9d5b903ad7ab53dfe8eab12162c8cd71205c587e4ac2efcd361acd77874a85b323f1a267ed6c64fb1da0e8c0ed4c2e41437fd3770 SHA512 b09127c633b34b0d4def87d37e3a1681ed3f1e3c24028f60e1af8178e23df2974d878320287771bdcf39674c8409e4809148428da0e931f12d52b186a92b981c
+EBUILD xf86-video-vesa-2.4.0.ebuild 625 BLAKE2B 76af440e65d48e464185708115315678f79845dddd190dab70e6ded04e8faa41b4100b851fe437c1f20e0ce4870289a554b5e18ea36a30a11a734b8b355515d3 SHA512 a3da53bb2fe7f2578dbceefe6dedbb1fb648cd27393377f0cd9fc27854bb3d236add7ff15e0368dab633b2db7fb519561329452162d9933bcac117fa84aaa4f9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
index 540931da416c..89b894b769a9 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit linux-info xorg-2
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* alpha amd64 x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index 42a4ccc16f8b..519a32e1ecda 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vmware-13.3.0.tar.bz2 473527 BLAKE2B 8916c5d95d4347ff3e874d4131a32660777c0e3ab6808b537cbe668c30cf775ebfd2fb7900aa43f6a34d0578ceac4545614024498f6f0143e9b07035f6e99c3c SHA512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca
-EBUILD xf86-video-vmware-13.3.0.ebuild 367 BLAKE2B 5fa5c972ffaa111710abf95ebe2a9297dc5be9274d39eb8b3863370375ffabc2e433ed86269d773215ebf55f81035a4c9d7687812f2bc138e2b544038368eecd SHA512 dfb90019cea67dd916b20fb4f986330fdd945061a4ccd8d5827e59efe07ae82a01ae56cba5ae22a99652f551f7de338d4c6d18a0ec5ad70a6c5cd1500e9bf34a
+EBUILD xf86-video-vmware-13.3.0.ebuild 345 BLAKE2B bafcf5a3d209a1eebdbccafe24a7d5bb89f9d93d92ede252a0c80a6632998ae8bd1f4d7fd4e948d9d6d7b5a363396a1b9cd33a6829c3d049e9b1f8dfe10bbb01 SHA512 1312c212e6bcd30bb746c254a88350945ebc808731e77a59168302d27685317feeeaa0736e2a430bc9ede34c262095f1d55f6f68b49957d613b51852f5f7120f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
index 3ccededf146a..cfcb0e76de79 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
@@ -7,7 +7,7 @@ XORG_DRI=always
 inherit xorg-2
 
 DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="kernel_linux"
 
 RDEPEND="kernel_linux? (