gentoo resync : 05.02.2020

122 files changed, 176 insertions, 119 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 396ae2737366..8633386d8e19 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/align/Manifest b/app-vim/align/Manifest
index 2991875f06e5..a38157de34a2 100644
--- a/app-vim/align/Manifest
+++ b/app-vim/align/Manifest
@@ -1,3 +1,3 @@
 DIST align-43.tar.bz2 34490 BLAKE2B 61fa5d7233275ca372541379bf498004553daca788d1cf4f23da7ddae001530507cab551d8c49a747fa252c88acc0a8f0d24f8d58e515fb9db31bf1c76c1b26a SHA512 b796ce56a60982a1b974a55e6b3ec74cd13ad8b572b00f49d814f22385d76441cb244c913216af3ef0d2ad128d5871eb60e5fc70343e55ce88453356941b0ecd
-EBUILD align-43.ebuild 392 BLAKE2B b0656b35697da22acd25e641199e7be1f9232cabf9fa5a1d0e2b1b52f3a4fe5acf73c4dbbd481d4b45fdc19f79e01c580fa47c258ff7881eeaccd59f52c6f222 SHA512 beea50bf7e363e89e185ab82a858d111b32b300cd7039a2c7e019e58db7fa549d12ffdc2230af72c8ae0643ccd8768c062349398039284d59af6dde784ba59ab
+EBUILD align-43.ebuild 393 BLAKE2B e7d3a4a2161f49cfb902e4ddf914e62db56f51457862cd3b3eae6b7b57e0ca830ebfd31d0bf384a7cd3e7db1ad569d1d79de323e12d4be8c3030acc7a3eeabb2 SHA512 5f08f5e4874411231bfcde19cfc24212557f3f5e82a32569cbe525a9067cd718b7c82a3f62fbf0497dd638da8c63769310bd9b42d9172fbcf5075da10251c928
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/align/align-43.ebuild b/app-vim/align/align-43.ebuild
index 877894bd4964..1217d935038e 100644
--- a/app-vim/align/align-43.ebuild
+++ b/app-vim/align/align-43.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: commands and maps to help produce aligned text"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=294"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 RDEPEND="app-vim/cecutil"
 
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index e560ce24b814..db8e8ebcca5d 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -2,6 +2,6 @@ AUX alternate-2.18-hh-cc-alternation.patch 918 BLAKE2B 0362420f64fdd1607529842d9
 DIST alternate-2.18.tar.bz2 7907 BLAKE2B 574369557d3a56b163e7288bc60636649a2c44192c56d1d30464cbc2eb89e672aece59a205d39124e062037b3bc4983f628ae0bed53b7982915c8f9546ec4117 SHA512 397d39a5c5fd186f32f3e0a1651f9b9f739899ffcfdd344e85117c4bb676d8fb8c668410754fefe8934ff1a57537387d49d115dfa17bdca896e423935840ae3f
 DIST alternate-2.18.tar.gz 8652 BLAKE2B f6e50d3e1499fb913f7cfa4ff95df180855c7857a700428be1339916aed4513bf77a8da62b75407a6c129f4da3e3bcd00f5caed53d7a939a2eac96a287a11ffe SHA512 d797b99cbe536285d87c5bb14adfcaa3e18611351c8529d9a0755606e766ecc006f19af5cd9b9535f236220dc525bbc27e1280cbb1e3c71f7444cdefd506cefa
 DIST alternate.txt 8897 BLAKE2B b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651
-EBUILD alternate-2.18-r1.ebuild 727 BLAKE2B e09fcbd230d6ff7ca1f940556a16483f7fcf9eca457abbfe519fb2c27acbd794b633a96bd2e7ab6f35685832625dd00234374041b1132f122a85854ef48970ef SHA512 1b0932395f1783e4adcad151dc5f12c71938706f15210f26137f6932a30ec17da4f842ddb816e00fb9831bda8c746c3bdc0aa82e091881b7185c1a9c5e6341ac
+EBUILD alternate-2.18-r1.ebuild 728 BLAKE2B 929513f8b39d7abc4daf169e6112e065a9a25b10a545307b97d3b4f012c1ebf5bed801fb6c3ba781278cd7b238913e91eb32e261827068612eb6d5a4a0748dd6 SHA512 36ec620a8fdd3396baa403029567380491172788220ebe46f778de89b2ac7f981997045f0558d0ae59fa379fb169706debde6d0ffe5abdf8a7e514ef81d446b4
 EBUILD alternate-2.18-r2.ebuild 1013 BLAKE2B 57659ca6fb819c9bd22975a31f3e51a84062e31d8b9c44944f80cc95d36149c4d476ab6e7ec2da8bd443af6020dc2d83907d7a2c27c487e29f94d35d4fd9c3a5 SHA512 bbf5ef860e9480e8fbc7dd62ffe6999e9c7d1d5a1f1dde913b9f56318415d5884497f77d55b5c1a168174eab00d145b373bd0a1276960cf4597e7f6db26c5c25
 MISC metadata.xml 331 BLAKE2B 2dc5ef5397f37066b5fc7d3a3c5c04185632f538fa6efb5006d0d8aa12d51696464850b2b3a0aea4e7bff8c3e9caf9cbe9e90a312e903d0b5313e29eb5588d3c SHA512 ef4ca068ea9f5409c814ca371c0f68456799bed2bae3019cf2ea3af5c2d13750a059f1d885e2c901cc6549cb7915dcb48abb9d5ce7d67210d89b73d79a2e319d
diff --git a/app-vim/alternate/alternate-2.18-r1.ebuild b/app-vim/alternate/alternate-2.18-r1.ebuild
index dd9a4b2a2719..eb2452ef0178 100644
--- a/app-vim/alternate/alternate-2.18-r1.ebuild
+++ b/app-vim/alternate/alternate-2.18-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/vim-scripts/a.vim
 https://www.vim.org/scripts/script.php?script_id=31"
 
 LICENSE="alternate"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/autoalign/Manifest b/app-vim/autoalign/Manifest
index f5e0ca779414..c7636820a398 100644
--- a/app-vim/autoalign/Manifest
+++ b/app-vim/autoalign/Manifest
@@ -1,3 +1,3 @@
 DIST autoalign-14.tar.xz 13400 BLAKE2B eba5a5fe00d264c1b8aaacfb79e9ba6bdb0f6a6314a6a8364c89b7e4136a8edcdae73db2343f94a7b76103285a88e6fa13d60cbaa91a6ac35bea99410776819c SHA512 40107b8e12c4190c4f31c740d9b7615eb0836f4d159e6071526de768e6f7726849cb0cd93af8674aff7d6cfecc1b7f27d5b894628f426c51941bb914b92944f2
-EBUILD autoalign-14.ebuild 771 BLAKE2B b460dc053cc677c1196b3399b5a71a5e11724e6ae053c89f2c8a5a4a22e797d406a82fe7f76f4e2ccec22b9ae7f9affb34c55eb67f0f98ad22c814c85baf69f1 SHA512 96d0ac9dd64f23355a00248305d26ca94a184a3a93514c88df567571e32d0f2b757dc214dde32d31b757da979ede4584232e52ba0cfdf87d417096ed51d85ec1
+EBUILD autoalign-14.ebuild 772 BLAKE2B 128b4308ce110b27c7c59407827305f20d05c09eec370fab46bf05a88d676739039506053451f73b7f1755a8ac8524354ed98389aefaa8fe7a0ab14a3567d617 SHA512 7d82a79ab539f49d612279b37b5106aeaa66baeb8efebadb5a5becc93f8de663584578009ad5c2f9531bec32aa32614d81350442715710297cbc22f274ea45ec
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/autoalign/autoalign-14.ebuild b/app-vim/autoalign/autoalign-14.ebuild
index 0d7d12e9d234..a4b6e3580c03 100644
--- a/app-vim/autoalign/autoalign-14.ebuild
+++ b/app-vim/autoalign/autoalign-14.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: automatically align bib, c, c++, tex and vim code"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=884"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 if [[ ${PV} != 9999* ]] ; then
diff --git a/app-vim/bnf-syntax/Manifest b/app-vim/bnf-syntax/Manifest
index 423084150d3b..77e4495b9a3c 100644
--- a/app-vim/bnf-syntax/Manifest
+++ b/app-vim/bnf-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST bnf-syntax-1.2.tar.bz2 887 BLAKE2B 11923f80153d760e92577e461fb912a13ea6ac1ab8c48b6371362d9f5e6ddacf520608626ecb2020f0bc043106241a818b53131be43c991720ae37df8ec40132 SHA512 e073866a8dd41bc0ab982e250bf2a803d78916dbdaafabe504a6854f67255fe4ed84a4db426f1cbde77c9b0a059070fda666338c53b6ddcc7e46f04d9f0265d6
-EBUILD bnf-syntax-1.2-r2.ebuild 556 BLAKE2B ee6139b5b201617be9bee86c7e8a2f2506ae604d62599ccc822e1614b214beb73d5bdae64bfb6828c9b83132d41975ab8bc0e561e3106f7d9282028ee1267372 SHA512 bbf353bcf9a5436bb2f744bf0bb02273691bc05e7506dd4061fd7b987acb9a03a958b053c14b1ad5c3404e79a443d03f7f0763d4009a65c99d891eb88d246ccd
+EBUILD bnf-syntax-1.2-r2.ebuild 557 BLAKE2B 39a28d1469d23162ab749d2d9e45ba830b22df3dfa5c95d28a793afbe716f25134b0ffddc6af6257b44b5f93d8830b7baa96acc30b8d65d73d2f453f5bf38817 SHA512 75615193d066cd1759e03403b6f35c4e033f7d19b4db87d15e35463710d78eeb70307859a94b6501389d4e3fa6ec2bc48820ddd3ba728bfe5a87626e1d52e298
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild b/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
index 5df55562ff91..da6fd99f35f7 100644
--- a/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
+++ b/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: BNF file syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=250"
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/breakpts/Manifest b/app-vim/breakpts/Manifest
index d4fd65c86051..a61e36dc96ac 100644
--- a/app-vim/breakpts/Manifest
+++ b/app-vim/breakpts/Manifest
@@ -1,5 +1,5 @@
 DIST breakpts-4.0.tar.bz2 17349 BLAKE2B c7ad9eed8fb13537c940e6868f5e4e5dd812a6b7f7c26c4617e3c24905b6e2a817dc91990b613b700e793dd763a6841f85dd7f9cc42fb9f5afc25c3609f909fc SHA512 a480bf32cd3e756ac25849b1d5fd20521bd8c965454bb94c33810c9d1d4464762a731d08dcae858c59853a6cf41ab3cb6cddeda440c8b041cc8ec192ab2bd2fd
 DIST breakpts-4.0.zip 20124 BLAKE2B 2ea7568af5407d57c4d4b505c69d625056d62e8f5bd25bf5ca13918e3ffbc0f83de2aedb0abc3468215a650308ed8b592a618c0b50c24dd8ad3f931ef5d2ff8b SHA512 3e7f148896a10abd30a16d903c14460668ee48d078ae3c3b6ff663dab53d32199d8cf9cd3a56164a32d0be2684e64a882e917f3f632318ce85db5eb07e29754d
-EBUILD breakpts-4.0-r1.ebuild 682 BLAKE2B bf0c5025e3e2707a805b6fbd22f97313235c6a7d55f0397015c36f7e0041305c374fc44104d5a26c1f56f9a7452b60fa26f72869d6fb65b1f433e9f90930780a SHA512 90aed4c69a96cf1cbbd27162d9e1b057792f3f1ccaf6335a99060bbf89fe2b1dfb0344c2999004802628329b567ff33728faf643df0cfc5eabd73ece79a1c250
+EBUILD breakpts-4.0-r1.ebuild 683 BLAKE2B 87985cf12096f59b064d8199b4e2d0db915fd15b7326fe45e6927d425b173e63e1d2bee0e377b7993191524bd6e314bf83f2710a54c83bad34b7383a546e85fb SHA512 d87c3b7b4d7bed374a8bfe870ac0aca6b4d3a5246943ca1bf0d3cdb433522bb3b8ff08c20eafe4eb46eaa091e0755f219dbd6651bfbd94e82f94a0861378616b
 EBUILD breakpts-4.0-r2.ebuild 803 BLAKE2B 1ac75b05bd5d45dbcdc8cedb9687769c1deff041acd406824b62e40758c57927e95c031533d15a353a59a436d45f2cb3ca1519fb37c1dfdfcc6e27abb3d4d2e8 SHA512 eaf5a8afbd71843625a60c672bacc09b3e1d52d6ba6a69e0878ad48d0dd9fe1000ee67619b9cc0e5981fa80fd676e9ad0f62563bda5901eb9b97d2a09fbac701
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/breakpts/breakpts-4.0-r1.ebuild b/app-vim/breakpts/breakpts-4.0-r1.ebuild
index 2358b0b21ccd..2667564163f6 100644
--- a/app-vim/breakpts/breakpts-4.0-r1.ebuild
+++ b/app-vim/breakpts/breakpts-4.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: sets vim breakpoints visually"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=618"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-vim/cecutil/Manifest b/app-vim/cecutil/Manifest
index 95352fa6eedb..d9723e42b16d 100644
--- a/app-vim/cecutil/Manifest
+++ b/app-vim/cecutil/Manifest
@@ -1,3 +1,3 @@
 DIST cecutil-17.tar.bz2 6985 BLAKE2B ae67aec09177198ca2934ec488a76105f9fabb867cb9b435a7696a45074d65876ac04df2bc3f33dcca82220e63d2627e86ca5af08a7d31c6a0ebb29ad85ca1f5 SHA512 2ad7963e5928d3d6b46fc4a8eafe1927445c73e54b8af2869253a8223aa3dba7776a118085b4e7b517845c3872bdac96978981004e863da5a7ff8716acea1393
-EBUILD cecutil-17.ebuild 374 BLAKE2B 0a8945961bf1d3c19d52e5155c1b300f4b8103135a316227b4c8d9d3bf8c60e8e2ef160f63d50281e4cf17a1b0d6d065cd0364cdc15322be9bbbe4bed783d0df SHA512 846f67a261785fd4be2669a2fe1c056c7c6c5378980f22384388dddd096bf3b4738185ca7caa4a08d4a3f2e2c09770fb2364bb61f97fa5f81a92457841b1bc17
+EBUILD cecutil-17.ebuild 375 BLAKE2B 88dee2f1062ed0f2b48db65ea34b19de1a074add63667afeb59131c7a651ce3a110dd33e3c7368ca4aae576d826e1c063aabf5be4cbdbafdcf126bc89490bb38 SHA512 5fe698a67b818a92b7e92faf48f2e6a40a75817c65ffbee32504bf8c8265d9b2a108daf92440e8c53c5c1ec355deabedd3989a4a50d00cf8c83de0a6b8e3adfd
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/cecutil/cecutil-17.ebuild b/app-vim/cecutil/cecutil-17.ebuild
index 5ad2ee32c8a9..85e5ad0116fb 100644
--- a/app-vim/cecutil/cecutil-17.ebuild
+++ b/app-vim/cecutil/cecutil-17.ebuild
@@ -8,6 +8,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library used by many of Charles Campbell's plugins"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1066"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/cfengine-syntax/Manifest b/app-vim/cfengine-syntax/Manifest
index c94fa88c75af..54e6f79d278f 100644
--- a/app-vim/cfengine-syntax/Manifest
+++ b/app-vim/cfengine-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST cfengine-syntax-20141019.tar.bz2 7611 BLAKE2B e43f3c374292404ebe28dd63bc4ee7f95d51ef6e88948d9155f3c1f6c58c948a58e844325ab7b12b300d277e573a61ea9855041c5389bea4341586ed5e1ce2b6 SHA512 c8987073b9cc9b1494b0d3cb8737a5b99f62c1b99f5b1e84ce1903e37a924ec9b3e2487cb3b72c75dfba40528809289efdaf3641bf6c059a668c6bf073bcb83e
-EBUILD cfengine-syntax-20141019.ebuild 533 BLAKE2B 394f966a09701bb5d0857ea4a9d06492e9dfbcf699095e8b0149aedbcf14ca5021162e45f41f6697844ffd931c04dfd796e865ab1caf9d5f6d7a282cdffa7fb1 SHA512 5dcca2328ac6b458f5bb372598db4aa4a895335d65e4e4d3661c463c4d5991ef07aa32d5c53bac3cded2260e969c64cfbba311df283efb4b0b46733aae912800
+EBUILD cfengine-syntax-20141019.ebuild 534 BLAKE2B 7ef84136d61e80937dadb33eec9118f54ca20fbf22e94cdf1f69aef114f8e3272f3c0af075e9dcd3a09e49621864b6762658498fcf16ffbbfc357d6a979b92a2 SHA512 1132365e2001ee59099d8e5aa0c07426af61d6c4279c9a8c64dd2160405189d7f9c0c8e52dcecea7248cc2affbd5fc142c82c2716878773e4ebab8864fd6ded7
 MISC metadata.xml 538 BLAKE2B 3eb09b3af0b2cb8732cc07640aeef9218ce4bffa529437cd2e5fa18a32c36411e29a4a923dcfa9691c67d274e039f54dad872e45979a14cb29c53af746a45bcb SHA512 64ce2e382ba91771caf3d654164d111191f65cbe281d8525ce4ae683ee3148c47f8514e1f01dcc9ec052e0db6ab75c5b2453dbbde5f0e00bd1b4b6da5b0433cc
diff --git a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
index 6459dc9faff8..240b2ae008be 100644
--- a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
+++ b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
@@ -7,7 +7,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Cfengine 3 configuration files syntax"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3"
 LICENSE="GPL-3+"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for Cfengine configuration
diff --git a/app-vim/closetag/Manifest b/app-vim/closetag/Manifest
index ce8821a812dd..34a62579b1a0 100644
--- a/app-vim/closetag/Manifest
+++ b/app-vim/closetag/Manifest
@@ -1,3 +1,3 @@
 DIST closetag-0.9.1.tar.bz2 4717 BLAKE2B e5324bf5b6017d7a1116c3d9dafb24aeb3151dc772250282be6897d9032412e47e09e7841c70a0703baa0aeae549a6fc15ec1547c1babbea08adbfbe3568425b SHA512 67e10871c98716bf65c1c1f3e07cb65ebd158fb058ee4e51e189703a5848e5f35066fa492c9614703936add21fbb34a387e9cf4a82043d794f3abb62d6c3ff38
-EBUILD closetag-0.9.1-r1.ebuild 418 BLAKE2B f4372d4760f56afe4e6fe127f519e0a35fc62285eb25279da62e5aec327b21d590fd52a8b1ede1fdaba11645cfa6617eb5a77d364a9110388208ccb8d9a8a960 SHA512 85279925059bb11e8b1574568f6619b0dc1c5df5d6686bb6dd6d5bd6949cd917aa43a03176af3efcf90232f429879b0edc8bcfee3b6a032f1e81324999880337
+EBUILD closetag-0.9.1-r1.ebuild 419 BLAKE2B 2d291226021ca5a19ba68ac30dfed2f6bebdb44eae057a849dd53546996367ddf191b96a24f41acf1af00ccc032bf5814f2ef17b4076cda379440820ea0b8c49 SHA512 48de522c5617a29dfa9a338e934449ababd777ae3a6cef9390673bfada3046fd334ad363f48d75892eee18a236cc53cb6cdf18eb725ce7a5ca6321fb9bfaafc5
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/closetag/closetag-0.9.1-r1.ebuild b/app-vim/closetag/closetag-0.9.1-r1.ebuild
index ab2e93def305..c3a23d7a17bf 100644
--- a/app-vim/closetag/closetag-0.9.1-r1.ebuild
+++ b/app-vim/closetag/closetag-0.9.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: close HTML/XML tags quickly"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=13"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/cmdalias/Manifest b/app-vim/cmdalias/Manifest
index c3b46859788a..b10f66377d87 100644
--- a/app-vim/cmdalias/Manifest
+++ b/app-vim/cmdalias/Manifest
@@ -1,3 +1,3 @@
 DIST cmdalias-3.0.tar.bz2 2601 BLAKE2B 89b36b2bd638dbdc454739e1f9a3cd61715faa5c392bf3a85c937a0ec179f4e35485ac3137fdb84c2d66ba235e44af84d1ce42ca7e8f212438e88eb91f691570 SHA512 a29b8b588c662ca48e8208422e4592e4d2a2908f23ed123b0b2aa639e6c05725dcc6ee0179418dbfdc39108953de064f5da5eec4261f7e9db5efea0d91fe58aa
-EBUILD cmdalias-3.0-r1.ebuild 442 BLAKE2B a7e932c1c2babf9b35c8380b16c0e5c9fdfa1ede74b771525573ab9ea9aa5ab7ddcdf1a37ba50e1d2b675a9747eafec02b27a93d470254145ddb88d15b2d4b7a SHA512 64ba4c261fb9ed34fafa8b049bfd83113fcc206a836dda5e80b80e1205a6ce3af5edd9a67f6aeccf0fedff7a362d464ab5c5ca4c6d645580437ba803b9f743d0
+EBUILD cmdalias-3.0-r1.ebuild 443 BLAKE2B bfdbf97040e100202da1f31eee4207eb8ee18fd58c68a3edcff938a532e54795d05d58e1318e86eeb90dbe410e02858906a604a5d9336ddfd0f75818b001ccc0 SHA512 53f611ee256375488e2fe22842184ff5310195690b88a72b12ba00430043e6d1df8118555e50efe507938c4f7bca92a606bb36d59c019634bde93e6e63af623c
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/cmdalias/cmdalias-3.0-r1.ebuild b/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
index 0d37167dd15c..44d07e91e562 100644
--- a/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
+++ b/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for alias creation"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=746"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/colorschemes/Manifest b/app-vim/colorschemes/Manifest
index bb5f2d86939a..0d56031016e5 100644
--- a/app-vim/colorschemes/Manifest
+++ b/app-vim/colorschemes/Manifest
@@ -1,3 +1,3 @@
 DIST colorschemes-20140623.tar.bz2 683654 BLAKE2B 465c6dda4b45b847ac674d0116987723f68454a97b57471569d3d7333e64960a6ffac8a3bb4d157f2f9f87d0be9ea871871ec33de2e9e09fd67eed1ad8fa96b3 SHA512 523a1fcc5f179ede94887c844397bf507ba6432f7e8812794be3a2451f467370e0c2119000e138ca021f05eee4b3f43e34444916f3fed3eeb7749db459b502e3
-EBUILD colorschemes-20140623-r1.ebuild 844 BLAKE2B f2ad9606ebb275e3d930a6b932cfc40f0c4d4b10f8dc24a9c4a4c878767784129558afc3a2caca350646618b36e7f96e673c16b68f9ccb0fbc6c4d9ddca93186 SHA512 70867b1bf8d396f701cb44fc941ef73e170854fca49fb4cbd645d70fb63613ec371015a3ce1f31e1be0e6d91ca773271a5f7efadca34a25419ccd5bdcbee3a77
+EBUILD colorschemes-20140623-r1.ebuild 845 BLAKE2B 9d6bc7e0a4d1a2c1d7f6a5389fd2873bc27172ef1e68fce05ef0b47f35c48eaf45d5e38b2a54c56bbf262300d9fc339db226e20235508540f33a19cde9c9a4bc SHA512 4b7af222e41c6007393bc7c96fa640574c0c016e43a50c87f0b70c1b8d460b358f65a66ae91a9d33896617596227bd2f5ff5d14fcda4869ada9290d6848d2379
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
index 7c04954fbc90..f2b32f4a9bef 100644
--- a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
+++ b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
 HOMEPAGE="https://www.vim.org/"
 
 LICENSE="vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a collection of color schemes for vim. To switch
diff --git a/app-vim/colorsel/Manifest b/app-vim/colorsel/Manifest
index 3347c06ff1c7..71120868cde6 100644
--- a/app-vim/colorsel/Manifest
+++ b/app-vim/colorsel/Manifest
@@ -1,3 +1,3 @@
 DIST colorsel-20100406.zip 11216 BLAKE2B 7fed182d4d79c1ab971f734a196a3d99b5b45abf92fa5c101ef05c8b74b8f4ddeb0bb144c46c23c3926f2f40a22f1ea0f107f468744232e5e6640622e9098984 SHA512 628c2824ce0c5524f45eac209010873324111c33697fd4e36a71d7dbe7aa83f388caec46cdf18224faaaf5480fb671e2e0fa241f0ab4379b276354217d5587cb
-EBUILD colorsel-20100406.ebuild 512 BLAKE2B ce678c3fae7ad07f85cc27018bcb46ed598b98d87ebe733ae145b913fcc17a9c5d4d8db89b26d2d9f57532481b29942fef66686ea5a3def4b0cea4bfd3475213 SHA512 be123e53431f2b3c8b67fe501ee99ca3babb8cfc781dc39c6597df9c8bebd276b5ae2e96edbff56f316639722a01911123a89c8e697c9e80edbaf420b8c2fb56
+EBUILD colorsel-20100406.ebuild 513 BLAKE2B 7b690bff4cd4b6ee0c49df77d3ab9ad6ea541b9f86c37553053ae04a14605bf9e5105387f7997db4cb571597fe55caa127439b3b2ed35a2cb2874bfaaf645563 SHA512 31e35ee45988147c492d80a41003a6a0464bac56b6aed1fad6221c12b32bf4fbe112a42287bbfe6d2eec37dcf79ce0c9a48e26c1bc6f3947c10ce5cf495371ab
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/colorsel/colorsel-20100406.ebuild b/app-vim/colorsel/colorsel-20100406.ebuild
index 7c63a3c90123..03be1d10aab3 100644
--- a/app-vim/colorsel/colorsel-20100406.ebuild
+++ b/app-vim/colorsel/colorsel-20100406.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: RGB / HSV color selector"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=927"
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=12789 -> ${P}.zip"
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
index 052a34e88bac..6c2cd71227c1 100644
--- a/app-vim/cream/Manifest
+++ b/app-vim/cream/Manifest
@@ -6,5 +6,5 @@ DIST cream-spell-dict-eng_2.0.2.zip 1778434 BLAKE2B c4f73ba51cf1371faec1d3aaae44
 DIST cream-spell-dict-fre_2.1.zip 872841 BLAKE2B 0711e0780c8a9b77f8bea9deda47bef3417ebea91f672a5146a0644c2f2fd70f4ccbc032802a62bd60b908d1c289a2acc46bf80115a3c37a5ef113f509319773 SHA512 d34773e3ec2bd905a669175680f91146ead8dc0a7d3de8fa668c56e550eed23ac6c8678b2e7b3c642b756d6eba97b815494395c07b3f28cb54e3a01cf8f5b1a0
 DIST cream-spell-dict-ger_2.0.1.zip 894848 BLAKE2B 0018d95b887ee48b7f36b9a7a90413a3a45c4daf6f939ec428670f54e690206e447813c0fff3048106d816960b6be0ce7153362dd0305fc2276fab1b58269efd SHA512 1fb1a797bfbcd0516d8124daf1256b27a356ef3eb58887c2a55fc8537f211faa60dcba713935b2fa5595ebf6bba07a1463819060018f725e5cd0952b978a342a
 DIST cream-spell-dict-spa_3.0.zip 1710280 BLAKE2B 44039b8ee664fe9c9664bb60af60e6b9687dd51989a2452ee3bc7afca4fa6d7f124221aca7d8578c27b462b3d660417a7c518ba4bbff64fa76125cecb29f0fd9 SHA512 27de9d920afe191ae4e7d5267b5ad6fb14a6e4185d474c09d17af1eb45f926dab2d4696080cee25d1591bf0b588234a20778e9b1485927dfffa8595b19e247d2
-EBUILD cream-0.43.ebuild 4344 BLAKE2B 11b442516988d105f75db06950fd699d0b7adb2192f1de113602cb6da80bb956d467c2a106a21aaa478db46adf7c47f95659cb1dbcc60858b88b6b3b79c9510a SHA512 f3b4fb8ae5d23d56402dfc2c4d18dde113b2ca7fb206512cb664f0e0e13c25785ebc386d4f16c743f24dc27b07d42495ba41c11d46bf337ea83b25fbc8cdba3f
+EBUILD cream-0.43.ebuild 4345 BLAKE2B 4794db5dc022394996c051cd2e7dbbc3d753db07d5ee10a9a88b30b39d511b980864861170c93d9ebb6be2f5448b004c0e07a33201e51a8ae6f9ca6751fca69b SHA512 83d988ce5b7d09413cb4f5575097f4420575948efab89d590e73c86428c65d530d9f34dec723a2f66e98b8b4798c6d38083802a82affeca4e8a4f816d1de6c19
 MISC metadata.xml 324 BLAKE2B 6c7902862acd6c6ad8e94e0bbd0d63f771039cd456cc401a72812c2dbe94d91bd13610fe77cb6484fecf33afc9beccd8aaa3e8d11cd4dfd0884c3bd90a228c10 SHA512 0c3e2ef2f849117218de711a2952e6571f92a5bd768c61004284bfc72f8945c77174fb3f83bb70c69ef030dbcab467eb1a531e09a0baf7d85167c3deade5cf65
diff --git a/app-vim/cream/cream-0.43.ebuild b/app-vim/cream/cream-0.43.ebuild
index 996ccd4a5a63..09dde882858d 100644
--- a/app-vim/cream/cream-0.43.ebuild
+++ b/app-vim/cream/cream-0.43.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 IUSE="l10n_de l10n_en l10n_fr l10n_es"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 DEPEND="
 	>=app-editors/gvim-7.0
diff --git a/app-vim/ctx/Manifest b/app-vim/ctx/Manifest
index f27d46659c98..02539843bafd 100644
--- a/app-vim/ctx/Manifest
+++ b/app-vim/ctx/Manifest
@@ -1,3 +1,3 @@
 DIST ctx-1.17.tar.bz2 4391 BLAKE2B 2e6ba12c1f416e7de10bc2b6fbef79cc0b4fd3d3e80820034db3b327730b8927afbc26fee4d93b96cbaf510d8642a4ccf95b6b13cf8d83d6d05de3deecc0238e SHA512 35839f005cec56baf90ecbf46ce28530f9d3a18d8a538323d3f1d2134fa392a9595d95c3258c9ce2320381a69b1fb4a61b2ad2cd9d4c581e75bea378dfe7e13c
-EBUILD ctx-1.17-r1.ebuild 477 BLAKE2B dec530b3b2934fe23c02c445bed0ee801a9ad4dada34b63707b944391106cf2020a1703032072953d9beefbf1aad2440ce8562539363965c42eb903791d583d1 SHA512 2944924f6795b7a9f510f5685fffb2bf04152d21056210f429345fa84aa786536524a9222163af334cbad2161f0d00518763faed4d9388b89465936653fb13ec
+EBUILD ctx-1.17-r1.ebuild 478 BLAKE2B 2f5d46d6e08bdaa7815d01ba85749259421d7a8a48763c6b11456d6be150f29806dc393bebb93c6fac57e9389e86d2e32423337f343a265f4a521e751cbf21c0 SHA512 1f3c2b46ba88a76e954467098dbbb78d1fdf5b8f9fe14daad0e803b8ccc4aeceb441d5507312029d3e7bf9db41a13b34d62772b506a5f5b133f754e72ed778c6
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ctx/ctx-1.17-r1.ebuild b/app-vim/ctx/ctx-1.17-r1.ebuild
index 3d0faf39b45b..e7ba75efe04e 100644
--- a/app-vim/ctx/ctx-1.17-r1.ebuild
+++ b/app-vim/ctx/ctx-1.17-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: display current scope context in a C file"
 HOMEPAGE="http://www.bluweb.com/us/chouser/proj/ctx/"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc x86"
+KEYWORDS="~alpha amd64 ia64 ppc x86"
 
 VIM_PLUGIN_HELPURI="http://www.bluweb.com/us/chouser/proj/ctx/"
 
diff --git a/app-vim/curcmdmode/Manifest b/app-vim/curcmdmode/Manifest
index 1e1b1c020820..7349e544c2a8 100644
--- a/app-vim/curcmdmode/Manifest
+++ b/app-vim/curcmdmode/Manifest
@@ -1,3 +1,3 @@
 DIST curcmdmode-1.0.tar.bz2 3566 BLAKE2B 138c7b9b84d69a40df731dc633dd7b7e2b2859af70d8418a5760a7b6016dd61f3401bd7bd1bb7854e500c744cabb8f0c65a89fe2ee37ffbe0a3117909c232491 SHA512 eae4e7cc92ae3838ffbdb507fd51174daf2fcd05d23f418555ac9ea3dde5562e49c67ee7b27dfcf6bf2088dd335ca97165835919dd804a86fca581b4d6bc0ea2
-EBUILD curcmdmode-1.0-r1.ebuild 487 BLAKE2B f7e27dd0363ee7a6467f0872215f942ed5223c77f8f3a0e0cf72e64a0b5e05d3544cbe5839ae891854828e17874c44605f659308babf90aee95dec998ff4b8e4 SHA512 fc04cb7a064c5838136757c7fe5a7a87617808960b2f3c2b07bb44b242427634a0161fbff3b14bf97ad6b5138a08071f0f631426f3c9f91d046b1cf24cd23e36
+EBUILD curcmdmode-1.0-r1.ebuild 488 BLAKE2B 4e790e767864b50e09ac45fa0a22a74d2562d0dcc424c2c3391eb61873378c23f69118015ad6d0e5d9085916c247ec69a87211a47292e4da5deb8754291b9b4a SHA512 73dcac7ea920913195c8a4cd66de78c6d201ef7c0e433f38c3af915a9902aeb2bb3db2a1f1097b44dfff072ae66e0bb8bd3f761ab4b5c5b58188d81264040302
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild b/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
index 48607fca05bf..ed01186b17e0 100644
--- a/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
+++ b/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for extending vim's mode() function"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=745"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND="app-vim/genutils"
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index fa7c80613dd8..3c066c0544d3 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,4 +1,4 @@
 AUX dhcpd-syntax-20030825-multiple-addresses.patch 588 BLAKE2B 1f38da00084f2e3c42ec7c851e0d4798782e7727f4677a289b0db9096d93bcd8fb2a28695c05f390727bca1c1f27ed7f4918472496e94e673009ca8ba40d9600 SHA512 9b6a22f50bb4402fbe63c7971b11a1b1d7dfec5976758897aebf14a8f0025c52daaed9e3c8668a93f5b2c7c61afde600040f6c64aeac62f2e0e9a6b01735a74a
 DIST dhcpd-syntax-20030825.tar.bz2 2761 BLAKE2B 95478de740c28a93e03179e576e2edf02a682a6161bccae676b379dbb5b654d0239c3f8e523925f2e6d36f949847f9ba7cefae20104196d71f42837afcaae76d SHA512 97c1706e0ab2c89ee20618ae0c854347f8674a3008a5c4414aacb78e984e35b0eb6eeb5f641363ed6601ceeac0c794577d518658db9200c7391871ffae5341bc
-EBUILD dhcpd-syntax-20030825-r1.ebuild 492 BLAKE2B 72c9c1bcb39f96dbfce86f340777d633a995c7c48e310ef82c227315b3329e93a0c3c49407f3d69a72ed150a9b56f382630ad8e700fa10c44af07836d3884f5d SHA512 22fae6348c75418e624d8d379130f8eb1a4d05d6b6522c82bf3340fdfe226665bf9dc40854b6512ef273c1c19cf4d1ac80628f0218879329a9e5af878046d0a3
+EBUILD dhcpd-syntax-20030825-r1.ebuild 493 BLAKE2B 4cb868410c460410da0f1a8ce24ee0aab2aa20e3561944fb0ceba0cfbdd8ed484b2f5bfaf2f60d97a78011b91fb54f744dd5717c67bce59999039e7ae641037d SHA512 75948c4f644bf9312480d227f14f28444a6555c3619158be87ceb31c58443146da77521592982cfed5f5b07716d19c83cb5cd4ac433eb1970d1971bc934440d6
 MISC metadata.xml 451 BLAKE2B d8b36c756c321d18b52d77db7cfcd40b3ee3c9e8cdc282c090f6172f8b58b2639026650c317cbd2f4b1d575353a4b3cd22d80fbcea298d875fa5b737d69976b7 SHA512 cc138ac01df08624272da2daac14b2efd86fa8880e79b76de9fed6798fb5b8f6421fe608e2851af9c1afb7e6586f8d3f27865729960ce82ea76ac29f499e9e9a
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index 0132957321bd..ff07a2248b5c 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
 
diff --git a/app-vim/ebnf-syntax/Manifest b/app-vim/ebnf-syntax/Manifest
index 2e82913f67ac..21882f95674a 100644
--- a/app-vim/ebnf-syntax/Manifest
+++ b/app-vim/ebnf-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST ebnf-syntax-1.1.tar.bz2 981 BLAKE2B 5ab1916fc909f8b6b4fc139fd34c5c982f2bfac3f4ccfa53f13945787db6b9c6b5531cb805d4a0feea5f3165259cd3a033951fd9074344e62657e067571e5300 SHA512 0fba3be91e998b26a3011bfe18765a3bc3ebde6aa33e96580dc0529d79a067020cfeee614dfa40126a1a968d3ca8e77711eca096095675cf6072061c9be7c083
-EBUILD ebnf-syntax-1.1-r2.ebuild 582 BLAKE2B 109f7998c113695e6404c6630c508a73e157ca7039778e0ab4864aa21af2f08926ff4eab1bf2557f56309d75614f73983ef073a97c385fda8383557b8d5cb66d SHA512 1642c6d5ae458bc4f7edafbf65dc994a01f28c065f6321a5fe3f36b7d9dadeb2e51f79e1a1032e89d3bb6cdad796322db6979b65159fe1ad3eef5a429748155d
+EBUILD ebnf-syntax-1.1-r2.ebuild 583 BLAKE2B 0ee6478f89dc1bf90691e2c7419f0d8323241ffd7e881160dc6de92d61799f0cddd516d97c6bbdb28e7d7c35865edca07e720be788e54090c0df8f8afaff2314 SHA512 7782cb159ad94ab78ddecfb5ea0ea8bc7e03c3489f72d3ec34bcb7ec866a87df3da3fc6d95c79101df940ebba3b79d3328f8d7d7b902e413aa9f7a5e7884c006
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
index fd08be1bffec..d06979c9c949 100644
--- a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=545"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
index bda97a019092..e005d4b0e112 100644
--- a/app-vim/editorconfig-vim/Manifest
+++ b/app-vim/editorconfig-vim/Manifest
@@ -4,6 +4,6 @@ AUX editorconfig-vim-0.3.3-python3.patch 5601 BLAKE2B 4a9bee66b7b3b2b016d13a557a
 AUX editorconfig-vim-1.0.0_beta-wildcard-slash.patch 808 BLAKE2B bc35a580b10a9fcad5916197fb891fa4b9bb8abf7842fbd292b2a91dca60f95282b1bddb365d2286bc2eda4b4a8d922e8aea89312aafbce3a039288adb112e71 SHA512 004f27b01d0f8bd2a71687ce2c09bc70895377034775ee7b2705874d2458cacf36b5d1300d6ed9e1a6925b33428c7a208e223e4f65824cd3bedf56b938c7bd92
 DIST editorconfig-vim-0.3.3.tar.gz 35395 BLAKE2B a7b65c1472024017dd408e5c4ac5048004d0bd55f44c7cfba49b5973cb445125ed89cc3d4363fb902a4c5fbb507f3ee5ed0ca48aece3fb6915e643bae0dbf70c SHA512 2dd968cf6bb162db8e6242ffb60cc61fb05a8042804b6b46b9f9cd35be968f83b473f04797e47c5cff11d7c052ff523bf8ba1d568992d44b72b97b54a81425a1
 DIST editorconfig-vim-1.0.0-beta.tar.gz 31519 BLAKE2B 2d5e8e55e8dccc0b45453b8da9ecad80867a84d1ea20146581886f793c093c201521a7d1d4451122ae441d30f58acec28d29aa20da9de737b5beb7f44d55c0ed SHA512 159e3ca32a7ffe71853ba62a14d0469310b81345b0e704dd6a9f42c56f6f6b9a3f63502ccabcf43a15443acf4acefdaf078063ae747f49315b89f5518d7f9816
-EBUILD editorconfig-vim-0.3.3-r2.ebuild 944 BLAKE2B a0525d91f171c7343dcc9f8ca98c04d9f88682b1f789125e4b65d3352d76104348220ee34d384383ae9794e4ea51c439e2d3db1f4ee9e2ad5bb01e262bdc4b2c SHA512 3ad2a62753e21dcea790b3bd45330dee157bf6ef06ead05d4e70a439869e9474d70aa098f71578a283bbaf31e09f7b7da33870b9bb4ddce2bc7bca5d487276dd
+EBUILD editorconfig-vim-0.3.3-r2.ebuild 934 BLAKE2B 155150d1a69046983912213b39845e903db3b8fc300b2b730026eb980f24e88f37cc9865f3426826a90ccbacf83d293ad92854de8036b0166ecd3ad147d54d0d SHA512 6b3c96e74dfa6e15b1c733a590e3b04b3b9372804fb12dcc194ab0cc61608dc69019191ded4e0cfa5970e7a4aa3c98560f4522a536107e26e45ccfcbce67c08b
 EBUILD editorconfig-vim-1.0.0_beta.ebuild 781 BLAKE2B 2580c0c64c53203e5e09fe72459239b8992f5f644c6d0af485525fc445417fef88fdd62adb22019066dc6860ae84be82f01a1febbc2742808e6b84e529f4a14f SHA512 eda756f5ae0697fba4cee959571ef3314f575b6d11c1aa1023f71cd3bbed9c147f8d210235ef306af74e6988849cb242d8baf45ceefb19421ccaa0b3eb3ea13d
 MISC metadata.xml 419 BLAKE2B b73a8d7814d585826406516eff8e391fbeec6b1da25bb5b583ad65709260819753bba45f88cafd3c7337854843ce7aa02a8f00f9ab49973c0bfa422e4ef801d6 SHA512 57167b4b86b6bb89094b28341476c03f8415c1dff97fd90f91c882991afe5e33fbd14edd38a18e07d06f3498f070ced5ca9e598b66e7e615c37146b598b6282d
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
index b32db6c1c566..a3f80d6cb8c4 100644
--- a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
+++ b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python2_7 python3_6)
+PYTHON_COMPAT=(python3_6)
 inherit python-single-r1 vim-plugin
 
 DESCRIPTION="vim plugin: Support EditorConfig files "
diff --git a/app-vim/enhancedcommentify/Manifest b/app-vim/enhancedcommentify/Manifest
index 7f0756956785..b74c873726d2 100644
--- a/app-vim/enhancedcommentify/Manifest
+++ b/app-vim/enhancedcommentify/Manifest
@@ -1,5 +1,5 @@
 AUX enhancedcommentify-2.1-extra-ft-support.patch 665 BLAKE2B f9afbc2602b1f7b215943a4bb504e31780e41edc602a80c5aac22780561c6be0cd471dc19e6adbc9be66e56d1db1c4c6ae972b8eaea62328c00146f41aacce11 SHA512 44adbcbf9fcb993db85e56853cc0eaed95fa9b194bec1a1be71523323ffb6640fdbedafd94b4f336de105c0b1b07c6b479a6f40a5a15bb6baa5a22644e33946b
 AUX enhancedcommentify-2.1-gentooisms.patch 808 BLAKE2B 6802720fdc4883629a2e180461982ea9f6d51886d882895a4aa962b4a407e096811473e97b9fd6b502d4d2aa0da076625fd758c6b108c930e8596059a7fb8084 SHA512 974ae98fedbc4c3ea75499d615066efaef5dd8e03ebe00bb20a5fdc6dd8d5cc7ebd0f34e86cb587175f0c3e26d04bed4d09561216dedcc7757d1e9266dff0046
 DIST enhancedcommentify-2.3.tar.bz2 17005 BLAKE2B cad7f66092a9c54535226616dc2da8c13b9fcc1ae8cb2a5077462e0138345033ccd756556b640ee6e4569a1ba2037b98138ad84f9d44d9466a3955f3ef0ea12e SHA512 673cb42fcc5a2d23ae404bbfa4664f388901249d3ed8315f77227f3fa42f3c267d69eda7554347b4e70de81c9bd58437c243a42d62218444063d5235fe22a171
-EBUILD enhancedcommentify-2.3-r1.ebuild 557 BLAKE2B e34ef57120978c754cd59675913d27194f62514bd28c00d23169f58001c5d3c81a801f13957b48fe0605d3a631c8054a9fa5fdd4d51cf64b6fea1edb2866679b SHA512 79b809cc7879538aec0f25840020e0cd9a22991c20ba55d3c55fb1430b8fce7747f6e9cf7e9472ca3e84f6dc790cd98aa58d87fa8aa7d68833df41a44667b35a
+EBUILD enhancedcommentify-2.3-r1.ebuild 558 BLAKE2B a1423a651d481210b5126bdb60eee04fe00f6308b927b32f8d5e9cfe57d1867eeab9e1a2ec8b9681b55563ffbaa73bfc4ecf444b7255f426fda4270b024e2780 SHA512 7e83d1f6d4f595d5741a2b358128b365fd48cab73b4923ba5025c1c0fff0aa91a6f7dc6b22b26190a92a670d212a159e253649f386a595734f93728c1849050c
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
index 3d04912e6153..0e62c1ee5e07 100644
--- a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
+++ b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: enhanced comment creation"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=23"
 
 LICENSE="BSD"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="EnhancedCommentify"
 
diff --git a/app-vim/errsign/Manifest b/app-vim/errsign/Manifest
index ab1ac1b8f93f..0d53a277fa4b 100644
--- a/app-vim/errsign/Manifest
+++ b/app-vim/errsign/Manifest
@@ -1,3 +1,3 @@
 DIST errsign-0.1.tar.bz2 599 BLAKE2B 85b6589da0cad1827d16d33e1e38c7b533c3ab3caa985bb77bdb5cc8f96fbc1e29daa6d925ff30be69e8810bf7ea8148d0c4340144743f6cdc50d2c9110ce9fe SHA512 ccf1136043b5a54614ef90190c157c02fa5470bd79159b8ba6f7a7cd95bdd0c0dcc41eb993d8a26d2b308012cd400f4d3168f4e7dde7bbdbe8dcedcfe5d1c929
-EBUILD errsign-0.1-r1.ebuild 548 BLAKE2B 9adfa98efb0e4e6a6ba0299f9ade747ac2b040abc025435cd7afa6cf53e01599fe91430f3c0569db8ecec526815ad65397c08f60d879d94f58926b2154157c0f SHA512 5ba4594fc680687fe5bd350670ea7cd8c7f2d341548e33a167e05665aa419175651dc9fef7f7383a3e252e00d028441e9dfd760790578a46ce258013ce423e14
+EBUILD errsign-0.1-r1.ebuild 549 BLAKE2B ee96a2782b54d43072f4986250dbca8b4f95633e33bbe12d27bcff86a2b8646d103f3db62d9fbed41bd62d49e459077818fcec4acfaf437284d5f1f3eff41f08 SHA512 38fdee677c30d1d26c9f249781643b97bf262f08e1323ebfe595df583b423b56e5158747579d889e93d74961ae0e81315dd2dc4b7ee81189b4964827162178ec
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/errsign/errsign-0.1-r1.ebuild b/app-vim/errsign/errsign-0.1-r1.ebuild
index 46ade2f94c13..c9592c46bf19 100644
--- a/app-vim/errsign/errsign-0.1-r1.ebuild
+++ b/app-vim/errsign/errsign-0.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: display marks on lines with errors"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1027"
 
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/eruby-syntax/Manifest b/app-vim/eruby-syntax/Manifest
index 3bf986ea1b92..edf9fbb53be5 100644
--- a/app-vim/eruby-syntax/Manifest
+++ b/app-vim/eruby-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eruby-syntax-2.0.tar.bz2 958 BLAKE2B 467e1df5bf32ad83bb427bfde6755425a752051b1532397e75f627dc084cfb6bbeba99655366698f812bd398b171fec4110af0fba28de1900a0a22aaa08b01ec SHA512 1fdf1e6ad95109528b13b30d7504da2ea8678785b1a716c33bae0b94fafb8f23d50d81022b5bc373c1970f6d3df04f2e78d87fbb2067f0c270780963b472468c
-EBUILD eruby-syntax-2.0-r2.ebuild 508 BLAKE2B 94551c7ee56ba3e4929cdee9b2623a0975832032de9b4b5eac5f0e0e521682679b6904b350909f32bde89ff03c39082d342a910f53054e08f6bebbf0714a98bd SHA512 4421f93830a6f2cdab2f04f2df154db03dc36ba6376244d7f7a98b4fe597e61a31cb25a09141ea4a39b3ca181c71e22dd169176885810b244c39c8ebf1e2958d
+EBUILD eruby-syntax-2.0-r2.ebuild 509 BLAKE2B 88fda8dee29187be01671697c085656c278400ba536445bc8dbd4a127e6a064ffd924e5b364ea49e6b24d716edc4be1b065632c2fb795963f7450f9a1a268a1a SHA512 b7f0663a1a953eaba6dff0353a72e352ee98c360ddbcae9aec5c3f36d7846350a2ee72f06ecea182a8704132ccdba98f03e5aaab082ecb086cdefc9fcf2c06fe
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
index a2703de17a75..4e1c4f0fb4d4 100644
--- a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: syntax highlighting for eruby"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=403"
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for eruby"
 
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index 159f1d1e0425..44e83b1df93e 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
-EBUILD eselect-syntax-20070506-r1.ebuild 572 BLAKE2B 11207a2a43e96c50d79ecddabd75508cadba0504c1b75aa6b1852dad32eb6e1895661455c2db7ac269af0bd09f958e36bd2bce1208df85645a3cc7c7208928d6 SHA512 758c2d297db99a7dba703c4601af11b3725c9d3ffdf042d2be7cbde8f953dbb82b05a652a780e7aa1093437097d4af62094550cb9852cff331669a48314bcf07
+EBUILD eselect-syntax-20070506-r1.ebuild 573 BLAKE2B de496253ba0762399e52d3642e2b7c04dfbf676eff946985bf929313030e3a80d4cad91ca143bd76f8d792f9baf8cd45be088abbd404d3cfbe45dee06c8f27fa SHA512 e7b7e117b9a92bc88ba56438c76364cbee6d0ca7f4deeda5acb58152e4f262b7783ed67f2fddafd31a1980669783549a1d829e53ee38294bdc4657ab030f1350
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
index b51271c6fafe..ea10ddd21780 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND="!<app-vim/gentoo-syntax-20070506"
 RDEPEND="${DEPEND}"
diff --git a/app-vim/fluxbox-syntax/Manifest b/app-vim/fluxbox-syntax/Manifest
index e952ba84bed0..8f2d360c4c54 100644
--- a/app-vim/fluxbox-syntax/Manifest
+++ b/app-vim/fluxbox-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST fluxbox-syntax-1.5.tar.bz2 1376 BLAKE2B 2006668a89077febb4ec919354359cae1170156950abb553695d6424cb277bca69a5e8ffa93a9e4b09b990e96f9ee34654d34dc15320140dad589808ef9960dc SHA512 0567af6fe0994ea228ac56c3a26485ba5cce7762e3d70d6dced978e56017f6769072c83ae68125de3e03190562a7a10102bef038c02ae148cf70cc0c5951b8df
-EBUILD fluxbox-syntax-1.5-r1.ebuild 887 BLAKE2B 31aeed0df1e08e55fa34da96dce79008e33eeb3a9601969f9508ac1d4ef2e19bfd8dabb07e2621cdeea9f0fc1b5883882ddc9a2a13066a26c6fee2030183c23d SHA512 118677adf471d24c83c96724320a9289e21610806c6085e344a6c3cdd5e21bb01206172870439976529d5dd919bc5d6b410556292efc5609981a924b753315e9
+EBUILD fluxbox-syntax-1.5-r1.ebuild 888 BLAKE2B 5424adbb0ce367d7c75ddfa8b85ac783c39c23cb5219acde308b62daac11becb2962032f641bc107de49bc1fd89d9406ace2a86f454f8510ed27d4e6a76a0d58 SHA512 1e85e83ffc1ab0cd9724b31a074b38f579165e1e7207005fae7f4495ad4e6c5846f4f185dc165a839aa5459d1a7b52bb6c39bb311749dd441dee0e36b308fa04
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
index cac117a4fd89..99da06afb9fb 100644
--- a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: fluxbox files syntax and indent"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=679"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-vim/genindent"
 
diff --git a/app-vim/foldutil/Manifest b/app-vim/foldutil/Manifest
index d2c2801f0cec..d615f1f32370 100644
--- a/app-vim/foldutil/Manifest
+++ b/app-vim/foldutil/Manifest
@@ -1,3 +1,3 @@
 DIST foldutil-3.0.tar.bz2 7323 BLAKE2B de59313da23a277a2eb3e971b3033202001cd1304058b5e096e33e7c28f95326169754c0e0062120099677e567c6bd79b265a69524c8b8fe55a9666ab6bde23f SHA512 a38561c4530333f5a56596b2fe19a2892f58b4fd35229536c054578b199e9b6b19c18d255aa1b078d51ac4f610d4ca49b205d1929e8be51299bee527058b3452
-EBUILD foldutil-3.0-r1.ebuild 548 BLAKE2B 345997b30841845c4a647a491fea8b130ace2a94120e93a02b7885fc22a834c88d3ca29606a9c59a410200cfbb2cc6e9e85058b46a2d9988381376e82f52004b SHA512 37eb4a1975a91049247ef690aaee8a0b97e0876c1fc0fdc7798dff35369dbe41edf2b3b8e58bcd3a07dc6155c08270203d230ab5b2cc69925d3c7704c2b0157e
+EBUILD foldutil-3.0-r1.ebuild 549 BLAKE2B b61351af7ae365385f3853191b23bb3c8eafecff9721516a3fd93d93ae4798a8498d15297e20743e2934449e875f48730e563b584b928cb7a02b704b8a57fea6 SHA512 57ea9a24a8476eb12bd6a7ee008647c41fc6d4c659aafeeb903ad62d45aac5d4844874302b3f1de0ee0365c200e9d554a67d95b1cdafaf77ea7ba310f4df8728
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/foldutil/foldutil-3.0-r1.ebuild b/app-vim/foldutil/foldutil-3.0-r1.ebuild
index 034686ed7a4e..fc1ed812235a 100644
--- a/app-vim/foldutil/foldutil-3.0-r1.ebuild
+++ b/app-vim/foldutil/foldutil-3.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: fold creation utility"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=158"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=app-vim/genutils-2.0"
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
index 8d5f2de9d566..44d95ed23bec 100644
--- a/app-vim/fugitive/Manifest
+++ b/app-vim/fugitive/Manifest
@@ -1,8 +1,10 @@
 DIST fugitive-2.4.tar.gz 33340 BLAKE2B d5e5df47e0492510abae735dd47b51d797fe38862401f7d8e64404f6fa4e040641141c6febb13b05910cc44dc0372b084fe0ee8c3980a73d11d65e1a502ed627 SHA512 fb9d4129090bbafcace9400e9f21feae06bc9f903a54cfef7c4cbfa62856019a511b924c294e86fd26cd713d588ca0054a17d9676b59e2f406779ab5d51c3363
 DIST fugitive-2.5.tar.gz 39318 BLAKE2B 437f4c36b357937fc83e0107882d535c5cc9e609801147d1a48c28e16c4f964c221ff404301e57c9d740a04caf4cf5383a1f307ad89a76294e13b784561223bd SHA512 9a58ff3fa9eae72fca3d1232d01856ef56fe38b7bbf61be44ec4cdf4f0f69fca69fafe19266d657530a6d08f856236b1d1370bb770b14402bb7e476d5ca4bb78
 DIST fugitive-3.1.tar.gz 61142 BLAKE2B 15436725924d7ab09903973d77e9d7ce904f6bfaee451da2d3240236b2ef0589efd4b34e3673550749a6f021802018b2fb86f09ecdd727231f58bce3fd7c82b0 SHA512 4301e53a688ef1c822c146e04c41b6724cc38503733c622c0be8ea67ff2dd442f487fab8569bd3c8f7d97f6a4d5b42b58c0f23a216d74b862c09ed5c57f6ea87
+DIST fugitive-3.2.tar.gz 64708 BLAKE2B cab484ec66b7c54857856ed1f6cbebbf6d3fb1afdb35b004f72f8c06785a18d8810244255305cd949e25d1f78d734c46e400488526631b4070d3e0b104830552 SHA512 c7ac97d52f683a73545efddf33986dedecbae25208ebf0703dccf99cb46fd5020362f724c5b530aeca40467d9e864ce6597d6eb5eaa93a33643191e1aa5b44db
 EBUILD fugitive-2.4.ebuild 623 BLAKE2B d33285b4bd46225b4c6871a4a730d9db9c738a7100f423624914d2f99d0214a53db16d375701fcd4fe5c59994436fbfcb719772b9b2552fda9bd5331d56578ac SHA512 a1343ef40078b1345a163b3ae50620c2770b87cab3a360afd8b2af32a471569eac17e68a339ebb8591f012388775d09c557f3f0a2b9afc1b7510d31de22813c3
 EBUILD fugitive-2.5.ebuild 625 BLAKE2B 668ba1e4efa3a4dd956278462b24b2ca98b4e02378e2878c6ab85bfe5c13edf1336ead71aba7756e6e43af1e5dfdc9a4d678c2d2ffffbc9d9cbe0e8026fddcf1 SHA512 93a7857bee6df123e936ce6f1644b8ddd8fe5810dc3b799f71d93b4124e8277e4721b2793c2906009cf016be4119964643e168a79c0c8273e42b9991be9417d6
 EBUILD fugitive-3.1.ebuild 625 BLAKE2B d429d4e0ea98e6d35c91c17cef0c59f1bf27a0fa6adcb120d808cae0e7cec60dd2e438e83a07ed40c401423fbde4ed4f2fe016f54d21ec52ceddd32223d82a84 SHA512 ddc4ccdb0f6e345ef5d20fb53e5e34e02d451934b51c0db99048e4718ca71532a9d842337513f6d897f2b7d84465fd717f90779c7a7f5b2e0803ab9b8addd284
+EBUILD fugitive-3.2.ebuild 625 BLAKE2B d429d4e0ea98e6d35c91c17cef0c59f1bf27a0fa6adcb120d808cae0e7cec60dd2e438e83a07ed40c401423fbde4ed4f2fe016f54d21ec52ceddd32223d82a84 SHA512 ddc4ccdb0f6e345ef5d20fb53e5e34e02d451934b51c0db99048e4718ca71532a9d842337513f6d897f2b7d84465fd717f90779c7a7f5b2e0803ab9b8addd284
 EBUILD fugitive-9999.ebuild 625 BLAKE2B d429d4e0ea98e6d35c91c17cef0c59f1bf27a0fa6adcb120d808cae0e7cec60dd2e438e83a07ed40c401423fbde4ed4f2fe016f54d21ec52ceddd32223d82a84 SHA512 ddc4ccdb0f6e345ef5d20fb53e5e34e02d451934b51c0db99048e4718ca71532a9d842337513f6d897f2b7d84465fd717f90779c7a7f5b2e0803ab9b8addd284
 MISC metadata.xml 342 BLAKE2B cef6ff7e21df2703dc1c1138f95ad5f8e478a7c6bbd013791fd7c1b1754a2f7eaac9c84ebb42af9cef1943e7a94a880d0cedc030ff95966ac607a1b0b37dc37f SHA512 4ad3c706ea17ef2ab4e6852c6251cec3b8b5b37b687cd3ed87061adbfb791b8786bb5faa4550a73c707a0013ad8981aeda930eba8d74221cc7ca33d110ceb842
diff --git a/app-vim/fugitive/fugitive-3.2.ebuild b/app-vim/fugitive/fugitive-3.2.ebuild
new file mode 100644
index 000000000000..0d4da8993529
--- /dev/null
+++ b/app-vim/fugitive/fugitive-3.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
+else
+	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+	S="${WORKDIR}/vim-${P}"
+fi
+
+DESCRIPTION="vim plugin: a git wrapper for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/genindent/Manifest b/app-vim/genindent/Manifest
index e7f022e70800..2ad688111c90 100644
--- a/app-vim/genindent/Manifest
+++ b/app-vim/genindent/Manifest
@@ -1,3 +1,3 @@
 DIST genindent-1.1.tar.bz2 1248 BLAKE2B 761b5285ba8816ec8b64542d9e6784f9d771be8d02fc085dacfc8422dd636be600c44c973089b1922d19e8b2ec0256f66d547f35609db6d3f08eeb0998fb69e2 SHA512 aa90cfc988b08708bb25352b66196191e6cc322f2072a771cf768a0e2ace2e4e193e2e34dc0556266bd84c49055ec1d4183f1aec3d89fffc29f5ded88c26a2af
-EBUILD genindent-1.1-r1.ebuild 500 BLAKE2B d11fd1a17fcc5e3874d3de48488b2c76db319241a3bb5209ac1ac1a89868031116212ee2b0803b93682e2dc30466b8f1a0300f8f4ed0d7a14c38bd7cf91bd577 SHA512 3895b29d8e0b125ab877d8ef528518719dd6268a52ed81ab43df6e4eccbe3b9692597cc7d4ff4276456beced0b70f2c1087693dcc5161159a1c670b5dea61e34
+EBUILD genindent-1.1-r1.ebuild 501 BLAKE2B 289455d0d88602105f12facce7e25c6f2e1009c4867a1e1d3a7ad30f9d8fd4d96d439389b22b848fc0545d863bed66773a8d0f725b43f6ed59775ac47ccc4d5d SHA512 aeecc3edd6be8f3bc44bf6ab20cfc8e6235b7a9fb4f12cf30165d374accca1c59c6fe9594fa7ecfaf9934179e63e5e30f5b5dfe1d492331776b5771518f1a2d8
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genindent/genindent-1.1-r1.ebuild b/app-vim/genindent/genindent-1.1-r1.ebuild
index 910248ae4516..44e5d09a5df9 100644
--- a/app-vim/genindent/genindent-1.1-r1.ebuild
+++ b/app-vim/genindent/genindent-1.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for simplifying indent files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=678"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 133b0cc77636..63eefe695af3 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-syntax-20191127.tar.bz2 18635 BLAKE2B 79db829602df5795e32c44db71e28cfcda06ef014e9d5e5cf47d6f7fcb0b054c46caef1bb594c4fceae318df8a8cd0c6a619771ae5438eb21deed530842ce53d SHA512 654b69cf55719b9c254c376364f404c393189ec70d7b8a9284349774e00118fb636dbfefa86eb57220a49a5a7324e9f0484879d69afb199bb1c8ae7f0b5e591e
 DIST gentoo-syntax-20200120.tar.bz2 18593 BLAKE2B c29dd3b3896bdb78e5c07b40474434c5ba6fa8b3a89f8ec237136d0474e8eaace8a72c7e3974ff63eaa24d3e57a1e61785bfc7889a93f7263ef9387caa651936 SHA512 ab57707b4a44f33c085a39eb745ca206312d84ca49680e24a462eb75d65cc37694a545f4a31b4ee2919d0f6b30276ce25f6caa7e20782511c7534bf2319e8a4f
-EBUILD gentoo-syntax-20191127.ebuild 1268 BLAKE2B 0b459617961d1c9d3153dc43da3328f242194bb51382f24c212697da0f7e88d967dafa1e05a1b7c94b193221279a45567e49af1402fed26e8d720e54096f1161 SHA512 1e5a1283c590cc444a5588b173a56903b8f96992cfa9f140a6339cd8b73f5f44ba1ca577041cd29ff33540fa68dfb8fddbfa04a2afc51cde879fffb0b79fb990
+EBUILD gentoo-syntax-20191127.ebuild 1269 BLAKE2B 8cd60d78051ceef9c175b9f759e71047310834173c622a8dad689f48af7907c130cf1973f32bea8ba46f54de9416fc9b946ba0b23c3059716601899b5f4cfd8c SHA512 4cd75fcda4ddbd638e754c549d5bbcfe0fecb57452c9a6e0d47aa8ec03dbf311c231a447cc58a23a7587604548c2096a222e78157eddd0f74eecdb6814752315
 EBUILD gentoo-syntax-20200120.ebuild 1280 BLAKE2B 01ca8d12e6f0d3828e8efbc0bdb0e8cdcd902966044044911ad0e4204611bc92b20c19dd169000e1163c5e5cbaa0e6989b73464c142a5659a46e71cb850f8960 SHA512 c790cc5dda54ec29dda14a663e761b9b63da26efade0b5da67e3bd02869d47e9589ef5a53971b3a3567ab72bf6728651619a5cef5df34c243c599fc5189967be
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 585 BLAKE2B 7f904a47ab12627ae911fa96328c50af2cb16b785fa0b60cace8a586b17de344625b749b52ef6b89b4751aba74bc25339b3e6c9105ee47d15b5c6539b5d902ee SHA512 dfed3c4c2b3697b00896591dc4b23eb6433ce77b4aaaab05119ca0b11e355e321b2cf5f0ab5e0b2dd075abd1a266908e07b80846a11d50f17155d7ab35e6c742
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20191127.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20191127.ebuild
index 2a09ca25d5c2..5d1c1fa13955 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20191127.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20191127.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/genutils/Manifest b/app-vim/genutils/Manifest
index 52263a6a7f37..169d9899263c 100644
--- a/app-vim/genutils/Manifest
+++ b/app-vim/genutils/Manifest
@@ -1,4 +1,4 @@
 DIST genutils-2.5.zip 30510 BLAKE2B 4e9466844efc0cc607b22ed6aca4cb49f1b65ce569e631a2a0c7f4534e433ac70a3b57b18b8de930eb2604169f71e35c4fbca26b4a521a2ee34a48471a6c6240 SHA512 80a751038f629d58ce962a6be7d806cf2b7c35ad28f9d90e58cad32e1e462083629f2069ac23281683db026510d7e3d96d6883027d424fae3de63352b80fc5db
 EBUILD genutils-2.5-r1.ebuild 575 BLAKE2B 4d6b2df7ccb4507a477277da8f274d56770fbfbfe06edcaecb5d30b5dfd8ef5789e089a02e94d8d2ea92b0b699bc38b4950f0203831c5eae2e999de3c0dee31f SHA512 7e62d6852e6deec0b15e0fe34b7fc763f29f1862c6c0d35bc78eadd5187dc742b6062693907da5a58e2a67eb2cf1e581439a75e17933a1e46431c2290bcb7268
-EBUILD genutils-2.5.ebuild 567 BLAKE2B 542af48484cad7edba2febb8aa6694f3e4c508f48ee2cf0b03d81dccf54b200ae384df18fabf19547e75bcf3f8562acad96c814105e98b3673602636e59b5dff SHA512 76d043c8fc73223ae91309490f8834d9c5db03e3ad74457ca4b1985f670caaf5e278fe3fe76b831a7e398483dab7cc8dfff4543ff44f748eb6c2334bf7ac44e8
+EBUILD genutils-2.5.ebuild 568 BLAKE2B b0f64cedbce1cd7331939a69c77f4ac3c84816fdc32d86d324afa71d7bf824d1b4f7cbdb4e42a8b1ab219015eebd517eb27abf9242db3da485861800ba3bf957 SHA512 12de9c737d3403a9367e9d70b79a141b0b2c848ea13ae0eeb64ff1182c3870cbd9e622823a92372d6dd3410ef0e690a37eabf6956fc60be2297018bf98b3f106
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genutils/genutils-2.5.ebuild b/app-vim/genutils/genutils-2.5.ebuild
index ad3e2f826c81..a574618df732 100644
--- a/app-vim/genutils/genutils-2.5.ebuild
+++ b/app-vim/genutils/genutils-2.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: library with various useful functions"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
 LICENSE="GPL-3"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides library functions and is not intended to be used
diff --git a/app-vim/greputils/Manifest b/app-vim/greputils/Manifest
index 8aac9b20804e..f284a91c7766 100644
--- a/app-vim/greputils/Manifest
+++ b/app-vim/greputils/Manifest
@@ -1,3 +1,3 @@
 DIST greputils-2.8.tar.bz2 11886 BLAKE2B 7c1a8c08393d50d044203b8190c5ce35fa75b5ab6e2b18a6e5ad2eb679ac4685c92c336fe347e03db230a6f3a459d7acfac9f4e0161ca4adb17ee90192b38641 SHA512 07a7b22a900860b982bb0596232892ad056472fa48447131ba56083caef00318886719f379c9f9296fc00fd54575ab16aae71b3d1adf2af5d05a11a45a2bd7f9
-EBUILD greputils-2.8-r1.ebuild 480 BLAKE2B 67e8437109fb5e09c370408acaea2d85d714a0448dcbb72b3680b5180733932e5f105cad46be7b072dbdf5015617d4ea7df552cf3cf838ac77db8d8c5cf4abc6 SHA512 ce50fbabacdd0264b1907d46fda725e9e989abd0ab2c4a8be8b31eef3be687491fbd5e60e045a2a66ddae0d9744bb6591ad00c8de621ca565417c7e9b7802282
+EBUILD greputils-2.8-r1.ebuild 481 BLAKE2B 0e942b075ad723e60d3c2ee85b6761a2f6f912791949642c5642de5bd9355cd7861267117876c47d1fb6303578375217441a2e3f473504c2321bbb09bed87628 SHA512 88e1d948e79617a99350afc8924d46ce9591fabeaa1eaacc1fc734ec9082f3add464636f467b440238705fcb7215a985ab8c8d257f3d578faf5aa3dfe087b0e8
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/greputils/greputils-2.8-r1.ebuild b/app-vim/greputils/greputils-2.8-r1.ebuild
index ad6fb677b12c..260e5354b911 100644
--- a/app-vim/greputils/greputils-2.8-r1.ebuild
+++ b/app-vim/greputils/greputils-2.8-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: interface with grep, find and id-utils"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1062"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPURI="${HOMEPAGE}"
diff --git a/app-vim/gtk-syntax/Manifest b/app-vim/gtk-syntax/Manifest
index 01ce767f9676..4ad6f491065e 100644
--- a/app-vim/gtk-syntax/Manifest
+++ b/app-vim/gtk-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-syntax-20130716.tar.bz2 234878 BLAKE2B 0d412e1a04f4cfa0303108bf7e83e21332e1ef4d84f6f65054b860db032aa65bcc0c1ae827ba4968e650114343eeb444bbf9e985e6c4cf8cf4f69b957936a100 SHA512 a90bdf84765ebaf10946b974c7720ebb9366f7ae5e360c8254ffd54bf9eacf1d0e35cf2061ef42727ffd7df3b4d78bb9e5f3ab7392180c435f8eef06c81ff5da
-EBUILD gtk-syntax-20130716.ebuild 439 BLAKE2B 494be95a3dbe1461ff9a9a66733abff49bf819a54fb5abfb8f243245c684e0921e17e509b2603cae81a585e87e2e77c1c4ec9e7e2891e03021e48eb26c621cce SHA512 6eee54e74a1f0b47569d850de891ad5a6f627d6a4db5cc8e76cb343fd399ab767324a98fa066381522d8541cd6065742286d9132f04926eb5661b610a0dbb157
+EBUILD gtk-syntax-20130716.ebuild 440 BLAKE2B 3abb8fbc7071ac2a3706f03eb0ec7acd7e94f87f6e84858914f79631028ec9b6aa6064fe30329e1271e003f1eb1b338f93c7ab6d50b92fdf2937fe91de250b33 SHA512 496925daa8a2485f88bcb9a6896cd419f95c9724afd414080478ab77de00463d6e3e3d68480bac3563413bbb7a2665800f857f64a1cabc9ac101f4ae994468fe
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index cf82bae1635c..d8c9332d56bb 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
diff --git a/app-vim/help-extra-syntax/Manifest b/app-vim/help-extra-syntax/Manifest
index 33dec7b626b5..b9d75499ee18 100644
--- a/app-vim/help-extra-syntax/Manifest
+++ b/app-vim/help-extra-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST help-extra-syntax-20050106.tar.bz2 633 BLAKE2B 2e46b9b2f46a102c9e7a8036198bfb87806ef40c87e2c5893203f174dbbbc89cb13e1743616834c9e273d5838c8ab996399d06cba7ad3ba0b692ec345d96e080 SHA512 84fde638941bc0b63b599ae0ae46dc151796409652bd99520df102b54e60497df23ee62b61d8ee2c7532029cf0183702345dffe743420dadee3e5ae6c4a2ef44
-EBUILD help-extra-syntax-20050106-r2.ebuild 599 BLAKE2B badb886a5c56dfa874109191d31dc8e8b1dfd1c5f362780fe27e0ca5f47714f47d45c55ec01bc05fd28f49a51f55a8e66ec4615981abcb9ae284fa7ca4c16a8d SHA512 6b40376d945836be0215367afeff9d2df88c5e94e0886a223c029ef4433cfe940ef1717b72604bc3cd219ab6ed3e0806fa89205a1e16c94b9d9f2215da517d89
+EBUILD help-extra-syntax-20050106-r2.ebuild 600 BLAKE2B 96ba1016dc94817b812490ba8599d8df5fa0f5f8ac89ff14fec96fe56c52de493ad9c4fb62b9b9964761e5980afd964b15928110d9043b0810c89a2b80047bd4 SHA512 e6db91f82e8561591e9faafe42e78e060fea7968727bdf09464f4f3b85b6a318cda1c9754e83074314a9ecb1d6dee767891ada40d82823094c555596320e8e05
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/help-extra-syntax/help-extra-syntax-20050106-r2.ebuild b/app-vim/help-extra-syntax/help-extra-syntax-20050106-r2.ebuild
index bbe11531b29a..d0cd9a5cd914 100644
--- a/app-vim/help-extra-syntax/help-extra-syntax-20050106-r2.ebuild
+++ b/app-vim/help-extra-syntax/help-extra-syntax-20050106-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: extra syntax highlighting for help files"
 HOMEPAGE="http://www.drchip.org/astronaut/vim/"
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides additional syntax highlighting for help files."
diff --git a/app-vim/increment/Manifest b/app-vim/increment/Manifest
index 07d60f4f91ff..2d5f59168bc4 100644
--- a/app-vim/increment/Manifest
+++ b/app-vim/increment/Manifest
@@ -1,3 +1,3 @@
 DIST increment-1.1.tar.bz2 3058 BLAKE2B d079e0fa180b68a0616ffdf5b2ca86496f7aca2ab2e69e27e16a56dda49c96eed0ad7c53e0a0aabc9b29fcb0895247987afb28282477247046e07bb3f01630b6 SHA512 eae4fd492c02e83556646df35c57a50c07a09ea3c9cca0c8d8e15b8a49b621007e3952c23dc997d99d22dd8352852d98332180aa299ecdd4e53ffdafdc6b7a30
-EBUILD increment-1.1-r1.ebuild 379 BLAKE2B cee4fc85bc0549e5f892978f0208d74fb10cab6d82d7f54bfb578d937b34fd19b96240a676e65e275820a873a6d5bdae8a70c30d60191a56bdf085a7b8afde88 SHA512 090717ee116381d9e2b6b215a331c2055d543cf0be315e999bd606e13975115e63062675d1f18a728adaa8d9d498e586de5af997d4298355fb7751346151c649
+EBUILD increment-1.1-r1.ebuild 380 BLAKE2B 368b3ceead6a82ef6935096dfec7eae32f8d5238961907ffc59bd2a6c7b21193bff52fdeb67fcd9a78697c66f67110c307e1e5466b9abdb6f0c2e55087eec880 SHA512 dde391a93c032bdc5a4604ca59d5336404998864c2f6f832b8eb01f1be7ae48020454c1bae0c7162854a2eab32b1a1505002eeae9b02362a2f55d188949d9f01
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/increment/increment-1.1-r1.ebuild b/app-vim/increment/increment-1.1-r1.ebuild
index 12e6a64a35e8..1c845e8feccf 100644
--- a/app-vim/increment/increment-1.1-r1.ebuild
+++ b/app-vim/increment/increment-1.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: easily create sequences of incremented values"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=842"
 
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPFILES="increment.txt"
diff --git a/app-vim/info/Manifest b/app-vim/info/Manifest
index 7efaea82c190..e0e5c944af82 100644
--- a/app-vim/info/Manifest
+++ b/app-vim/info/Manifest
@@ -1,3 +1,3 @@
 DIST info-1.7.tar.bz2 3958 BLAKE2B 23c8f8e06e923adc6d97ac578331cd5669dfe54ba7dc470c07426dbcf475cab4cf66ceb60a1f1b79c0fc12109db4ed3fee575bde56de221a9ebf8fe99dca9d63 SHA512 8d1d00b844a7485544fe02e17a3938a08b25be8cea7cf9f5e139be5b1f1f1b37abed8d717e149154d7bb87028f4d7e94b1ded844a6f83e8e645da2a214eaa81e
-EBUILD info-1.7-r2.ebuild 633 BLAKE2B c0c9c277c488bdd2377ceb1ded493786b3654f13a8079977ad9bd0e9a31366c604940ba8fac5f2a78078580001bf45fbd47d49d65eaa0258dd22f702b931aea7 SHA512 dfdc7c0c49905bead348d8b512869d488e781ef3b587c43088465a37df4871e89128bf14821ba5523172e9e461f843ed7b8dedcc9914018a46c4236533a5534e
+EBUILD info-1.7-r2.ebuild 634 BLAKE2B 2ccccde834cb3e6393f94ae2f9221c809985643794ff54538d02efcce4a2d7fab3001177a4474fb73baf9ebf7b9e1a8de58e3b52288497472d8dd323305dd971 SHA512 0029be191a3f5f1afc913aa4cc153f7be1997739a75fd31c949ee6bbb74d44572ed6c81db45214a258cc51bee7bb53a3a35434f9173b0de433013348282bc3ab
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/info/info-1.7-r2.ebuild b/app-vim/info/info-1.7-r2.ebuild
index 53f82639139d..0b7fc7095a66 100644
--- a/app-vim/info/info-1.7-r2.ebuild
+++ b/app-vim/info/info-1.7-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: GNU info documentation browser"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=21"
 LICENSE="BSD"
-KEYWORDS="alpha amd64 ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc s390 sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT="This plugin adds the :Info command."
diff --git a/app-vim/locateopen/Manifest b/app-vim/locateopen/Manifest
index d592150cbf90..2cf9aa760886 100644
--- a/app-vim/locateopen/Manifest
+++ b/app-vim/locateopen/Manifest
@@ -1,3 +1,3 @@
 DIST locateopen-1.3.tar.bz2 1925 BLAKE2B fe9b4c7abc0fb26eaa75298368ae7b9440a2c6d7d25e94da80693de0f61517b50fb200536b488f485cfd3c4b243bb8abe5606dda12e07a8f6246bd644d74e8de SHA512 93d1f89eef3b877830a01a0fa609855108e3415836128d27f3b66fa6e3c57614a81e0cbcc984e39e0353883b7d8fec86c73f77a4c3f10a1cb8183b8be21a6dbe
-EBUILD locateopen-1.3-r1.ebuild 789 BLAKE2B e57d87d9e895eb0c948607d3e9925d698af6e0fa31b54ed702d4c9223ba0f4e5504680b35bcf459540adf63ed8d286e12ca6d5b8b942b5211a56e3dfb0fb3bcb SHA512 c4b981c1ae3250645e09aab373beb068a5f748b58f5f71c180bbfd8cf4d00e553ac9ca8be1b881bcba9695e8e9256f44a991dde90c1b746dc64149dadb5b77a4
+EBUILD locateopen-1.3-r1.ebuild 790 BLAKE2B 5ee38ac72442b80cd5f8dd8471367dea24f959370baf034002a474bc9c2b9e6ffd84a5a0a86259309935329dd8bb39e7241235dbb14f9534c47d510b0d039a91 SHA512 452a6bd1750f213b12ba09f8908c46bd2b7f25d9a5b3655ca3943f36f1947945463cde9ab39d1f89274ee686f16e406006202fce9da30022675854d74f595c4a
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/locateopen/locateopen-1.3-r1.ebuild b/app-vim/locateopen/locateopen-1.3-r1.ebuild
index 0074be8f297c..7d29e724059a 100644
--- a/app-vim/locateopen/locateopen-1.3-r1.ebuild
+++ b/app-vim/locateopen/locateopen-1.3-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: open a file without supplying a path"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=858"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index 0322260c66e5..9e9e1aa01cd6 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,4 +1,6 @@
 DIST merginal-2.1.0.tar.gz 13510 BLAKE2B c44f3873f36ee540e69f1cd87558e2601f944f430d15ae0e863adbba5383637ddbae2bee01cf1f7788f677a159da7870a83b909562813f8817d610e85f9d4a96 SHA512 3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed
+DIST merginal-2.1.2.tar.gz 15156 BLAKE2B a8181ebd7aa67663b4541b5cb5028b6cadcca68c48f325dca07308ad13554d1d4b96b53f0a30e516cea732c880e68cb7e4cb7836b72cbd6b59a009e8d3c744b2 SHA512 70da5529ee22b3f06d83ecac62634d46d30472f064613a1844a7cdae31ed97366b5fcf6b31f4becd4cde246ccac32be6528c8c93ee2f02bdd32932388282f9bf
 EBUILD merginal-2.1.0.ebuild 721 BLAKE2B 7eb8255843d8b9cd741c645096e374ba3328585fdb0818676c21b111442fef0fc76395c54d3f7e84f072b1c8c481d7933157da41351215e3c85a4eeca8ec3d49 SHA512 c1f63cf5095f0729ba39ec1eccf9eeb382bf2a1e9dfd5d9a85486f9c315d5521f2d46704cfa6adf6ca91a2e2cf319e8e48a77c7eea3b69910a58d3ae978f88b9
-EBUILD merginal-9999.ebuild 726 BLAKE2B 563099f5ecf0290cf8542523794ed261252dd979f006a5e65fb48e1abade837b66485d056681c2b2a849d1fdcb9c9f2c6f1cd8fa5cc7a1e564232fb73ffa7ab9 SHA512 0792f9864e98b518a3a5422e3d1803cb51921b12c60856553d97880aba8b75c95a9ee3f0906475c39461a6f3266e6df31e09c778f96d3ca7fce36670804d5895
+EBUILD merginal-2.1.2.ebuild 723 BLAKE2B 1461df549aae456ce6a16eb691fa1ef26a91aefb50dd87ac46dc61d97a796f5cf601d31313e50af73de2193fd17d742db7049add5d74c20bf54f32e6a3f439bc SHA512 f36ef17603e3a1a1608fcaf283a1ab5c1d1937438b80f30c17633ede84712c54f57988d3d34d2565465e9a7b71c2c71de3c9bf72b7068afb62529f5294797e47
+EBUILD merginal-9999.ebuild 723 BLAKE2B 1461df549aae456ce6a16eb691fa1ef26a91aefb50dd87ac46dc61d97a796f5cf601d31313e50af73de2193fd17d742db7049add5d74c20bf54f32e6a3f439bc SHA512 f36ef17603e3a1a1608fcaf283a1ab5c1d1937438b80f30c17633ede84712c54f57988d3d34d2565465e9a7b71c2c71de3c9bf72b7068afb62529f5294797e47
 MISC metadata.xml 345 BLAKE2B d484adbd45fa9339d6199f9978129adce0a8dc2ac1a8f0edf4dee62cd115a8043b0aadd6bc7708305516fd16caa6da8feeab3270f2e7f82bb751e916c0a2573e SHA512 c86f966d8b95d7ae380395af45af1046b3102e4c921f5a4102b4d421c707659b4e5aee25765b8af1e815cb5274963bdcae482cc4700d3196259e62ecaf6919ce
diff --git a/app-vim/merginal/merginal-2.1.2.ebuild b/app-vim/merginal/merginal-2.1.2.ebuild
new file mode 100644
index 000000000000..6d95e33ef108
--- /dev/null
+++ b/app-vim/merginal/merginal-2.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/idanarye/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
+LICENSE="vim"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+	rm README.md || die
+	default
+}
diff --git a/app-vim/merginal/merginal-9999.ebuild b/app-vim/merginal/merginal-9999.ebuild
index fbe6b96d4612..6d95e33ef108 100644
--- a/app-vim/merginal/merginal-9999.ebuild
+++ b/app-vim/merginal/merginal-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit vim-plugin
 
diff --git a/app-vim/multiplesearch/Manifest b/app-vim/multiplesearch/Manifest
index 7e6097ef5edf..a68b824e61dd 100644
--- a/app-vim/multiplesearch/Manifest
+++ b/app-vim/multiplesearch/Manifest
@@ -1,3 +1,3 @@
 DIST multiplesearch-1.3.zip 6500 BLAKE2B 6ef00cdc03b46f714ced36e38e7928ccdccb2821c09d35e08fda77520b3f7ea612ca2f7818aba19d2d9b0baa1ab5fc4268b547973cc058557f618e1d5ee56739 SHA512 015e5744c0b0c496ca9263c901f29d66ea8edb75de6d39eb5b4956d977b1714611fda199be730fd77f6a9c0ceb0fe0cd74744ba3853b747f33bcdc8af92e7235
-EBUILD multiplesearch-1.3.ebuild 489 BLAKE2B 9b72f40caec4b05f9ab86b0249dc177db313e88930d0600462a23dd3d5fedd03c7f198693741b6f2ceff571ca2495e1d6da574c8c17e24d000b8d15c4790aefc SHA512 2b556dde6e5feb7e6951ba931c5f9be3072cab7d941c22e6c6c89c9ca3f11cd008b5ae230b4bdaa21270d7e84663cd5786cb80922fd9ad509ff9a5cdfab99101
+EBUILD multiplesearch-1.3.ebuild 490 BLAKE2B be0c34af8a6c0ed69ecdabe3aeaeb9deacd44d80f6c3b0e087c696750395fa160655b6b9c3d90378729b5cafdd49a2e6dbdced6f81c3b731f3f6868561a8dc41 SHA512 b13b1095c671168bfb47f16fe1652d009de3ecb5753f55e3b96d9c994ed4047091a3cb91f18336c71c3fbc7c7c23b21eca49b8c3131d22355065a368cdd63446
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/multiplesearch/multiplesearch-1.3.ebuild b/app-vim/multiplesearch/multiplesearch-1.3.ebuild
index 23969f4db751..1b93eeb4c6ca 100644
--- a/app-vim/multiplesearch/multiplesearch-1.3.ebuild
+++ b/app-vim/multiplesearch/multiplesearch-1.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: allows multiple highlighted searches"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=479"
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=9276 -> ${P}.zip"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="MultipleSearch.txt"
 
diff --git a/app-vim/multvals/Manifest b/app-vim/multvals/Manifest
index 970221e9949b..6bad9a158234 100644
--- a/app-vim/multvals/Manifest
+++ b/app-vim/multvals/Manifest
@@ -1,3 +1,3 @@
 DIST multvals-3.10.tar.bz2 12299 BLAKE2B 83a38101e7f43768af2682187279456ee3c131acb78b1d152de7978ebfea183cec86239a7cf2d76d1602a593f3c46f709b2194f7d2783dbe7fea636f7db3c262 SHA512 6003b7fd2c16ae7b6ee400482aead44a5b7867d9e010d689b1b25452f78f4a84335a257eef56deba241fae8967e57b877132693b1ded1b4b01c0248da472152f
-EBUILD multvals-3.10-r1.ebuild 447 BLAKE2B 8871a703bf84a6ba6673c26fe06ce4e9cd91a18ed6736572d98a8806191c983289656dbd24b6a6c2ab36320d3b7de5120b1d62443f04d9b8065ba37b5159136b SHA512 a8074c167f866069c500b53da88bceaf68372e94b02ed6b63317fb674cc45049983a764190247df64107519fedc796e3ec53e04f884bbce8befc2996c5f9a9a7
+EBUILD multvals-3.10-r1.ebuild 448 BLAKE2B 1fe1b8c892cdb677f4216ff26b0369997bd453b4c6f1db39dec258089dab9788400d2e38ba4c284075c51ad0c45040e5f16de7274726b62846c9aef9aa76d0ed SHA512 114bfee320bc2c5c76682b7c244a6ee8688d6f3efd962445c410b7f5e8bc7d2998ec65c54c967a160c47d17ed5fd7cc25d7754641b64214e714a44d28d398f6e
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/multvals/multvals-3.10-r1.ebuild b/app-vim/multvals/multvals-3.10-r1.ebuild
index 99c87201ac8f..1ed7423c60cf 100644
--- a/app-vim/multvals/multvals-3.10-r1.ebuild
+++ b/app-vim/multvals/multvals-3.10-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for helping with arrays"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=171"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/nagios-syntax/Manifest b/app-vim/nagios-syntax/Manifest
index d7ce01e42909..01a2f208d68b 100644
--- a/app-vim/nagios-syntax/Manifest
+++ b/app-vim/nagios-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-syntax-1.8.tar.gz 1737 BLAKE2B 73f3b40b4e79d3449cc0f62e88efa5e7d2085db6050f05a5dd774a375a477f22844c8b5603fd89aa676bc26e90d4ad21ebc377c11c05a67909d0b65e1861983e SHA512 53a17c521a66a42f0082e6a963059ff96ed5f899e2be4c50ab68cbf237d1ca6bec8476b798b4a99563a8fdd6dc6ef632de19399b5aad12bad586f0cf0161f76f
-EBUILD nagios-syntax-1.8.ebuild 554 BLAKE2B ff066fc273b15ea38db7a4b83ba00dffd4e5d72fa8ca46ab4672a765bc6c113eb87c558d82590628d0c7cde4a9fcce17a8982d87d1ca53cba25ac9b49ecd4487 SHA512 13a7c9cfb509795a07d7f4016f7673d7788162ccd316fbe8d80f998e76bd1f8518dc3143c6cc05353efce72ee42d8e5326a54d18e93c1f40b16d3cb0345c49ce
+EBUILD nagios-syntax-1.8.ebuild 555 BLAKE2B 02b2cea40f29c251f4cb3b73eec9445dd560b774bdf5e7364ba61eac5b41419be215e9457b6343c23e72cde22e11c3d15fd2b0bb508f265febd767291531fcd3 SHA512 2500e4aab163eb52d34602d496598ab0ae57949123c0d6aef7e2895d791c13ecffed63ee719075c93280bc4667c42305c57934d5df1eb8797e9cff94d34dbb6a
 MISC metadata.xml 452 BLAKE2B 6f55d99e5936a8deeef449a45d4a35a4ae34e6d7fa10c642153b4c815dcbffa29574dd68cb1923a61f04885a7521dc56f384550d4a85f8d58ac4830bf15fbe35 SHA512 9cab1433b109d4ee6a223b5da40a276e330cb97ea4a48a570e399ebf939de36623f052bd222c0f957cf3c7ddddd7c380d2b5a711867be32de059006d48d85b9b
diff --git a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
index 37286c2a11f0..487751669d98 100644
--- a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
+++ b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2261"
 SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for Nagios configuration
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
index 6fe1e6e55f7f..fbc33cb72a0c 100644
--- a/app-vim/ntp-syntax/Manifest
+++ b/app-vim/ntp-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST ntp-syntax-20031001.tar.bz2 1636 BLAKE2B 43cf45ba4d6096c1f07a89c8e006d3fb6ca1b81e6d0e25a11541ea17cff96979e1221f48141799fb26655b3337017dd06d900bbc087b25efeb666cb45dbe5de6 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8
-EBUILD ntp-syntax-20031001-r1.ebuild 428 BLAKE2B a43d799a35b670a3628865ba1e85ae52014e0c6b2c22b6580da48d1cd928a42afd6f59bc6b07569cf4a3a00dfbe38603a0351d1d1f1f8a4e0201556d3afd79df SHA512 1a846a2b46ac9a2a32885421cb7c15ece6b446c0656664f884318bbd522b0d2a66e4c9fd267b45da217346c74a1bbbf29b2e3dcf812571261a845c841eae6390
+EBUILD ntp-syntax-20031001-r1.ebuild 429 BLAKE2B 44e61677120043a4438f2a6f613047f9061a73dd214fa6f28c027402f7cc596e8a4c80d81754e196f9e607486803cebeeffdd0699e01a75b0ce694c8e885eee3 SHA512 8a291de79da9c715669396330f443c91be4e2f248ad71ff5a3b2086a19177e963b39be75459d0783b4fec6cc205ab2f9d04d1cfadf89ba0fc3b4e92c08dc32d3
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
index 74f867a5e412..34c5f6af2ded 100644
--- a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=778"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/app-vim/pgn-syntax/Manifest b/app-vim/pgn-syntax/Manifest
index 2d3426f52c8b..1b121cdbb1a0 100644
--- a/app-vim/pgn-syntax/Manifest
+++ b/app-vim/pgn-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST pgn-syntax-1.0.tar.bz2 675 BLAKE2B b89caf025d9856f19d5d7221c4f8747949a513932e8a5dc908b1324e823d0df592b8536d01aadd59bfc61674314a922ecd2a55d5a38f009011e755ad45679116 SHA512 8754881ac77d84359609fc55a00fa91f4dbad6e66778c7d9418fb7ed401c8fc063c1bb84d2574368827db0ecdbcd20c6f9e25808a691021f8d0b3afdb3360c5f
-EBUILD pgn-syntax-1.0-r1.ebuild 432 BLAKE2B 2936922de84c3a4702a8dedfee3e67b5a16cf2a6dbcf8a63f0ba8e7706f6e24503587939b6c00d92ec3787f3c4343b920b6543c3b161db7714fb75300dc0d644 SHA512 7220c51043840ab48e8e5e2865ee8e9262597a08d32524ad8916d74e81d8c343897d5d25a3dc94d9f9231fd5984b5dfc8c4d82c762b3b7485bdd23f66cac3e19
+EBUILD pgn-syntax-1.0-r1.ebuild 433 BLAKE2B 749ebb35774bfc7e3dd21053a1230f6fdfa37c8d0ca650e546280e455bc4660f43e87fe070ac19e60bfbc06c98ecd679a302538f2192dd0c92a4b7b931226b05 SHA512 6bdb4f6479f6deb211673baaf829541895bd0af056146e00ce4c63c3567b81e99f6f48a4501c1542ee46a7419153d6fa74696e60102cca2959e5b82a5200a915
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/pgn-syntax/pgn-syntax-1.0-r1.ebuild b/app-vim/pgn-syntax/pgn-syntax-1.0-r1.ebuild
index 8b10a32617c6..3309a1f02fc4 100644
--- a/app-vim/pgn-syntax/pgn-syntax-1.0-r1.ebuild
+++ b/app-vim/pgn-syntax/pgn-syntax-1.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: PGN (chess Portable Game Notation) syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=677"
 
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for PGN files."
diff --git a/app-vim/phpdocs/Manifest b/app-vim/phpdocs/Manifest
index 424a333b557b..f0cee5444cde 100644
--- a/app-vim/phpdocs/Manifest
+++ b/app-vim/phpdocs/Manifest
@@ -1,3 +1,3 @@
 DIST phpdocs-0.26.tar.bz2 3772 BLAKE2B e14b0a2ddce2ab375adf845e06f9d760bb09611a930d5a2988d1e33bcf2d2890c5be81b1d148f48d8fc96a87b871a19abdb1223a00a13b611b6ba2dbc62d44fe SHA512 625717ce5e8cfe8ee6fb76611df28838f6bdf54905af138dccf6e2870c29c36f6c618872d81990833c06d30ab3f010445d2d31fb4173eb8b245113f8b5c87bcc
-EBUILD phpdocs-0.26-r1.ebuild 505 BLAKE2B d10422a2fc993b57020c079256c8fdeb51eec091cdd2b2dfcbe968a8d6f130203852dfe44b9ed36bfff2dbaa6a5cf7ebdfe38d802f0ba543d39d2e2d55492828 SHA512 931f5f51c378e05ebe78ebc7c1bb6df2db4256e4dcc9b4435e24878b4e55890c156c882bac0302bc7250af4b83d931b75484cd8b1ad36aa40cb85d7c0e459488
+EBUILD phpdocs-0.26-r1.ebuild 506 BLAKE2B f1f1186cd44bdb0ddde42261fbd21249783fbe8184b54a612b627074c0edc7dc42873bd208c81f27e1f40e121b408ee26f88ace20154fc1fe490bab0d66b6730 SHA512 36b95c5abc896e5b68ce66f1339c753fd9c6b42d4bd3442ff85b4420bd0cc54929bb6b13e9d66e9b456ed5ac28dd2ffc4601226172c149180d909cdf7f240462
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/phpdocs/phpdocs-0.26-r1.ebuild b/app-vim/phpdocs/phpdocs-0.26-r1.ebuild
index 40740286d0df..12911dc36c23 100644
--- a/app-vim/phpdocs/phpdocs-0.26-r1.ebuild
+++ b/app-vim/phpdocs/phpdocs-0.26-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: PHPDoc Support in VIM"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=520"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=520"
 
diff --git a/app-vim/pushpop/Manifest b/app-vim/pushpop/Manifest
index 7c0b6460bfce..40fb2a67d404 100644
--- a/app-vim/pushpop/Manifest
+++ b/app-vim/pushpop/Manifest
@@ -1,3 +1,3 @@
 DIST pushpop-4.0.tar.bz2 7486 BLAKE2B 6f0a4d7f91d1e7c4c2409485784070efa99257f3f96c257a23f9f444fe4e08307fb3e1dd695ba6a205e290fa1f15768bdd9c6346c9b52cd6151cb83eb6b1ea10 SHA512 84f61908ab25ea6028c0f77d935286ffe3b8905400e455e1d123ca6e53cca2422e066adfcd8e75d2ad1d63d7e01524fea286a2eeeda3dd0968076be6a4229684
-EBUILD pushpop-4.0-r1.ebuild 515 BLAKE2B e3c9ed7c918dbc9dad4a40d73a88e1fad6519c2dc9745d4d9c46a619860303cb568ef9d47a4da492ba5273ed4173ab6dff4f87adc436a3cff3fd0b300402338c SHA512 1ebf0e50acd63147772025f958fbf309cf8f6b227674c8ec1f338f41c04f1a882ab6910d614fea4815e145bad8ed2f852f2cf0cac438de3b5da38c06e5f03ab8
+EBUILD pushpop-4.0-r1.ebuild 516 BLAKE2B 418c1608f40702e3da0db4b38030623e0a7d13f8337dfde2d88f3c9ef84077be1b74137e0824c780d95ee21d98f2d39544acc13ae871f2e3046fd3d95c9ed455 SHA512 102f2fbaa6164e9826449abbafc17e10ebadd64482be526a34d0ed2c664224ecf617c130eab7ca4ec3eff2e7eca52d9e9808d09f5f4b3a0634611a0f96bda0a7
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/pushpop/pushpop-4.0-r1.ebuild b/app-vim/pushpop/pushpop-4.0-r1.ebuild
index e17bb1a022ce..b013eefdcf28 100644
--- a/app-vim/pushpop/pushpop-4.0-r1.ebuild
+++ b/app-vim/pushpop/pushpop-4.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: pushd / popd from the vim commandline"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=129"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-vim/rainbow_parentheses/Manifest b/app-vim/rainbow_parentheses/Manifest
index 3b9db51a3aae..2b16844d684c 100644
--- a/app-vim/rainbow_parentheses/Manifest
+++ b/app-vim/rainbow_parentheses/Manifest
@@ -1,3 +1,3 @@
 DIST rainbow_parentheses-1.0.zip 2827 BLAKE2B 655905c1b54d5c885e1a06fe4403786b76958ba47d0facae3d3a1e657ae0a702b3f939383e2f617f5bdca9b33193dd52196eff5915236180e0d9d4a6a4e22e79 SHA512 326310058a7dd25fbd47105334cc1a6a059d40842afe48164922b7869af344dc230a5f3b329c13d5d0ae9779814507defa8d0ff56b951556e8f2bd685313e569
-EBUILD rainbow_parentheses-1.0.ebuild 465 BLAKE2B 9bd56a696c95e0a3b349333c4d4b07369904aac70e456cf7ffcfbf1dfed6baa85d32377290a8d2b7519792e3fad3e54e0343cb8fa93027d25f806ba6241e638c SHA512 26bd9fb6ed5a1ad321d80c87077b757d88c9a00ad8f053e634f603fe7352dd70ed8b26067d60cac8f49c96f459b8cc471fc2f68eae6171612095b79102668d5b
+EBUILD rainbow_parentheses-1.0.ebuild 466 BLAKE2B 51d82811d3868f33b007800f5a5c61d1892285c2eedeef76b82b7d16aa1132886c47aaedc1bbc66a5e5765d255e57134c730c8bbf98f10bf0929ecb7854305e3 SHA512 b88a72ba952b227eb4d3824db1db18a8e463f7b10e6bc5d1eb0a4ed5d58836c17f4e0952762531788ee150315c4576325541d77565c7aab03e7c89195c3fdcc9
 MISC metadata.xml 454 BLAKE2B 36c6cd350f7fec2a1e473f7c9fc071943d5de82826e7cd66159542710137ecee788fcd3390d8271a36cd8c1f7a4b99e4c864dd92667e502630fc3243f03084fd SHA512 a4b31f36a2f9097b165e424cafdeb772ece04ecbfc5b7813e17ae13eb5ee4a15f1e180fa20ac722087ba2968385c766ff76be1599dd584a01d804604c732dd63
diff --git a/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
index c9f0a4f2d4cd..8d2306f17dbe 100644
--- a/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
+++ b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: Colour parentheses to differentiate nest levels"
 HOMEPAGE="https://github.com/kien/rainbow_parentheses.vim"
 SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND="${DEPEND}"
diff --git a/app-vim/searchcomplete/Manifest b/app-vim/searchcomplete/Manifest
index a4fa56f51499..794cb17b4e0e 100644
--- a/app-vim/searchcomplete/Manifest
+++ b/app-vim/searchcomplete/Manifest
@@ -1,3 +1,3 @@
 DIST searchcomplete-1.1.tar.bz2 1204 BLAKE2B 0259eea8117d2e27eb939b1d8f5a05d4d2d6b9b6b493372c5d15a7a2a379b112e7eb2c385392e37d5ef3ac2d1e77fdaa7640a6579af3c4e55a1dea8e63b4ce64 SHA512 8c30b446c330665d303935f07566aa0b3ac8bbb89a3068d5da40209f3a4d17dc3371245dd7bef567030b1a33653f9c481cd1165ee200b0c73723da5f5aea2043
-EBUILD searchcomplete-1.1-r1.ebuild 390 BLAKE2B a59ca05b5f29801454a7f07aa47162f838e3c6b54ecf2977f4cfdbc8422de9385221b814e6a9b3fad58040ef6447627481a50d0087846726edd62aacc2b80165 SHA512 1586d26b24d5dbe6812a68bac869baeaf285cf399995816b277faab012f2fb214d8b0eb28c1fdb24d8b3261da492783bb2759c7987717da37d528bd1ecddb445
+EBUILD searchcomplete-1.1-r1.ebuild 391 BLAKE2B c8e83125bf4f302f90801cfd9da0e4e5ee9ae8bac9bcca37d13e2333180f984c8a4667d90f274e94687b0281d6ee7fd16bb6bdc62f54ee4b2a1be7ee38b5c2db SHA512 e89591fb4751905be1c010f2904be998dbb82bcfc83229decf60792782727106a1591eb2d1524b4904790d6633ceda5db4bb15b610d1948c53f54d467307695c
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild b/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
index 27a3dd05e227..efebeb76721d 100644
--- a/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
+++ b/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: tab completion in searches"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=474"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=474"
diff --git a/app-vim/securemodelines/Manifest b/app-vim/securemodelines/Manifest
index 85bbd2348cbc..d26db55d77a0 100644
--- a/app-vim/securemodelines/Manifest
+++ b/app-vim/securemodelines/Manifest
@@ -1,3 +1,3 @@
 DIST securemodelines-20140926.tar.bz2 1562 BLAKE2B 14b58973e25eb91970f62733840a8db20680cc57266e68129d6a490fac970951044a350d936e497797892bf428de737226c9c57c986de5816c0e771bc65418e0 SHA512 15a948781751998d832f445e7c3ad936e5c034fcc9936d977c5cf05215dd541a235fc066f7e774b151fac2afb2b0a59665d13f6f981cc59d4e1135f06f6cdc35
-EBUILD securemodelines-20140926.ebuild 505 BLAKE2B 6d45e1d53115c2dac537c0aea68e2f80b9f3b29a1354e1df2d6aab10cf571fb09fe1997800a67abc4827ee12c84f833618489128bcbdf1eed102f891414d7f59 SHA512 33611d85071f783d555ab7297d74cab2be01815a2265abe3f5acd8d6604aefbf724d62fdf0e3f406d594f33f87496cf5191b3028a27c979e1cd493059f98d552
+EBUILD securemodelines-20140926.ebuild 506 BLAKE2B e5d858cdd3bf752daf3d66dad2c669d0098b2d9cfcf77aee9c069f22e48f781f5d020512ca6ae223dc2334b6bf78b52262cc1bc8ff9f8e8ba10c8b1c09eac552 SHA512 42f95defca46038527a7edf5c40adb0d2aae3103e9acf32a03417a07618f7fc1a502f14e5c9b4405d6c5b96084031314a85d2fa0093a4dc02050e8e662b8277a
 MISC metadata.xml 621 BLAKE2B 1917398769758c657f0975c986e7ee09056ad2a87782a47523bcc558a2ac1644da90c8310add6e86b29c697264ef817f2bb6f08738cb9df3668a9ed13d416bb2 SHA512 ca9e3cce0633bacbb643201bc746e9c6397e9803c6b6c717c1a6e8fd2582e85e61f9fe7c8ea3ea575de6150ded96a0d26ce0fb6ac973884c37c19ce28ded9204
diff --git a/app-vim/securemodelines/securemodelines-20140926.ebuild b/app-vim/securemodelines/securemodelines-20140926.ebuild
index 9d6b2045f0fe..5aabed6258ff 100644
--- a/app-vim/securemodelines/securemodelines-20140926.ebuild
+++ b/app-vim/securemodelines/securemodelines-20140926.ebuild
@@ -7,7 +7,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: secure, user-configurable modeline support"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines"
 LICENSE="vim"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 VIM_PLUGIN_HELPTEXT="Make sure that you disable vim's builtin modeline support if you have
 enabled it in your .vimrc."
diff --git a/app-vim/selinux-syntax/Manifest b/app-vim/selinux-syntax/Manifest
index dec9a9faed77..632c42a32bf5 100644
--- a/app-vim/selinux-syntax/Manifest
+++ b/app-vim/selinux-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST selinux-syntax-20041225.tar.bz2 1411 BLAKE2B 426db3b7698ec8b0bcac90f3098a14f100d5cfa3d5ac36791ada0c6cd1d83053446e82f85eeee181253df9f2c69a2fd82871a96ca73d3a737d4cb5b4fc50f234 SHA512 ff048bc00a7774a8ab265bcaae4e5f7c2a3de48027ebfa4e8cf23611089fa33bbec90edda83b1341df618706d99c6b4fb52111abdc48b68e9924cde0ac1fe4d5
-EBUILD selinux-syntax-20041225-r1.ebuild 436 BLAKE2B d62593e1267384380ca83ce23caf5944dd110e058cf21fad25a7209651e08d1b3c6f4a8db442e5826e7d5ce01f9a5090564500176245aee30d8d96ad6832126d SHA512 dcc2598002a670dbaa5a260650ffe9aec92b4224f0b41b023a9b2f7629c6c4e364fc5865ce5b3fe27716db672c8aeda2fea3f4fb01e4d0ab11bb7f26eba46502
+EBUILD selinux-syntax-20041225-r1.ebuild 437 BLAKE2B 22d84c2a03a7d0a21b72ae51831a6a051abc8d271543689fbbe2b05a1b55614d1429ed53a0143faa535506f3ae40ed5dce984b8fceb9537bd9eb6f65cfc92b32 SHA512 6e33da539de9a18da7094807a916145ff4aa4a5d99802b0e0e73f3538433f5f6b38a74f918e72bd90e77ff47b248acbfc35ca7d8c9746ff180ce9a343e8b947e
 MISC metadata.xml 360 BLAKE2B 1f19a9b29777df127caf7afb342b3d8d65adfd4817d6109c0f3ee900cb34138559e6156557153c84edb6116a34de5b6108402c9bec973c388d409bf77bd2b5de SHA512 6d2aa6636d95c12b37ff47e212b8bb61df9fdc7484627a0111a34cc50363d13128e79f1f20f43059e5c92c09727584762dd80695f791a0cc040561521f777834
diff --git a/app-vim/selinux-syntax/selinux-syntax-20041225-r1.ebuild b/app-vim/selinux-syntax/selinux-syntax-20041225-r1.ebuild
index 350a5c371503..eecf0f66cec4 100644
--- a/app-vim/selinux-syntax/selinux-syntax-20041225-r1.ebuild
+++ b/app-vim/selinux-syntax/selinux-syntax-20041225-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: SELinux type enforcement policy syntax"
 HOMEPAGE="http://www.cip.ifi.lmu.de/~bleher/selinux/"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for SELinux type enforcement
diff --git a/app-vim/showmarks/Manifest b/app-vim/showmarks/Manifest
index e571173f4f5f..3b27162897fa 100644
--- a/app-vim/showmarks/Manifest
+++ b/app-vim/showmarks/Manifest
@@ -1,3 +1,3 @@
 DIST showmarks-2.2.tar.bz2 8195 BLAKE2B 2be7ef6fc040fcc6d808771ac45523148685b466b5eb7ffc6c5b31f4a2387375c84aae931ffcb6494ecaa9cd9713567e9f7fa19981678cdffaecc38aa9f27bdf SHA512 0121070d8b8c51b3b31c1d052b368fac304ee38e413881e67e2b9336b1edcae6af165c592d592f42c502834856d2c097b575571286574ba83a51d4fc9964b7a3
-EBUILD showmarks-2.2-r1.ebuild 837 BLAKE2B dec7dcb428bd6a829f04984f71b90f74a907194c6b33e543ab6d46b1708898a5811c2ae79cb5f0f9903a7533b6b79868857cc88ffb5ccb5dbebc93aab71926c0 SHA512 b23952082f53b138cbde105fe8a0cffbc96396891135bb074659b6566dd19ec99afe642374efbb4e78ce2f822aae4b0b80f0c342fe4912a8154b61ef096930ee
+EBUILD showmarks-2.2-r1.ebuild 838 BLAKE2B 4813dd4bd0eeefb2c7400ebeb3e3b317d9c84c434ac351425947decd6b04ed00c9758750184e0cadc4acfb429ffe99d91f2da1746bbf16def9ee6346170c4768 SHA512 068c91277021ec7d340dfe75d7c5853836cac7fed797b0781f3530a9ad48ed7e8e6440cc828a1e6c1b623c0b8aca70e1c1187f52eda0461fda2fee8c85c9bb25
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/showmarks/showmarks-2.2-r1.ebuild b/app-vim/showmarks/showmarks-2.2-r1.ebuild
index a28e80f254c9..c346a75b6f93 100644
--- a/app-vim/showmarks/showmarks-2.2-r1.ebuild
+++ b/app-vim/showmarks/showmarks-2.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: show location marks visually"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=152"
 
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPFILES="showmarks.txt"
diff --git a/app-vim/taglist/Manifest b/app-vim/taglist/Manifest
index 833d321e452f..bf7ba2f6233c 100644
--- a/app-vim/taglist/Manifest
+++ b/app-vim/taglist/Manifest
@@ -1,4 +1,4 @@
 AUX taglist-3.4-ebuilds.patch 451 BLAKE2B 4d22d3ceaa1af58b804710cd1af60b402c6295a269d51fd39bb78911e3a44f0a775c52676ca6d939a9c9c8a99ecdd17996b3c3ad0b4c9bade0866ccedd742eec SHA512 9fbff7c21e0c3bc73738dbb28ce8a10bf9f5b052d669468940f471988e8e15862b75104db1b0cdd209a679c4d72f58b3c147f5fdaaf8248e5ed0bc18f3615684
 DIST taglist-4.6.tar.bz2 40344 BLAKE2B e6377f8ac353f77ee7656b95eae0d79722f66ade3f575de14194aa7c2ced7e30d2d3e62ba3873db8b0b3e2985d360f3b4f100072d0bb26617941d3d632ab5cc4 SHA512 64686f2685cf4f9b09eeb7e1981a1b9d514cce2f6ea4bdf3e3613037d9818556ad6ed95740a84b4d73eba3fa1d5d58a41f15e1bc0a1403c50a810f5a704f3073
-EBUILD taglist-4.6.ebuild 501 BLAKE2B e9ad234475fe6f897d1f5b94ec0896a98c1dcf63f4f17360809260766cdaa096f1f9818cf95982695347111e62167f54a7e1f0fe058a2a93bd0a45d8075e47dd SHA512 a292c887ebda9ff2372c54c5755926f3d6a710f2931218ec2d301a5fa8b67ad5625a3f89aaaa1aeb7f759e96bafaa734ce8556d1c7f0d448f22588ce29959218
+EBUILD taglist-4.6.ebuild 502 BLAKE2B f84ba36792a36fe58704d8a507223e9978b49450c678c9e7b9fad998d629946c3a75a33c86739bdd835eed0ef6804030f38da5d130f21debe376c4a30ca477ba SHA512 f21fd6d27e2e131147c1f0d854bb569b72b348acd8d9f924e4c18588c5567ab2a4d6f1d6217012196a17d24da733698c1ac261e186d751570cc65874fb73ad18
 MISC metadata.xml 330 BLAKE2B 4c578f7ca8885b73f0a298749a5f1335815b25ea619b65200d8d5acf9a6b27502fe00a13b0ab0bd6684c604f87099f0740857054d9e6e62865dc800fa09a4e1a SHA512 0965202e6286e18810375b491ed126f12a309958cb726c259c549c38b1813468e0d17a1d00d01dab882f5ea069cb03aa5c1d4ce09399fb2efefadfe70aaf5dde
diff --git a/app-vim/taglist/taglist-4.6.ebuild b/app-vim/taglist/taglist-4.6.ebuild
index b4214d29c76e..d4e0205d3da1 100644
--- a/app-vim/taglist/taglist-4.6.ebuild
+++ b/app-vim/taglist/taglist-4.6.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin eutils
 DESCRIPTION="vim plugin: ctags-based source code browser"
 HOMEPAGE="http://vim-taglist.sourceforge.net/"
 LICENSE="vim"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="dev-util/ctags"
 
diff --git a/app-vim/thlnk/Manifest b/app-vim/thlnk/Manifest
index f930f20ef3ac..466d3c62a9dc 100644
--- a/app-vim/thlnk/Manifest
+++ b/app-vim/thlnk/Manifest
@@ -1,3 +1,3 @@
 DIST thlnk-1.2.1.tar.bz2 35428 BLAKE2B 0121b4e6a949ad1dd447560052479de8a62248098ffd6397d49b94c33e1a19d4a76c9ed63b3306cc6e484dd8efbd7434f52c2fbed741c976526d620c278fde98 SHA512 c3de0452a5a5d068f9c64d7ef1f7e390a3f870546a7ab2daec41d301c19f57d4a0e254fd45de4775455746312f48f3223b6ddbaa80159a0ff56cf707b9cc0945
-EBUILD thlnk-1.2.1-r1.ebuild 366 BLAKE2B 9db16803e8d6cb75fce739cef96729c68529606368aed34389816d5267a00fc72d5b3953d3b0fde94c8d4e92562ae829b4c927c7436570d8cc71ec4defc38dab SHA512 e4e66f84a059a301ae8b88ddfcd27149aab6530a2d14bd94e5a5c937ed6c45fcdb7d52e63d359a5aaf8e526975f5e9cc790d3d1d38f97e514133a4f6bce88c43
+EBUILD thlnk-1.2.1-r1.ebuild 367 BLAKE2B 35e0e7f0a5fcc8bc96bc1099c5848a126bd0e078ad1a421e0dcdbb168b07f047e92b94e68eddeee42d633a62f836e7ba171f2feef9bb5064f791dc29f36a477f SHA512 97207b0747716cb9988f20fd90d83398a215aa200c18cea37b554f3ec87fcbb44c319e33190f6ad9583a92ddf754dc12916c889793e433aca7191ec43a2a4f27
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/thlnk/thlnk-1.2.1-r1.ebuild b/app-vim/thlnk/thlnk-1.2.1-r1.ebuild
index 430077ec35f1..b545a493ffab 100644
--- a/app-vim/thlnk/thlnk-1.2.1-r1.ebuild
+++ b/app-vim/thlnk/thlnk-1.2.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: linking in plaintext"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=293"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPFILES="thlnk thlnk-reference-manual"
diff --git a/app-vim/tmpl/Manifest b/app-vim/tmpl/Manifest
index 6e87d21d5d4b..199536df5844 100644
--- a/app-vim/tmpl/Manifest
+++ b/app-vim/tmpl/Manifest
@@ -1,3 +1,3 @@
 DIST tmpl-0.1.tar.bz2 1165 BLAKE2B f7b5d2d79fdefe9c46c544fb9d98e0b76586d05a43ac49947278dfd43b8c9dc19eda0876b3c9f4e8e8a068cc89e011ec2ee5fe4afee142a759d8b33822dbae76 SHA512 c50d15be556224544ae99bb1a4ec78fca6d0cc4c1df11c4ef5302ce851b8f92baca04e498774cd1352ca3f1a8789498e7f47bb371828da13a7703a2f654ab51c
-EBUILD tmpl-0.1-r1.ebuild 401 BLAKE2B ad20d3207491ae8080f43c1ddcaf23952b313bb5f9cf00077d7069ee5e7cbba6a27738f74ea7d7ca44f2943a451465880d27c76b80e044c2325705d656adf91d SHA512 213daead08e3d2791488a6f9b9a11b40533fd0df7c6d6439862de59377d451179a8360c2633aaef61c7a8b2754ed0262e620e8961a7e4737ffce41d4c2cfc47f
+EBUILD tmpl-0.1-r1.ebuild 402 BLAKE2B f17c0209854794cc980be6046a3c27659a722be7ee2c12867938e0c0a4d5a2915ade5ce65b36eed0d18236fa7ff78652e7b03f07896e057b2d44635fbbf08ebe SHA512 5fdff6564c52231144643060e684aaee06983db58e94d61af2324b8456fdcc5f2e40fa6cd0e05f4a4fbc974403fee31585ff19455c8170db410bb41c85a61b4e
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/tmpl/tmpl-0.1-r1.ebuild b/app-vim/tmpl/tmpl-0.1-r1.ebuild
index 3830427b32de..d5564a71431c 100644
--- a/app-vim/tmpl/tmpl-0.1-r1.ebuild
+++ b/app-vim/tmpl/tmpl-0.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax for Sam Tregar's HTML::Template"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=254"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPURL="https://www.vim.org/scripts/script.php?script_id=254"
diff --git a/app-vim/toggle/Manifest b/app-vim/toggle/Manifest
index 596610f63602..dc6a12c9377f 100644
--- a/app-vim/toggle/Manifest
+++ b/app-vim/toggle/Manifest
@@ -1,3 +1,3 @@
 DIST toggle-0.5.tar.bz2 2790 BLAKE2B 365bffd541cfb40c7fea59049a4b7ef0caf0ef105a5ab382e740f3400b399715227d2d5433875583dfb31ac847c0a90d5436e6ef2aa1f8327eebc868484146c6 SHA512 bac60e8e09cb3d82ba1569c333174fa58596fcd009181a56feabeeba4590942805a14cf08c3ff3dc7920e8481d14b3bb659bb85ad1c8bd85ca66a5d491dae05c
-EBUILD toggle-0.5-r1.ebuild 444 BLAKE2B 330b74daf6af3acb0c9ba20655d675f469491042144ffc4bcf0a9a5b53260e74adbeff3ef4a570e23742a428b415fb14ecedee4b40cf3fcaa9e1185e5fe3cf14 SHA512 7afea8db84084cdbb61ae2fa565badc57453afad4adb0475c6eef5a23fcc4ed35c75da4e4c255c38288991febf7b440cbea348a666be43e4010bd97b2ffc51af
+EBUILD toggle-0.5-r1.ebuild 445 BLAKE2B 59d025ade4a9b34a5fc3731f86fef444471b089388d0d4264a70ab67534b7765c22d3b507e2e344da90b6536b323fdd6e655e7c214d9f644190af1a1655e423f SHA512 3554dfae5ec8e18a40d0352cb37ec91b3129152abd0022ef7e45d6b705adbe1bc54a8ebc3aab70bf32d4944f42d6a112e320f40608a4b834ca130dfbc2f07abc
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/toggle/toggle-0.5-r1.ebuild b/app-vim/toggle/toggle-0.5-r1.ebuild
index 7e312a8c91de..b5e7319aec18 100644
--- a/app-vim/toggle/toggle-0.5-r1.ebuild
+++ b/app-vim/toggle/toggle-0.5-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: quickly toggle boolean-type keywords"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=895"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/uptime/Manifest b/app-vim/uptime/Manifest
index 08ef3427b710..1145bcec5bd8 100644
--- a/app-vim/uptime/Manifest
+++ b/app-vim/uptime/Manifest
@@ -1,3 +1,3 @@
 DIST uptime-1.3.tar.bz2 2315 BLAKE2B d0237ff2b22820de85d4f0e4e7a85bff082cfe24af61b00b523a2df6db0bb22943303bf2ed09796f50ba7a49a16cce6d06b3ff06cc26cc8a7d4802693412bcf9 SHA512 42291261eb9f7246b68c32bef08599f604a5e1186eccff0b4ea118bb336e79a5c84cfbc2a834d5e50db3c2341c95c05f2961589efc3e459d3c6dac5f5baf50e4
-EBUILD uptime-1.3-r1.ebuild 347 BLAKE2B bf294a60505c8dba9b4997ec0a7adb4b88beb0394401af91a5da4377dd3f9a49cff127cd700951a4f97cd41c27d3f431b5b99482e94a1582bd1f6424223f4f48 SHA512 bec31ea1a1147cb2896b8e8cb37eb0667023f9419023673bd0c8a45899aaa5d87c93013a7437c722928f7c67d7c07900eb67b23de4dce34b1393b3e9da674bd1
+EBUILD uptime-1.3-r1.ebuild 348 BLAKE2B 5ec86d9c96289fa007385d23d2bc2cb53d022d62a0e82fe9b40f47647b0ba20e0e0321b8784c4cb326513c3db98f4ed5287be11ca42233734f60ce1a166c6081 SHA512 5c7c2eab8e719c86068cab4158433bbc17d38b1c5ec5e8dcf0fd0cd9485ca58db1eed6e40c56531147d6935130554a36ac309ada0632785c8703dcc83a1d5959
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/uptime/uptime-1.3-r1.ebuild b/app-vim/uptime/uptime-1.3-r1.ebuild
index c1c65ceeca84..7f92ca823f30 100644
--- a/app-vim/uptime/uptime-1.3-r1.ebuild
+++ b/app-vim/uptime/uptime-1.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: display vim uptimes"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=965"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPFILES="uptime"
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
index 2166aa64db9a..56b6f7f09b0d 100644
--- a/app-vim/vim-latex/Manifest
+++ b/app-vim/vim-latex/Manifest
@@ -1,3 +1,3 @@
 DIST vim-latex-1.10.0.tar.gz 260820 BLAKE2B 2314ad5ded3bea51def3172e8f2b7a7483839b58804f9d8c1cc1c8f1139c1da731f91525691d47dba57d07a7db85c371e87c5ce0d3d22a004a9402df7e7cad3a SHA512 1d22b675c124e402a280dcc3a675b49a92fb9f4d42efdda0ea97be26379cd6c023589a35e165f4231524d853380e22411901bfbcc98f171c938ba800821a1213
-EBUILD vim-latex-1.10.0.ebuild 1563 BLAKE2B be3904387c858bf6c9a380ecd8e84600f318658b09c9a04ea28b73666035d00ed6e679469af33ee6b89017618a9a672eb28b2994e7407799b7451ced7f6d8bdd SHA512 e970789d51160e55b73e24920bc785cf4ac3429d5f40ed6948d9ab651b5ac61e39252b6072b39982a5a6ead6b1b07712a9b2ac50c5d3d63639f72ff1dc4f9e7a
+EBUILD vim-latex-1.10.0.ebuild 1564 BLAKE2B 08054adb116e161a8d0943b94aae1754c3ba0d24677aeb8a8deb2043a9d8b70365b57d6a5ca5a2ef2a1563a437868a4b497bedbd98a4e26c61927feab81413da SHA512 3946e141d0f138416b6786d374b58033929a72dad232c743a2f160826a76245d1e53bafe4de095dec655dd5f3b14ff2ae32e63544671c4096d624b29efa1cb37
 MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
diff --git a/app-vim/vim-latex/vim-latex-1.10.0.ebuild b/app-vim/vim-latex/vim-latex-1.10.0.ebuild
index 1b4757120c67..58de37ae2552 100644
--- a/app-vim/vim-latex/vim-latex-1.10.0.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://vim-latex.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
index b2865646d111..c728b07808c2 100644
--- a/app-vim/vim-tmux/Manifest
+++ b/app-vim/vim-tmux/Manifest
@@ -1,3 +1,3 @@
 DIST vim-tmux-3.0.0.tar.gz 9658 BLAKE2B 188485b4c74e60292aa153693246c9e612cbc4736accb7aafad3ee901084023b3f40374212afe2139c634b8457c2ec871f0cf5e6d02beb69fc3c433f26b8610d SHA512 d251ff07b0702e4f9969d02a9c32924db62f77b71250fda175053883abc35c18932f9869ea0514df1b7acb9cc65f6b39e2b8c640ad77ff36a19ceaa74d13d77b
-EBUILD vim-tmux-3.0.0.ebuild 420 BLAKE2B 1b263acda3c775fec6770bcbcb3d7e5fe590fd1c36c001379e3d1eb85e993ff3712e14716bcf636033b32d8a5e5e3843600fad849d0b1c19ecdabe05648569e5 SHA512 66d6d0de7140ecb7978c8dd91bb4be4ba096e0c85c38d4f7ab24c895a040ae5f06fe2f489d168aace1fa6cfbe61f40db25e5e7fd19cfcb56f5628de164e74036
+EBUILD vim-tmux-3.0.0.ebuild 421 BLAKE2B 60c49a5449ce2cbb06c80fc7e35f493357e635e3e130d9acafdd72f9c1436d6c1da98549b356702d701d15fa60add39014252d9f9e3394207cb20e23cf9dbfeb SHA512 9d4378f710a0342b158bcf3a8f4b3c138aa261a82ea2da77d6ee6fc305e621dc9269458dd5fa1f89b676b57ffe432ffe680a8cd0d3a0dec133ce70076790c1cd
 MISC metadata.xml 556 BLAKE2B e9419237fa1f3b2b3c15d1adf7ca5afdc0da4a1fd051a4b46d839a67079170487c85e05e121c64b4ec4cc82064e217898831db1ed0a2018c345b227c44554ebe SHA512 181979dee06b24a1d4f1b3b325558c628fcdb0ee4d628c7002777f7e460e8a35026f021bb21c79db243fd067d16168c7db804a33c10be0c59f6bb22d46cbf9a9
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
index 299ce0de31ba..52e4a215c1d0 100644
--- a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
@@ -9,4 +9,4 @@ DESCRIPTION="vim plugin: tmux support for vim"
 HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
 SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="public-domain MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/app-vim/vimbuddy/Manifest b/app-vim/vimbuddy/Manifest
index 7e237f772230..dd437493c3f8 100644
--- a/app-vim/vimbuddy/Manifest
+++ b/app-vim/vimbuddy/Manifest
@@ -1,3 +1,3 @@
 DIST vimbuddy-0.9.2.tar.gz 1152 BLAKE2B cc7ea6fcffa05bacbcbcab2850486c648cc9dd4fe2d7896865ef17acef6c9cf8b05ee33a14fd212b156b4ee9c4c04a8abb764c320a74b0cfead545f1ab3f9636 SHA512 feca2b303e677cdc0ed1a02e92c54ae293ccd380006667ea49c93ea804975bf8c40044c11e2599ad3e81062a453465249120fc7daaf2eea994d8d81d3d2f87cb
-EBUILD vimbuddy-0.9.2-r1.ebuild 522 BLAKE2B 8de3dc2f2ff9fd958223f5e3c3bd3c9de1e67b4bc804ba9a76d4d9b97f9ae5a50d44178e874df56ee45bfedf0731d880fb3ef7856d64294383dfdfef9c2a0e28 SHA512 d5ee85db3eda08cc926289d974eab498f24a2e4911339ff9c8c6a96888450c2f79217e52b684caa073c9127ec348fdc4d514faf384fc7f63dfe98a6454dccfef
+EBUILD vimbuddy-0.9.2-r1.ebuild 523 BLAKE2B 25c12bf614ea943f26b225f7e4bafa8cee2d9220c8ec87708a231ffeb66eb04b70a8b3d03beec4d57275e11878b4142f6904c75ae05245c9a12348028d411fd0 SHA512 b29c73db29f475bb07fbf766d43d31f705032c3436fac4d1670e2ea8f2a9598df47d173c15331190b6b05df616d7c48cd8f303c246c9343048f09b6188691fb9
 MISC metadata.xml 338 BLAKE2B 2e474bc2ecade1fe907cfe44bb86943ee572783d3bfc849c900a05d9c6056d15b989c80e348a3d65596140ce1485c6d516f8f856d5901d0317831b553e243176 SHA512 1a949dd9cc669a43a63ac53b3429325ab44873aee6ffa02c8e8f1abfd64d47c6645c1c4fd4a312cba81de1196abee5ceee5510e59b6637bc19cd34880ff32048
diff --git a/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild b/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
index 1a9eeea4e49e..610460192242 100644
--- a/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
+++ b/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/vim-scripts/vimbuddy.vim"
 SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc sparc x86"
 
 S="${WORKDIR}/${PN}.vim-${PV}"
 
diff --git a/app-vim/vimcommander/Manifest b/app-vim/vimcommander/Manifest
index 6a498a67c2c1..4e5cfe00ef22 100644
--- a/app-vim/vimcommander/Manifest
+++ b/app-vim/vimcommander/Manifest
@@ -1,3 +1,3 @@
 DIST vimcommander-0.81.tar.bz2 8447 BLAKE2B 62cfde9c053db718c8b35126826fe14fdde625c2341a22cd779dc13d9972a0b28a19f3f1efbb6dd6fddd96b6487478d113b055d132029e77d170b6b378c92f1d SHA512 903c97cd56d24f9c568b863c52f69878bc3aab7f8728de38697437bf0c0697b585b1d5ac5d824d472518dabf0f2367dff24b1881742b7d28c0f5452d74c37fab
-EBUILD vimcommander-0.81.ebuild 388 BLAKE2B 1e3442992200e3355c2da689e11334b194c0fd1db0f92d56bfe10832e592b2db0d3ae28667f11bb19bf76e7c35bfb934aae26e9e5bca1e6097fd6c387c85fa68 SHA512 15a4ddc94f0f6cab59b4895bcb94df042c58a55f874d975f0cf77b4de90726e3186762a0387538613a40e9a642616070ffa68634b33c7edd7efb42b8fe17aa72
+EBUILD vimcommander-0.81.ebuild 389 BLAKE2B 3ace8e700f2d1f68d7db2cb1525f814f25befb97fa3607bf5601af6391e92d8d1c7cd1dcfc10248e0fa52d8c6445c37d8a4cbdbdd966776858853c05d96f52a4 SHA512 ab9f2ddc37ee7d39da887feabc6c5534b2c0628dab436481d0dfdc2b9b67766b1d9dea1bd2c8faa5409cae8909306aa76802a74a4ff33c6e7a6eb299334928f7
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimcommander/vimcommander-0.81.ebuild b/app-vim/vimcommander/vimcommander-0.81.ebuild
index 991351f9bd3b..253292ca19ca 100644
--- a/app-vim/vimcommander/vimcommander-0.81.ebuild
+++ b/app-vim/vimcommander/vimcommander-0.81.ebuild
@@ -7,6 +7,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Total Commander style file explorer"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=808"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index be4e06783e30..ac5e35bb8a25 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,7 +1,7 @@
 AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963ac23ae291d186cfed97e944fd5e757cbe3288e5dafc243f4caea2acbeb56c27e92d257565a84fbcc8a4900a6287056e8e38bf SHA512 44bb6760c11a21ab817141cae5817cc4d5b88a5c94ca4e30238d9e009f080d5ae98522dcde910d5352090e7bf998ad47fa658a56bb16bb50ca905b14e5d2df2b
 DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a7945d84d30866556821319fb052252a37e2dd7f989c47c376b4986b616c7f99e0753ef3f6b54b9f4f02aa166e998b65 SHA512 62c860067d394dbae639aa9d51627637769c22c4c651f2f9328ca88e8afd85396e1f371bb0cfee432e7a1faabee570a1e29ec086c6532681a309b909225fb90b
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
-EBUILD vimoutliner-0.3.6-r1.ebuild 697 BLAKE2B a9fb1b157c55494d0cfd01c1920e00b2eae6f711a0c98aa4a136afdd36e64f1b7a2f5fcf8aefb38880682b12ef4ce6cb9803a538b12c4c5283c86517f4daeb9a SHA512 8fcba71ba216d91e589caa40bcb41cbaee6624b0979c11b43aa2afdcc3d9cb227493ac0662c91dcf27daf5711ede562acc0f4044e7c2d4aacd9e3398052bbce1
+EBUILD vimoutliner-0.3.6-r1.ebuild 698 BLAKE2B 33fe3fb434089f26f8f0b1c4e95917297bea59d45b0238166df71e244289ed0daf438a78447223fb0d42e2d3d4c645c684791810e67b96489046a45e97738065 SHA512 25c71e241bfd205ac87418c61377591dbb0119b188c6b2ee52cef9f05ee25fbaca52deebae40139da903ae3a20805e3f9307f3ccf89cbc656115533a042322e0
 EBUILD vimoutliner-0.3.6-r2.ebuild 1300 BLAKE2B f2359427b0553a0e05caeb370a21c2433b3b1c9d1918166d77e27cf83462cc6d216ecbcc972dc9f3a1bb0e466708ec32fd57027ee602d12a51ac22f78427a47e SHA512 dcc2f89e998ff2bb70eb5200dff6a17b8d38ca2c8d68492aa47dce216d313af8db81c0d79d1a2cf1aefa04aaf2fcd96f904705cff4d5676c8234e50f8daac934
 EBUILD vimoutliner-0.4.0_p20180301-r1.ebuild 1094 BLAKE2B 06f2432288653826cb839fb0043701444355c2dd1161a5baa0d7f99eae6d4a987ca99c09858c810af284472dcf9a80971d6681cbdc940137d19410ef022515b7 SHA512 56413d64eda82ed2cc01813b6dab78769e28498f9013e483948461c5e7da111fba1e3b10374f188db8712d5009cb5861942b0db3450d9f553c0d9006df713520
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
index 476488e93c9e..de0e7cbb577a 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: easy and fast outlining"
 HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="vimoutliner"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
index e202b7701060..0057efa960a8 100644
--- a/app-vim/vimpython/Manifest
+++ b/app-vim/vimpython/Manifest
@@ -1,3 +1,3 @@
 DIST vimpython-1.13.tar.bz2 4270 BLAKE2B 7973aea8ea397f3f2edcf8a2845ab47cad3015925dd9e42e37a7ada47f25073b68d6d8f8c378a86d90e39c0aae63aba784753679b4d04a5aad268db157400ae2 SHA512 467217ad160f02d3ecdc8c43e35966e496e6c5f99bef115bd4905795c0fd5b8f68f68bc8edd64ca1dbb1c6fbc088ef6ae996f524f0343943702f2a92dcc144ce
-EBUILD vimpython-1.13-r2.ebuild 474 BLAKE2B 30147c16acb089cc641f722276ddcbba0f40dfc95a66ae3228c040b82afbc9641fa298729e98836ab02d1c62141ed61a45ede88830fc9655d80e368783555be5 SHA512 acdc7283f598b07c894b7de3ff3fabc84027a27bba00c88b2636f96dbc2fae4ae8516dff4930a88926dc08cd28026d999512a559379749062abdbf8f37081024
+EBUILD vimpython-1.13-r2.ebuild 475 BLAKE2B 55506b2125bbdd97306987bac774a6139bf6a4e68864c18d1006ce251b70bc9e030010e2b1b6a075c0823c331c821cf64d62e556ded85d6a0420298e541cf9db SHA512 307727e5b0f7a67dcf221760fbfe00a6e70bd37265cba855f6883dad3b6a4688970da752e7afa1f7e6d10d984d99e6795d9f699c0b26691911fdf8b896d33ed4
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimpython/vimpython-1.13-r2.ebuild b/app-vim/vimpython/vimpython-1.13-r2.ebuild
index 9d7ea68bb944..5f279c41ebcd 100644
--- a/app-vim/vimpython/vimpython-1.13-r2.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r2.ebuild
@@ -10,7 +10,7 @@ inherit vim-plugin python-single-r1
 DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=30"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-vim/xquery-syntax/Manifest b/app-vim/xquery-syntax/Manifest
index 75f8027f3bb0..bb022b6c3ae6 100644
--- a/app-vim/xquery-syntax/Manifest
+++ b/app-vim/xquery-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST xquery-syntax-0.1.tar.bz2 1552 BLAKE2B e33f5359d3059c7558516939e2ce14c906f12fd4b7c5d035cdbadc9485e1fc992e50a2c38685d27ffae40dc7b22375c6825ae414131846ff0c19d68484750ad0 SHA512 277503e2d7089702c58b2e04a48345e579b6cfdee5042da90e8401b914c1d515c811cbf71f6dedbeee4a21e7a4807bd0d694323ddb2bd6b9437edaaba5a0f2fd
-EBUILD xquery-syntax-0.1-r2.ebuild 584 BLAKE2B 0bf0662e91084d66fa5cc858a50dd2742a81ba095601391d86ed0a2af94bd9b82f0903ab27273ea05fa724cb0f5957a730786313bb35cd6b1b48be5cec051c43 SHA512 e159a1c317efe2e189cd3652f2c4ca255d5ea89b77924a2d8437a9b15e2474a4fb39f30db2bcf43f3eae8be13af9060998f9ef796c616d491b9321c7b19383ae
+EBUILD xquery-syntax-0.1-r2.ebuild 585 BLAKE2B e327d5bd13e8db665bf6d77707c05247be24b9c5e775db80d235c5b4d2b49df4f048f1275b5479109df97bd8cfb4f75d729be02a3fffe062e87d3a804feb344b SHA512 62c496dd4d783270bf3e604bd2734027070a9dc620ea19b088c5b5ff3e960baa0514ce765a0a311ee8bd1c22f4481feb7cae9cfc861712e1b37a0213f9d0ef13
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild b/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild
index 4261c5cc64e3..db0cd727109d 100644
--- a/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild
+++ b/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: XQuery syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=803"
 
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/xsl-syntax/Manifest b/app-vim/xsl-syntax/Manifest
index c2eca61b6c80..85a175a1b23a 100644
--- a/app-vim/xsl-syntax/Manifest
+++ b/app-vim/xsl-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST xsl-syntax-0.3.11.tar.bz2 5770 BLAKE2B d7d06bf7e2537c8c6c1419f557e4c29042a1af6dd31850c28feccbd342a1beb60dded565f48b715d021ebe3279e0d4a75daa3063e7e8347a1977f97947a0a92a SHA512 e09f0f6ebe023a681560a12e919c9573abc2bf0f1a6fe1bda233ca296fa4fa81bead99aeb7eafb387f04e199f7601d8ce6593c767be1b3e94ff73135ea0f4361
-EBUILD xsl-syntax-0.3.11-r2.ebuild 565 BLAKE2B dcc903b148fe5514884f4e3d39b0b6c00f904f06ec1c11b19cfefae577c1993d7d56d2fc7718a362b3288bb03b0cd1d8ea47d9d49face56ae29841c87b2e96f9 SHA512 d214c81fb756080531fa1b8bb3c48b79cf33c9821fdd2bb0fe24de3dce20831b62d78be2ab955cec6b6e19eb1c07222160ef3defca3cc732914dec1e54f1c02d
+EBUILD xsl-syntax-0.3.11-r2.ebuild 566 BLAKE2B be338a3bdf4082e9317af34e1927aa2974d806e952b7aa9f0280003f7cd811478fc8c3dd8ddaebc192e70c8e2ded75982e349f92b50e6f54a6350d3a63993472 SHA512 76eb48795d749b8c90f34943b226cb73476d8621242889f8f78d239b1085825890032c587fe3ddb4ac2c9be509eefe100d5f525f30d0eea778f2da8ba9feb672
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild
index 8bc90a7472cb..7fee2d238aa3 100644
--- a/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild
+++ b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax for XSLT (with HTML and others)"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=257"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=257"
 
diff --git a/app-vim/zoomwin/Manifest b/app-vim/zoomwin/Manifest
index 1c3772c601bc..e26f25048044 100644
--- a/app-vim/zoomwin/Manifest
+++ b/app-vim/zoomwin/Manifest
@@ -1,3 +1,3 @@
 DIST zoomwin-24.tar.bz2 7928 BLAKE2B fc841f859635c58738a52ed55fdea997eaaaa867984347a0977c0818a24517ad580bbc3386567304d5812e20fa0015fbf3cbc116b50b7a56f361d5140a25e8ab SHA512 fb20958813c1cd956c25f34c9355454b5003cf1a2d3582149c07ea3cdb4630a0407f2407f3a8f96abec37659e75facef13094d6d1ec2972b937dab8bdf9d61a9
-EBUILD zoomwin-24-r1.ebuild 343 BLAKE2B 842b28aab64f1aa3dd97b47e2fc90fc25e08b34907bff7628c5c15106ad2cd8348a48aa778c15db01991a72d158bf56cc9e68692703dba4a26ab3f15200bcf97 SHA512 382e0027e5d6376024380741a148faf78e8651442134d6094e583cf17b71969ecb83cde1ba8dd60f8cb09a07ab6f339b391b967f75653c2489db15c1dc29f704
+EBUILD zoomwin-24-r1.ebuild 344 BLAKE2B 3dca78648c6ca24fe58d3ab6b0c9074ea0b958dd80d175f1e779d921c9c5b50b3ea4622ccbbf47077c44e0abad06b2d7a8fc2bac7cefb68aa23a18527c058694 SHA512 de9fc5da3b1d45001208885c5be864893e20d574161a5cbf3bbf580a5425e241472315ca235907500f125c2b5488f4fdce5def45f2f8d9f2cecd712dc3d9ce3a
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/zoomwin/zoomwin-24-r1.ebuild b/app-vim/zoomwin/zoomwin-24-r1.ebuild
index 81a1be2d4cba..e3c31af27c94 100644
--- a/app-vim/zoomwin/zoomwin-24-r1.ebuild
+++ b/app-vim/zoomwin/zoomwin-24-r1.ebuild
@@ -8,6 +8,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: brief-style window zooming"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=508"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="zoomwin"