gentoo auto-resync : 09:12:2023 - 23:17:54

author: V3n3RiX <venerix@koprulu.sector> 2023-12-09 23:17:55 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-12-09 23:17:55 +0000
commit: 8fc08491f26431ec46b36d6ebef9551f3773b96f (patch)
tree: d1b5bd96d856b4ddb71d02628504d39fae5c168e /app-vim
parent: fd1ea0a53f74daa4fd860ac35a20ba1817fd20fa (diff)
150 files changed, 151 insertions, 151 deletions
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index b42f84caab04..ba32d9ac1281 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index 5465528de0bb..6228a35fcbd6 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -2,5 +2,5 @@ AUX alternate-2.18-hh-cc-alternation.patch 918 BLAKE2B 0362420f64fdd1607529842d9
 DIST alternate-2.18.tar.gz 8652 BLAKE2B f6e50d3e1499fb913f7cfa4ff95df180855c7857a700428be1339916aed4513bf77a8da62b75407a6c129f4da3e3bcd00f5caed53d7a939a2eac96a287a11ffe SHA512 d797b99cbe536285d87c5bb14adfcaa3e18611351c8529d9a0755606e766ecc006f19af5cd9b9535f236220dc525bbc27e1280cbb1e3c71f7444cdefd506cefa
 DIST alternate.txt 8897 BLAKE2B b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651
 EBUILD alternate-2.18-r2.ebuild 995 BLAKE2B 96fdeff6a4d502b7c368643cdc3fd8388892003613908f7408b3cc8be896bba3911cd0e129b82006c678c1fb162dd6d197ebc67252d856e9f1cf59142319b720 SHA512 2f4e22cc32f3c1cb80edebcfebef3db3d133bb5f451e043d3d9c25d83f14b579883d0a408486d691d3ce0d4f6f10f54b2e96980c8a585f6226056ca6e66eb365
-EBUILD alternate-2.18-r3.ebuild 1000 BLAKE2B 9cca092871ee1e67a0175d6f89a5d014b58f124133b81de2d9f1766e9ed318933018a0c59fe8de021e3583d1468b09871ef1035ceb56a101f8aa5cdd0a658774 SHA512 48d3dd18a4e3c161971264f93bcc24774a6c8f39bf0b49bdc3ed8e35ee6693e8cac16efe339f0a1309bd9c1a405578a74682d62ee9fdc16d205537fe3b4d7c32
+EBUILD alternate-2.18-r3.ebuild 997 BLAKE2B 37e0cf3cd848ee4a835e7378470d63fc811ba7f18e04c787da5d1081531b1df8d2cc20d2e0939b14c90b3e1431619c99048082a049d33a9c6b5489a7638795e2 SHA512 299611a208e1e17d826e5be6784d63d89c0fe83d55357285403e5073cd96f740331dd93f88f0cdf2a1eb2e464f5a730cfe51ca3e84a73140eec075610da95127
 MISC metadata.xml 332 BLAKE2B c54e6ef20fbf88e7ce67a793b3914a64dbd291129c186527a23412941ad882e492a4b10692bbacdc8b1718b15ce53e31057cf1237d264ba9259105143fb24468 SHA512 0e9f477bc091e9be6585d40eb298f24cba09b8adbf742915dc56ebe779c62863168327163004e462c5b0259cc6f0deef26d6a1c78d39d87f081845e3692bcbf5
diff --git a/app-vim/alternate/alternate-2.18-r3.ebuild b/app-vim/alternate/alternate-2.18-r3.ebuild
index 7588fe2d8ab9..7d68857f991a 100644
--- a/app-vim/alternate/alternate-2.18-r3.ebuild
+++ b/app-vim/alternate/alternate-2.18-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 S="${WORKDIR}/a.vim-${PV}"
 
 LICENSE="alternate"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a new :A command which will switch between a .c
diff --git a/app-vim/bnf-syntax/Manifest b/app-vim/bnf-syntax/Manifest
index 21f5df5793af..395887a24e10 100644
--- a/app-vim/bnf-syntax/Manifest
+++ b/app-vim/bnf-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST bnf-syntax-1.2.tar.bz2 887 BLAKE2B 11923f80153d760e92577e461fb912a13ea6ac1ab8c48b6371362d9f5e6ddacf520608626ecb2020f0bc043106241a818b53131be43c991720ae37df8ec40132 SHA512 e073866a8dd41bc0ab982e250bf2a803d78916dbdaafabe504a6854f67255fe4ed84a4db426f1cbde77c9b0a059070fda666338c53b6ddcc7e46f04d9f0265d6
 EBUILD bnf-syntax-1.2-r2.ebuild 555 BLAKE2B fbef88cbfb05b199a2b8c921f28727e09422843527a93690279bcd39ac9fc534a77e3fb4f3779b48bc81e19126dddf0d0cf4c00ae224f9f97d05fdd243182e9e SHA512 e5c795abc8b800d309df34e686c1c7325b4401cbc752ceb24cf4b8585d7e9eed12f4b5f44c0cd4fab444217323f2ec0c1e6eb46d2efc3b4bf67c02dd503ec60a
-EBUILD bnf-syntax-1.2-r3.ebuild 553 BLAKE2B c757a0d40d6ecbf194ca681f097859afeb59807d2caeb3b945a14529b9e5b4a8898c57cd930eb6b02cf84d964ba4470f11b991b37e4b02c0d8015f298c3fdeb5 SHA512 982f6d5639d374e1406a69593bf8d95647f53b9116d2095f03b1540a22d54a06f9d38c5cc8f0fc8c9a9e56452684cda2d2e028a3f078d9fe595993c954a4ef5f
+EBUILD bnf-syntax-1.2-r3.ebuild 549 BLAKE2B 6a8ee0347d73713ed9baaaea8ca6ea0d2a2829018e152e907afcca088c10e773f77e2e6b02f6a2413f9aa81d2592b6ad6a94538f9b54a3c312fed0eb97d41512 SHA512 74958de89910e013d6a5f9e4eb8ec3dbc16ead2d7d8d4ce0160db1fb6ebf0bdbf594601f82257e42bba49587fcde19d14107086febf9e5414de13150129485d6
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/bnf-syntax/bnf-syntax-1.2-r3.ebuild b/app-vim/bnf-syntax/bnf-syntax-1.2-r3.ebuild
index 8e08807acb05..ffdef1144e88 100644
--- a/app-vim/bnf-syntax/bnf-syntax-1.2-r3.ebuild
+++ b/app-vim/bnf-syntax/bnf-syntax-1.2-r3.ebuild
@@ -9,7 +9,7 @@ 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"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for BNF files."
diff --git a/app-vim/calendar/Manifest b/app-vim/calendar/Manifest
index 0b5fa6c36186..0be913bcb369 100644
--- a/app-vim/calendar/Manifest
+++ b/app-vim/calendar/Manifest
@@ -1,4 +1,4 @@
 DIST calendar-2.9.tar.bz2 11070 BLAKE2B 9c137d6975f3978776e8739dfa0697a6fd9f1828c0903ec529008d6c272e2226418e7f175149f048feecd405235501a88967fd6fa4dc6413eabec4021d675bca SHA512 8d1c29cb1e7b8189447d60bb5e8940b7ed52837c9039bd8ff8e3ce19c5fd7a9a8060291bb8a0c0bd2a2bb677fce388bb7f807f25358f3903c28b07c715ae1a07
 EBUILD calendar-2.9-r1.ebuild 317 BLAKE2B ff18c838ae0fb02963871931c9b820ddd6be4770edbe5e3104842305d0264360feb6fd84b897b3898c28dcc8b96b22cf545957ead046e5c468a579d91d12455b SHA512 47ed341fd029d23442a243d2d4d71eedeaf696a383daa55a21ff2d0f4a8be7f1105d09fef1d1fac4cc9df004812760c11e968327e72626fc5fd9bf334382bf00
-EBUILD calendar-2.9-r2.ebuild 321 BLAKE2B 461118ba8972735e344021378b3ba925ae643af025f2ed330e6efdb3781de560ed1032f72bde735789190ff9986944b7b9ea941818956e91820d00347bd8b991 SHA512 559ed6b87b6e159a149961c23bd12795f97f223cd7ba19f8d15771390114044bdc1dbb13666fd83274ea46a6e50d1239265daa51e3e70475ca438c10c3268479
+EBUILD calendar-2.9-r2.ebuild 319 BLAKE2B 11f46c14a5d316c263407d22cf802b8a85f97b8fcb9e0ff42dad1c803b6af40876a97eaec5b8e738bdad567f31e75fcfdcf627613fab70139aca5eb3d697bfe7 SHA512 9fc3512ac062c6ea43e8f37541f5434dd3cc9412621fac083e128833db45afa88d00e487cb148f7c85723f2e1bba15fbf003139142bbccf6dff7e1676e567cd6
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/calendar/calendar-2.9-r2.ebuild b/app-vim/calendar/calendar-2.9-r2.ebuild
index 44b3e1cb9e36..f3ec681d8aa7 100644
--- a/app-vim/calendar/calendar-2.9-r2.ebuild
+++ b/app-vim/calendar/calendar-2.9-r2.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: calendar window"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=52"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/cctree/Manifest b/app-vim/cctree/Manifest
index ee84781478b9..429f869e6ac5 100644
--- a/app-vim/cctree/Manifest
+++ b/app-vim/cctree/Manifest
@@ -1,4 +1,4 @@
 DIST cctree-1.61.tar.bz2 23243 BLAKE2B ba39d476ed68109a614cf5f626a44010aaa7e6154edf0c05f87973c46d95957a46fa22e29d73b0d3d602bae78039fd0bf6ef356d94f6570e0cea205bb6335572 SHA512 9d29c573ef3cdcde1ec91ca34684c84c8beb3b89669654b1f9dafab928a11d8f1df77294af06c7612ba8aa7d65dfba69352f3f74dd11c98d22a300907d8a6b0e
 EBUILD cctree-1.61-r1.ebuild 804 BLAKE2B 5aaf44b8cbfcc0dee1470e55b2a946f796456707474c5ce433db2c6c4579ca31f04ff18b22e99cbb07d27115b9aa4224cbb606ab23694544b71f95f91789c252 SHA512 0eb287aa4d494e57248350888c311ebdb92dc4e86c3bb79b45da4e25fc9313dd115717a7f9e8522f254293ef64ef9446dd19689eff66a679798ebcf687b0aebc
-EBUILD cctree-1.61-r2.ebuild 796 BLAKE2B f2dd68b21fbe9676d94758098a5db5a337d153577f0a2919cedad47d7ee7d63d44b47edca5eed4b4032efb63e938bfaf85915a469fd5d9e8d6658f27088d0330 SHA512 ca4395ba5b80a342e012b44d862338c54ff7612cd5b1437e4a7cfdc3b5d158fcf54c7a507076cfa182dcd4515511a47f1525bc87fe24b9dbf939f6f3c25a0fb3
+EBUILD cctree-1.61-r2.ebuild 794 BLAKE2B 7a45e687bdda672051363136ca67c07f91492a1ab622e2e91ce95dc49825f605a3dff2873814d8447b227f19de001b964d33dd976f27901095871e8d622d6114 SHA512 792488cedaa3af4db3781ab87c859c9337cbbfe2240177af2c0923caec63494fb6a4fa48d2482faeaa65581b71dd9e28a7c33967473db17fcb53c69607a709db
 MISC metadata.xml 333 BLAKE2B c02947972a5dce67e6ef8dd7a24fcae5c16f2a1359e0eabe699ac2c031889abfbe440b2bc897a126f5f2de4c5e4aaf8c0e7a4c4e5577a8679c0f8a00a4440d53 SHA512 b13d0108b1f4c8077a5d3f5a1e1d36c6a66f05da4f6e83df4f63e13ae9df957ce83a901eeabeb51a10eea5e2b729477e3dee047522c17f67e4d70c9bc93a0d98
diff --git a/app-vim/cctree/cctree-1.61-r2.ebuild b/app-vim/cctree/cctree-1.61-r2.ebuild
index 5f3cc27fb666..b48c868df567 100644
--- a/app-vim/cctree/cctree-1.61-r2.ebuild
+++ b/app-vim/cctree/cctree-1.61-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis
 HOMEPAGE="https://sites.google.com/site/vimcctree/"
 
 LICENSE="bufexplorer.vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/closetag/Manifest b/app-vim/closetag/Manifest
index 0241f6a75f1b..5bedb994c419 100644
--- a/app-vim/closetag/Manifest
+++ b/app-vim/closetag/Manifest
@@ -1,4 +1,4 @@
 DIST closetag-0.9.1.tar.bz2 4717 BLAKE2B e5324bf5b6017d7a1116c3d9dafb24aeb3151dc772250282be6897d9032412e47e09e7841c70a0703baa0aeae549a6fc15ec1547c1babbea08adbfbe3568425b SHA512 67e10871c98716bf65c1c1f3e07cb65ebd158fb058ee4e51e189703a5848e5f35066fa492c9614703936add21fbb34a387e9cf4a82043d794f3abb62d6c3ff38
 EBUILD closetag-0.9.1-r1.ebuild 417 BLAKE2B f5c539f182965fa2909d734bc2d5abe08c703b667d8b713d106d58ff972977b1e150a38996da557b2d3da0e8c33698aa018dfab87483caef993d24bfb9de1ecc SHA512 0cffbc60d5316e1d2e83db8b51cc6d96910f90c7460a7b69618103b647d943b26764d31ab27875614d096199698e73c77daaee6260234b7cc894713b71f2d3fc
-EBUILD closetag-0.9.1-r2.ebuild 413 BLAKE2B 1f45410f35da6ebdb2f373887e64f545f171202d1db495ee20ccadd64baa85d1a6aab4ec72d3a05e8440f5ccc1569b28a393719d19c4ab6e385160b032f5c724 SHA512 1dfc5b027c8c2125b03a52d3daabf94546111249b9721069fbd88927ede64ff0f108e3c14a4e13d96b0cd154c80230785bd6f0603e45957f3128e898698a68c7
+EBUILD closetag-0.9.1-r2.ebuild 409 BLAKE2B 52db02d8a03e8532965531d905c835706ba98c11cd02692a17d021b39989ba1f96e20b294174920bf99e9c35f101fab66854a9ca5660d3f6c2cf7246de1e363e SHA512 3634ba84de7af0de9dc1a45f1609e9f8db93d004f0df5209f008125deffd85322db905ecdc308855446b0decb72a5b7d805bd29b1009411f6e03481142ee3caa
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/closetag/closetag-0.9.1-r2.ebuild b/app-vim/closetag/closetag-0.9.1-r2.ebuild
index d3cf6bc2e000..3ec3f3949285 100644
--- a/app-vim/closetag/closetag-0.9.1-r2.ebuild
+++ b/app-vim/closetag/closetag-0.9.1-r2.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"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a <ctrl-_> mapping for closing HTML / XML tags."
diff --git a/app-vim/cmdalias/Manifest b/app-vim/cmdalias/Manifest
index a1acc817ece9..1acb6d0d377f 100644
--- a/app-vim/cmdalias/Manifest
+++ b/app-vim/cmdalias/Manifest
@@ -1,4 +1,4 @@
 DIST cmdalias-3.0.tar.bz2 2601 BLAKE2B 89b36b2bd638dbdc454739e1f9a3cd61715faa5c392bf3a85c937a0ec179f4e35485ac3137fdb84c2d66ba235e44af84d1ce42ca7e8f212438e88eb91f691570 SHA512 a29b8b588c662ca48e8208422e4592e4d2a2908f23ed123b0b2aa639e6c05725dcc6ee0179418dbfdc39108953de064f5da5eec4261f7e9db5efea0d91fe58aa
 EBUILD cmdalias-3.0-r1.ebuild 441 BLAKE2B 7b1ef147bace1db80c8e7235b6d09ccb5b81b6fa20a610178277d2636b6f4b3084b842976667f462ce7169b033ec0b7592ed19df62ea07314e72f9a8a181bcfb SHA512 33c186706c0109d5719ff8d676175decafcb7f0ce23640239c5e9642381cc06558029a400a5cd6c38be720d6e9d0027d3290061854cc73ab38cdd0ef24e3c145
-EBUILD cmdalias-3.0-r2.ebuild 438 BLAKE2B 3e655c111060f35d69a0f871034dc3cc7b64e9b61f51c0bef788a70d85bbe9d0962d25ec1787d4b90e00944d8858b4a4940957e6eb3f72b3ae4e0bae1011f732 SHA512 83f68dcb89a3384ae63243b5deeec20a837039bf397566e076ba18c4ed78ccb99df0b1f0072c8993a7a6bd87d3aebffd772bd48bf2815be20e118c79d065f140
+EBUILD cmdalias-3.0-r2.ebuild 435 BLAKE2B 3011098ffe988ec3248c98adfc7ab296cf645eb245e034c07b3a269c11107b609407f69d7ac60005d6cf78497c35d86c5d70255f877fcdc0a13bd355b317bcbc SHA512 32dd3583ed86cdd2dc3de2a36ef6b25ba0f39cf9c353b48e364e0fcb7b363b122ab8ba86c4c8f9bf599907ec87e194cfae6cf80e16ff7f3e8051d6c07060707e
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/cmdalias/cmdalias-3.0-r2.ebuild b/app-vim/cmdalias/cmdalias-3.0-r2.ebuild
index ad85aa02aab7..022932d73298 100644
--- a/app-vim/cmdalias/cmdalias-3.0-r2.ebuild
+++ b/app-vim/cmdalias/cmdalias-3.0-r2.ebuild
@@ -9,7 +9,7 @@ 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"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides library functions and is not intended to be used
diff --git a/app-vim/csound-syntax/Manifest b/app-vim/csound-syntax/Manifest
index 0283f87cfbc4..8d3bba127c44 100644
--- a/app-vim/csound-syntax/Manifest
+++ b/app-vim/csound-syntax/Manifest
@@ -1,5 +1,5 @@
 AUX csound-syntax-doc.patch 388 BLAKE2B ec94940f41e3e9b891f4d70488bfc17b00e8f95a8efa989bb040261ccee8fca60b21e1a6f80c5b9189473ea73a46b3fb1f30d6f384607a97db89cf2d7c51aeb5 SHA512 a05e5bdb3165bdb3c86fd963e9767eaaca7c7047dffd73d239fa58248ad24f78667ebea6106777123ea1e366ba4c72387b5765ead760acbfc881d581691920bc
 DIST csound-syntax-20160804.tar.bz2 326658 BLAKE2B 04ba7e1eb3afee6b32de4603e91f78fdc7fd3b70b137bd05ecac5ace2b34222a1cc8c095cd7776abe46b7bb18bd67d1711bca75f20e2f656162d414f2c6e2b2f SHA512 83ba89768be3d9e5dd701cc8323fbbff75ce399210891fc1e5676e278c39cfdb4b5e4a354c93c1f439a667d0ea65f459aea0b6f79740a061381e22d2557c0eb8
-EBUILD csound-syntax-20160804-r1.ebuild 367 BLAKE2B 895fbf3a1f6edd7abddc051e674689801f661ab1ded54b79e515ef194af8e0b884a08598acdff739743c02efaca8cc901fe9005091e5accbc20397b0a9d86be8 SHA512 52ab505a63970eba67ad776430c7b154bc38c1bcef9a2e390e1b6fa7d8d69383b273effe3a6de5fabadb5ba8d508be95f9687f8411c17dd57a03d1c6be6f4c8a
+EBUILD csound-syntax-20160804-r1.ebuild 365 BLAKE2B cb1d144376cb96cbb906deac0356f97ea0cd3a32fd685bab7007ee9b6db8912aef6cfab4220158fd118ecae7dae94b9374f1a741dee5a8a5519807ed940d45d8 SHA512 06375635b32daf5d5577a1223ecab32a714b7cdd8d5e787c48c4da9cb4b22a13e1817a8beea300db354079bee721627919f0e79da324da89b018aed5da492fac
 EBUILD csound-syntax-20160804.ebuild 365 BLAKE2B d3711e677e8c34c70e7a15b4ec303558f0f261c5b94e567251c986e9e3ff5acf570806295c1e1842a7c9322ff8ef88478eb1e0b13071a6de0fa48eb5b8e62e23 SHA512 738f9e812b0efd0846127cdbbb08b278c2b32023c315a4e08d905d37519fee35ba9a69de2ea992dea13c88396f4f3209542645e44b355b259f365e8ccc57f884
 MISC metadata.xml 330 BLAKE2B 1dbf9776a5ac0cc2a4ff1f40f121d405d3122f453c23a4c2b794606ba87ad9d9f6b1bf6dfcb2f0def4696bcd3a46317825e187dd23b98bb88edf90aa2e10c46b SHA512 c6e324c27a076e931d8ca121334cf45cd9f0abb71bd01708844d831121432d7d5d0e84a3db408f9b2290b89f9af03918d2777bde0d93c4ac4e975627f5c9931e
diff --git a/app-vim/csound-syntax/csound-syntax-20160804-r1.ebuild b/app-vim/csound-syntax/csound-syntax-20160804-r1.ebuild
index 5da0b220f740..bd83fe3c361f 100644
--- a/app-vim/csound-syntax/csound-syntax-20160804-r1.ebuild
+++ b/app-vim/csound-syntax/csound-syntax-20160804-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: set of tools for editing Csound files with vim"
 HOMEPAGE="https://github.com/luisjure/csound-vim"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}"
 
diff --git a/app-vim/csscomplete/Manifest b/app-vim/csscomplete/Manifest
index ec1bd0050398..62d4aea96dc3 100644
--- a/app-vim/csscomplete/Manifest
+++ b/app-vim/csscomplete/Manifest
@@ -1,4 +1,4 @@
 DIST csscomplete-1.0.tar.gz 16621 BLAKE2B d05f7f781fdbb26f1672ab47dc01345be3fd78a3cf57e7f746453fd437f1b387a24969fb3de7cb23163abe098a670cc36ac989e2a1285de6c7499ec41ea59a0e SHA512 adbc2634534c3f0f8b3ea2389950d37540a2f5c7b4756e428cf50d6086fef5706aa5cde9b3cfd1fa87a9b6f07fddb26be75bf32f7ffc4193d5f0813dccf84c0b
-EBUILD csscomplete-1.0-r1.ebuild 440 BLAKE2B e3cb14bd45e1a07163777d0e961c82752fb63bea7af814b7d81b831214b589ca43f2df7c85b34504171377c0b48f4bef994f3db32cbff3fb6a1a8d4c0266a9b4 SHA512 0fe2bbce32ff30394030b70846d99611f6662d97ee83a3a2eedbee864d303d035987d181d38c6689e23e3d6328f4640e43460e3be66d37abebc6caf398840c2d
+EBUILD csscomplete-1.0-r1.ebuild 437 BLAKE2B 1198293de61c94e6b4f857444362c6bcce0009d19fed12e278670e8659d85e847d7bf37dffdacb3ba17ad55fdf4730ff0827c144a8eec01c54c5f7a446f3e9a7 SHA512 ba08f82af2c6ba37657bc948bd16c6d83ccd2b54dc8da7e2b7b9ec09b3df64d052e09cdb35aa743275e0e6bbe0eefa61c64d957662a6d0f48786759e711af880
 EBUILD csscomplete-1.0.ebuild 462 BLAKE2B 4a234b63f98bfcb4356e0d6295db28e6f33cfafc9caa1eec5c65c84c0b3876c33a1df5799a043d048726eb4f7bbc85c604780a08f24900a1f9e8ce8f7f220136 SHA512 bd65d4b3655cd194b29c9d8a337a00bb4079aa29799dfaeccd435ddadce0d75f1e6a45a9c5bbef2bba2c4965cddb7160a36399d88743d2d358b5ecae970cc162
 MISC metadata.xml 432 BLAKE2B b69d23f26e33c438510a8b9e3758258863393678971be387530f3fde369ef7757686aafc93c7847137662fde6f5fe3f5e9bbff9995ae1528d0dbe028a2016e72 SHA512 be8823a80fabf1f587cb58e0852e6130577c9d2702d0f7653a3d093e2c9a17af007a22c370529823a76824e1a5ffb008ea2868e532dd9dc7d690c93d45c1208b
diff --git a/app-vim/csscomplete/csscomplete-1.0-r1.ebuild b/app-vim/csscomplete/csscomplete-1.0-r1.ebuild
index 148ed99b34e9..39cf200e927c 100644
--- a/app-vim/csscomplete/csscomplete-1.0-r1.ebuild
+++ b/app-vim/csscomplete/csscomplete-1.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}.vim-${PV}"
 
 LICENSE="vim.org"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 
 src_compile() {
 	:;
diff --git a/app-vim/csv/Manifest b/app-vim/csv/Manifest
index 016f1a294e2b..03a014ef439d 100644
--- a/app-vim/csv/Manifest
+++ b/app-vim/csv/Manifest
@@ -1,4 +1,4 @@
 DIST csv-0.31.tar.bz2 38537 BLAKE2B cc148b084b6b139646b4bbb0a907830b02343e3ed6f55cab0c7f0864124705df31c71e2eee976b5bad340400e033e9da303f9c1e972185dca2164701ecf38ae8 SHA512 1d0716765e3268e20ef7b2ed822e7322febbe2c9e9b775e79a2628c4641f157084b6b24d999b051657881acaee5ae8dd36a558ef31e5985bf7bf14ac894d5677
 EBUILD csv-0.31-r1.ebuild 325 BLAKE2B c552086da2673808ec74f62635d10d20346c37d9836884edb91cbd01887a7707a502cd6e11525b031b1364d2b4beb6463c99d21472813d77f0c656a1e1a14003 SHA512 9ef6f9f5e85cf6a9104913824a2bbcebff63ee51ce4f58089e44a4d792c46e70deb721b3b0b0edc78a1f5fc5584576824fe859e5a8546058bedcf1f9d39f7cfd
-EBUILD csv-0.31-r2.ebuild 325 BLAKE2B 70ca2aa78a4c8ee678e0dfcc01f33f392849f31491b77aa20b7d09efafc636d3f51901f90169a4623c24cdfaf83b1c518570f02049d63a1f450cd4af36bd450b SHA512 de8e63e2b9687ff509f9e9eec07e4b89ee45cf606d8014629197805f16be0ee41ad0811bf29dbc50582400c4fa7e8a1fe66020c24480be5a3f25550a52e96a3c
+EBUILD csv-0.31-r2.ebuild 323 BLAKE2B 7f9eaab3a729f5b0af5a9e2d6347c760d06f72a0279837a3a16596d6a260c070df54a9fa0af3627ff0ee5a28e1ce10c391a3fb00a8595748e442289b8e96b727 SHA512 a6b2b30b79e783df8944a1c1b222d8540f9d9bcff20c82e76b0812fbfd4f98ea7bfa1b38a4280ce01d922fcb302c612c3c91864040c0e119276f3e5b7fbedecc
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/csv/csv-0.31-r2.ebuild b/app-vim/csv/csv-0.31-r2.ebuild
index b66e0423a79c..ec97dda83232 100644
--- a/app-vim/csv/csv-0.31-r2.ebuild
+++ b/app-vim/csv/csv-0.31-r2.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: display and alter csv files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2830"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="ft-csv.txt"
diff --git a/app-vim/ctrlp/Manifest b/app-vim/ctrlp/Manifest
index c1d8ccfa720c..b08372fc984b 100644
--- a/app-vim/ctrlp/Manifest
+++ b/app-vim/ctrlp/Manifest
@@ -1,4 +1,4 @@
 DIST ctrlp-1.80_p20180418.tar.gz 76376 BLAKE2B 2ae3e85eac29bb07bfafcc60b879b506b57b7874ee9798d4fc0e420e06283ceca4cfe4d282fb9552c1971db48de25dc8df03d3e20d85ae1bbfc72f1162cc1fba SHA512 08a566087e0be0496c3dd1d60e24d65421b7fc758c95d3959181293502dd1e3581066bebea58cc1ef85f2a7cba76b45eee2e5ff2c522e27523ea31bebe4a36d5
-EBUILD ctrlp-1.80_p20180418-r1.ebuild 539 BLAKE2B 7d6d616eacd82e4dea7e8c0e75e632cd2fea872145938e7535b79359613261b9797d19d4beb91f11511fdbac570e7c76b19a02b4ffc3abf06064b98b83fb9ba8 SHA512 c48a91b98350de3d44d305a7b7da1f907e03db19b5a5f0429d305137a0bbd175e2e8727aaf831f805c10aed17f4d00329fbcd7cb59a35ea59f800d22c64bbec5
+EBUILD ctrlp-1.80_p20180418-r1.ebuild 537 BLAKE2B d25a7e9433249dcce28e667aeeda3af2f66c4115dcef591eb079ef839cc01be515a2249ea5b6f1f9254d2a14e4341b3f9febf0bdcac24484400ecd1646135146 SHA512 2e215de21dbabd9aaadd929742af1d918aa812f7a8af26e8c8f898d5669cea34a69cd31f2b74225bbeaa940c86f242e3ef6396e374fb920683e5f4096b5f8bb5
 EBUILD ctrlp-1.80_p20180418.ebuild 536 BLAKE2B 5cf16efcc11ed2154e4e6fc4a05c2093aa05dcc26595a3883f5438850750f4d64dacee6f555bdfdcccd1bf9b606b6c1fa2a414a91d4a20fba35088ab06ff3f99 SHA512 7a2b87e55f6e9d6109b6f4d0c1678eac47eec87aafed9a1d0c65562a8bf5d2b0a61f5cf5a3c553b0d9a23b19c77ea1cc82ec0b04711a6ea0ab223daf137a95f5
 MISC metadata.xml 339 BLAKE2B 710de3e33829b4786f7edfda6e5e6ffbfb5790832c5d5ae125e219628925112b5f8588d012bd734057a88e4d60b42672419e44161e8a75d2015f9fdba169f7d9 SHA512 e8ae7a6d0a98c4d73a8b9ee1b4fa36f8f203663ec1e3f6a309a34d17487b60ed7ffe4e0178c12ea1a4b384cf9003f2c1538f560e5ebc5a937ad951db5c420338
diff --git a/app-vim/ctrlp/ctrlp-1.80_p20180418-r1.ebuild b/app-vim/ctrlp/ctrlp-1.80_p20180418-r1.ebuild
index 83360a00f25b..cd5804137d03 100644
--- a/app-vim/ctrlp/ctrlp-1.80_p20180418-r1.ebuild
+++ b/app-vim/ctrlp/ctrlp-1.80_p20180418-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ctrlpvim/ctrlp.vim"
 SRC_URI="https://github.com/${PN}vim/${PN}.vim/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/curcmdmode/Manifest b/app-vim/curcmdmode/Manifest
index e467d62553d9..51726612ad0b 100644
--- a/app-vim/curcmdmode/Manifest
+++ b/app-vim/curcmdmode/Manifest
@@ -1,4 +1,4 @@
 DIST curcmdmode-1.0.tar.bz2 3566 BLAKE2B 138c7b9b84d69a40df731dc633dd7b7e2b2859af70d8418a5760a7b6016dd61f3401bd7bd1bb7854e500c744cabb8f0c65a89fe2ee37ffbe0a3117909c232491 SHA512 eae4e7cc92ae3838ffbdb507fd51174daf2fcd05d23f418555ac9ea3dde5562e49c67ee7b27dfcf6bf2088dd335ca97165835919dd804a86fca581b4d6bc0ea2
 EBUILD curcmdmode-1.0-r1.ebuild 486 BLAKE2B 32e11dc24bc17d1c51a2d6f8b9f3ec8cdbe279e14abb09671628f53aa099c5ca7eac7900bf90cf07943cd315791c3e1a800a478ff613b116f740cb8a0dc65a67 SHA512 8bde9866683542c0a61afc2acef05a11a48b24b16ff587dc1b20975d25e8e40fe7e065ba335bd702e7dc0b4622e3812438c86af0d892140ab6c433cc0b7dac23
-EBUILD curcmdmode-1.0-r2.ebuild 483 BLAKE2B 00a1814064d091c54793d0097be7626706931e290b13e41efebd50c5041ea59824d46aed7edd6ee5abe037bed35e546976c1b2fe28cb3409167414817499a8d3 SHA512 5caa62440a08bb356bd786d67f3426cbbedb08038b7a67c84fe0b63e35224940d5c90cce4cd44f072081e3de2db16add0511313c8f2fd49961217b486c3d3bcc
+EBUILD curcmdmode-1.0-r2.ebuild 480 BLAKE2B d6d09569685a47e100b5c5da58e780f1951c03e76b45604c12cf2926a72d9ea3c19013d870c808fbc88e52ba6022f9720fa021ca4ec0d7a8b89e00a8baf9a2b7 SHA512 120f9fd1b6ad0d7dd66f943c4586385335940423f803d2e47a99f030f8888421f02e55966f6f923bb5be1e5dbaf7869f777297f11b3d2fe446ef4315a0810104
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/curcmdmode/curcmdmode-1.0-r2.ebuild b/app-vim/curcmdmode/curcmdmode-1.0-r2.ebuild
index 73c3b850195f..fd7562a5ed0f 100644
--- a/app-vim/curcmdmode/curcmdmode-1.0-r2.ebuild
+++ b/app-vim/curcmdmode/curcmdmode-1.0-r2.ebuild
@@ -9,7 +9,7 @@ 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"
 
 RDEPEND="app-vim/genutils"
 
diff --git a/app-vim/cvsmenu/Manifest b/app-vim/cvsmenu/Manifest
index b1c590a0b2fb..9916e4048074 100644
--- a/app-vim/cvsmenu/Manifest
+++ b/app-vim/cvsmenu/Manifest
@@ -1,4 +1,4 @@
 DIST cvsmenu-1.147.tar.bz2 16440 BLAKE2B 509b5240232b8bc2770a49e9b7814ce5783114108d22f2ae80de04c19ff037fed7c76479b3c783407c753c5d7b7f58a51df455dc4e9f7d4472e607d8b1e3f5d1 SHA512 ca25c4b6d50d0d82ce179a76a8993b1a7a5ef72d032639ec9cf16fbdeafd87eddf7f89214fa8d370d330f5f7501e1265f1c5635153cc387e23191ab81ce56c8b
 EBUILD cvsmenu-1.147-r1.ebuild 480 BLAKE2B 88e2005a772fdbd4f2e77fe4a71661aaa8f3da768d78a298563e99949e9afc49d918efab4c79439908e01fa3552b75682f201f4843b7184b6f9d303edf23db2b SHA512 30cf8e0e0aafe85c21b8fd745ab9179b45e016f1df6167738493d7c56a912cdb723c982dd22e1ffa72c7445cea653d5ba70db019f69d55821877fe3892f6754e
-EBUILD cvsmenu-1.147-r2.ebuild 473 BLAKE2B a4d7b5b74839d782f9abc662a397d0cec8f8555e8b62b0d141125a7bf716024d1cd3f969fd70228bd9554b432f02217f000ee0c4ffa91eae6316ce1c71c25a75 SHA512 267e068b90d524348f5388bc75de76a2165e1b1c9c53663bf9bca3482937354992b29a60297d123fd1ea305fcd7e0cbb2b101be5ae658ade310aee4458d97a64
+EBUILD cvsmenu-1.147-r2.ebuild 471 BLAKE2B 54ad2659c4f323fb504cbea4e44f4f58de46338d7957628902348ed234575fce04ce40c59c5f340882e0765adef00121be7ac23bab1bc7ccbea2e0e57e3f4c1a SHA512 1d46fe7ec35842f72d00ba836ff742e664959a86735f8a1e2e286adf5948601cf076586065f5ff6971f4d24d65d303c198e7888aa68109590ddf201692b32218
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/cvsmenu/cvsmenu-1.147-r2.ebuild b/app-vim/cvsmenu/cvsmenu-1.147-r2.ebuild
index 93ff89281d19..8b8751e9b480 100644
--- a/app-vim/cvsmenu/cvsmenu-1.147-r2.ebuild
+++ b/app-vim/cvsmenu/cvsmenu-1.147-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: CVS(NT) integration script"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1245"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 # Note, this comes from CVS on sf.net
 # http://ezytools.cvs.sourceforge.net/*checkout*/ezytools/VimTools/cvsmenu.txt
diff --git a/app-vim/dbext/Manifest b/app-vim/dbext/Manifest
index dc4ffea5d44f..116c16c3c665 100644
--- a/app-vim/dbext/Manifest
+++ b/app-vim/dbext/Manifest
@@ -1,4 +1,4 @@
 DIST dbext-26.00.tar.bz2 109724 BLAKE2B 01f1378514836ac43cbdf9ca6087377ce83118b95fba04d530854a268f22dc2dc78a5f163c75c35ed9bf76514b3889c5f420b704f105dbd88bffc17f3d3c1bd3 SHA512 02d0f75443d91d32f8a6423712fb7eebde7659b986fcca2ddfef6458a5fd5caea3c73ba21ecd7a0fd57793f0a6fbc71d81c2ee6db3b82a9d98fd84572b1df18b
-EBUILD dbext-26.00-r1.ebuild 334 BLAKE2B 1df9a000a515a384a6ecdc17cf0067c757bbab0ef61227662eb4a804d5ec69710c00be99bca710ff804fb351e6f6920c99da26506c0de48b4c8a365b6182cd29 SHA512 c8bb69d3b4367100f9f7b8e7b0b5f83aa47af9872d0e4cb5a0ccc6c3b972f60d541ae41a55c8689f6e05dabf4d5c7d6fb6d0edc1cef104ed242abe86af76e5df
+EBUILD dbext-26.00-r1.ebuild 331 BLAKE2B 455ffcc38f1460ea4689619e6dd9e55d6b0aef823d71c8e271b7e0e5e6198d750e97f7445cf3798ffa16f521541782330a4a3445f3850982b003209c0716fc27 SHA512 eb22b9477053ed9c46a39b594fb3f187d712190cbc4f6ef0af47b17bf6256c2b691ef99c2f40bd68da22ed62d562119b3570452fb98e0507f62fb41b937faee8
 EBUILD dbext-26.00.ebuild 332 BLAKE2B 1ef70306c946cb18d2fd8a82ff1863647b640e2b5aff7d5f4c6544a4ef002db8187c3649bb6abf8c1a83bdd2040a5c480dc9f8382fbc11271d7c7897ceb64967 SHA512 b3fcc20e340b19227b1c1dc95a6780266468cb2da0a5d54beedf2f8e68c0aaf600f3d987460d1c95f1153a2edfeec1094eac0ff67a16315d0c27f50bbd735f0c
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/dbext/dbext-26.00-r1.ebuild b/app-vim/dbext/dbext-26.00-r1.ebuild
index 21bb9268b3c9..5b1e2eac8081 100644
--- a/app-vim/dbext/dbext-26.00-r1.ebuild
+++ b/app-vim/dbext/dbext-26.00-r1.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: easy access to databases"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index dfa8bd9796fd..675daeff3ff3 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,5 +1,5 @@
 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 507 BLAKE2B b697110484076e0f9836fae5b64a5cd19eadba6902b669037b82a577abe434e38135e09c2e27b813391bbe35b08e576fc4db1dcb84e020c10b44d86cc5c2b34a SHA512 646c2d19dd82b9d2b0577162b5df93959519a88e53e2c3e75ec6cf45f29cec757884ac24829b706d1a8990d0e4beaf39f414a259a867e476440312ff0110d53d
-EBUILD dhcpd-syntax-20030825-r2.ebuild 517 BLAKE2B a8c1643ba02b62cfbc3fcdbb3ad36d4252e03c55512024867817839db0a5e6cf4d0daa74d0758e4304783dfc98ae61ff29ffa0c9d490ed75fc7007e5c33e9759 SHA512 6e9c0e525442b58ee80873f8504c9568d17a6c967508370c3b8408513ca89b5a8fd72a5a99b90c1be98ccd5b84093d548332743cc2069fa495d0adf61012bd53
+EBUILD dhcpd-syntax-20030825-r2.ebuild 511 BLAKE2B d3338f6a8392deeeec93c2213ef138acbf1d1281308b5d2218bfc38c43278790a436ccb5334572bf722fc6bec0326f413b9fda55fe720369f6ed0bda831e0664 SHA512 c58ebe6ab73055cc0dafe03b3ccb404817a573918676d707404359d9ede1ea19cdafca38103efc1de56559482f5d0930a8701df7a146072319610a1045a93fd4
 MISC metadata.xml 452 BLAKE2B cfd0bc494a065a27c24589f6b815b0377f597bf10863652e52ca37faa6e9004637a86c7d0fc68231cf99445a5df67763d33ec22edd563c7e4f902d611b0e2f9b SHA512 34cfab0ef96a5719c51d2b2f5881ca643672bc38abc70bbdd1556f3d10a6eb188ce1ac24654e5542d98837cc60aede9fb024d6b9cdae15b9de2f9ecae1194c3b
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r2.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r2.ebuild
index 52fbd526f0ae..08c38d6df2f4 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r2.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r2.ebuild
@@ -9,7 +9,7 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
 
diff --git a/app-vim/dirdiff/Manifest b/app-vim/dirdiff/Manifest
index 4085e0cfa822..5d10919639c0 100644
--- a/app-vim/dirdiff/Manifest
+++ b/app-vim/dirdiff/Manifest
@@ -1,4 +1,4 @@
 DIST dirdiff-1.1.5.tar.bz2 11131 BLAKE2B 17a7adaa67f90c2e23ada8a53b10c5b50db3039bb17b7a32797870072b1b06ff14cc8b1b41106d0eadbfc9ac4dfabf1bb4e925a39ca2ab2a8b4444e64d7acc66 SHA512 d1abc7981d38eb784cec265146fb3b45af32f9df17698d133f6f001608c48d53aa2529f4d3d7204509ee26fcd84e813842b5a8193b145abe9d0cc468f69b7f87
 EBUILD dirdiff-1.1.5-r1.ebuild 365 BLAKE2B 0796cb8b400c02bf77fbb12f6d3f619abc54624c8b84088a444b7de517028ff21cda6f0f89475367132e6d8c3766f1be2a971d7df465e2f84ee0b8ccabd807b0 SHA512 ca1f498b21d711495d171008a0976bae20563f3c461b284023755f9c377f52d07d759700adddc6d3df8e8af924be93816a7c84af709abae2e16351169fc06581
-EBUILD dirdiff-1.1.5-r2.ebuild 368 BLAKE2B fdb3d3dd32163dd9f08f0e62bb69f771c6915a159a8af343d41b7a855db941e82f75a2de93f7d32f758305cf17aceac50ef987e1db1442e4c31853bd28d624cd SHA512 39694c92aca0e235a7382f73bde6f643c88fd444cd36c891b98ac06bb2b6186373099085f6890d1babdfaf8fd34ab43c3e033f97e0b838a34b8cf07b56f93266
+EBUILD dirdiff-1.1.5-r2.ebuild 366 BLAKE2B 26aaa9ed3107feb83a94bc93e0ff075def298b0fc2cc045cd412aea1ced061c429b7f6552916123f48f1ff590ef04d8b3485b99625787af51b85b399352fa8ac SHA512 4926da314274654b2739d315f47206d8847a6e5f185d2a8a28c9f4ea31b650778b7cd7661ef274f05f3a564ccb7f85a37a2ffc03248d777c65b5cd9ed21dde4e
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/dirdiff/dirdiff-1.1.5-r2.ebuild b/app-vim/dirdiff/dirdiff-1.1.5-r2.ebuild
index 29ba9cdc2dc2..e7adb733abcb 100644
--- a/app-vim/dirdiff/dirdiff-1.1.5-r2.ebuild
+++ b/app-vim/dirdiff/dirdiff-1.1.5-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: diff and merge two directories recursively"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=102"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-apps/diffutils"
 
diff --git a/app-vim/easy-align/Manifest b/app-vim/easy-align/Manifest
index 83d1e829d9a2..86dae67768bc 100644
--- a/app-vim/easy-align/Manifest
+++ b/app-vim/easy-align/Manifest
@@ -1,4 +1,4 @@
 DIST easy-align-2.10.0.tar.gz 20056 BLAKE2B 3319cfc84147a3cfb0c7109dbb9116c94b734da528623944e2546667ac45e5d912e404c8c94df963002e7789760ba8fa7023e98cf22c1201bedbe8f667b1d13d SHA512 4a6a46db96b78d830fc0191b77b2226e9c1a2de585b731d1997f69ee31c8c76038ceb14f18e13f30fee00b5ce9ca7aed4241db06cac303b8ae903a856e4baabd
 EBUILD easy-align-2.10.0-r1.ebuild 557 BLAKE2B d939303b32c8172c73517c55e829195404a872b77fdb8cf7c8715a80a08ef378a6e4ace0aff893e71ddb32cdfdc0b4aed110405192a078083aefd08b2cd19db9 SHA512 dabb5b12dee983d13187c4aa70b159476a9fa907cac74fae76e066d0b6edc4337fc20834b1cd2ec66db601c0faeebf5889135354e9834c234360883e144c68d2
-EBUILD easy-align-2.10.0-r2.ebuild 565 BLAKE2B 4b2560ae2e840ebf9e7a26f7bf06ffac1161baf2041a61601a8f1c8b19d993548cc76837a0cc1ad75adcf170c83b0949e32c4fb3a72f0b2889306b80c6a07914 SHA512 f65d7f2199bef3e661a414a9a5c505bf09184255aea806ccf24d9e6bb66be45cd9851c48ca6f0a52c4a98d1038cea8b0b090cf8a9a1efbb4f8e5d001260547f2
+EBUILD easy-align-2.10.0-r2.ebuild 563 BLAKE2B 9d59ced71f350a681d80a119d0de38e009e43faa2a0c415f96a8bd16beef432e4081c598993f1a1da6a8465f1cf983cbe9592ce31b19feb5b26459c08ac019a8 SHA512 3ebd3e3474a1aa479572fc0292e2f9ef5aac8fcc31bc66b6e03948faf076183a9e6ac1b0750b148bfea86db0c6e15f5df2c813f2cc6d22e4fa64a89e4f0e8875
 MISC metadata.xml 348 BLAKE2B 97e42b8671b9bbab3c14e206d26658b784826a5100bcebcdf9bb2a62b2d98a3882bcac7871c4e1a6d56ba0b93679adebde4e4e61ea04457635c7f8e2e0781223 SHA512 1b10b0b775d94f63d0a54960c8fe31c9e4997949c6774fa97e1439cc12abc756ec77f793aa211812af9a2848b6605ccb16c273507d3348d643bca4223c862d61
diff --git a/app-vim/easy-align/easy-align-2.10.0-r2.ebuild b/app-vim/easy-align/easy-align-2.10.0-r2.ebuild
index 05c1978fbbdc..eb6e725b1d0e 100644
--- a/app-vim/easy-align/easy-align-2.10.0-r2.ebuild
+++ b/app-vim/easy-align/easy-align-2.10.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/junegunn/vim-easy-align
 SRC_URI="https://github.com/junegunn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}"
 
diff --git a/app-vim/ebnf-syntax/Manifest b/app-vim/ebnf-syntax/Manifest
index 03a432e9f1a4..9cabec231ab7 100644
--- a/app-vim/ebnf-syntax/Manifest
+++ b/app-vim/ebnf-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST ebnf-syntax-1.1.tar.bz2 981 BLAKE2B 5ab1916fc909f8b6b4fc139fd34c5c982f2bfac3f4ccfa53f13945787db6b9c6b5531cb805d4a0feea5f3165259cd3a033951fd9074344e62657e067571e5300 SHA512 0fba3be91e998b26a3011bfe18765a3bc3ebde6aa33e96580dc0529d79a067020cfeee614dfa40126a1a968d3ca8e77711eca096095675cf6072061c9be7c083
 EBUILD ebnf-syntax-1.1-r2.ebuild 581 BLAKE2B 0b6933ab5ecd0c7935717df68050288240342240ec53483882db356077c19b33f7712739c1042299bb75451302e0928e1f0ec656b76d483bae4f6b02314de275 SHA512 7b2f8c953d6bede17b69d26fbfaaa52a099d32695b36593f4da931a225e195945836e120556552718fd9bce356f04ba9d8f09b47f0717856ccfee07e30071615
-EBUILD ebnf-syntax-1.1-r3.ebuild 579 BLAKE2B ad319147fa4fd1f68c04389b325dfcef3532e97bc69eaf058fa488f66ca365f8f15683a6e4aae3d8205dcc80f14bb5bce406554053ac6b964a266ac2d5980f71 SHA512 a7074684e79a323443bb45407ee2f04ced8fcf1b2c56b8708080651255e9cb5e52239080e2f954e34505bab71311b152ede54c9d6e93bb33a6efefc3f05457ff
+EBUILD ebnf-syntax-1.1-r3.ebuild 575 BLAKE2B 5ff4479183f2237eb11e217821b7c9d46bbde389e96353c392cff787c8cb5c3698916b283c1d54fc4d0a6fce9c4238a52905f4a4388c18355409c436e8148ff1 SHA512 74d2a26241ff2b9933727526242b0e093ea68b177f2110a538227bdf37050596929421acf646c8770d556c2b66eea47f2d6cf2684d7b2347775beafda21e7020
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r3.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r3.ebuild
index c657db10f5a8..08375fec1db9 100644
--- a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r3.ebuild
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r3.ebuild
@@ -9,7 +9,7 @@ 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"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for EBNF (ISO/IEC 14997) files."
diff --git a/app-vim/emmet/Manifest b/app-vim/emmet/Manifest
index 5ae9499fda93..827c141413b5 100644
--- a/app-vim/emmet/Manifest
+++ b/app-vim/emmet/Manifest
@@ -1,4 +1,4 @@
 DIST emmet-0.85.tar.bz2 31274 BLAKE2B ffba1130c7c51144524a9da6f1477f1c836b7f16b19c669050139540beaf933382b62a4a7784cf4e90703b153f53e2da8416126f606c6fd572e73efe7b09e9b4 SHA512 567f79c43ac0d5560dea2130e6fb6d32f25d35b20c3bbf8fc40b7cdc8c20e2d9352b9e1c03e57de2077ac192915ab174a6bee442d5311f01cc79c3fe6e10af56
 EBUILD emmet-0.85-r1.ebuild 375 BLAKE2B d44eed4306f223fc2301cd8d32ce89851d16fbd116bad66181c8bd733d824c184442a2e25920e1b5fdd981c9064578d3488f0ef24e4b4d8cc395ae6718c7b323 SHA512 9afe6bbc7f2a81f9602b8bc1379eb321b06f420c0ef36f67cab4494dd7a63c66d400a5cb9c62a8e3f9e691e3b30e35d48d11357d60af9c3e5203177847fd310a
-EBUILD emmet-0.85-r2.ebuild 378 BLAKE2B 2c1027ef939231a35b01a36c6bfb2c5860ce1dc2b716550228612e6720daca1e0474c35839eb89465ee1c13554653c65967a2c3cc07b55f71b70eeb9a5dfc9a4 SHA512 51aafa4090118931fef8e64c944a926dc62d602cb113ab94f6905a6bd7758a3a7be2cc77f76f2f6bb5a249ee385c1d9ffad4ab2d44c214fc3095982570681db2
+EBUILD emmet-0.85-r2.ebuild 376 BLAKE2B 3676c73b9514ff93d944af1114a898f78ad1736d78b3156fe5d473d9fe19fb758c9392b87354bea9c4271c5ed81dbd3e85695a5aa4b81df00ddefb9a613ae0d2 SHA512 a6cd85e885b1acba7cfaddfc604de8b4f0c11f3d6382aec4013a8532440e0b4cd3c9de8d5bc698681752e459bbe6539e32b46d833896489e35be96f0286c78c8
 MISC metadata.xml 246 BLAKE2B 410fd0eb2d2b412bb4ca13905fea3351e818dbeed07d7063df2ebfe9000dd45ba7ac827a33c8961913ac567db7caa61646229e43b527edbd704795cc09ba3c94 SHA512 2c66e46cc1cc61356d6784064205b832cd2854c3dbfb6dc79ba55b968d1886e2063a7bdb4b2541651e4f289c09bd344cd4eb7d48b2bda67c955b09f142b63c55
diff --git a/app-vim/emmet/emmet-0.85-r2.ebuild b/app-vim/emmet/emmet-0.85-r2.ebuild
index 62e982a78a3d..43acdfe3ef7d 100644
--- a/app-vim/emmet/emmet-0.85-r2.ebuild
+++ b/app-vim/emmet/emmet-0.85-r2.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/enhancedcommentify/Manifest b/app-vim/enhancedcommentify/Manifest
index 65e8a76bddd2..8199b3fa0526 100644
--- a/app-vim/enhancedcommentify/Manifest
+++ b/app-vim/enhancedcommentify/Manifest
@@ -2,5 +2,5 @@ AUX enhancedcommentify-2.1-extra-ft-support.patch 665 BLAKE2B f9afbc2602b1f7b215
 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 533 BLAKE2B 1d58da77caa2e13a1966578006eba674f1e4e07f9741515b4b6d69434e810d0c9b23c196bbca2163eda2752d4b02c338d9f1f6a31bc005d04b2046384968f6a5 SHA512 51a7a1a27df1ce6f6fb9a5664b30f6244aad495113875f05c8920ba35a8f061f2a072218f9a9b009c336f704116cf2e0b01df44ed0e362e428625bf02a396493
-EBUILD enhancedcommentify-2.3-r2.ebuild 537 BLAKE2B 9bfa96e467a31c5517ef8d95bd3582134b5ab9e7a4939e8e42fa5f9979839906fccd3b82d78b2c02e70d2365d486da7de4bdfe5629e62b664b44bbc3fc19d645 SHA512 d8117679e28cdb84dc9544ee3bffacd954efc089e670b5e62d17b74435baa2bffcc37430723385468629b7ed3f372b560ee6bbc66a8d281ab77c36a65acdfd85
+EBUILD enhancedcommentify-2.3-r2.ebuild 534 BLAKE2B c1c24ea0b28be55e551756779bed244701f5720eb1258eb399e616148cee7085ba175bd77eb33d0d00ae49fdb46bded55def9713ae9b9dcaeb7a353e8982015a SHA512 eb5539d38b2787c022de24eb110ad4c7b44351c0180c4c34dde86dbcc202f243517e0dae64b9c298b66d7d71d66a58cc57e61d85f0d5b91d70f24364f56314ba
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r2.ebuild b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r2.ebuild
index c1d5b6079805..daa4e4578a0e 100644
--- a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r2.ebuild
+++ b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r2.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 cccb61e7710c..bb1cc775f357 100644
--- a/app-vim/errsign/Manifest
+++ b/app-vim/errsign/Manifest
@@ -1,4 +1,4 @@
 DIST errsign-0.1.tar.bz2 599 BLAKE2B 85b6589da0cad1827d16d33e1e38c7b533c3ab3caa985bb77bdb5cc8f96fbc1e29daa6d925ff30be69e8810bf7ea8148d0c4340144743f6cdc50d2c9110ce9fe SHA512 ccf1136043b5a54614ef90190c157c02fa5470bd79159b8ba6f7a7cd95bdd0c0dcc41eb993d8a26d2b308012cd400f4d3168f4e7dde7bbdbe8dcedcfe5d1c929
 EBUILD errsign-0.1-r1.ebuild 547 BLAKE2B cfd72d55618541be62f2427e63c8580db1a9647b50b42364edd4294663594a7abdabea4df23fc464d31835fa7dc56965dad6faf5886db51f329bd32881d71593 SHA512 53f16a7fb0f80282566202906b7ed2f8bbc24cd7dbde34c5677ad1809745c20e4b8a75784f10ec066c81fc7d183f6d6b94065de2679c661075f4a620c2ccfd59
-EBUILD errsign-0.1-r2.ebuild 543 BLAKE2B a64f4db5d72bd4fda29a3df7c4be8961019bd79004871e13fb944896e914a5c0c01c6b11b5ccb8a82c7bcc6f26d1eced9f840c03d07fe11abda2db9c4d5d4c58 SHA512 f6ee64382e20c04d50b92f98b103cb894df2bcc242543d79cc48bd06f0c9f2bd56104e31be6cff67068cb92aca6e232f7a5ca7b050a7f0151fd0f4d71b4bcac3
+EBUILD errsign-0.1-r2.ebuild 540 BLAKE2B 44bf5fdd06258aba0003a1c3270a9b8475f57345c94a55b5fbfe010ae5afd556aba07969e5fab1e777f0c5c8fb36d84da7070805d1bf97001bd2d36cc9f494fe SHA512 83fb3aa2cb04698b9fc9cdb5a1c2cca5ffb34db19e6553b98da914a3e7999f6805fe1878ef63a41a3fb36ef0ae08c3eae04960c405c4470142b6aceebba688e7
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/errsign/errsign-0.1-r2.ebuild b/app-vim/errsign/errsign-0.1-r2.ebuild
index 0349bcfda883..3492e3835186 100644
--- a/app-vim/errsign/errsign-0.1-r2.ebuild
+++ b/app-vim/errsign/errsign-0.1-r2.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"
 
 VIM_PLUGIN_HELPTEXT=\
 'To use this plugin, simply type \\\\es in normal mode and any lines which
diff --git a/app-vim/eruby-syntax/Manifest b/app-vim/eruby-syntax/Manifest
index 346cc01c9907..ff8c7aac4d28 100644
--- a/app-vim/eruby-syntax/Manifest
+++ b/app-vim/eruby-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST eruby-syntax-2.0.tar.bz2 958 BLAKE2B 467e1df5bf32ad83bb427bfde6755425a752051b1532397e75f627dc084cfb6bbeba99655366698f812bd398b171fec4110af0fba28de1900a0a22aaa08b01ec SHA512 1fdf1e6ad95109528b13b30d7504da2ea8678785b1a716c33bae0b94fafb8f23d50d81022b5bc373c1970f6d3df04f2e78d87fbb2067f0c270780963b472468c
 EBUILD eruby-syntax-2.0-r2.ebuild 508 BLAKE2B 667ccf36a52872f96ab636fc74785abec5928756fba543ffb2a03c8034f75e8543bcd023cc7c8bcfdd2a101ce0f8282ac244b1d4b46a2a10752d20a2044df023 SHA512 7bc24fa9a4c78276e23a6ae6ee15574b826252f034a3a6d83d1a26e4fddb17cbcc0219511bfc44903d8b7544e8dfbd4f12a749ebd9ef143350c6860d787c6c1d
-EBUILD eruby-syntax-2.0-r3.ebuild 514 BLAKE2B 8d037c09fdd51aac9c2b4a27e1c9e18a900f0ef1400f905bb3ccf14a0c25a7f6e028dbb7e3066ee671e5f090aca2b78aff4e0ae98936d04030e74e22dace4739 SHA512 0b49ee5c9b968c1deeab3758b3c53531c4ec9ea6d7b6464635a0d3678da1df4279501687e337d6dd2e6622fba9f6fc229dbb929f9c82e067e595d61705c2eead
+EBUILD eruby-syntax-2.0-r3.ebuild 509 BLAKE2B d6a2c81500675a07880baa3c03a8677a264093bb3d4617e9b270104e1ed772a825f86c00a853dafbd3d20b4e21cd1e8cfc3cf8e3424e9e0ce9b7c7879076008b SHA512 86c9593fad8cd3c83ddf857aa3088e4e593f41c92e05d2151490cb2fd1709c5744d23a344fba2e86f925e29d77de4a18b822a3804d0a70be1883445bd3facb21
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r3.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r3.ebuild
index 2bf72a0fb743..5c5aa79710aa 100644
--- a/app-vim/eruby-syntax/eruby-syntax-2.0-r3.ebuild
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r3.ebuild
@@ -9,7 +9,7 @@ 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 69722800a9ae..48f83b5a8170 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
 EBUILD eselect-syntax-20070506-r2.ebuild 517 BLAKE2B 4b079d32aed9351a703d75b568cc6fb389ab43f8c453740d99cc5db7882d11bc3dbe6d1a2e2acf054aba66e2b1a54d249416ca45f2e0799537d2aa410a57e509 SHA512 4ba69e6bee7b196a733683702c4fbb26b649126646e1aa76ee1b06ff12f03f1a2aa3c0736a43760c0596e1f3ad47f86ca4194ab133833519c7b7caa563086c17
-EBUILD eselect-syntax-20070506-r3.ebuild 485 BLAKE2B 7b97582da3af2dc6f997a3849d99e5d3348385adcde3f1d30ad913451134c0657e74b3dea80ef27ce270a447458f4005754342ce99c5e462f665013615330d7f SHA512 43cafce77be0358c18da38cdf81030d3b31ec5595f4e944dd6f888fcb2e3794e8f25723ea8e133a5a6758f6856c0066de5c2713d01beb58a903e296f872add7d
+EBUILD eselect-syntax-20070506-r3.ebuild 478 BLAKE2B 3012aebf5774e70b87af2b0a79934e57c290871458dd2152319248fa29d40f21577a3757fa1a65333564822107153caa75d623a77acb7663983412c8a6c2b02b SHA512 0295cf0f8a3deaf0d5604d92e2a3f937488975c84fe1b84ad7d1986387660dfb440c5c5757e9dca8296e8d9705171ef8950ef9b9f953c51609352e4cc2ae0566
 MISC metadata.xml 274 BLAKE2B bfa9b39d4cd1b8163066648034a81b6c9fc23284334d76cbf3b71711a9548646a095d1fefa5e68455645867b5b0c1a7de96e106949b58e1e2ef7cf788ca28bf4 SHA512 aca1820afddcb39050481e3b3ea0310dc197f723ddb1130abaad0ade665062ac12c3f4bc4dda016e1fc9767f15c2fa484dca08a8bca2860107ae82345dcdd63b
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild
index d2dd907dfe0d..7768c8802515 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: eselect syntax highlighting, filetype and indent settin
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="vim"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 VIM_PLUGIN_HELPFILES="${PN}"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/fluxbox-syntax/Manifest b/app-vim/fluxbox-syntax/Manifest
index 5cda4d041ebe..0b482865ac98 100644
--- a/app-vim/fluxbox-syntax/Manifest
+++ b/app-vim/fluxbox-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST fluxbox-syntax-1.5.tar.bz2 1376 BLAKE2B 2006668a89077febb4ec919354359cae1170156950abb553695d6424cb277bca69a5e8ffa93a9e4b09b990e96f9ee34654d34dc15320140dad589808ef9960dc SHA512 0567af6fe0994ea228ac56c3a26485ba5cce7762e3d70d6dced978e56017f6769072c83ae68125de3e03190562a7a10102bef038c02ae148cf70cc0c5951b8df
 EBUILD fluxbox-syntax-1.5-r1.ebuild 886 BLAKE2B f59b53cdcae36d9dfe27e6d6ff1b3353ae7a567a95093220127b27717585b0719062bddd485a63cb5586b95b7630c945f119419d15ac4a7d7a1f99a58af7fd79 SHA512 51697c27f4c28d7313d0f6dc72aa4ef0fd549b78c7ad30796dc98798924f2aa4b12aac94fc64f47e016ca703d3fa23b98646680a431ce7ae0ff49439c064dabb
-EBUILD fluxbox-syntax-1.5-r2.ebuild 894 BLAKE2B 80164500b1b6150906445f1b027d48d049ec1c5136f1e02e794b77baac01010453bc8acffeaf2bf6e28e3509cf37ee0d807241343c2eadd8a64952ae7587750b SHA512 c2c0b5361f4a1cb724c5b712638bcceb3888bdbc50c47739352935cb1694d1a3b16bde61dd7624718ce7ae1c346d59ec7a5f7502e73c0474c03e9c2cebf23ccb
+EBUILD fluxbox-syntax-1.5-r2.ebuild 889 BLAKE2B afd33686cc6fa55e0ce597ef284f3aafa3a1e3fc673d1fcb1a75ed2e6441e95af08cdcb97e1374eee4ce9519230d9f7e8ab07e7b8d4fb4b8d359cf800fed0a24 SHA512 18e286c5d4d432ada3e680ebda9ebe05a7971e84d5520878160aa20133e81f0d4f261a6263f4f3961111d312c0ab9cd6851fde3641c67ad9a44eead091c54ab0
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild
index 28e337173b22..9f423c1bf0f1 100644
--- a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: fluxbox files syntax and indent"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=679"
 
 LICENSE="vim"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-vim/genindent"
 
diff --git a/app-vim/foldutil/Manifest b/app-vim/foldutil/Manifest
index 1c311f8aaf12..e268835da5e4 100644
--- a/app-vim/foldutil/Manifest
+++ b/app-vim/foldutil/Manifest
@@ -1,4 +1,4 @@
 DIST foldutil-3.0.tar.bz2 7323 BLAKE2B de59313da23a277a2eb3e971b3033202001cd1304058b5e096e33e7c28f95326169754c0e0062120099677e567c6bd79b265a69524c8b8fe55a9666ab6bde23f SHA512 a38561c4530333f5a56596b2fe19a2892f58b4fd35229536c054578b199e9b6b19c18d255aa1b078d51ac4f610d4ca49b205d1929e8be51299bee527058b3452
 EBUILD foldutil-3.0-r1.ebuild 547 BLAKE2B de6fe80efb4800fd32d0d87037ee2a211fdc53a600951a9e06c0124a8514c4b6e44399d6d8002d44c81bcedba704188580f0bdae69b4e0365c7b1d93243a6867 SHA512 9989b62e275c9a288a29f9cad66174ccaa83a3210e5cb4f0f2faf0f307f336bec0a2ef8ba1598aae14bee36af17aaaed17775a6dcb0ad68de44014a4217d0881
-EBUILD foldutil-3.0-r2.ebuild 544 BLAKE2B 28d5d8404fc8a8758c2de216245c9dfd944cf3be34a48ace7e6c1f5ff6f7333d6cd7ab051fd109ffdd320c5eb3c0ba22440faaac293e3af30fc6b242318152e3 SHA512 778f26f90b22ba4db0c4f747a71c6648468c928eb215781bdf0f51311f1ac83942d526f5cc0921b2150b1c1b50c06fa10bacf7157b3fea953be0d67d22b7365c
+EBUILD foldutil-3.0-r2.ebuild 541 BLAKE2B 1f6fa9fbc84c8eea04ad220eab1a8d989e681e6c3571ca395eb4fcde0b2d06c48644b01d41cc3ed6ec4e8be5a5fbfdbf83ff7070faec9a30a812ea3e41657aba SHA512 fd9bcdee632957c4326cc6bd7a55361ae2cb4166451d4f4f393e5c5fce695502ece1fe64a69ff6e1fc2d1abf8623a163b711b89a08c0b82db692120bccf5c2cd
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/foldutil/foldutil-3.0-r2.ebuild b/app-vim/foldutil/foldutil-3.0-r2.ebuild
index 24e498bbfa3e..d57658853a74 100644
--- a/app-vim/foldutil/foldutil-3.0-r2.ebuild
+++ b/app-vim/foldutil/foldutil-3.0-r2.ebuild
@@ -9,7 +9,7 @@ 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"
 
 RDEPEND=">=app-vim/genutils-2.0"
 
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
index 66401051e509..71b03aceb596 100644
--- a/app-vim/fugitive/Manifest
+++ b/app-vim/fugitive/Manifest
@@ -1,6 +1,6 @@
 DIST fugitive-3.4.tar.gz 80677 BLAKE2B 7cb341851248eb05a8094617f349e382cb8704f69116d8a00f07db40d96b4cc86b98515a59c489116fe7fdadb9a73a65819bf792005bda316f1a0bca311e6938 SHA512 313f1b06c843f85cfdbee059f1470b1ed062c2055e552fa1e05b01e59d9950c181b19e7553cbbca575b1951949970691081582128be7148885485d4fbed0a4d2
 DIST fugitive-3.7.tar.gz 84271 BLAKE2B 1c00272174bd76a2b4d34aa54a7498b2f75a5322d587e3436d82f21d6188027768bea0475c99fcbc50a82b89d9a9a7697d18106cb1eb2f9788afa81848fe2de8 SHA512 8252b69c6183f5b710739eb68ecb3fbdfad52df3dbee0a3a04ad33f410b489d7fcf1c0bde0cb2d53995a6b4e34191c165c652d08e6145789a88f8c46bfcddf56
 EBUILD fugitive-3.4.ebuild 623 BLAKE2B fcc6f0d03de813c484835ec024214307b05f0f19693cedadb3c462937fd5802265002ee94360a15a844466a66067e4cf04e567f15060ae64538589d73f160424 SHA512 433673db4c18480be1e4bf863d344f957353c84c1596cd2107202b24fcb6073cfa99cf0505bf9e7a3585ffbf2f40237ae4fb342dc687cbba7fd33835e7facaa4
-EBUILD fugitive-3.7.ebuild 636 BLAKE2B b96e40e319f06e9b527c8290ec707d6047ddfe1fe1b8f26c8cd58c8cf57cf43b60ae6775fc7b8edc712cf7c6c5a2e194be85a08efed955d9fd5b2fe376d73797 SHA512 5a39e9f04d72ce81f97d6fdb12b20efc49b168e9f37983b1dcdf94a6e4e17c3a44359ef3ca97118f9f6958bf7265943f6361aa308f2bb654fbe824615aec45cb
+EBUILD fugitive-3.7.ebuild 634 BLAKE2B ad576ba820d8345bb56b56142445d73cc561d0c1afd8eba46e6ef37cef74d50065a094b4a54e8eba165ad81d5e18435d3ba382b3e84e85107e13518613b9649e SHA512 e9a134e554ac18850de2d8c3f37e7830568fb48c7579cbebfda91fb9c79d38a4712155db0ff0c6ad1e885f8f91c3f4a0f9d66ef7621bd03916dd17f09fa52276
 EBUILD fugitive-9999.ebuild 636 BLAKE2B b96e40e319f06e9b527c8290ec707d6047ddfe1fe1b8f26c8cd58c8cf57cf43b60ae6775fc7b8edc712cf7c6c5a2e194be85a08efed955d9fd5b2fe376d73797 SHA512 5a39e9f04d72ce81f97d6fdb12b20efc49b168e9f37983b1dcdf94a6e4e17c3a44359ef3ca97118f9f6958bf7265943f6361aa308f2bb654fbe824615aec45cb
 MISC metadata.xml 343 BLAKE2B 14d84b683c5ba0998876e7711a4afb8d5f23bfe72cd54b80d73dfb05eb5fb19dbd9e1927cb9fb56a4eda13292343a8cce56d67476daa4b5262193279517a159b SHA512 00c0719b8ea84f7aac1ea31b852ea2ebb6c724999329f3d0693f447aa1c278924318c0eca12c183340b19e848ce40873f7ec9c3bdf9a3f1c9f7a15fa98d78bd9
diff --git a/app-vim/fugitive/fugitive-3.7.ebuild b/app-vim/fugitive/fugitive-3.7.ebuild
index e0e4ec9939dc..2bbf6b56cb72 100644
--- a/app-vim/fugitive/fugitive-3.7.ebuild
+++ b/app-vim/fugitive/fugitive-3.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/vim-${P}"
 fi
 
diff --git a/app-vim/genindent/Manifest b/app-vim/genindent/Manifest
index 0577510f4265..f96cc28aecee 100644
--- a/app-vim/genindent/Manifest
+++ b/app-vim/genindent/Manifest
@@ -1,4 +1,4 @@
 DIST genindent-1.1.tar.bz2 1248 BLAKE2B 761b5285ba8816ec8b64542d9e6784f9d771be8d02fc085dacfc8422dd636be600c44c973089b1922d19e8b2ec0256f66d547f35609db6d3f08eeb0998fb69e2 SHA512 aa90cfc988b08708bb25352b66196191e6cc322f2072a771cf768a0e2ace2e4e193e2e34dc0556266bd84c49055ec1d4183f1aec3d89fffc29f5ded88c26a2af
 EBUILD genindent-1.1-r1.ebuild 496 BLAKE2B e77ee2e71a083141e84394f7b54cbb2b7064eceb4a62b39f250429173e35befb682c4e0acd5ffa2a94b6ea38581c83abb2765346a81e9a25638589b0e65eab55 SHA512 5d1decdc5458bdff167cf954fdbff5656b2406f8feb87fe1562f451161cee728433b18335e0f038bb94b9c5b250f7810a7e1f505acada2baf2e6e3548b1a7b4a
-EBUILD genindent-1.1-r2.ebuild 495 BLAKE2B fa377079f6ff74cc2d5cfec363ad2b4843027b98889e3119ff07c253ca2c65e3b037ceba10800dd384b7606e8e01747c32256d69b4989818931aeecce0f3b540 SHA512 2d70f3c69026465ea9ae7c3d2ecca9e6721fed93ff65b6ded3bf7c4cf40398f39a3bd9fabd834f3912658521117e7df2ed641f9101a95b3a9133acd29a80564d
+EBUILD genindent-1.1-r2.ebuild 490 BLAKE2B 0db54bcc42dd332382052e8d3cb16b13b1439e3b87a0ddd0fd391b42b89b204975a76d4b3ecf5187bc26b12d1b34935815232742262eaec20a4f973d378ac44c SHA512 c693f9b126ca706c11dcf0bb9b573f81db355e1bca23b0114ba43627adac70cc0ad5f462aa0eae6d950142ad30ba4a20b451348a110c0d1aa051d5024e117e5b
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/genindent/genindent-1.1-r2.ebuild b/app-vim/genindent/genindent-1.1-r2.ebuild
index 070c24fbee40..7741a2bdc559 100644
--- a/app-vim/genindent/genindent-1.1-r2.ebuild
+++ b/app-vim/genindent/genindent-1.1-r2.ebuild
@@ -9,7 +9,7 @@ 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides library functions and is not intended to be used
diff --git a/app-vim/genutils/Manifest b/app-vim/genutils/Manifest
index 4d58980602e2..4038af4a6741 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 569 BLAKE2B fe1a6f05048c98482437be078fdea6b9c01b8716949e169accd3e44e3d9cf88e54412cabb46fdd84b6f6577ddc116b90b9edbd9d6637666d146aa9d751f233f7 SHA512 238315ea42e5aab7aa9c05a5b7093762efddca524c25956594926c15f27c339c7a09a97149da55c94c7d4c129e63f70157623679207c06b2977eb874426f40ba
-EBUILD genutils-2.5-r2.ebuild 572 BLAKE2B 32bab5c0d375b2a61d6be45df79fefd418142ab8a07eca15836e6c8711a42e1e247c243bcca0250965a0a9c318f9424d1ddf1cb9118573b02b0753959df7e71d SHA512 24759228e66b0d963784a75aae8d98f4c793143ef3dcfb81f9ebfec1990c6aaf7bdeadadc6e0a5eee19c2cfb84297b13d507b5c7a2ab69a30523d5957ed265ac
+EBUILD genutils-2.5-r2.ebuild 569 BLAKE2B b61c5e16d80d4e6db2b0ace60c1e68769284b23336d27187dd6b1b42390fbde39ef364d775926f2c7121278dd023120f1ad05dc9741ac70a4ba4f5b37ae42146 SHA512 fb981fafb9f5724f080e78db588c6d1301b4acda5bea5c8de81358cd983159c47df9be1edd21098398d67e5218faa2084431f07b2633198169f720dfabfe2dff
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/genutils/genutils-2.5-r2.ebuild b/app-vim/genutils/genutils-2.5-r2.ebuild
index afead7157d7c..d9a4cedfefb4 100644
--- a/app-vim/genutils/genutils-2.5-r2.ebuild
+++ b/app-vim/genutils/genutils-2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zi
 S="${WORKDIR}"
 
 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/gist/Manifest b/app-vim/gist/Manifest
index 35da83377ffb..84448d75e2b9 100644
--- a/app-vim/gist/Manifest
+++ b/app-vim/gist/Manifest
@@ -1,4 +1,4 @@
 DIST gist-7.3.tar.gz 18170 BLAKE2B a6f281f92944203c17037a8ab9cd7e202ad491a11f7e79cf89794bfd94f188ac056c25c138fa98a9d50ebb38223e679b334c79705bf1d063e54f43297db6da40 SHA512 dbd3f638a365c8ee419140d9a934dd2c80fed181910137f61cec3c2d8d61300c21cabc9fdf85d83caa185cf78edb92990e04d49d937cd3fc546b6ae889e5cbb8
-EBUILD gist-7.3-r1.ebuild 601 BLAKE2B cfc4d0ea1575c856f664422ed79b4bbae1e30bb003bec352d18b3e6c68a39cff3e00862a14caa1afef69503a42957c878bd54813dc854b6f98769bbc2bf9aa82 SHA512 22bbbfe4a1313cccdb036e52e7b3ef1b4849e4646d204cab375baf58750b81a533011d7c0345cbcdb83c1ca5d0dc080dfa4f621792b16b08aa33ed5a2b451879
+EBUILD gist-7.3-r1.ebuild 599 BLAKE2B 4f848829442daf7d813a7320a0856e2ecd1cc1d358de50557ad72d51a69a283d915947849703cc51acf0fc63d4cb432388a5f405d1a9d7f4548883a0e85d0688 SHA512 ff5ec140e7c6c23dd8fd2ec53358c94b4e8e0910f7f9b4564430d0bdf97fda7dfa617be8468222343b042bbd020bc8c6f0d530b635337027adc5e9c50d129870
 EBUILD gist-7.3.ebuild 592 BLAKE2B 9e78b6a346b20b8e903f2ce6bb782a2a19e686a37c9b90d3735c634c6efd605763b61699f04b03d648ae10e07e87f18416b2c56b81ea5bb9d5f21743c27cf6a3 SHA512 c51310701a98482a34f5eeb11c3d5cd01fbd899fe9925cf656b6ab233551f8942ff1faf97611b5bfd3fc48748ea45b37d0e012518a2ce340fcb57b8c72823f0f
 MISC metadata.xml 329 BLAKE2B 3adfb9fe58d4dddc733866aeec7969910555328e9a23342b4ad0457405948a83cad44cf856a3a6a303e089e6e784dd38285abba002906ee5057af757159b15ee SHA512 d4f0f838ab90bef7c9178f65d45f4f9d97f0d4c8feb7af29dd70bc2c19af370130d5003ffcf7c4450b4172b4189a58c0645cf5953fc05e5f6bc91951ba59d141
diff --git a/app-vim/gist/gist-7.3-r1.ebuild b/app-vim/gist/gist-7.3-r1.ebuild
index 73379f7be49d..03a2fc6405fd 100644
--- a/app-vim/gist/gist-7.3-r1.ebuild
+++ b/app-vim/gist/gist-7.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mattn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 
 RDEPEND="
 	app-vim/webapi
diff --git a/app-vim/gitlog/Manifest b/app-vim/gitlog/Manifest
index f56211531d7d..85cedf186e66 100644
--- a/app-vim/gitlog/Manifest
+++ b/app-vim/gitlog/Manifest
@@ -1,4 +1,4 @@
 DIST gitlog-6.0.0.tar.gz 33956 BLAKE2B 5a7472db7cbf03396e3ed4e7eea417e44e538946d9432b4d94c3114b59bfeb961c6e0df4137c116f152b57986b7cbaa1aeacd59df33d709f2794f5d2607693c4 SHA512 17016057df69b22e72548d00bd8c253ace864f0551890f64e6b9a91c1411b1e0a479d6c04028583edf9f9c366418b50b758f60d197fe0a62a75c7799b68a4069
-EBUILD gitlog-6.0.0-r1.ebuild 503 BLAKE2B 1c38b71251cb215be5c070922a56ea38cdf62b48f1dfbca01869c81bb52457c327e746c0b58e1ab3db5c540c06bcda7d19d7ba08cab99784b819133a7f22cc55 SHA512 0c62fc63c112ebc1b737179fe4f0583c7cec2395fea534ef6c4a68c492c248ef5a58c810900fd37b31665d855036a2837e290498b443f4c538685bd9bf053694
+EBUILD gitlog-6.0.0-r1.ebuild 501 BLAKE2B 48995ffe5184f098004143878013de3737c516144e98daec629a83fe36e244489e7ee9257861d564718fad193d29ffade0fec3afeebac2fad99d5b2c91ee156b SHA512 480a87e774ad2a65b7488b76f79a00ebd4ebb7532ed41d29bb209e198f6ecf4922ee5cc7078809e2548c02d887c351fb49ce86b11fdf9d4ac66c0a1923c031c4
 EBUILD gitlog-6.0.0.ebuild 616 BLAKE2B f9a96e2db1a7d68426f0a80ee950811326c5873e240302ddca95d42044a8f55d1701bdeeafdd5028b50e17e266c374ad9e5d2d3fde9e2e738befe804b4a3f407 SHA512 911a6eab4bb9c8ce03fb3077c793a09980bf4f58cb009bf88bf4b534c602589f1d9beb6e7b309b7c6acc9473260f6dd6d7fdcfa6f580136d77f23e9bc4146e2c
 MISC metadata.xml 343 BLAKE2B d526b979ef691b242cae34c108fc8818cf06d7dc70d177171ecfcb0e67fccc1adaeefee3bd17ad0c16440790ea55923f3d50e73c8fa163423feaa2f20efc3dea SHA512 8ca39ec24f03a434a674c1cff7ddc88b5aa028fd06dbe9fe34cf3d3c2efe9b147d9da279b6ae95358f6ff3d0bbc99b6910d57cd7779b48115f146a0948a58a3f
diff --git a/app-vim/gitlog/gitlog-6.0.0-r1.ebuild b/app-vim/gitlog/gitlog-6.0.0-r1.ebuild
index f089417b9cc9..f26c792ce2b7 100644
--- a/app-vim/gitlog/gitlog-6.0.0-r1.ebuild
+++ b/app-vim/gitlog/gitlog-6.0.0-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> $
 S="${WORKDIR}/vim${PN}-version_${PV}"
 
 LICENSE="Artistic"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitv/Manifest b/app-vim/gitv/Manifest
index e3e35cf176b1..bab8c5b247da 100644
--- a/app-vim/gitv/Manifest
+++ b/app-vim/gitv/Manifest
@@ -1,4 +1,4 @@
 DIST gitv-1.3.1.tar.gz 553719 BLAKE2B 0d775f3bb05b3a49b69c5717f13a0f923fc5e0b5366c217042ac75e13c01080828ae4cd3e759e7dca44556c2b07aafa42cf8661a3ad0f52152c5cb8f4db294ed SHA512 e6a6773dcac18fdc36c891bd592d4dcb2eb20af6253df5886582fd223e040fb8296dc606d4fb25abd7a14f9dc1a712fe0e354821e234c8f54b1b5914af55dcbc
-EBUILD gitv-1.3.1-r1.ebuild 545 BLAKE2B 95b1ef7c9f7cbd408dac7ba02f4a63e8e97ed122fae5fe8df92ee48350059426211fa24fb015ec61c428f407271acf9b54af5b1983799a6017a84736258971ba SHA512 df7a52a6f75bb31f0fadc84384541033904c594295091d409456549e988d98093670508ae59b0c2fcaee9d14620b5331eac157b6bad4520d761186fe2e482639
+EBUILD gitv-1.3.1-r1.ebuild 543 BLAKE2B 4ed3c361ed198d156e3b055ffe5ec5b585863b0952f1da458bc60528715a538c08896ab5558045a478239206aac8f63d3813b0223793da99334efda7d43278e2 SHA512 460d5158563c13bbadeb01dbb7f0a86f66ae8da5611a5b4a7f80d9f54950b5a353bca14371ec6e8093e1b6104e11bf0d0a5aa4dc9d011e28549420627de97a90
 EBUILD gitv-1.3.1.ebuild 654 BLAKE2B 5c9f903d09816b8fdfec4775736601edff78658165598f83e699d1b3b78b66ca9da714114e03a2c744b510ad563d9e9b1650c023f5122e39caf23cc66a9a3795 SHA512 0bbb35f1841d27c115248bb1d580c7b5db8f12f551db2956f3fb70b292aad1702548c034163ed23787e868b5581fad0ea1648eda22f48dd7aeab44bef331a3da
 MISC metadata.xml 340 BLAKE2B b1c28fd897ce61f3a49a17bf5ee05a4754a08fa9aae3fa99da56135450953e58126eeb237c60664e800ac434331881a88fb8f7d794715738a2c8ecf4ac53173a SHA512 be9ae917520a64b167b5a957de77ed0261448bccef97285c0b6cbba59e4c3969fd459e78d04a7aa41d632b5b1dfe9268a74008ed7443b0cd9db509dfc617afc1
diff --git a/app-vim/gitv/gitv-1.3.1-r1.ebuild b/app-vim/gitv/gitv-1.3.1-r1.ebuild
index 967936be8c8d..e161f509be08 100644
--- a/app-vim/gitv/gitv-1.3.1-r1.ebuild
+++ b/app-vim/gitv/gitv-1.3.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3574 https://github.c
 SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 x86 ~ppc-macos"
 
 VIM_PLUGIN_HELPFILES="gitv"
 
diff --git a/app-vim/greputils/Manifest b/app-vim/greputils/Manifest
index 0d3693344932..89af92b8a030 100644
--- a/app-vim/greputils/Manifest
+++ b/app-vim/greputils/Manifest
@@ -1,4 +1,4 @@
 DIST greputils-2.8.tar.bz2 11886 BLAKE2B 7c1a8c08393d50d044203b8190c5ce35fa75b5ab6e2b18a6e5ad2eb679ac4685c92c336fe347e03db230a6f3a459d7acfac9f4e0161ca4adb17ee90192b38641 SHA512 07a7b22a900860b982bb0596232892ad056472fa48447131ba56083caef00318886719f379c9f9296fc00fd54575ab16aae71b3d1adf2af5d05a11a45a2bd7f9
 EBUILD greputils-2.8-r1.ebuild 479 BLAKE2B 9bbbf15c3096b85c090b3fe0d3d2241baa95413c5c41a1020b3ad6ec0d8ec9263207d15b48d4997325e8adfd41f309c03e5bbe89b502471a987715d042a45392 SHA512 f52982d70f6d1d2500630978cd142e1db6d3f21b5066076f0ae1874da3911bd1277d1950cb091f99e9feb4b43c4b00d8f67b6ee382985e54af900119e964e4b1
-EBUILD greputils-2.8-r2.ebuild 476 BLAKE2B 5ca081f6ad3d2477278285e9395c839648557a66027032aec6d0edae6f541f4ec0ef49a870de775773c1686a0a1b7f3388ffc0094fa936e203224daf98846a95 SHA512 285fdc988e175e9de2dc62efe9b9b3755194dc9e3a0e3a7363637e3c182c699c855e62a38df69df8f929dedd48a733e6935f586348a1f601b0d44f6a5f57297f
+EBUILD greputils-2.8-r2.ebuild 472 BLAKE2B 851f36e3cfbeb02ac929a559e8140ecd30eab7d54a4042a154a9416508179dbc1be4946596559cf491ce9f77e893ce7b230cccb023884bf1a1ca3323760d30ce SHA512 f66655e525b774214bca1ddf0dc82b9e1503f2cf33015759b3779dca9f7110b6d1208fc57034fed38e9b792dbcf411a3f2b38d411bb87f25f347e8e443609c03
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/greputils/greputils-2.8-r2.ebuild b/app-vim/greputils/greputils-2.8-r2.ebuild
index eb0e1b50bf42..83fa36062498 100644
--- a/app-vim/greputils/greputils-2.8-r2.ebuild
+++ b/app-vim/greputils/greputils-2.8-r2.ebuild
@@ -9,7 +9,7 @@ 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"
 
 VIM_PLUGIN_HELPURI="${HOMEPAGE}"
 
diff --git a/app-vim/increment/Manifest b/app-vim/increment/Manifest
index cb4be6e1d482..c5bf3a65fb56 100644
--- a/app-vim/increment/Manifest
+++ b/app-vim/increment/Manifest
@@ -1,4 +1,4 @@
 DIST increment-1.1.tar.bz2 3058 BLAKE2B d079e0fa180b68a0616ffdf5b2ca86496f7aca2ab2e69e27e16a56dda49c96eed0ad7c53e0a0aabc9b29fcb0895247987afb28282477247046e07bb3f01630b6 SHA512 eae4fd492c02e83556646df35c57a50c07a09ea3c9cca0c8d8e15b8a49b621007e3952c23dc997d99d22dd8352852d98332180aa299ecdd4e53ffdafdc6b7a30
 EBUILD increment-1.1-r1.ebuild 378 BLAKE2B 904d88d9617df66a19a11ab7e7c2bac4bf486e4bb20676eb3597f0ad4cb963482f4047235f3cb6d7f07bc3e7e4bb6dec6a065e66375e59b07745dbb01ae6ad5a SHA512 971d97f5d0710e5dd637ea024dda05f6cb55fd6b8e9efdcffe3c5d1aceae6f1e56e782d210a358c4444f1d6c49274a83f71eb2167320bef166daf8f44e11e420
-EBUILD increment-1.1-r2.ebuild 374 BLAKE2B c254ae2de95ba5e6f06c9f86f31a5bfe3c50a101008196eb2bb849dfa93b3f159ab4323a4a12ee091a1b1e30d44ac04cbcd9dfbb128c5eeb00ca6afdc7f4e30a SHA512 c3ebc4a864bb1b040755f4f43e5aa9b2a4f4690b5faaee3919bc93b02a719fb95c45a1d53b62dd60cf5b24e4abafb0c9d22e004a8fa6b42d2b2bca4443c8234f
+EBUILD increment-1.1-r2.ebuild 371 BLAKE2B 50feb25c5ddcdefdc4908736dbe6279b6b5de6e50319d7ad3e1f194d702f204315c60f4b48bd20845d3f3c43df512b6d0339cb7d06953ef0f41b69249a797797 SHA512 c4787f6716dcf594ac699d47bee6636891a50e1ec51df8bbddccb82ca031a0ca324c1fc98a8c07f26b324a69d4d6013d533e0ec1f615fffbd6ab88e3150d90f4
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/increment/increment-1.1-r2.ebuild b/app-vim/increment/increment-1.1-r2.ebuild
index af33ffcf7a1f..40cf8e189a10 100644
--- a/app-vim/increment/increment-1.1-r2.ebuild
+++ b/app-vim/increment/increment-1.1-r2.ebuild
@@ -9,6 +9,6 @@ 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"
 
 VIM_PLUGIN_HELPFILES="increment.txt"
diff --git a/app-vim/indentpython/Manifest b/app-vim/indentpython/Manifest
index ec9ae117e5bd..58a76c27c167 100644
--- a/app-vim/indentpython/Manifest
+++ b/app-vim/indentpython/Manifest
@@ -1,4 +1,4 @@
 DIST indentpython-0.3.tar.gz 2305 BLAKE2B 080224b87a10d1a7cd87523b37257b099efc873a954a5af63d8046351ad67fa6a58c6d84405ca50416b735f52835029e2fe653a24cd80d66dfb851f050b2421c SHA512 a3750ad7f935be914821cdff6b55b9bca1fe4d076d6c364be3854679c8c3466f14a4df486258fbee5a24d58373bc6258080e598992b22a0897e18a170555ebd6
-EBUILD indentpython-0.3-r1.ebuild 432 BLAKE2B 3e5b5ff04c2b8ec4e3042dcc0561b8af87a9762033623d762205b7e8fb10398b8f4055befe2b786cf457e8314202b7ceab05138922ceb23f3db2893618f36d58 SHA512 646f4b84a66508f86a8dd088aaf52f0e3b3011765ca01b2386e07181c548a50809574f81f1233e109b824a66fe23609696c868d3c654be973bda8a708f5eac8b
+EBUILD indentpython-0.3-r1.ebuild 428 BLAKE2B be0ba2b7cd9e7e6179595aa5959522d069ef4150b3f4e900cfdd336bf3d72a702ee74882827e452fda192aa479b24377559d399638cf257c5866647e0d70c43f SHA512 e894dac2d88eaf662729a5f5082c6a9f3c5092c5e9586f9be606106fbfd62426d863ab2e71429befe674eed78e7eccfadbe474cb2c7645ad0c97d6e6d3a55d91
 EBUILD indentpython-0.3.ebuild 431 BLAKE2B 50793b88fb7e1d5e03782ad8383cc02da2199048cabd15799f21ba805d3f034adcf871244d6f356249dfc020ccb9b5380e949c810af0bfb6d47fc4d0a8d31925 SHA512 80710b0d87c4e1ca973be6c8c00274d9e23b0346662201f54c6e9aa443f65cbfa0fed107c8a1df63a7b46ab8d47d6bfaff2771d5722807aab131b340fb45de5c
 MISC metadata.xml 438 BLAKE2B 1785b8aa441b5842a5c590e3fe9f0d14abf44b028972125554fe429d99f6f4feaccac4d33599d3b25ad56ba912d21484f6c93be64cec5435e2dd80fa3edf0f19 SHA512 bb145aae339b9cc3761067f6c6336637eac6961e10cf65a714e17544baa621d335085f9fb163b29ff68a64c7d38c3cc3fa90494d06fa468e6e6702c75bd7d928
diff --git a/app-vim/indentpython/indentpython-0.3-r1.ebuild b/app-vim/indentpython/indentpython-0.3-r1.ebuild
index 8d60d7933396..0fa07e0aef6d 100644
--- a/app-vim/indentpython/indentpython-0.3-r1.ebuild
+++ b/app-vim/indentpython/indentpython-0.3-r1.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.t
 S="${WORKDIR}/${PN}.vim-${PV}"
 
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
diff --git a/app-vim/info/Manifest b/app-vim/info/Manifest
index 477d0d3d83b6..81cbc6ce44f1 100644
--- a/app-vim/info/Manifest
+++ b/app-vim/info/Manifest
@@ -1,4 +1,4 @@
 DIST info-1.7.tar.bz2 3958 BLAKE2B 23c8f8e06e923adc6d97ac578331cd5669dfe54ba7dc470c07426dbcf475cab4cf66ceb60a1f1b79c0fc12109db4ed3fee575bde56de221a9ebf8fe99dca9d63 SHA512 8d1d00b844a7485544fe02e17a3938a08b25be8cea7cf9f5e139be5b1f1f1b37abed8d717e149154d7bb87028f4d7e94b1ded844a6f83e8e645da2a214eaa81e
 EBUILD info-1.7-r2.ebuild 636 BLAKE2B 682bede432915cb5eb2d65fccf5fe35e544f01182053dcb3ac4e8c5164aa4eddc5b301bfd4767faa5eb36513ef32b11e9e021ee36c48d73443b53a3e8b8ffc21 SHA512 42ac2c88b6a80336c6784ebdd48ee099eeda231781d225d7de7e7262c656ae1c8c9570959ae560e0d932367bc53e0f08b80acc5309c5ebfa3300ee71c03bf275
-EBUILD info-1.7-r3.ebuild 633 BLAKE2B a5e27617e32050a6d22c83784cc1c7cd5eafada8901579e3959d6aade0f8646fabb25146aed74a1b9fec362fce5380963457ccbd3caf4b1cf1710b2a4e1d3ef0 SHA512 d389ba0b904a56b6ddd7235760e4c4f35c4d9c65e66ae9c16e3ae4a9154b4f21768953d6e8b239361e41780206242a446d3bf69b7c5b5413450cfe7c3414764c
+EBUILD info-1.7-r3.ebuild 630 BLAKE2B 02f51ced76d95246db1940465f7046b9143d6320cc222ee7a0492042e1f8aff9a8d618fd27a36bdf89891eb0b2964df7bad2a995cc34c6d3645610f5b62f9b78 SHA512 a0656d76a4b96f7fdd3f4173d6111398e622a2faaff559825220fe3c836891012eb1f19378d77ace8133755778c9c8e69eecd5719aa6ab71c2c05e1b1d5696a3
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/info/info-1.7-r3.ebuild b/app-vim/info/info-1.7-r3.ebuild
index 5b11956b2c7a..53fdcfcf748d 100644
--- a/app-vim/info/info-1.7-r3.ebuild
+++ b/app-vim/info/info-1.7-r3.ebuild
@@ -9,7 +9,7 @@ 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"
 
 VIM_PLUGIN_HELPTEXT="This plugin adds the :Info command."
 
diff --git a/app-vim/locateopen/Manifest b/app-vim/locateopen/Manifest
index 2f09128bee34..00f9229fcbd1 100644
--- a/app-vim/locateopen/Manifest
+++ b/app-vim/locateopen/Manifest
@@ -1,4 +1,4 @@
 DIST locateopen-1.3.tar.bz2 1925 BLAKE2B fe9b4c7abc0fb26eaa75298368ae7b9440a2c6d7d25e94da80693de0f61517b50fb200536b488f485cfd3c4b243bb8abe5606dda12e07a8f6246bd644d74e8de SHA512 93d1f89eef3b877830a01a0fa609855108e3415836128d27f3b66fa6e3c57614a81e0cbcc984e39e0353883b7d8fec86c73f77a4c3f10a1cb8183b8be21a6dbe
 EBUILD locateopen-1.3-r1.ebuild 788 BLAKE2B 90163c2322ed0faf7f13aea967fd75d7e2119736bbffb532702cb288f7929e1f9e4348321a6e3dee41b56176dfb91f200d283941788738a096f80b80c17632c5 SHA512 1335dea394142b2ebd472e7afd9cbc7f5faff1c5fa539d5b22053163136e0447ae8b9e8028aeb7d983bc48ca1ba66ccdda27e0ff697edc62e7fe9c6eee93b634
-EBUILD locateopen-1.3-r2.ebuild 770 BLAKE2B b59da416618a584a301e042e035f6a17546452bc826f4b2f2c620c664eeac09d5ca008a1692ccd74244e3ca904442b5a99b19c0b461364f4526c1e6a4d3dd6c8 SHA512 ed75cde620bc0f0c1a396204ee4e06d7d4582bd56edfdd689337ad70f0aa9701eb2e0ec1a28c04e97b86b1fe918274643e0be2170ea14dc6e782e359d2b244da
+EBUILD locateopen-1.3-r2.ebuild 766 BLAKE2B f89483a09daa527802a78b42eb0f431b1822eca681c103d53430b9c6a5ca04b93af4753fe67c6277bef392d7ee45d6e52d6194c53c0c14939e9ae9a50a33057f SHA512 09dc474d619675c61ef1e9eff7f5b9b6f122a42442fedb33505a39ab4621427601e46759071b80bb1bfd399ec53806ee04ca9fa3b7bbaf9447b701bafd35e82e
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/locateopen/locateopen-1.3-r2.ebuild b/app-vim/locateopen/locateopen-1.3-r2.ebuild
index 620fa6113d63..55fc532a167b 100644
--- a/app-vim/locateopen/locateopen-1.3-r2.ebuild
+++ b/app-vim/locateopen/locateopen-1.3-r2.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"
 
 RDEPEND="sys-apps/mlocate"
 
diff --git a/app-vim/matrix/Manifest b/app-vim/matrix/Manifest
index d9baf2c10ce3..c39301385dba 100644
--- a/app-vim/matrix/Manifest
+++ b/app-vim/matrix/Manifest
@@ -1,4 +1,4 @@
 DIST matrix-1.10.tar.bz2 3365 BLAKE2B 71c8d4fe2117b4fa8fb31ba880b3af456f046d6f78bcec54107dab58bee1b733887752aba06f17fc6b4196ada40cc1ba7c5a7e4ddeafeeb5630f6ee1d8e44627 SHA512 9c268ced7b0a7e3117c88bfe005236f1fc61cfd74fa10d46318b739fe61a97f7bd856d125d69cf599a79efb8fb181d8876641cda65ae5dc80e4c650e7430fa85
 EBUILD matrix-1.10-r1.ebuild 431 BLAKE2B 5540aa537722fd860ea9bbc3ff4ebfaba11765d31148c5bcc0070d07a405ff66cb9402f9ffc6cbb3a3f19efa729ecb1ea70d7c2fb1ed9955701c3f50393cd5db SHA512 6c4fffbd235db17b2f593dd2e56b20d10ce2c42c285128c18b8f45251ffd0ebcfe191812a7b53426935a4e52d5f435dcd3872105a3c28c33dcc860cd5d4fc839
-EBUILD matrix-1.10-r2.ebuild 424 BLAKE2B 7dc1c04f8259fd5d4bc4568ad70565bf19a4681378f09161ad0f3927ab67b1f1bc72e27713cef7f972e3d55ceb3294be695ea9124fae80bd24e794144438a30c SHA512 a070ca739f2a297fcfe94bcbf309099ddb7633ea419fa2f1d1d8a948239868b1ed91910c50efd91381f331038174d6f250c4705a9151b5b27e874834251d957a
+EBUILD matrix-1.10-r2.ebuild 421 BLAKE2B 100fcaf60ac308fc551dea6cff2d7ceb8638e944e8943273378f60dc51682be39c4e974b66171284eca9585056f96fb43dc53b50f5cf818a9a9934808608a2dc SHA512 6726343825073936d200fceae94a2f583136e9320f95d5648d2f61ef9699273e676912e271231068a922fb194d6037b7befe5b97baca02f81c2ad126c61b3e92
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/matrix/matrix-1.10-r2.ebuild b/app-vim/matrix/matrix-1.10-r2.ebuild
index d52456bb444a..94da92c4716a 100644
--- a/app-vim/matrix/matrix-1.10-r2.ebuild
+++ b/app-vim/matrix/matrix-1.10-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: Screensaver inspired by the Matrix"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1189"
 
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~mips ~ppc sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides the :Matrix command. To exit the screensaver,
diff --git a/app-vim/minibufexpl/Manifest b/app-vim/minibufexpl/Manifest
index afa173dce47f..50ddd0a08b5e 100644
--- a/app-vim/minibufexpl/Manifest
+++ b/app-vim/minibufexpl/Manifest
@@ -1,4 +1,4 @@
 DIST minibufexpl-6.5.2.tar.gz 32119 BLAKE2B 01809246c81fcc2b346e7bdc2dc114c5a80cae2e58bce54c1d2f9411980d31e4a5d0a8d434dff58d284555084e95d90079492c8ad956ad2aab9dabf03186bbf3 SHA512 325fb58b025392c5484574c4988ec95eb7374a10b67a4abe28857a0ae8d768316ef4d477b51bf442ffc1bcfb5f68dfd0c924731291b155192731055fed3569d1
-EBUILD minibufexpl-6.5.2-r1.ebuild 471 BLAKE2B bc2d7b5451c09cecefdbf620ae2971201154659bd4f9663e6e832bf539db8fd73ed981361773afab7a0ed8b5a02e7cac02136cbc6d43c1db3711ea98ec354c5a SHA512 d9d914158991b5b2d6e70dcb6ae03db196e417b8575ff8cd755e6804f29f775d72f5ff27283af66d89c3beb816c32c8d55a1be0a75b21d9db09c412bf662c7ca
+EBUILD minibufexpl-6.5.2-r1.ebuild 469 BLAKE2B b1f9dd4665e56ffcddbadc6d1c94ab15cfc43758fcbdcb1f8dbfffd9924438aec6540c0f61fa2a9b769f0ecbf725f97a911c3424ae17ca526b4bfbfb0286d26d SHA512 e2561db76404443ebce7dc0fdadebc80b0a147072b23f73bbaea7d14a59510a013b1534738b1350bb40204c87a9b1a3e2f0acb7fd00b0cfbd151ee5ace4d3207
 EBUILD minibufexpl-6.5.2.ebuild 466 BLAKE2B accf8d664221edcec2cb915ea6729aaa5fb8e8bc2c38c9dd165a88fc6163636b88e4a27bfeb39ee533b146ca36a8444b4f7df20fcfeb60f7cc6465af6cd77b75 SHA512 c04d04879f0ee2ba1818dfc8e2ce6c2fdda55625d75aa93c1596bc86b8f60f502df3875ef5705f8d9c84e15c93621e8c2e3e10efde6f6a40f42eff6eae1ae2a1
 MISC metadata.xml 349 BLAKE2B 6da63a8d73fde8af3d6f6623028cbba80ee2a5e0e5a7583d1affc8e249a1f8a3b98920409977fcebe03642ea467855048b294cff9a09f497aedca464d9ef7eec SHA512 ac05cd974aa87477501f2b027bdd735969c099ede8714e8b5d919040a92f634da3961f1c39f1f9131920e73198d56800d5f98700eac5ff17f2a9d18b075cb0d2
diff --git a/app-vim/minibufexpl/minibufexpl-6.5.2-r1.ebuild b/app-vim/minibufexpl/minibufexpl-6.5.2-r1.ebuild
index e0f6c6b22ab3..bc883cf64790 100644
--- a/app-vim/minibufexpl/minibufexpl-6.5.2-r1.ebuild
+++ b/app-vim/minibufexpl/minibufexpl-6.5.2-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/fholgado/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="bufexplorer.vim"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/molokai/Manifest b/app-vim/molokai/Manifest
index 5814fa8a7e02..bb7edc0aaac6 100644
--- a/app-vim/molokai/Manifest
+++ b/app-vim/molokai/Manifest
@@ -1,4 +1,4 @@
 DIST molokai-0.1_p20151115.tar.gz 3817 BLAKE2B 595691992ab2e1820afa105ee23a123f28db7c5bca80e5b99e87b7b3b081d1d1e10f9db81686bcc98ef79042118f119b0ae191ca9e7a7b8004b95267f35dfef8 SHA512 8ba5821dfae8c723185999d038142b2061b01ec8c9c6340fd082bac0bdf78d2fcc21a8e3103f20b58bc60c38ed62966376903e85f5b9b49947d38c8c34d14908
-EBUILD molokai-0.1_p20151115-r1.ebuild 411 BLAKE2B 40dfabb107f68ad769815ded24da754f7a0eb38c1354ecf71bdc6bf2e58b6b91ed585091d3f8629d5e3effea6b698375b9fa15ee7118808722793292b9dbaeb9 SHA512 7aa4ca5ddbb3701b0c405d5c5670430a863fecc604c90d6ced24db0c76fcf1cb4c86c4a158a77915ab36838e3f9989a3a3a6028c1397e4f0bc6cd15fb83e0409
+EBUILD molokai-0.1_p20151115-r1.ebuild 409 BLAKE2B 1c856389486a1a967bcfc6d50c4ef3317a38e89325f498dc581a6a02b6374f7a05d1508b75ab4027f1fe667dd9b6103b97d2f5bf50b631b42e83a56666c2feb4 SHA512 8bbbfe2bc4f20fd41f760a77f2ed59a55984a28b52701cd2ff2478de27d5ce274fa9479208d6a22449ff2c77b30575694f3e49fafb30fe7fee0db2182939b611
 EBUILD molokai-0.1_p20151115.ebuild 413 BLAKE2B 5612f0535876b2bb160dc63e4fd323d4ea5c804f1db8a3d9eba470e51a859ec6927a055ff0416ad1bfe623f6cb2c5e9fade311e8e77edbe9ca5f5fbb87b24194 SHA512 164b52b698b44b950402d16e401670b06c99bfe98d592cd2b03a14bbe1f686edefd53be09081477bdcb093687c2f670b5d882b5fc73de57777adfb284b4d1138
 MISC metadata.xml 329 BLAKE2B 8be00b93f53b01cf113ba208132f48349639c8ce9aa77179ad80c33580a2ee67412e1af67f60e86f0109971bd4375746345c66844872c8326f345b853038c6c3 SHA512 a2c6cfd27bc598520757b8bf220e1957fb4d67b14ba6170fafaadb5f4a3d998705f781a959764702fd504636566bffa3396955775ab6093821893bd750bd0f99
diff --git a/app-vim/molokai/molokai-0.1_p20151115-r1.ebuild b/app-vim/molokai/molokai-0.1_p20151115-r1.ebuild
index e64205210f5f..0519715954cf 100644
--- a/app-vim/molokai/molokai-0.1_p20151115-r1.ebuild
+++ b/app-vim/molokai/molokai-0.1_p20151115-r1.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tomasr/molokai"
 SRC_URI="https://github.com/tomasr/molokai/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/app-vim/multvals/Manifest b/app-vim/multvals/Manifest
index 84b565cd3ad6..de18261913c0 100644
--- a/app-vim/multvals/Manifest
+++ b/app-vim/multvals/Manifest
@@ -1,4 +1,4 @@
 DIST multvals-3.10.tar.bz2 12299 BLAKE2B 83a38101e7f43768af2682187279456ee3c131acb78b1d152de7978ebfea183cec86239a7cf2d76d1602a593f3c46f709b2194f7d2783dbe7fea636f7db3c262 SHA512 6003b7fd2c16ae7b6ee400482aead44a5b7867d9e010d689b1b25452f78f4a84335a257eef56deba241fae8967e57b877132693b1ded1b4b01c0248da472152f
 EBUILD multvals-3.10-r1.ebuild 446 BLAKE2B f5967d4ad703d8121360598019201e799262c95d5f8e1d019741e374fd13228970f894793d43171b01ed23a38e2ba01b5708af4314cfcee5dbbf82e95432e6ef SHA512 42ca07dddb3cf245c5264514027a3f3da8bd2da14ed7a6cb3aea25bfd2b11aae0c89e3d9d0f832951fb6b894b83cf88422eebd7810b35015f6fcc8bf361e2783
-EBUILD multvals-3.10-r2.ebuild 443 BLAKE2B 1f684e788f4015593620096dc964f845ad92915ec48ef9d168c2cf686027a8966459a255d32973940df124e4590f5d61cd27d447754a70d911657aa9fcf6b174 SHA512 c3d8d7e64138728ac04de7ad6a4cce30744422afcfaa20e3331210785060a0fd7a0ef7f2e015ae37947eb80d056e4f7e2ebcd313ede76205f6f5455f2a9461c8
+EBUILD multvals-3.10-r2.ebuild 440 BLAKE2B bafe6caf10d81d5b6e2682e7c2f730facba91af2de9aeb2566cfa9eda5b8d55b549a924aad3dd3c2f696ff342776877a01dc95006eea84135281fab74e13c547 SHA512 c1740b5c64bada4e619b69fc94b48931fdfb3b3cddd44b311ba54bd1df6697b604b2919cf88cd000e1000cfdab1a3e806d94856c5127cb9140a7aec1d9b98636
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/multvals/multvals-3.10-r2.ebuild b/app-vim/multvals/multvals-3.10-r2.ebuild
index 1be9bea496b8..7222e7349b40 100644
--- a/app-vim/multvals/multvals-3.10-r2.ebuild
+++ b/app-vim/multvals/multvals-3.10-r2.ebuild
@@ -9,7 +9,7 @@ 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"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides library functions and is not intended to be used
diff --git a/app-vim/nagios-syntax/Manifest b/app-vim/nagios-syntax/Manifest
index 02a99d918e34..eae3a0938002 100644
--- a/app-vim/nagios-syntax/Manifest
+++ b/app-vim/nagios-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST nagios-syntax-1.8.tar.gz 1737 BLAKE2B 73f3b40b4e79d3449cc0f62e88efa5e7d2085db6050f05a5dd774a375a477f22844c8b5603fd89aa676bc26e90d4ad21ebc377c11c05a67909d0b65e1861983e SHA512 53a17c521a66a42f0082e6a963059ff96ed5f899e2be4c50ab68cbf237d1ca6bec8476b798b4a99563a8fdd6dc6ef632de19399b5aad12bad586f0cf0161f76f
-EBUILD nagios-syntax-1.8-r1.ebuild 560 BLAKE2B a8ac71607937e217f77e93d086bf66958e6a48188b5bcc853ddb811eebd5de49f1444ad6347876c839a47cb38cdfdc210804a02ce5a91b02767ebb1b662bcc01 SHA512 5d3d37690d2931f7c18e7eeb5e146690607de635225b293816af7a50fad6e964ed3ea89193fff3c946985896ac5b434aad766e30401686bef2299bac2ef8c76b
+EBUILD nagios-syntax-1.8-r1.ebuild 554 BLAKE2B 8ce85c6b501d050fa75d6223e96319480171772ccd63621d3fd6a58f3ce7d96b5154d71192d3d8b6fe15a9dbe053218fbfbee1eb3bc2798719858ca29c9399e9 SHA512 483b913c0ed79b3d08cc14476c2442993c06718709a98cf1358250d30331abcac06c8254874cb7bd5f559104df3679efe7402cb4bc41c34ca13daf5972cd6b42
 EBUILD nagios-syntax-1.8.ebuild 554 BLAKE2B 6c6fffa8f2b28b8c5b6d9d9bfecaed41ac1a961a63f9b1aa4b279bfd87082b568a0b353ad1f62f46c927544e1684f31cad30e651735136ecec192dbe0a571b39 SHA512 b3b941d466de458147882a868b6bb70bce6314fb6e57d72e5b2ed4748d2e0393273ce18d9f9c05c4f07b6447cc3fd8fe96ffc3ded44a0bd6c4a9eb0a9dbefcc4
 MISC metadata.xml 453 BLAKE2B 02b397e4f390b40b821f31169c840a60f1b57572de434cf19834d6be612796243a314be081205530dbed8f6bcd72e5521429e33226f954a69a98b34f97532b94 SHA512 7fb595040603bf41105b782649293badc1a51ac2a2c3fbb8986b7937c4654f58b7814169d0c11d5183aa1a3e3129febe2d7b990fd18efd48d6ab8d62c99757b9
diff --git a/app-vim/nagios-syntax/nagios-syntax-1.8-r1.ebuild b/app-vim/nagios-syntax/nagios-syntax-1.8-r1.ebuild
index 81df74e6db27..a725cfb56195 100644
--- a/app-vim/nagios-syntax/nagios-syntax-1.8-r1.ebuild
+++ b/app-vim/nagios-syntax/nagios-syntax-1.8-r1.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/neocomplcache/Manifest b/app-vim/neocomplcache/Manifest
index 1c32f5182873..8ae8e81c3c11 100644
--- a/app-vim/neocomplcache/Manifest
+++ b/app-vim/neocomplcache/Manifest
@@ -1,4 +1,4 @@
 DIST neocomplcache-7.1.tar.bz2 73724 BLAKE2B 16c04762164c6b086b4683bba71073eaed0a21b003f7d42bb7e4d5a7a1767f982b80840c229402312622e2f9b3f5c9a0759bfc8ece3b320ab38d94c406453cf9 SHA512 1ed17243722055a08bfda6b3e5524870d55377dd5998cbc5677f673974eebf5ee4019975e6b66c12c8ce5ff804d5c1512e69b7f53f56c1bb6f87638025a3210b
 EBUILD neocomplcache-7.1-r1.ebuild 409 BLAKE2B 1bb35645109e95df34c0c24ada5194543bb25ed73cbbe790ce79420bbd1e96681081b5a7acdf0a7a7d72b2cbac21d6d0742c168d6cccee32acf93998eb24e17f SHA512 5ece8cdef88464189bc80fd269898e659c487fe0e382eb90ccd1ec5aaa54a76c2665782e4e6c69f3bae89a7e0677239d6adb4085ad2b7bad7b9c0027ceb0ed76
-EBUILD neocomplcache-7.1-r2.ebuild 412 BLAKE2B 75605127be4fc3f0303a2c3090fcd0baad83f4df45741080975643b92f3ce1262e8f2ab3008639660fe0c6f2ac045545b73ee8c78481f49a9d4ae45e88c81a2b SHA512 e2b3d0b8bf2ff2517b477579edcd4345e9a3887a9c311be4b10b4199dcd7745d568ba6ecdf64b9e235df3dd51585048bdde869a4685c59190b8fef4976e78591
+EBUILD neocomplcache-7.1-r2.ebuild 410 BLAKE2B c390346a655f2bcfff2c86afc89060aec90a06da20ce3557dae56213284f0caa9f224b59466c949343df4919266ebf8169ab2069441e8a4feafba1bb168b77b2 SHA512 8852d27e4711d6bf4298746087a868de6ab5194a523e497bcd59fb91e70b37558835a619a9c56e19eb300ef720241cdaa3f1fd7edaf5f32ad20cb26d14ac396e
 MISC metadata.xml 350 BLAKE2B 0e43ce33753d40cebd877d546f27d79fe57e5a8584a94801860b4da00577bdcf96d0362a7042887795f96a20f5a704822025a5b0bd073d2de42e597ae2232c7c SHA512 a86b87584f9544073e49f2561a94518e66bb0ab5053893a7739b791027911048f3aa44c1317bb577369e82c97a692869220273a52d59e32644b87478ef5be76c
diff --git a/app-vim/neocomplcache/neocomplcache-7.1-r2.ebuild b/app-vim/neocomplcache/neocomplcache-7.1-r2.ebuild
index ee52f7f69d36..faf7433e0af2 100644
--- a/app-vim/neocomplcache/neocomplcache-7.1-r2.ebuild
+++ b/app-vim/neocomplcache/neocomplcache-7.1-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: ultimate auto completion system"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2620"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/nerdtree-tabs/Manifest b/app-vim/nerdtree-tabs/Manifest
index 1bcc17ce5ee6..cd93c2ffa47a 100644
--- a/app-vim/nerdtree-tabs/Manifest
+++ b/app-vim/nerdtree-tabs/Manifest
@@ -1,4 +1,4 @@
 DIST nerdtree-tabs-1.4.7.tar.gz 11135 BLAKE2B 0c2e5a5616a7e4a22600d20f0d759e95755194a3d867034e3c1f66025f3e19c1df0b38f34f99f7ba2a2ba640000543db5e29096b705d51f5c98098965fa9c562 SHA512 f11172f0f64628752c7b523c7f65864a35b57ac83c966dd765402489c52b78c6a86bca65b99f788f2abf0b3d489e188dcfc9e75b342818dacbae221930aa6449
-EBUILD nerdtree-tabs-1.4.7-r1.ebuild 480 BLAKE2B 8ca2bcf7eae165938fdf1e0347bdd3faf17bc20af9536d0c5f1761e7fc93f18ac4d5d3ae3bb67004e74811b6d247d3358c5ead0642864ff525551502f187db84 SHA512 cb827ab5a6280d471c092611205f498be3edec6df464e4b23523b4d4c677d2a18580be38817d7e4dc573271100593c17aa926efb73ac6e1027950b85f016483b
+EBUILD nerdtree-tabs-1.4.7-r1.ebuild 478 BLAKE2B 41cd8746ed9365ba7a44ff6b8b052835bd3143a47d3a5dd85adb0ecb6a589028b297caaba4cc9ae68d181dc511ed8187d95df2629d0da69ad723c4186db7a0db SHA512 b818e07bbc886389b61dfb0480940502c4167cc156de21baaff9b198c6fbf7b28ba0efcadf3350e1aa58f59909aa46f235b4271a3e99f25e9af6385804d78010
 EBUILD nerdtree-tabs-1.4.7.ebuild 478 BLAKE2B 3d46488b0ff0b79d3b13180ae6202fb85e901df1d6be4ddf776746801132debcd5b4ac8af0715eb6e8d7177e717a8ff2381ef3991334985c6094f651622db798 SHA512 79976817e2e36c9236204cf61cdb5c7643d47509d382fe61b1265e49607a997050448424412b5601a9c1e555d684355fa2ffc0a189fe3b7cac646822f326789b
 MISC metadata.xml 433 BLAKE2B 9e902d815235643adc6b4aa98d42be74ea34fc488d883740b2edeee9868e7106523a51c10d59ff1954174ef50d2342555b58159d3334c086219c5e3a9cab5aff SHA512 87d89bbf0f673948a8ae827e8be27c76901641b425d8ff919224e1939b93a82a2449de729c1a44db35f5c01057d668d368a728512473358880d05f46824f46d1
diff --git a/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7-r1.ebuild b/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7-r1.ebuild
index 4db2fd61abbf..767252ae6a43 100644
--- a/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7-r1.ebuild
+++ b/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jistr/vim-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 S="${WORKDIR}/vim-${P}"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-vim/nerdtree"
 
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
index b0eded57e209..afcf1e98e47e 100644
--- a/app-vim/ntp-syntax/Manifest
+++ b/app-vim/ntp-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST ntp-syntax-20031001.tar.bz2 1636 BLAKE2B 43cf45ba4d6096c1f07a89c8e006d3fb6ca1b81e6d0e25a11541ea17cff96979e1221f48141799fb26655b3337017dd06d900bbc087b25efeb666cb45dbe5de6 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8
 EBUILD ntp-syntax-20031001-r1.ebuild 443 BLAKE2B b105d1bfc0a191e9cb2150bc329990f218cb3465dfbc5e42c4f8082cf36916aa2e25945a75a14eec6ad3ea982292df5b6e0e3dc6f79f6780af8cdc43c7f977bb SHA512 0b4fa877b7b1ff76c1815a3786e9c5224c4820d2797eeb10bc6d91632c08c0b6a49bdf239b1cfd41b4872cef1937a63f6cd0a9607a70e5930d6374e47e5d454e
-EBUILD ntp-syntax-20031001-r2.ebuild 450 BLAKE2B fc15d3d5c9c82c99bf61a9ab378a0f5003568785decbef2f5724fb68ade510401efbe3a989537debe7f914d3759c4187db9281a984878aa4e5397186a21151ab SHA512 221db7bf8f8f4d9c30e8a60b162de859062bb2dfa90e5e056e5ba8acf4989b55308e3db8095d040184b40163e2002fd17658ebce223360c437b2c0da4829c02a
+EBUILD ntp-syntax-20031001-r2.ebuild 444 BLAKE2B 659c8465d3c395d6cbf72b1adceaebc8bc21490ea84248bb854caa1c3988e2737c042647bb12518f8515469890bce49ab79eadd8173b5c396ac89a6b394e08dc SHA512 6c132d569dfbcd00336436d2ece434ced4b8de3b88878099850afb67a3abf4d81f59414c77caa5b1c4113f12392896a409d5b57782420b0c37d10e9cb7172da6
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r2.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r2.ebuild
index b42383124d36..b692bf87f107 100644
--- a/app-vim/ntp-syntax/ntp-syntax-20031001-r2.ebuild
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r2.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/app-vim/omnicppcomplete/Manifest b/app-vim/omnicppcomplete/Manifest
index fa1dec25d958..76dd1b987690 100644
--- a/app-vim/omnicppcomplete/Manifest
+++ b/app-vim/omnicppcomplete/Manifest
@@ -1,4 +1,4 @@
 DIST omnicppcomplete-0.41.zip 38331 BLAKE2B bc85f1a90edbb837363a09d28db6c36842a90952f8965ee9005dff0aeea1e63bf68ff8ce37f09da36f245f3ef3aca36b9cbc5439d0c1c2c6c759fb0d4b276cfd SHA512 565703f0e21f818308dbfbfaaec981eb522621568dee5b021bb8fe243da464b1d7defa45dc1cc2ac3370b3b3c67fb39dcb0dd7a1535a4dfe2ad81218f4ac71f3
-EBUILD omnicppcomplete-0.41-r1.ebuild 532 BLAKE2B 4cbaa83f18bbb7474d63aa181822d248b94cfd8d2b50b80ed4b1f519f5bfc1da12d7e1eb135c9e9afc553f74972da68b5889178de61bb72fdea9e7669f830bfd SHA512 0756c2bddc30a4f3b6ff74e123fef50cdbdb88e1d8cc05c59538ff97c520306615de774d218dbaffaae5872430d5694bcef9e5c74f62009a1b70ba0ed5e66366
+EBUILD omnicppcomplete-0.41-r1.ebuild 529 BLAKE2B d695bab4bd7292141f5ca6340b3704f1d6549470a0317ef95315b338df44a665975ac5ba3853b8e47c1ab853991e7de79dba46964188c7f17acccfc19482bf9b SHA512 73a194a522dbdebc4b805d54d8ac02323debbccc562079146f963c17e68f91c525e6406c74a1273da8b42eaa4b50554efd6731d2e7da749f5b7068b5e28a09a7
 EBUILD omnicppcomplete-0.41.ebuild 537 BLAKE2B c33544b7270be70f0ce7d671d92ac5db567cd5c123851b6723cf9a381526c4f18b357158a1cf6552a7e88d0e694d5483200c453140835d35feb8c0fc615a4c1e SHA512 23931326c6b7c1dc8e34d94b12133e6cc28a3847c3d18be4afdc6771840b453d77c1f7802169a8953a910e095bd8b38bf60376d4932859adf4a94724d44c55a6
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/omnicppcomplete/omnicppcomplete-0.41-r1.ebuild b/app-vim/omnicppcomplete/omnicppcomplete-0.41-r1.ebuild
index c68d0db8cdeb..a2bec1895aa1 100644
--- a/app-vim/omnicppcomplete/omnicppcomplete-0.41-r1.ebuild
+++ b/app-vim/omnicppcomplete/omnicppcomplete-0.41-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=7722 -> ${P}.zip
 S="${WORKDIR}"
 
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND=">=dev-util/ctags-5.7"
diff --git a/app-vim/pathogen/Manifest b/app-vim/pathogen/Manifest
index 89e98dc314a0..f507c731c66d 100644
--- a/app-vim/pathogen/Manifest
+++ b/app-vim/pathogen/Manifest
@@ -1,4 +1,4 @@
 DIST pathogen-2.4.tar.gz 6458 BLAKE2B ce28371994938ab4386a6e0a45a9b096443129b7e8de47c92a4c1fa819b7c2aef1e32153866fd1d86a60f7ee2fe2c59ae972700cc22dec263364ef8f51ebe24c SHA512 54da8755991e5c52c5a9258c92ce5731434a15873df44d12e9491ed9bff1f9ebfe2a1c1b94a9ea3615b38aa1833d511bb03c65e85955d96373b6bffceae89fbe
 EBUILD pathogen-2.4-r1.ebuild 448 BLAKE2B db9b9189458ff3b7feafd8287223113b656bb97865a9b958395e8b5b1062a2cf6f8f9c2c1559ae78534a8db8195ee7c222bd8cb676b15fbb2133caf00d2f0e5f SHA512 28864afe4b2eeb7f4670f487db6b055b3014184913db9a8e9864bee713f5913c63008972ecd3e0655c7527af3d11eb3e86b74e4a438ade21fe1ec57d275b1ba9
-EBUILD pathogen-2.4-r2.ebuild 447 BLAKE2B 77a4f41647619a969c0c664499c2dd830940cd94c791e6a3d4a877631354c1407bb41d0537a6084e60cda54762c526e197cf783dbbb4440bd3e8f30cebcf3d03 SHA512 38c35ed6efe73d3dfc51f645bdb1b67ca7212712ce80476eb124c3ea598aa3b3b67cbb9fada84e0500789900285ecfb64c81892c13457f53de370341a095c12e
+EBUILD pathogen-2.4-r2.ebuild 445 BLAKE2B b6c4b4e51d5fa7253190dd6a70375de13defa488d64924c44e72f9f8dad7cf98ce01513ede7b94bdff363a53c64685ad73f7d07298e637b0c032f13e6a13374d SHA512 aeac9d995ab323f702024a2e35a3d33c26dabd0e2f4feea6b783526ccb1797f34a4212384dbff6c77d72fb1a8bb037a4e58c78d7b3b6b062b9defd429ae1130a
 MISC metadata.xml 343 BLAKE2B 0c9004a4447321dcac607e35991a59cafd08ede04d3cc6ab3b4b3804d23a3735ae5eb9bf3497362756b619d679625848c691c0d91945e2de31fbf3859ff481aa SHA512 4bc1d4eaa4c8535fb02a3bfd363ae7e988040d603bdad7dc8c22996bb7ffd341365394ed16588bd85ba3cb51bd48a2a1d6b676e0ae28e824a96f9280698d5f22
diff --git a/app-vim/pathogen/pathogen-2.4-r2.ebuild b/app-vim/pathogen/pathogen-2.4-r2.ebuild
index bc7c022bf56f..a6aa69dcb9a5 100644
--- a/app-vim/pathogen/pathogen-2.4-r2.ebuild
+++ b/app-vim/pathogen/pathogen-2.4-r2.ebuild
@@ -12,4 +12,4 @@ SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar
 S="${WORKDIR}/vim-${P}"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
diff --git a/app-vim/pdv/Manifest b/app-vim/pdv/Manifest
index 55334576cbd9..c83d5f792b97 100644
--- a/app-vim/pdv/Manifest
+++ b/app-vim/pdv/Manifest
@@ -1,4 +1,4 @@
 DIST pdv-1.0.1.tar.bz2 4473 BLAKE2B f0f41f97730e3a9b5b7f29228652e11eb1f6dafd37e349653c2ec511e84719c615d15ed692ed60f8928a98388614682da009fb1b704bbbeade13523754a5eeaf SHA512 4d7cff977b690d6bf54885aeeff201033b3445aa118c4cf57ebde9cd71ea6e0e548d6c3419e7344aecfe4ca54de01f306406fe3d2aadc7d05d010093792b679c
 EBUILD pdv-1.0.1-r1.ebuild 539 BLAKE2B 8dcf066de9c56b547e08991b0709d41f31eaeb4ef1853b462989fce802b5c2f784a4db3589c4b23d7086c1929ff4d6d18960e6bce8dda3f989fa2691ed8ea8ca SHA512 fccfe55173ec6745572a341e1a44c1fccc3aaea88a6937c6837a98aa5f43ee0eeb9802032ed718163c63e9680f3962bc164b7de4ad3aa19e8a330f2167a8ea93
-EBUILD pdv-1.0.1-r2.ebuild 531 BLAKE2B dfd676e9d5ffb779a7e110bd1a7a4f7fa9d4c88a4c5da06107d9888ce783e8f5e4cad8e015c224195763ae2c23b998194e55cf47e0803e9c0e8d1942451b0572 SHA512 fe4139f0436dfd5cca74197502c1f9e75d29a064515bf08206d63f8b60527b7714ad5fb19e344548f4b2cbdaaaffe27a6cb468401e5f2373eb4da44e25b2a3f6
+EBUILD pdv-1.0.1-r2.ebuild 529 BLAKE2B ed387e2c7e498f4e33c0f0b9e4ccdd7ea5b82ef61e7ced622aa10f7fd7f99593d64a2ed742f71905b6e083e680ed71f5395d6fe3e35ca9eb25d2c44786a629bf SHA512 f6d8f16fecc2524663717d820de94eff343f31b681b3d3735613393b8b6a36b034226e05b30f8f06802373071f7164fc42945206c8961955e0d210dcd6373118
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/pdv/pdv-1.0.1-r2.ebuild b/app-vim/pdv/pdv-1.0.1-r2.ebuild
index a8a2a1562d1b..4a0fa105c2a5 100644
--- a/app-vim/pdv/pdv-1.0.1-r2.ebuild
+++ b/app-vim/pdv/pdv-1.0.1-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: PDV (phpDocumentor for Vim)"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1355"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPTEXT="To use this plugin, you should map the PhpDoc() function
 to something. For example, add the following to your ~/.vimrc:
diff --git a/app-vim/perlomni/Manifest b/app-vim/perlomni/Manifest
index 20606d2b4eb6..1805219b4508 100644
--- a/app-vim/perlomni/Manifest
+++ b/app-vim/perlomni/Manifest
@@ -1,4 +1,4 @@
 DIST perlomni-2.5.tar.gz 20152 BLAKE2B ccba727b3ed2317a2f1983202eda97dac38080ee0e79173a402f45956c713741acebe9c79ab8321bd5b3c23481bb02963fe93edc26d022ccf29d3724a704f006 SHA512 5a7eb10233d620db73387d79801b451183e1a00f3086f4667cfaa871e6cdd43b1c978beca8eec28050148709d98e8f55be048806f111fb4bdee16a4e22786bb8
-EBUILD perlomni-2.5-r1.ebuild 486 BLAKE2B 9701a7e636367c8ebe4b4c3d71875fcac8e85b9004df22ae06ec9d980ee9a3a00393d4b933b9d4805b62ba840a33dd10ff0745cd6669e566dacc669b51645f84 SHA512 f54c99a1719dff74dde1c1ba3d6b5e68874420552706894a7bccd917ef93fad98e0f79d7cbd4749a449329171e65c2b10f9ba66c5cc89300d96d8ebf7a0e12b3
+EBUILD perlomni-2.5-r1.ebuild 483 BLAKE2B 2a625455c6ea47574cd296a17f1d69db5a7cdf8c849df6fe13d6af66a4488180e771caf13daf1478adbf3ba6fb2c78018e800684c7e472ccdf3688c71ff33f10 SHA512 804b25997794a7899e7a604314377149f307fd795ec5767d7846031944fc045b6d21512009bce53ff7b96fbe98720029eb424d8e305b71f29e178668940bb319
 EBUILD perlomni-2.5.ebuild 501 BLAKE2B ca6f5252171334a66a8db60fd1375d3d69f27de6b79254acf6e96363c4507cd68297033b59ebcfc61ab7cbbdc1baf9967e6c3496becae2b5bbd21bb90152ee4e SHA512 2911f98f026336cc01569b340e39351d364e01d64edf4c80f4a6252ba0605a39ae6b8b2f9722406bb001a270217ed44788d3ccd6b7c98286d20b07dfa4aa5ca2
 MISC metadata.xml 426 BLAKE2B 8812688fddd7b4c8866d9b9d158d380477b4004ce5bb4628759bff08e3c4aaa75e9373896eca7fc29ffb67aaeb92cc0e7b86370984af77f32dfc42adc174d217 SHA512 9aca7dd978539c36113dee4f6ef4568e13fa4e4428e8bf9f14c3e684df364dfec6b4da83399baeb7d6b80e6e6b56ca3f2bd41faeaa3724abf4990bcfe8984f05
diff --git a/app-vim/perlomni/perlomni-2.5-r1.ebuild b/app-vim/perlomni/perlomni-2.5-r1.ebuild
index fbaa53b23584..f9cf064c8acc 100644
--- a/app-vim/perlomni/perlomni-2.5-r1.ebuild
+++ b/app-vim/perlomni/perlomni-2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/c9s/${PN}.vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}.vim-${PV}"
 
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
diff --git a/app-vim/pfsyntax/Manifest b/app-vim/pfsyntax/Manifest
index dfea3d7c54d8..f29af97e3ec8 100644
--- a/app-vim/pfsyntax/Manifest
+++ b/app-vim/pfsyntax/Manifest
@@ -1,4 +1,4 @@
 DIST pfsyntax-1.3.tar.gz 1540 BLAKE2B fd590d18815d947a20f76fa5b4d197131f1fa9170ef7b0b2409c2782188706a300cebda20c89f90f861836ae440f509f10588eac4bb947fda14043d3eff44819 SHA512 6967cee9a039f405a4b42a44678d5c632eb93ef48486c03a6929991d31ac03677cba4223f49c14e6c9d73b15db9469b3fa3c0f2586b4994d25634d0885121c5b
-EBUILD pfsyntax-1.3-r1.ebuild 407 BLAKE2B a53918a3a6a7a8cb6a51422d2283bd4e7250fa77e3920b0961d09ae21b604215ed86c5f3c16ab79094ab93a3a033decf0b7ae7a983bcd6155fbe8074bfa01632 SHA512 f351a926c277a905fd168e8de4182c0e2e2234af204f0ac9ec2452d7abfb843e11f31835b2af7faa34b75618d3753138ad116f1ff083f3139911a798775e6fb5
+EBUILD pfsyntax-1.3-r1.ebuild 405 BLAKE2B d87e555368769af7cfd326f43f16a3ae422ebaa9f543b103b35ed0d1b4df26430ab6318aae2357cf2fce2c34cfcbad8a0f664b98519d16c0fb1a3a6ff4bf50de SHA512 f6cdf411c9d71c5986dd0e65ca49f57e5e0410116e3622ec6d90fb691051e08c89492db8d125fabe5e95490da0f1ed396bf39eead069c87f7e538752ff6ae3c4
 EBUILD pfsyntax-1.3.ebuild 408 BLAKE2B fc31fbd6f8e65d1ac9d502133b18ea9b22371c8b719c31de7a0c45a5c22d52a6342c048d64ed601e070e52d3e8fd79a2148863714b2520880c096e142e6e8030 SHA512 e2f853e414ac2feb140983c28fc53392f0a928a0c86666371df1555e595a1e2a29c59e85ef80795df23a92822bc202d5b0f4b35b530506f168094056b116b22d
 MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/app-vim/pfsyntax/pfsyntax-1.3-r1.ebuild b/app-vim/pfsyntax/pfsyntax-1.3-r1.ebuild
index 7bbe1ace8e51..4bd5dbff1947 100644
--- a/app-vim/pfsyntax/pfsyntax-1.3-r1.ebuild
+++ b/app-vim/pfsyntax/pfsyntax-1.3-r1.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/vim-scripts/pf.vim/archive/${PV}.tar.gz -> ${P}.tar.
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/app-vim/phpdocs/Manifest b/app-vim/phpdocs/Manifest
index cd5c02f5e635..cadf691cd322 100644
--- a/app-vim/phpdocs/Manifest
+++ b/app-vim/phpdocs/Manifest
@@ -1,4 +1,4 @@
 DIST phpdocs-0.26.tar.bz2 3772 BLAKE2B e14b0a2ddce2ab375adf845e06f9d760bb09611a930d5a2988d1e33bcf2d2890c5be81b1d148f48d8fc96a87b871a19abdb1223a00a13b611b6ba2dbc62d44fe SHA512 625717ce5e8cfe8ee6fb76611df28838f6bdf54905af138dccf6e2870c29c36f6c618872d81990833c06d30ab3f010445d2d31fb4173eb8b245113f8b5c87bcc
-EBUILD phpdocs-0.26-r1.ebuild 497 BLAKE2B 2ca8458c40f53a1cf6cc8049ec9281f6e42ba811cdeb8ca41bc6286cd77d4d1dfb9b796aa8acf7f9fd5c5b3736edc6cff7242ed3c953474d83d16d5cfee9e839 SHA512 8943d5cb9d5e16815ef639ae49a8f7922dae66be2fad8061c4b9e1fa0e35505dc456c5a40851b7800694770b26bd3c780191194da649ad7a5e32cd4ccbf68b0e
-EBUILD phpdocs-0.26-r2.ebuild 502 BLAKE2B 08a05f789371ae068664a1cfd6e7f6e2681013bfdb2f8a61c8436db67a8e3a18e95e43471d418f9866c6050420eac28f66d5ec44af9ca07c629f1ad7d3324b77 SHA512 8c3b0e68088af64ba7f9ef0d07d88a5fdce0e565cf6b913672e7e27a67c1df75dcd8bfd29547205bc96318b3bd80dc73f6b4a607200b9c4a086d8576d3746825
+EBUILD phpdocs-0.26-r1.ebuild 491 BLAKE2B c04adaa371289588af44d579b36b77d4b8d4d58028360f69c2311d2e15f4342e622979bb253228ac442589da1c9b08bba44f3ccad55033d52ea0f5b46956d990 SHA512 bc32232233f27b982b5376958017b025161303591c1439c540b2d8a5c69686d89ff37d307e7680a0a46ec65c6b9c183fbc761380de33ed7a8615d776e2c928bc
+EBUILD phpdocs-0.26-r2.ebuild 496 BLAKE2B 268ddc4d356ba0073031c2a6cdfaeb194e6319dbd180a5e7582dd94bbf895d219388169d18c1080ff82ecb8c4db8c7899a65977cd36325a8a1b4a8c3fc0b74a4 SHA512 a861590df02a559b7b5c71f91f93f94c1fcf8c00260f990658184c50c470d6686e43249777d94f7b2e639a3811581b848d7576b51aa7695c3e4755eded6a964d
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/phpdocs/phpdocs-0.26-r1.ebuild b/app-vim/phpdocs/phpdocs-0.26-r1.ebuild
index 3f44b15532bf..3898ab2cb478 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="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 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/phpdocs/phpdocs-0.26-r2.ebuild b/app-vim/phpdocs/phpdocs-0.26-r2.ebuild
index 86c242169eab..fbb4872edfc7 100644
--- a/app-vim/phpdocs/phpdocs-0.26-r2.ebuild
+++ b/app-vim/phpdocs/phpdocs-0.26-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: PHPDoc Support in VIM"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=520"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~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 e389e333412b..5303381572a6 100644
--- a/app-vim/pushpop/Manifest
+++ b/app-vim/pushpop/Manifest
@@ -1,4 +1,4 @@
 DIST pushpop-4.0.tar.bz2 7486 BLAKE2B 6f0a4d7f91d1e7c4c2409485784070efa99257f3f96c257a23f9f444fe4e08307fb3e1dd695ba6a205e290fa1f15768bdd9c6346c9b52cd6151cb83eb6b1ea10 SHA512 84f61908ab25ea6028c0f77d935286ffe3b8905400e455e1d123ca6e53cca2422e066adfcd8e75d2ad1d63d7e01524fea286a2eeeda3dd0968076be6a4229684
 EBUILD pushpop-4.0-r1.ebuild 514 BLAKE2B 743f1c2432c92ae1ac6d16347a635d66194c365ae0c86316e5c3abcb16829249e03a438ef2e40c846c1e5bd9fd19289897aa1173dff0cc2952ee70418b3ed281 SHA512 c618c2cc11307a2bb105caad5dc3380c5e4017272538046cd037da7d903fc9240f744760416fefeb6da06840025594002e8b370ca63c03cbbc3e669ad5a55899
-EBUILD pushpop-4.0-r2.ebuild 511 BLAKE2B aff0b625c1cf61c4d0f901bb4e3ed5dfeab5fa8fa64457c82445c1ddef0e892e8a5d665b60820f7681c696e7faf60418a41baef19c41ba3559f686030e1acfcf SHA512 9998a29e3e4a4bfc0cc66dcc226343f86c8422b9d935040dff6f5ee04e167ae30624af73c3f104e980bccc2f0d6d3c8e96d69ae70c1b6b450cd97a7819b9b3c6
+EBUILD pushpop-4.0-r2.ebuild 507 BLAKE2B 21e612d604beb579cb915af781019ef866d65ae84fad8dd2edc81b6e111172c0d67f7877a7e0136b44d82ff368666419f8ebd0bc2664078da161aa10a3e61c0a SHA512 e6328771a87ab62ada004385d9d57fcd7fc2019da497b2f8de3b947856dafdf694e24e3a5bdc38563810422d9784c5c33b627eb139b9e3a0599b549903b9d571
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/pushpop/pushpop-4.0-r2.ebuild b/app-vim/pushpop/pushpop-4.0-r2.ebuild
index 0e1f79e43ff9..b2a3cf2bbdab 100644
--- a/app-vim/pushpop/pushpop-4.0-r2.ebuild
+++ b/app-vim/pushpop/pushpop-4.0-r2.ebuild
@@ -9,7 +9,7 @@ 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"
 
 RDEPEND="
 	>=app-vim/genutils-1.1
diff --git a/app-vim/rainbow_parentheses/Manifest b/app-vim/rainbow_parentheses/Manifest
index 326914243b68..5db7a9c1050f 100644
--- a/app-vim/rainbow_parentheses/Manifest
+++ b/app-vim/rainbow_parentheses/Manifest
@@ -1,4 +1,4 @@
 DIST rainbow_parentheses-1.0.zip 2827 BLAKE2B 655905c1b54d5c885e1a06fe4403786b76958ba47d0facae3d3a1e657ae0a702b3f939383e2f617f5bdca9b33193dd52196eff5915236180e0d9d4a6a4e22e79 SHA512 326310058a7dd25fbd47105334cc1a6a059d40842afe48164922b7869af344dc230a5f3b329c13d5d0ae9779814507defa8d0ff56b951556e8f2bd685313e569
-EBUILD rainbow_parentheses-1.0-r1.ebuild 488 BLAKE2B d01322bf2518d2fad2c4a2ac44debd056cf28c4fcb9ff1527252eeeec972070f2d9f4d20b2c5b0d98c67b0d2e6381896c60915c38c3c9182e69a622326ec3caa SHA512 9c0f94b2c9e430e6e845386686d83cbb18decb0985c5a0e50a038b73cb9f1a0d6cf5daaf71fe2536f38f330572c7fcd6846b0b1be9dfcb03cbf79478e81e7983
+EBUILD rainbow_parentheses-1.0-r1.ebuild 485 BLAKE2B b51a19af9821edc691fcd95141f3371a420fd54d9c4c6e2ee53919b22f58d8f62bae45631bcb159f8f48e1dc6c0ec0cef9902c1fe7b52fb4ab4a27fba513f9c2 SHA512 7e22a423afa219b1ad59f9070d968166b14c0d7dc9b01e1d4a7389ff8e09f4d36ecb3a68988fa35b3717bd3da1d277c279debfdb43bf3f552109958b5cbbbde5
 EBUILD rainbow_parentheses-1.0.ebuild 484 BLAKE2B df16ed8822c049554d108fd53f79d2ebe5fa7f0fce4e263248d4d5ef4a936b790ec52722aed8bc69b9763ee9ba361846b64b51b4f857967a97c5958d87ae3b04 SHA512 8ba476b0f9c3339c225103375fbef9a1f669a83e2bcb79595b5aeafa7957d58668de4d85f87af4c8c9d77a1b5d1f82a7a1dd836e4a222df32a28d78e454981f5
 MISC metadata.xml 455 BLAKE2B aa896d9c77a04ee7aef89371d37e85d4618761cb58cb8987e0f4569f452b089ce3e1dbce9ec6782890d7be1f9ae6cc206b6a09d15f72f7f8e1dd3c36b22e42b3 SHA512 5b71c496aad67e89c23b98aa31114a7912dcbdd11b866a76ff0a313c957e0eaaae5a75dc3cbb734f22241505203841116f3020e642cacd90f75d52dccf1d0dcd
diff --git a/app-vim/rainbow_parentheses/rainbow_parentheses-1.0-r1.ebuild b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0-r1.ebuild
index 88b4d3611f30..b4d5ddf603d6 100644
--- a/app-vim/rainbow_parentheses/rainbow_parentheses-1.0-r1.ebuild
+++ b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
 S="${WORKDIR}/${PN}.vim-master"
 
 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/reload/Manifest b/app-vim/reload/Manifest
index 4c4aa8199f2e..f8315256f1e0 100644
--- a/app-vim/reload/Manifest
+++ b/app-vim/reload/Manifest
@@ -1,4 +1,4 @@
 DIST reload-0.6.17.tar.gz 7028 BLAKE2B bb8e843e1092c7e155546da5aea67280ca4b028c037547434f00e15bed29d7fae062289bc8ca506ed9be17674ce63494f72273797ff7022aa95b46405b0a4a63 SHA512 639ffcea9bf94b0a8346850078f59ff332ff6180b042d2c22662d5c637307969644607ca3f19e2648a1ef9a019788ef1f83be52b627ca6784e16d1b7bddc39cd
 EBUILD reload-0.6.17-r1.ebuild 456 BLAKE2B 3a91603ba9d6802e14eee4e30f0d9f66015c51cf38b51fe9ae0b0b39e86e9edf2f6fad384a8bfe58c3dbc24ab80207f524b1d581659d8e40035cdd140e851169 SHA512 17e223eddf17fa8cabdfbb73ad5d5f80ef31a1c3bd919dbbeb6680ea872eac6e90738340b719a06b9313600857f4bea059fec002f428c42da8427698b5f90c3d
-EBUILD reload-0.6.17-r2.ebuild 459 BLAKE2B 74ee8462a5185ab1329dee7b55f7897c1f83737d413502d5a96c592e180c8ae3ba68c77f7e10203acb13c376548d1e23c01f23eac6d4b03c82b0eba9af82373a SHA512 c9de9be0d2ec38ccfd5338fc22816ff2f2689807c6806b78ac58f02784d02d330ec7aaf80920e8fc79a22012e9b8b9031fe7daa978f01b91b781b49a29d09f20
+EBUILD reload-0.6.17-r2.ebuild 457 BLAKE2B e1aac4484575fa5600ee5656b1f40ef5d699b70c3921922f449c55d12b68cab1aff79500769f3bacb1c104ef9e46396c9c451def3ff726e52f3fcb6703171460 SHA512 0581e6413715af038c9500a2e17bdf3c4a0ef1e9672a0ce4d0095237a3a1c0d7932730cd7aa1c5545937c8891756202e93ccbfdab7b57323e9dc2b4588e2ed02
 MISC metadata.xml 341 BLAKE2B d208aa92af6bbdd5fd65713daab4c7a01497f5cab6ee50db69ef6075e0fef5ebc400d589614f3c47c6793570171b05d49308efc89bdb67f89845a3f25f1d7919 SHA512 7c1e22a8026da62e3e83d537989f2d0f977ee47525c610a0ca3cda0bb86dad37395db653110dec9619ca2ec19dea0ea43d74d90a8fc4b1728bc4d428fc49b56e
diff --git a/app-vim/reload/reload-0.6.17-r2.ebuild b/app-vim/reload/reload-0.6.17-r2.ebuild
index 31d71cda3268..50f45aa05f1d 100644
--- a/app-vim/reload/reload-0.6.17-r2.ebuild
+++ b/app-vim/reload/reload-0.6.17-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/vim-${P}"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=app-vim/vim-misc-1.8.5"
 
diff --git a/app-vim/searchcomplete/Manifest b/app-vim/searchcomplete/Manifest
index 5c134f410b51..1e671deb49dd 100644
--- a/app-vim/searchcomplete/Manifest
+++ b/app-vim/searchcomplete/Manifest
@@ -1,4 +1,4 @@
 DIST searchcomplete-1.1.tar.bz2 1204 BLAKE2B 0259eea8117d2e27eb939b1d8f5a05d4d2d6b9b6b493372c5d15a7a2a379b112e7eb2c385392e37d5ef3ac2d1e77fdaa7640a6579af3c4e55a1dea8e63b4ce64 SHA512 8c30b446c330665d303935f07566aa0b3ac8bbb89a3068d5da40209f3a4d17dc3371245dd7bef567030b1a33653f9c481cd1165ee200b0c73723da5f5aea2043
 EBUILD searchcomplete-1.1-r1.ebuild 392 BLAKE2B 37177f2e5049219fb4200b89c7ed36f752fa485f9b842986ccfc20028abf4a8028e8bd34263d0acb745c5c494a2cdad069fb3c6998bac5acb7e56ac7a489d0b7 SHA512 090b2abb7c2aa56ea8710f9329937d4a6c87e3cec9c3a087e171144c6dce1791b07d205a578af1ec2e90dce822542b13c989c2bb2b43dca8fc1739084c075078
-EBUILD searchcomplete-1.1-r2.ebuild 389 BLAKE2B a6bce9fa04133946cf7edc4d6e3046bdf49319b541ef453cb3acb421d2f7da9319e0673ccec61cae86e4c050e6aa499fa011bfdbbe2411ca21df72d1597c38c4 SHA512 a3e5be158c3e1d530280877275d21ee822df919db74f8348de2fbcf130000f57a3b382cd9bd63da5f307bba2a0653752e2cf6246a1a65661cd476f85afcad7c6
+EBUILD searchcomplete-1.1-r2.ebuild 386 BLAKE2B d7bfec4cf34f90cd916dc1ab24906855415afaf571f963ccab8658a43b4da5e12ebdf8064d71d7fd2887b55c28f24b81c96aa30a1d8adf2e675f13a43ac74f55 SHA512 8864e173dd4f5c1816b79a6fa527caad77f5ce4ab911f5b0b14bcea9138969418de87d2564a19241c7fc352b82b8298d0237ce70b88b846f029c853014108c28
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/searchcomplete/searchcomplete-1.1-r2.ebuild b/app-vim/searchcomplete/searchcomplete-1.1-r2.ebuild
index 3c81583ac01c..3be735a03d9d 100644
--- a/app-vim/searchcomplete/searchcomplete-1.1-r2.ebuild
+++ b/app-vim/searchcomplete/searchcomplete-1.1-r2.ebuild
@@ -9,6 +9,6 @@ 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"
 
 VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=474"
diff --git a/app-vim/session/Manifest b/app-vim/session/Manifest
index 5bc961f81a9c..d9086678c605 100644
--- a/app-vim/session/Manifest
+++ b/app-vim/session/Manifest
@@ -1,4 +1,4 @@
 DIST session-2.13.1.tar.gz 79688 BLAKE2B 772350bd96bea4ef0fd83e0eac214d308c6c40965b3236c8b8c645bc59058ac0a78427563174f4dcf7d88d2514d1437d825f1486693ea52adc281a393de95b9a SHA512 44a7ca107da6710f70705646b4ace26a92abfd56802dc38e22e620f4155c3752d4c880b0055089d85d52b54e34a5c7b47bfc4c39721bd3569ec335c4d3a91efe
-EBUILD session-2.13.1-r1.ebuild 462 BLAKE2B 99536cd72ead11a791f00af8f03a535d9f2226fd200c118df7ac9242f16016f7a32f6229fd8d5af3685c0dcd867bee0b2d1571da6583bda32d5a39e87a2940a2 SHA512 c4584a5a6b50f465861ff02458138e489a65ec1c3888913d67b840b307781b29a48d3db042dd455c9a85cb23298d6697606339a8a370ed644fc167f4dea04548
+EBUILD session-2.13.1-r1.ebuild 460 BLAKE2B 747a0c526f7eabb239cc547796a65055de5baa545dcfac1da812d055eeb59cd32453f4c087df0c63eaf5306a00d61fc698ee8ef075c2a429b0ad85302233d982 SHA512 2cb37116e0882acc29dd1b1d6f3644c795ef8f05cbe3d2417056f138c53807d0b803a2e79d1d87e05ff783b45d03c0191975c16915ac3b11e50c69827260ab93
 EBUILD session-2.13.1.ebuild 457 BLAKE2B c000d62748951c453db0c4b1af245eff0e751de518aa819143461fbc1818a4f4c2615ba4d34d1d3ad74ef756655df88dd26eec958dd168c9ba8d87ed01b2f2ab SHA512 cc959ab1f5e65e8d13ab2bb884ed2522c8330451a3b75e4a9013bfcedd96bd7599f7e976e8914c7c3ac46ca2240fb016197633073b1e8e286a8b8c475822c410
 MISC metadata.xml 342 BLAKE2B aec8c720569eee58c95dcce4f9cc6a55279c94f94f1292bd593143ef6e19edb34bfe8a3c4bb3d821c7f94167d82fc7272c514d7b6fee12c7d194e328d1372561 SHA512 fbb5bce889142f593dcdac30dca2fa3c2e1562e3748588aaed66a624afa1c82c2143f19ab9845e9ec00fd00fe8526b7c8393a4574e7f09ed87c2d81efdb2a49a
diff --git a/app-vim/session/session-2.13.1-r1.ebuild b/app-vim/session/session-2.13.1-r1.ebuild
index f4da87a6223c..a1c5dece9970 100644
--- a/app-vim/session/session-2.13.1-r1.ebuild
+++ b/app-vim/session/session-2.13.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/vim-${P}"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/showmarks/Manifest b/app-vim/showmarks/Manifest
index 0bc8292d910f..bd9a4803bbcc 100644
--- a/app-vim/showmarks/Manifest
+++ b/app-vim/showmarks/Manifest
@@ -1,4 +1,4 @@
 DIST showmarks-2.2.tar.bz2 8195 BLAKE2B 2be7ef6fc040fcc6d808771ac45523148685b466b5eb7ffc6c5b31f4a2387375c84aae931ffcb6494ecaa9cd9713567e9f7fa19981678cdffaecc38aa9f27bdf SHA512 0121070d8b8c51b3b31c1d052b368fac304ee38e413881e67e2b9336b1edcae6af165c592d592f42c502834856d2c097b575571286574ba83a51d4fc9964b7a3
 EBUILD showmarks-2.2-r1.ebuild 836 BLAKE2B 4db0ebf081f3cc2ab83f7d15b18106f3eda8c3056a9af6b3d13675d2216e8eea5dd4f82d070936ad45cd99fe7ac310789f60484a34ef8b10800eb7b536709e5c SHA512 369ad4a48d68132bc31a7d0a8a2ab1f3610a5985399b17e2ed7d02b9b16305ed04f05e81b3e28b703568cec282923685b6815df68166a20de450bc5f1cd07b7f
-EBUILD showmarks-2.2-r2.ebuild 832 BLAKE2B f3aabedc5f48259f8a87bbbbc7177306b1ed62c62416b73d1e0352e00c3f0f253a9b1fa72308cba729171babdb568878cfae65aad4762a009b4774ef3485c525 SHA512 d3a27a24008eafac77eed26cac698bd476008b6725aea964ddbad68cb3647078e3c7514fb2245c5a3182a02dc027b1d215f3b64ebc0dcc997bf360d80e87c504
+EBUILD showmarks-2.2-r2.ebuild 828 BLAKE2B 8a08762a69a336d0194e7c5596733d8ac070519bcfafcc2d1b58abcb36137c4d303801a3dbf271a760c901e0858357165305d869dc46139718871fe3abcf4e0b SHA512 0a84039b6bae72358f5fe2ef9ce352ba8ac679182bb0f3a3f844e6479da6b3059b2ff918eb03ef3767ec6dcbb8a037ba58863f61be76420129dc5bc181cf4d01
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/showmarks/showmarks-2.2-r2.ebuild b/app-vim/showmarks/showmarks-2.2-r2.ebuild
index 247c654173bb..ee89f462e9de 100644
--- a/app-vim/showmarks/showmarks-2.2-r2.ebuild
+++ b/app-vim/showmarks/showmarks-2.2-r2.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"
 
 VIM_PLUGIN_HELPFILES="showmarks.txt"
 
diff --git a/app-vim/syntastic/Manifest b/app-vim/syntastic/Manifest
index 2dcd235cd2f3..52e82b836630 100644
--- a/app-vim/syntastic/Manifest
+++ b/app-vim/syntastic/Manifest
@@ -1,6 +1,6 @@
 DIST syntastic-3.10.0.tar.gz 268037 BLAKE2B 90f055a919d8b2407bda2daa3570e3fc9e2970905f65eca52f0a3a01c878eb98e2197ed017d272af298b42206f93fc73cfcdd196a638f9c536d4af44de6209d2 SHA512 c19f2f7b709bbd9aab30da0f493e773e3e56d97efa0e558af7a97fcda1bb2f091355e06d24971f1bde5b321e027b6fc279b1d473599b77db0e996bf7a247fcd8
 DIST syntastic-3.9.0.tar.gz 263275 BLAKE2B 574cf958b859a108cdfdffed29b3ff0f0903dac5c7fbc497e2c69831ee35532d317bde0ab827dda828ee7cb3cc13ab9176c9ea6ea233e03e7b3fcb5b7c49757e SHA512 04cee939226940bb95935434b7aba42a3419b8b7b73d5fa9052a6aaccec5d0724c4e3634edd56573d0080b31baf49c1a00811c6f88e4fbbdea7e761e5707dcb5
-EBUILD syntastic-3.10.0.ebuild 952 BLAKE2B 97fe478ce3d83b442f2a998ce57be8308c6c2b00de7392409c17f4d1dbd53fb2f9b62b00dbb26edce8dcdb54675845347a4876d01fef126b4a27b382b8c64738 SHA512 e521c6c3cf265f9dc75343190155f50931a21127d34e6ad131071c223e7673946e0fb578cce29fa69de324425b55e216877ffbd3a259043246e97e271d51645b
+EBUILD syntastic-3.10.0.ebuild 950 BLAKE2B 407d167e52b85550710a88af7f8b372505de312a901d9d0f3ced8cbc5357dcc5836db448f436b36a2b2f47a7e12551fe4651d5eb756d63f1c9c800b4485492a8 SHA512 efd74883b56f6926d86930627515b9195fadba3db98f0ef1e59e0f790a1bdbd0519de180c4c35bbfc77016cbc4a87e3a0e85677786f3ce128864e89897610316
 EBUILD syntastic-3.9.0.ebuild 950 BLAKE2B e879c506e98ebe8dbcfe3c6ea7af07ef95cbb634c569b1dff897b3ab8b03ab688b08500f8ccd90e34224780c8c8e916d8689c2ffc674265fc7f50a0645d659e4 SHA512 29ab862ae311bb8695316496758c1db391a18e343ffef7f788e4509e3347cdaf05ddb60e7203cce90c8268be15621f03c3f3a71fc155f6f7b027074aac9e88b3
 EBUILD syntastic-9999.ebuild 952 BLAKE2B 97fe478ce3d83b442f2a998ce57be8308c6c2b00de7392409c17f4d1dbd53fb2f9b62b00dbb26edce8dcdb54675845347a4876d01fef126b4a27b382b8c64738 SHA512 e521c6c3cf265f9dc75343190155f50931a21127d34e6ad131071c223e7673946e0fb578cce29fa69de324425b55e216877ffbd3a259043246e97e271d51645b
 MISC metadata.xml 345 BLAKE2B 8787d399c07d84a15c1e544c69671e591237929e4079477fea08dbc4c81b9b7201b92ff5e35363d843d55fcf493f3805f5b226940174b9b96f1e49d494407dbc SHA512 fc0126da5cace699a4ac83539e8b1fe61bb95d79761e9b9913c300e822bfc13adc14adfb2c3ab006a3effa681d1d6bc462a857ccfa87cad3ffe0c2991d38036c
diff --git a/app-vim/syntastic/syntastic-3.10.0.ebuild b/app-vim/syntastic/syntastic-3.10.0.ebuild
index d109f7f00959..b2b1b8836e9e 100644
--- a/app-vim/syntastic/syntastic-3.10.0.ebuild
+++ b/app-vim/syntastic/syntastic-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/vim-syntastic/syntastic.git"
 else
 	SRC_URI="https://github.com/vim-syntastic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="vim plugin: syntax checking using external tools"
diff --git a/app-vim/tasklist/Manifest b/app-vim/tasklist/Manifest
index 9501b3a2f9e1..457ec0559968 100644
--- a/app-vim/tasklist/Manifest
+++ b/app-vim/tasklist/Manifest
@@ -1,5 +1,5 @@
 DIST tasklist-1.0.1-r1.tar.gz 4051 BLAKE2B a74081063f4c0e25bc05534098fbbc77069e2df9be848df9342e26d8466b0d20cf3fb1daae133e4d8043447f3788da96ff4f18a976869006aca9a56f0488a0f1 SHA512 46ab07f5618e37a99eb3d8268adbc3d2aea278e320f43092601b7c6179ece7811610f1857ff01a950aa526905dbad72a412413e7793ce6e150db3a65e8c0e519
 DIST tasklist-1.0.1.tar.gz 4066 BLAKE2B d55e12f28546f400b34e11636814205e94c3c82656a068c9774fb23fcfd336fae059efcf307043b6bcbaccb939a4a4ed8d02c9a5944381bece096c57f6092ade SHA512 623ec5b147e485abe3e246796a6ed67dd8325ef37708e589c4568897da10ba70076eb5dffd9fb9333fc29d045c316cf382950de13f616873334fc734875600b9
-EBUILD tasklist-1.0.1-r1.ebuild 428 BLAKE2B 9c54dbf592d7ef92157a3b78297400b7f5655ee998a6e616016ce7047067f763d0e4764fe4faa8bac43f21676a6a0fb572ec32a9fa869039259bdc5c6ea2152a SHA512 b776bf197665e21bc60659727901c47650fb6bd509e982679656ed2ebb2e54a09a685c4075b969ef3c9ad9584c573cf96f0cb91993aa19cf30df1974ae808af4
+EBUILD tasklist-1.0.1-r1.ebuild 426 BLAKE2B 48f2317fa88e67fd2e47b378fb398bd0422baf5a542d4141f2df178788c195aa4ed48fa053de44d59e5560cd86ad08269048c6861d7f6e6ad46fc08ed1bd2deb SHA512 aadcd43d33d7b27cdb6c5b32ad9c084089141d3d50119627b51c635f0e368b0d78df30f0bf9b9365283e40f485034a9bc3d9460b48b22c255e1f57cd92b488da
 EBUILD tasklist-1.0.1.ebuild 397 BLAKE2B f0baba7365c46c2120083d8ad37ed1fdcd21e447c7d64ee6fa332701b8fa33dba64cc73f93d06321cb3292fbc5c945ecfc512beb5a9a5a9aeb36ada412770f48 SHA512 647a2728b9115728ffee66484604ce46c618635bde9dbe4f36674360930911c1cc2933d2801fb5fcadf128fb4bcae5225d9fe8122d36a7041ede0649175bd76c
 MISC metadata.xml 451 BLAKE2B b554332b2427e5363ed10499b21a233d81695c43e39fb000cff2d961be7b8102f5037d1ca11d8037dc1f258014941e7a7296786da5f6df9d44eabab00180796f SHA512 5982e7e9773cb4a0a3187a411db82b70f276d0b89ffa0b466a67627603c70ca7d5fd527ff48ef7ed477ba6aaac77133aac4746e7d957b52fbaef9bc2a433c3b6
diff --git a/app-vim/tasklist/tasklist-1.0.1-r1.ebuild b/app-vim/tasklist/tasklist-1.0.1-r1.ebuild
index 2ca1a425eff2..f487e3639878 100644
--- a/app-vim/tasklist/tasklist-1.0.1-r1.ebuild
+++ b/app-vim/tasklist/tasklist-1.0.1-r1.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${PF}.
 S="${WORKDIR}/${PF}"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/app-vim/tcomment/Manifest b/app-vim/tcomment/Manifest
index 613a63d993fe..b7a49147ee79 100644
--- a/app-vim/tcomment/Manifest
+++ b/app-vim/tcomment/Manifest
@@ -1,5 +1,5 @@
 DIST tcomment-3.08.1.tar.gz 49918 BLAKE2B df63a01432101e018a39f7b54dec0b91b415263e2b6c0f3e63521e1abe2247a005a1fc900cd6d18cfd908f75ae4b5767a5f7dc21ae620985d3465676c456a389 SHA512 609d5eb1e7785fb1af829000ab27ab63ac2bb7550bcd0f91c7c35f0a8c4b879e5348745f57b11d1e24d37920056ca55da8863e15e40d6fe289617d5d898a4177
 DIST tcomment-4.00.tar.gz 58709 BLAKE2B 64285c64d65e7308e3cb34494f1b49584f54707ba9f4e86a40a72c1434670819c412b68e4a30f296ce531913b054d482f5743ee7e6fd81baa5c3ee1d46dc8d01 SHA512 b072ec4b136ef6ea14e91883a77b036a26b2e2c0f6cabdce70e4aea2cf37a2c4b7becc0770ddfc8b7260a52cda729a0e4b8ff4a067c81bcbbe0f0e896b9e66c4
 EBUILD tcomment-3.08.1.ebuild 718 BLAKE2B 48529193db40c3ac956c74783f9357bc4b43addcadd4e07017570781fe0ee5f480e174fcea0a0cbb084e7261284ed40519a8880b3eb0e2ac6533f1bb0c764ee7 SHA512 2f2d941989a22a4df80a3c1751edf377386fdcf4ee8165a5cbad84bc18cb89f230ac9c44f5b6532a8fcd81c6c0a83adaece09bde23788c48267cdc4a8f8824cf
-EBUILD tcomment-4.00.ebuild 602 BLAKE2B beb7a5991e9dbe896c1604fa04a871dbc6284d998f32023cfb55a09c317cc864cc36326597e7fbffba9e412c696899e16ba1e9508fd92b8422c31cc65cabc403 SHA512 14c19be1e750faf8feb083e0f549e0697fce48911b02db3660be86d6eb69d5bb958d1351fa504fd6d44a087f6bde7569629f09dc35770726769f97eaff3531b3
+EBUILD tcomment-4.00.ebuild 600 BLAKE2B 917ef0d29e554056e88ceaaa4694a47ee1b2036d60352be2a64ff8fa780be2e2e6e207caf42262e2f6fb881923ca8e8b75bdf9cb530a7a6f9a51872cf6c934ef SHA512 459e354e8f94a57e925fa0a4fd5fe58001b7bfd9b6d7d8cfb78be84dad7ea3461f60d5adb9ee0d96702481f2776f1d387d01cc5d146b3741693b7eb5b721786a
 MISC metadata.xml 344 BLAKE2B 00d1070b4a88d315b50e0651832e4431ca1819fe4da87119fc7015bafa9a2b53ea9442e75e7675fbe5425bf9cdbbf2c2001837c0ef052276c6f8e252ed7863a0 SHA512 8e018a6fe184a49f874e6c4349d8bf2e356a0260e90d2637981fdd2360d7e29ab5c9d91bd62a37706f9221c11b17f44bdabf6ed322e964fb3872336bba94c775
diff --git a/app-vim/tcomment/tcomment-4.00.ebuild b/app-vim/tcomment/tcomment-4.00.ebuild
index be5dacfaeb75..583ddd7290c8 100644
--- a/app-vim/tcomment/tcomment-4.00.ebuild
+++ b/app-vim/tcomment/tcomment-4.00.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/thlnk/Manifest b/app-vim/thlnk/Manifest
index 00bac65de275..9c34bbd24fa4 100644
--- a/app-vim/thlnk/Manifest
+++ b/app-vim/thlnk/Manifest
@@ -1,4 +1,4 @@
 DIST thlnk-1.2.1.tar.bz2 35428 BLAKE2B 0121b4e6a949ad1dd447560052479de8a62248098ffd6397d49b94c33e1a19d4a76c9ed63b3306cc6e484dd8efbd7434f52c2fbed741c976526d620c278fde98 SHA512 c3de0452a5a5d068f9c64d7ef1f7e390a3f870546a7ab2daec41d301c19f57d4a0e254fd45de4775455746312f48f3223b6ddbaa80159a0ff56cf707b9cc0945
 EBUILD thlnk-1.2.1-r1.ebuild 365 BLAKE2B b9dd0e53f81dc1f72e8afcfa7133a3315bb208f45ae58890524e63777a2485d42121e03f6da67b4d6fd1e7759a4b83e5b31784a3de298eeed842017a4761848e SHA512 40a590976e3be23ed082aef137ee1dc588a209ac2c7ffadbb74f42ead5e10c4d426c796db0381ab3b33bd95afe20351f2a49e174a09959b0fdb709d8867f6eae
-EBUILD thlnk-1.2.1-r2.ebuild 362 BLAKE2B 6f3072f53988c7709af9a2df0f43fd3111e397852238a98070f1b5c455514199aea22609acece46a4b74a8937481f2fdcb55fb52f00ba819cac25037916c478b SHA512 3e606c6e438aa55dc8480cb9d2d1df8f65066b222c30006c67aec15c2ca1aae98480e028bec96673b0107a1eeb89550e7f9d7a5ae7583e49f2f2217ac8beba3b
+EBUILD thlnk-1.2.1-r2.ebuild 359 BLAKE2B 0a500eef22c12d3ff2cf924f160cb70af43614f07f3c58faf03c46d35e498c5613d97d994d996f9a5c68d81ee70a17cc3fc551df4896cea9b6af3d0d5e5ad13d SHA512 c4c6185e5a22bc956d46d9443939682dd63950b9d6d04419aa83c2b2e7d73a9e3bec23bb88ab324e27e971ff76b40a7938cfa57ee8675c2e655416dd30586f50
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/thlnk/thlnk-1.2.1-r2.ebuild b/app-vim/thlnk/thlnk-1.2.1-r2.ebuild
index 258496c59aa3..13e9c7f4b1d5 100644
--- a/app-vim/thlnk/thlnk-1.2.1-r2.ebuild
+++ b/app-vim/thlnk/thlnk-1.2.1-r2.ebuild
@@ -9,6 +9,6 @@ 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"
 
 VIM_PLUGIN_HELPFILES="thlnk thlnk-reference-manual"
diff --git a/app-vim/tmpl/Manifest b/app-vim/tmpl/Manifest
index ddf83d3df1e8..9ce746b6082c 100644
--- a/app-vim/tmpl/Manifest
+++ b/app-vim/tmpl/Manifest
@@ -1,4 +1,4 @@
 DIST tmpl-0.1.tar.bz2 1165 BLAKE2B f7b5d2d79fdefe9c46c544fb9d98e0b76586d05a43ac49947278dfd43b8c9dc19eda0876b3c9f4e8e8a068cc89e011ec2ee5fe4afee142a759d8b33822dbae76 SHA512 c50d15be556224544ae99bb1a4ec78fca6d0cc4c1df11c4ef5302ce851b8f92baca04e498774cd1352ca3f1a8789498e7f47bb371828da13a7703a2f654ab51c
 EBUILD tmpl-0.1-r1.ebuild 403 BLAKE2B d72ee821c4125d9bc408ddfa24be21f30ea2c630d6dfc8f96b283fcd213bbb624dd737c02044b20beebb95512a9b433cf3e4d7d958363a738920c818bcc7011f SHA512 9f1706793ea8ff522b75e42b21ab0c129b612648b7516a5c3e6a09513c0ff23a3dea89f29cee5bca59a607e379c51d47ab048a113020db91a10885a06192e0d6
-EBUILD tmpl-0.1-r2.ebuild 400 BLAKE2B 218195940ccfba0ec846343b2bdaf52b6db9e47be4d0a79dc7ade8c0af497406c6f5093c3bc2f63b77cdfa546d6a82c74d3167db9b588bfcd6531bcb6bdb15ca SHA512 ef54c47dd018d9f5095d8758769b46045c0ca8608483eaf396aca1067b8186009f8ad538736e83b00fd9ff933d58d0005176ff8892236b17841a2957d3e01f1d
+EBUILD tmpl-0.1-r2.ebuild 396 BLAKE2B 0575afef13b0c1de71a126f079a2f8f87a436d1aa6dca81dcfce757e9b9abdbc29e3a4146d8246bbeb2b95187a901a831609dc5c45ad37b5b2621e94b769c9fa SHA512 6ee3637e5b3a0734beeba46e589b114c3086ac99216ca85d2bf74e43fadb6ca18d2f49d8f7a7e5c80ca6bd7a81ad4428bba9d0faaf2729a07a9ebb85a17cb8d8
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/tmpl/tmpl-0.1-r2.ebuild b/app-vim/tmpl/tmpl-0.1-r2.ebuild
index 4a613dbd5bb0..6eb9f33d60cf 100644
--- a/app-vim/tmpl/tmpl-0.1-r2.ebuild
+++ b/app-vim/tmpl/tmpl-0.1-r2.ebuild
@@ -9,6 +9,6 @@ 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"
 
 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 5837d039a04a..c6d9ac399124 100644
--- a/app-vim/toggle/Manifest
+++ b/app-vim/toggle/Manifest
@@ -1,4 +1,4 @@
 DIST toggle-0.5.tar.bz2 2790 BLAKE2B 365bffd541cfb40c7fea59049a4b7ef0caf0ef105a5ab382e740f3400b399715227d2d5433875583dfb31ac847c0a90d5436e6ef2aa1f8327eebc868484146c6 SHA512 bac60e8e09cb3d82ba1569c333174fa58596fcd009181a56feabeeba4590942805a14cf08c3ff3dc7920e8481d14b3bb659bb85ad1c8bd85ca66a5d491dae05c
 EBUILD toggle-0.5-r1.ebuild 443 BLAKE2B 53e645f0c331423c907b4c24a1f10d7a51635abdb46ef7d191183dee824945374396fd1283117e03d4c86bed8a6ab16cc0637dfeb452a337b55fb119a65101c7 SHA512 106f10470443088f75c959c5f30c9767223260972c74fa148e92f80233f991a9537f39a6b71a3ace0c9b5cc097d550b563b02929c6d98d331b9a861a72a70cf2
-EBUILD toggle-0.5-r2.ebuild 440 BLAKE2B aafafa04c9d2b785552a43656c9ae80ffa2cb021db49ac1db3fc632589ffb27d7d389b199449581568ddc87d53dc78ff6707559076fc28b59fe7c673e8dfa93c SHA512 299342dc10782021dcaa90e8d6e907f7598ff80eca33dfecd307465b4865d10ed022d0bad10a10adfe51abadd767b8e37f513039f72690ceab23dc63576d030e
+EBUILD toggle-0.5-r2.ebuild 437 BLAKE2B 901392a19d818ba1d30a6a4ccd93c0b65d255e226f8364f4d339c67737ebbb013418a0ce0e3f8d5a9300fe8ce18d53c110829c8482d92940c1f71ce0481bbee2 SHA512 28bfa13ef5630daa92d78bbc34a3141ba112433b4d32318689659cfac7e892a481c13644dfc32ab4c6f752b3fee654ae613072d17d0aa62347ad54d4d3515a03
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/toggle/toggle-0.5-r2.ebuild b/app-vim/toggle/toggle-0.5-r2.ebuild
index d907ae933d66..f8152b0b9098 100644
--- a/app-vim/toggle/toggle-0.5-r2.ebuild
+++ b/app-vim/toggle/toggle-0.5-r2.ebuild
@@ -9,7 +9,7 @@ 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"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin will toggle true/false, on/off, yes/no and so on when <C-T>
diff --git a/app-vim/tt2-syntax/Manifest b/app-vim/tt2-syntax/Manifest
index d72ed1952b20..6a850ab51224 100644
--- a/app-vim/tt2-syntax/Manifest
+++ b/app-vim/tt2-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST tt2-syntax-1.13.tar.bz2 2991 BLAKE2B 07efcef9b28b8c44ff55d970dec2a9bff73c6e67adc3f03e6c09beca5552599b87150af08f82211f48ff79fb595f5324c60d1917a5f0378e769643b80c19b503 SHA512 0e7f5ca2b5dd53598778bb85a76fbb8be52ce789221342cb5ab51a5084c7d679b8b2f5cee4f8f05db9648a5828471eeba3d0367959f09d280d9c098a9c21e52e
 EBUILD tt2-syntax-1.13-r1.ebuild 511 BLAKE2B 223e07f8e7b67231a0a52daa06cb97c315b72be95cb70ac75f3bfde5580ad85df423172f9d9ce701033be4f2d8930629f329cdafb031c4e9d28eca26033731e6 SHA512 1433134b22a0af4bf081c3bf0690a2e394d02d854cadbdfb483f5c331aa6b99618f849e0b7d75823ab9cf06bd293b531c44bfecb85ba7d8be8c63126dac46c34
-EBUILD tt2-syntax-1.13-r2.ebuild 510 BLAKE2B 95339cf6110b5af71279a36bf8bb06096708894ebc21fcaf36dcfb9c4c6a5d991406f950d5c92a021023b47741951fab7f042ab6579ffd5f1c142ff755ceb078 SHA512 c773318240f652ae7400cc79e722bdcf19739bb6f3071de5adfafc355ecbee8c309d5f1aa2e74b32644d61841d79aac4e07300964e9c1b0a6ae6ea9bf5562a85
+EBUILD tt2-syntax-1.13-r2.ebuild 505 BLAKE2B 5f7d42f80267f60473628ceac54f1395591b657b859d2131c973468ade80240844d673cf1648a33a36ca39c20f627aed52e564b72e7e99ef2679823286260cbd SHA512 3efefd8734418dcf408ad76fa0361882efe0e6e950b454e7db7413e03ae7120a9ea6625aacf7f24ae67758d50925a885515a91f6a49634286e023546cd5d8ce9
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild
index 3f10fe35797f..1ab096367300 100644
--- a/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=830"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for perl module Template-Toolkit"
diff --git a/app-vim/udev-syntax/Manifest b/app-vim/udev-syntax/Manifest
index 51c4238db0df..2f7c7eb908c4 100644
--- a/app-vim/udev-syntax/Manifest
+++ b/app-vim/udev-syntax/Manifest
@@ -1,5 +1,5 @@
 AUX udev-syntax-20051016-ftdetect.patch 371 BLAKE2B aeeba09718dd8292ff9a7c8092597eacf422bd49c703e526158c1130e436fe6c342e08cd4c974e762ba8b1dba45166437831806e7c889d5656b7ab6d78b382ef SHA512 41369f811f4ce28f182ac61c3113f38248aee839a9d52ee6ba83a48d3689873b9afe69bc938d2c40c06d2fa94b72c2e904a4b338dc24d6131492eb05192395cd
 DIST udev-syntax-20051016.tar.bz2 1161 BLAKE2B c8274fbe552bdf54f5d241b270512df8d95f43ccd4da2e9c794d7470e77d5399dc35ba396b2beddf752e656cd889107fa10d792be11c4dccba0adea4f8418727 SHA512 3952cddd2598eb4e09fd6bc7538419c9dbb3eb94d55a81418fc66b5c3fb46f34853d4b97a5475f3330b752d4dbdd3bcf22a3f47c73d1d3e18b5efcc2b4696e34
 EBUILD udev-syntax-20051016-r2.ebuild 565 BLAKE2B ad3bd36adc6b52cdf45675b9c79dc37b6ae1f7548f7d0d11440c1c2aa0b0ed1e607185fecbb7f2971012d95a959051286a893ae450c6dd15ab27ce0fe4ecf968 SHA512 53ede205780703bd3ee80f174cc6d0cc7f355ee1c4c658326e66088067705e7bdedeb69e2e92fe5efaf66afc9f1babfb00416a8bd6b3d24e5c7b6b985ae9d8af
-EBUILD udev-syntax-20051016-r3.ebuild 570 BLAKE2B b1d69d7ed26109fb0357977f8c8152a70b3d7933f2ba2a5dc36c181adc1ddcb599388bcf7bf41ec8907f4a47f1029c327d6b3a59bda117368e1496f0ef4a3e54 SHA512 ceac2d7b3c19461acd899c5b5c9aabcf2d24da907ae70c029bca609fe29d7770fa3a8676e5c4992a257a736f05fddaca3e31655013301d79e3344abdb926f999
+EBUILD udev-syntax-20051016-r3.ebuild 566 BLAKE2B e2380864b50b26ba2219f8828d1c8b3f8dca19e99d00159ef5a1225d3c600c232938e26936372de7a07c909e52b76566765e91d98b4a928e3e473d9a74f3ca9f SHA512 22d5077e0112e94764e849f19b425ff6bdcc9f39e8a240f407402137e45cb496dacfa148d961de64b72ecc0c5b636ce649a64f98f98143b6b26dd5f9bdf6dda2
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/udev-syntax/udev-syntax-20051016-r3.ebuild b/app-vim/udev-syntax/udev-syntax-20051016-r3.ebuild
index 392ff5a1d0f8..560e4b9f6df3 100644
--- a/app-vim/udev-syntax/udev-syntax-20051016-r3.ebuild
+++ b/app-vim/udev-syntax/udev-syntax-20051016-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: syntax highlighting for udev rules files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1381"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for udev.rules files. These files
diff --git a/app-vim/undotree/Manifest b/app-vim/undotree/Manifest
index 18dfb1667e22..cd0315866c11 100644
--- a/app-vim/undotree/Manifest
+++ b/app-vim/undotree/Manifest
@@ -1,5 +1,5 @@
 DIST undotree-6.0.tar.gz 16288 BLAKE2B 38e7d185f0c2d9dd139c0c9b49593e1f6d14f7eab81b984c641b9d6917888510cda6a03d3030e051e257fde72f86d5dddbf65a8b29e4cd68323e9b976281f9ee SHA512 2654206adc8e4f021d5f2f3927ab5cb218e333a34fa5121e5ad48bf9b26e8d15c6b58cf88988407a587fb60cf406a4ed766fc4388672e93d4fceddc8712c4c49
 DIST undotree-6.1.tar.gz 18489 BLAKE2B 4570dbfd8f4f03e51bfb59587872993fed01d7e572dc517255c663ddfb3df8be04a5a7232175998889fea032faaf47f7eb6a9be6bbc46d1e644be1370ae54da5 SHA512 ed2831fee148b6a0cb78ea528db9b6a217da67fb74d95e00034671ecd7d0bef397077a7e96c29697d372a2bd1d0a6865e210cece57c4cccd97a0cf3e0b486ec2
 EBUILD undotree-6.0.ebuild 426 BLAKE2B 3d21aacddc751d54a9364240461fbb89ef6dc75aaec4fb4bab469f4569b200a1e0db3ba4ac86bfdf70703ceb72a231ad2339beef0548259f64355316e831e485 SHA512 ec70c0a62068b92bcd0e68a651967474ae609984e934fea98d610b7a7efba5b9714ca4a0aaedad324b243f9291457fd8265f3e464a56f7e410f6260136b86d40
-EBUILD undotree-6.1.ebuild 431 BLAKE2B f7f33a04113dca5fbe611e3d19180857ccf7af79385772a6222b8b4dfe95a7a7686e1ddd52936d8f2c36ac05a38ef4cb35880381cee020f46f1c945eec1454b5 SHA512 10e95b93a531a96910c4e09d7997a5a2fac8eba13978d2016a7057666c09d7f60c13904b963b16325b490cac9878a8d110a79622f34eacc4bae3fb9dd7cb5e8e
+EBUILD undotree-6.1.ebuild 429 BLAKE2B f7d644c910de9001c9605b5d225ae86a60b15aa4981986c02fff09c34d100ef4668f6b4699cc71242d1cb02971680343f15e5f8f2aa64f4465427d7d1b7262a3 SHA512 d7a9bc425f807ce942822321a2df4a4520129aacf7218f678e093db2ca2b49198ca7dc560a8df8b38907bd924d8490761428ec2662a5b43a5c650e8f47de883c
 MISC metadata.xml 340 BLAKE2B 35772d489b713635ad37ec4c81848f4f1b00610ab8ee4bd09bf0d52b99ced98067680d5675b34f599623a47516274df94bbfbfd422ea807d4a403834d3b3362d SHA512 2af43c1d140bd31c542e34071b99c2e4101135b957804400bacec05db48f7fb70d92c06e415cc734c384b4b36d1b3c2345137bccaf2a7958dd68083bb7657701
diff --git a/app-vim/undotree/undotree-6.1.ebuild b/app-vim/undotree/undotree-6.1.ebuild
index 15a7431dc300..4dce1b65976a 100644
--- a/app-vim/undotree/undotree-6.1.ebuild
+++ b/app-vim/undotree/undotree-6.1.ebuild
@@ -11,4 +11,4 @@ HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177
 SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/app-vim/unite/Manifest b/app-vim/unite/Manifest
index 1073c17188ef..f72fed4bcfe2 100644
--- a/app-vim/unite/Manifest
+++ b/app-vim/unite/Manifest
@@ -1,4 +1,4 @@
 DIST unite-4.1.tar.bz2 85622 BLAKE2B 58f4d4ac86fcf588ab0e3ecdb45dd67d0c16c67be2f6daff21f9d4451b94c9094671f4248cc6f4b39e5a292418908536cb222288dd344d56f9b98b09f5263eb3 SHA512 1fb19cfaf1b49843c79e2b9ff8e318b950dc1b65144f83a76776963a598e666f3094dc7f65f2708d7e074f8197121cee77e028a07c5735998f73f2d52d08c9ca
-EBUILD unite-4.1-r1.ebuild 348 BLAKE2B adde5b9c283d90026d7b45e9763006de4e52d93a96e10d2931f87f302c5a8ce164ffc0a7dc902d2ad1027f8e062c89866433df5fe5e112c60b26e7efbf093c9e SHA512 7f0a0094a7100c35056f891abb3d101bcdc02248a53274c798e19fcc8cfffc32f96e7cc896ddafb36ad5232ac3efccc8dbb2be93f5142699da2e99780cfb5a22
+EBUILD unite-4.1-r1.ebuild 346 BLAKE2B a5b63e9138b0e1faae3ca182582b1f4272ac5f7b91bd3d067d0cbb966d0b068ccbec9911f5d518d87bc31a7cbb5240592df260437656f5badd0b2cecabe06b85 SHA512 feb4955d2ac9512b017e9f3defe8e136ea708e8ff6d76d95533fcf172ff63e60193d25c27d67344aced2e7712ecc1230d71486b71b3e03d5ef5daf53b146bacc
 EBUILD unite-4.1.ebuild 345 BLAKE2B 91e98d5b33d7dc474054542493920035148a364e298466224d8ead6da20e649a646d13c78afbf1f8bfb3166260db64cbe27db97f4921ec8e00a7411529ec5b15 SHA512 3cba959a0f7e565f0cf1c246aaa8d1349c474c9cc306c5965fc0ea514705276f68ab5b827b4ea5f7a1ede097ba83bd240ca8792e35bcef35cbc8b5f3e3f51e25
 MISC metadata.xml 670 BLAKE2B 49e44cd5459e80ef088874b9ed62b81705c381b9ad4e7fb9e0f31b607ab1b26ab6bb92c46cf365d37d78e2fe776700a3b2cb13515053ad5e65453a8cd2ef82e4 SHA512 a40bc0a6f5614994c0594221a7cbd3723a0cc136b114a7a7e6ebc6254b0aad35584c3eb8f14a00e84d477c2c22b2536223cd9ddabe20e8d5e90900c516449275
diff --git a/app-vim/unite/unite-4.1-r1.ebuild b/app-vim/unite/unite-4.1-r1.ebuild
index 4cc8c13450b8..8cd4af59c93c 100644
--- a/app-vim/unite/unite-4.1-r1.ebuild
+++ b/app-vim/unite/unite-4.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: unite all sources"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3396"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/uptime/Manifest b/app-vim/uptime/Manifest
index 26cab8df66d5..1ca1706caaea 100644
--- a/app-vim/uptime/Manifest
+++ b/app-vim/uptime/Manifest
@@ -1,4 +1,4 @@
 DIST uptime-1.3.tar.bz2 2315 BLAKE2B d0237ff2b22820de85d4f0e4e7a85bff082cfe24af61b00b523a2df6db0bb22943303bf2ed09796f50ba7a49a16cce6d06b3ff06cc26cc8a7d4802693412bcf9 SHA512 42291261eb9f7246b68c32bef08599f604a5e1186eccff0b4ea118bb336e79a5c84cfbc2a834d5e50db3c2341c95c05f2961589efc3e459d3c6dac5f5baf50e4
 EBUILD uptime-1.3-r1.ebuild 346 BLAKE2B fa0b2a1798f5c8834050c2f55eec60cf868f2cf7ccd1637e307478625094d117d5b0b3de0d2e0a998cdf0145cefe363961db58b58ca1b8b9ba0fccf3daa66e50 SHA512 7e66009e6bd16afda2405c95ca05635ba9fefb73d7a60371110c693b694f69f25e0ddc5a5a825aa063921573ef4f67623c40b88f19ef764209338c7ff86779ba
-EBUILD uptime-1.3-r2.ebuild 343 BLAKE2B e595f36bfc44221cd38366328e2faf100c88293b3c0e6546420d982b396a4e8b9739a0442d1598c51ba6cd7a025e94ef255602be32e1241ff7ed25889a9ce350 SHA512 afda238766faac4d4a6efa59d2fca09a6c14a907e7656321dfc7d3f2a80a74fb87c538876aa6a4a7aef4c12c4350027bdbb322366a00040b115ac6692c64020b
+EBUILD uptime-1.3-r2.ebuild 340 BLAKE2B 193f30342fc531c6962fd2876405d24b2af5da0b06636fec915d9ffc01b12d9e6626036d584efe5cc987fe530a30d3bea803608b9a9600b69d0285b1be026c1a SHA512 9942779159b7cc62c997e4c96851e513e88b52e704fd46312fbdac8250e3ad5ce5c5c2af2dcee7784baa164d155f6f5463943dbfc4d3e6356c09b32eb8072952
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/uptime/uptime-1.3-r2.ebuild b/app-vim/uptime/uptime-1.3-r2.ebuild
index 790476e3b0c7..7e193d8588a7 100644
--- a/app-vim/uptime/uptime-1.3-r2.ebuild
+++ b/app-vim/uptime/uptime-1.3-r2.ebuild
@@ -9,6 +9,6 @@ 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"
 
 VIM_PLUGIN_HELPFILES="uptime"
diff --git a/app-vim/vim-autoclose/Manifest b/app-vim/vim-autoclose/Manifest
index fb0cbf4bb4a7..f18af1f32465 100644
--- a/app-vim/vim-autoclose/Manifest
+++ b/app-vim/vim-autoclose/Manifest
@@ -1,4 +1,4 @@
 DIST vim-autoclose-2.0.tar.gz 35779 BLAKE2B bf1536b3cdeecfc261ee30687d53ac2dd7632e21e877a67a99aa21e1d9e4389e3d1d3de764c76d94a8d97fa2bad1c7877276a5defa6b2ca137f1a8e866e902b0 SHA512 2604c2c16f25eb60bf660ba4f80d40d9aa51af38cc59a2727f0c705ba2abe5302a58dc60a71c791cc6aa002477587d1dadcc8a9269a93c5a9405a86251f4fcd9
-EBUILD vim-autoclose-2.0-r1.ebuild 422 BLAKE2B 34ed5f384bba9c9c5579cb57ae402ce2e7271e0c609024a1301c795bd336cef0c6879930dfc32f32ddda58b7e5955bcf51bcac6b2083c536ff81ad9bbd5a2762 SHA512 e4371d198832d89f1a2ffb205339767e82f8d6d2e097ad0c935583266a901e7cc5b471e22e3595130b753768ccbb2be82893d7a360a51a4a7b21197c49a5c3fd
+EBUILD vim-autoclose-2.0-r1.ebuild 420 BLAKE2B ae42a9e982f5a4f395cadc6eb070f2b0f8dd1b8845760b714e80348c380f265f07a1f4bc5b38b24f2142027bc4ed030488a8bcbc2220240861db0e1d5224784d SHA512 0a770a790b3585dda831c222e611c7eb3ab4d499d64fd7059cac82e16446f137e292ba8a3bce1f300a9726e5d97c40506e146e1a83534ac1249b5643e2d8f27b
 EBUILD vim-autoclose-2.0.ebuild 422 BLAKE2B b85ef4d43f1b22764ee2f4f5bcabfe005ef735ddeac66525efbd67718ff115b336cd2e590a7f094916a1cf6a7550a45f54ad6e1c7518a3a55e827595ebed7bdb SHA512 eae60fbbf7b3af4dddb73ba0169005a7d9222a6fe8040cd2046e99f9172d44d23a5df4a9dc7e0e2e55048b9ccf8c11df71e0647555b37d14d10333a871e8e3e6
 MISC metadata.xml 446 BLAKE2B 143d89603e02e51fdff64833b1ec062d711fe6be8cd08f835e6ccb4034724fae782bf399de8ea71f201b352f16511277b2e0ffbb3933fb50415e6ffd3ab1fba4 SHA512 11a452914fa674b91c16555a8dc41ec3b7563e0b18fb5f960249683cf72433deb7d1eb2cd6a1677b6631b7a26abbb8659569e160838b87e85a78bd6c94c502a7
diff --git a/app-vim/vim-autoclose/vim-autoclose-2.0-r1.ebuild b/app-vim/vim-autoclose/vim-autoclose-2.0-r1.ebuild
index 256532012217..a23b8b1e9756 100644
--- a/app-vim/vim-autoclose/vim-autoclose-2.0-r1.ebuild
+++ b/app-vim/vim-autoclose/vim-autoclose-2.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Townk/vim-autoclose"
 SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( README.txt AUTHORS.txt )
 
diff --git a/app-vim/vimbuddy/Manifest b/app-vim/vimbuddy/Manifest
index 06bcd4aea2a8..6b72baf5cbf1 100644
--- a/app-vim/vimbuddy/Manifest
+++ b/app-vim/vimbuddy/Manifest
@@ -1,4 +1,4 @@
 DIST vimbuddy-0.9.2.tar.gz 1152 BLAKE2B cc7ea6fcffa05bacbcbcab2850486c648cc9dd4fe2d7896865ef17acef6c9cf8b05ee33a14fd212b156b4ee9c4c04a8abb764c320a74b0cfead545f1ab3f9636 SHA512 feca2b303e677cdc0ed1a02e92c54ae293ccd380006667ea49c93ea804975bf8c40044c11e2599ad3e81062a453465249120fc7daaf2eea994d8d81d3d2f87cb
 EBUILD vimbuddy-0.9.2-r1.ebuild 515 BLAKE2B a48fbfccc37773c3db406389d9ea454f1dbc53496802894e1e7908a95565f85a6737dfb4e916a9eb8585b85357a492fbffd420f7831eb0a4f2d95dc593ddd048 SHA512 2fa54fd67a50f4b6ff51a4759163e867b89eaf5276af5990f4dad333d789b178c1c52b555dcce10000bb835179b0d7f32addecf38b2ab591ebb0702f02903244
-EBUILD vimbuddy-0.9.2-r2.ebuild 518 BLAKE2B 318e8f2443bea8896a823b3679dfa5d9e6edd95d7100b9f3bf24ca641820d91244b3eaa55388ce2d07ff9e06fea753ab69d557dace47130deba1c244c64abb0e SHA512 f431ed61fc0aee1e58427d701a1c4fae2ec6df41c85309d90db21853c28a609768cc3bf464ded979fe2e1b0d585fb8e64f9a291936a0f5b9f776856dc89cb502
+EBUILD vimbuddy-0.9.2-r2.ebuild 515 BLAKE2B 2e742af9aade036635d87388b9247a1ea6c35893f4dbc886445b3cece4dcbf6299a735bc340443dd820c5e53065488da948955dd3ca50f9f06b0111e65fc068e SHA512 2862755406ca557174feba39f94d96a3242e4d6d06af3aa75cdf9f194d683bb15115fad0158eb516502a14701e1c87d1aa2be9020ed12ca643f19f412a5466e1
 MISC metadata.xml 339 BLAKE2B fd18d17a5ab124cf6df3c4602a7b28834f910085ddb085e4a5dfd39bdd7c003d23fc4573478ef0cd5e49492897bf5335c53386c07f658c77fd041b8f7310af82 SHA512 1a7df9c0cf01eeee768e6fd1745824b7982cf9e559a5dd6e6e480167b801276ad81434a2374574f601a32e6ec733caa79e4653c3d1619321343ecabf55bcaafc
diff --git a/app-vim/vimbuddy/vimbuddy-0.9.2-r2.ebuild b/app-vim/vimbuddy/vimbuddy-0.9.2-r2.ebuild
index c1cc4e08520b..53f6e9d4535a 100644
--- a/app-vim/vimbuddy/vimbuddy-0.9.2-r2.ebuild
+++ b/app-vim/vimbuddy/vimbuddy-0.9.2-r2.ebuild
@@ -11,6 +11,6 @@ SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.t
 S="${WORKDIR}/${PN}.vim-${PV}"
 
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc x86"
 
 VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=8"
diff --git a/app-vim/webapi/Manifest b/app-vim/webapi/Manifest
index 5d30e5ddf0a4..2bf3808eae58 100644
--- a/app-vim/webapi/Manifest
+++ b/app-vim/webapi/Manifest
@@ -1,4 +1,4 @@
 DIST webapi-0.3.tar.gz 26388 BLAKE2B 878e9f760f9940b81647359fb8779d6386b4bd2d2190c77f2ef886a12a6d293f6f0e5829e05fe98e0c842cb927186f9e4a02dcddcdfe99d5e13d52ae43e7f775 SHA512 215516872a32f8d967a9bff6d13916d6571399184728c422babf486152fc4c3f57aa4a7fa7591d7205d4b2dd99138c36796d1f2d186d494d74cf5dd2fa7cdec8
-EBUILD webapi-0.3-r1.ebuild 436 BLAKE2B 5044d90830238ac22d6a34925caa07c2922c8e79b10e2075569e3261a2da0b2b3cfe58793eb4f33db0082c4329f10097f5c36c166171612c136dc0186f08bf39 SHA512 a5970288d3a2bf2b053951245341d55b09cffcf7743bc5db0e9d8cc8d1a6e0a5fe0cafdab67fc3ace6d32b535eda55a5b89a6379c62d9ea3280fe56d30677971
+EBUILD webapi-0.3-r1.ebuild 434 BLAKE2B a8c50370163b0bf6ae11bc54cc20f6b64c4c1fa6070f214ba19c2d110ed7311c7d2017ac53ec183d938d013e9c793bdffd8a554eccc392702fd47c5966b4c226 SHA512 ec37fcd7d0a6226116c268d017a584375f7e6eaeec31fe034fecfcb99eb0e09419b68e68909fc09f2976b9b521fe89d85a08bba0a969a4f7928d1c3a236ef1fe
 EBUILD webapi-0.3.ebuild 434 BLAKE2B a41c1ad0d3d1190a499ec3b172cdff0b1fcad3bc22c3c30efbbc97453a912d0738de1bcff74b2e44dd9f1c9628dbb235dc0d3ebb0b2ed5727bbe08106c17c5e5 SHA512 6f873f3fb085fdbebdc0bca0448f30d24097b328dc84b973b28c21c3e4929c375e2b022b65994acb4905f02f60fcfb8f48d83b29d6dc6581fa83cf91f297e612
 MISC metadata.xml 246 BLAKE2B 410fd0eb2d2b412bb4ca13905fea3351e818dbeed07d7063df2ebfe9000dd45ba7ac827a33c8961913ac567db7caa61646229e43b527edbd704795cc09ba3c94 SHA512 2c66e46cc1cc61356d6784064205b832cd2854c3dbfb6dc79ba55b968d1886e2063a7bdb4b2541651e4f289c09bd344cd4eb7d48b2bda67c955b09f142b63c55
diff --git a/app-vim/webapi/webapi-0.3-r1.ebuild b/app-vim/webapi/webapi-0.3-r1.ebuild
index 83e5160ae527..67052a4b99f6 100644
--- a/app-vim/webapi/webapi-0.3-r1.ebuild
+++ b/app-vim/webapi/webapi-0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mattn/${PN}-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-vim-${PV}"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 
 RDEPEND="net-misc/curl"
 
diff --git a/app-vim/wikipedia-syntax/Manifest b/app-vim/wikipedia-syntax/Manifest
index 48590ba5dba5..5683d01e61fa 100644
--- a/app-vim/wikipedia-syntax/Manifest
+++ b/app-vim/wikipedia-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST wikipedia-syntax-20101113.tar.bz2 3463 BLAKE2B ee37c972eaf884e6c5130356638c7309481f4e37b7c08056770d9600e35ef67b1480fd0b8f4eb68a10df9caf8f4152e325d501d752e799eb5b43de8f5b012ce4 SHA512 e0e52d4cf6e6e5a3f6cb32b0dc22c91c6b3b58292f1e0d67cb4de4ed2675d7f6bbb069d37e6a59b0cfad201c082322e3cb5300639e39447bbcda22d99c88b4b4
 EBUILD wikipedia-syntax-20101113-r1.ebuild 500 BLAKE2B 9679b5ab081ec14e73f67d2768de12273fa00bf0f1f6c78dab3460907ce0219ae3d3c22f72fe993f8758051bb140dc67a4dfcf9e70dcceb79c6bda79ce777c95 SHA512 390b1a88860f5c548060a080d3006e31afffabf6571e8c8a9dca11d68d54c097484daed7be109d0fd2a91fd149751e112a0258e017a157cfdbd51ffe12122e91
-EBUILD wikipedia-syntax-20101113-r2.ebuild 497 BLAKE2B 7afdd33d62a405e1c4a081bfe9629c693a30f0761b4e17075f993a16e472449461943f8a4509ec3b62e24da393ca77dab036fe0c86a57a01ba709a8e143ae7f3 SHA512 64322aa28ffe23816eca8393d1b92105162fd29523910dc6c24c3f65712d0dc1c31e62140d950e60b94ddf423a0182f29022d7ab184f763eb105616078facd3a
+EBUILD wikipedia-syntax-20101113-r2.ebuild 494 BLAKE2B 9c0b61972e8ad8df818a6441bb54d3caa02b9d96998760ac55cd148266763d7a8e794e5e73f16aa9a9e346d37f8a38e8526e548505ab5e36e44aa7ce8926b83f SHA512 e90e690578d6e7a445276a2c4e7fef0ac60da56177e742c14a7992b8b3b8d216009e9de4d9bd4e2acaa333e884b67b47e90be95642b5ec8c9efd7d4a3c5ff383
 MISC metadata.xml 442 BLAKE2B 06dbacb19bd4ab9c07afde7ec0ab3d561620b915a2e9cb9fd28efd9d7e4c605d2597889a8710c44258c5753f3e3297865108a978eb2eaaa10d0eb9852af2187d SHA512 e7d614d001f41434d8cd12109c72f8a32067efd23bf462b0d635b9e3f0e5aed13b1ca9be65c109f137b85ac71a66ef5bad494123e2b265dc8311ca93bdde0a78
diff --git a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r2.ebuild b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r2.ebuild
index 6465867f2187..2ce3c269f832 100644
--- a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r2.ebuild
+++ b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
 HOMEPAGE="https://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
 
 LICENSE="CC-BY-SA-3.0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~mips ~ppc ppc64 x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for Wikipedia article
diff --git a/app-vim/xquery-syntax/Manifest b/app-vim/xquery-syntax/Manifest
index c96062ccf830..8452737675ee 100644
--- a/app-vim/xquery-syntax/Manifest
+++ b/app-vim/xquery-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST xquery-syntax-0.1.tar.bz2 1552 BLAKE2B e33f5359d3059c7558516939e2ce14c906f12fd4b7c5d035cdbadc9485e1fc992e50a2c38685d27ffae40dc7b22375c6825ae414131846ff0c19d68484750ad0 SHA512 277503e2d7089702c58b2e04a48345e579b6cfdee5042da90e8401b914c1d515c811cbf71f6dedbeee4a21e7a4807bd0d694323ddb2bd6b9437edaaba5a0f2fd
 EBUILD xquery-syntax-0.1-r2.ebuild 583 BLAKE2B 3500a35d9720521e83d4ea76924f4bb1e6e761687524e609bfd7cfe4211ddd93192177b8505c473a2596ae577b12a8e66e551644ad7b1eebc7f461b9d02add1e SHA512 0ae5642c93bde2f87120f34f098868e36a534dfadaa6bbc571106f5c4ecea2ec04379d1849ad80e663ba91925870017f622d2f9bfbb365d1ce9835820c742936
-EBUILD xquery-syntax-0.1-r3.ebuild 580 BLAKE2B 978465b3de1004305005dec5639afbfb569811943f26cfa6563e9d06f3d74440131498425df0b9dd3943110c710d6abd3671c277e83177eec4533dc61f15ebec SHA512 736d283f26afbce52eb794ca4c0294e43e02ad81c4f27a2a8a08f6479f36f37150a116e8f2ae7f12c20741d24fcd77d9ffccef817eae95f43e066dfa11bb5748
+EBUILD xquery-syntax-0.1-r3.ebuild 576 BLAKE2B 2347801c9e3f40d8ffe7268622d8722247a0fc4863b1f287f291d9b2dc66a123a1b89bfa091859fbb97c59214cb0569d0077164ba683292a468bd27bcfd95783 SHA512 7f9a729cb9abe74f362920b877656f441c3b2a95b789aecd30392b1f103b2055627d6b7afb6312a15cf310108ff1915a3cfcc1bd3e56006aa4a71a0b01b05cc5
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/xquery-syntax/xquery-syntax-0.1-r3.ebuild b/app-vim/xquery-syntax/xquery-syntax-0.1-r3.ebuild
index a1bc0756a5d8..900e1701e9cc 100644
--- a/app-vim/xquery-syntax/xquery-syntax-0.1-r3.ebuild
+++ b/app-vim/xquery-syntax/xquery-syntax-0.1-r3.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"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for XQuery files."
diff --git a/app-vim/xsl-syntax/Manifest b/app-vim/xsl-syntax/Manifest
index ace84f20d038..547986e3080d 100644
--- a/app-vim/xsl-syntax/Manifest
+++ b/app-vim/xsl-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST xsl-syntax-0.3.11.tar.bz2 5770 BLAKE2B d7d06bf7e2537c8c6c1419f557e4c29042a1af6dd31850c28feccbd342a1beb60dded565f48b715d021ebe3279e0d4a75daa3063e7e8347a1977f97947a0a92a SHA512 e09f0f6ebe023a681560a12e919c9573abc2bf0f1a6fe1bda233ca296fa4fa81bead99aeb7eafb387f04e199f7601d8ce6593c767be1b3e94ff73135ea0f4361
 EBUILD xsl-syntax-0.3.11-r2.ebuild 564 BLAKE2B b25dd8ec8b9b0bc662594c5dcbeb014066b50236151fd5848fd78923ecf5138d2e6b0db0ff3f53c770b113d66f45f0ffa8d9b234215d06e97899d6b5085ca3c2 SHA512 4a0a7a429ed815f1b3bba6147cc50b2c3915b8fce2a5d2a6fcc33573871115e597735439ba735c17314dab84d40a63596113cc8fb628ecadbf8ec1b295033e1e
-EBUILD xsl-syntax-0.3.11-r3.ebuild 563 BLAKE2B 7c09dbd0d00334473ac05145c28848da8334532d392d6a65c0bf8569d2f1d1d77d74ceaac7479b6b57c003e2d1000eea7f843d28780355fbf429a953223e3748 SHA512 fc2d8044d20f6d7c2e6e553610dfee9a948885938dfe66f3d39b8a17761a38ee8611d63ef991649c2ef5e131a4dace9b70778340fc863ddb02b508ab4a0f8187
+EBUILD xsl-syntax-0.3.11-r3.ebuild 558 BLAKE2B 8b00903d98ef52863c6c4ae3b8773b5efaef180e9c1d358b05ec29d81582556ac94dc97cdf339194e6609a0c7722d67978099a247bcdbe9c793f623fe0973a40 SHA512 024c973b2cd1d3632cc757117700b2c6a9f7edb195e78efb3f74e55d7b28c6c00f619d1db0e00e9fcfd19d9a19afa151f915a51e0e0500c227db9d785cc26b9f
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/xsl-syntax/xsl-syntax-0.3.11-r3.ebuild b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r3.ebuild
index fb380c5d310a..357f4a7e153d 100644
--- a/app-vim/xsl-syntax/xsl-syntax-0.3.11-r3.ebuild
+++ b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r3.ebuild
@@ -9,7 +9,7 @@ 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"
 
 VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=257"
 
diff --git a/app-vim/zenburn/Manifest b/app-vim/zenburn/Manifest
index 28ab21572085..8e3bf006b4f7 100644
--- a/app-vim/zenburn/Manifest
+++ b/app-vim/zenburn/Manifest
@@ -1,4 +1,4 @@
 DIST zenburn-2.25.tar.gz 7361 BLAKE2B 728930ddfeca46d7e020882fde92841a0ed9c889504686589a5028b1b373bc3b7c862d8fcc0740731738416057f4c99533e835594e8ce01029174d74f446bab3 SHA512 e3d222b66696ce24ff6ce8ccda201a15ee27d868581c311b8c31e7eeada4a2fe3ca395d53fc42245b1dfe4b68394cd22f23203dbd6366298adc7a9d6428af683
-EBUILD zenburn-2.25-r1.ebuild 432 BLAKE2B b630977ad5c98d98878673bba9538e5eed40c904d0ba6cf23f2b78bfce86ae26346770020b82165192135d1ac597452b41968e8fffe4a7b5f09385aaaa1174ed SHA512 e6a27eba08abe3d199c78ba537e4b03f4c5a2982217a496ea4c7ad2b44a522585ac8ddf30727d8b616e4b621568b582020c6a25e46dd7c7fd2dabc7186095531
+EBUILD zenburn-2.25-r1.ebuild 429 BLAKE2B 64bfb3a4c96d175394413fd8836f3d96cfb674683552b93545574c5f5dc6d1abb4ba824946c2b9b20662a28e9531de0c2b1beb34125d2be0c256ac50e7c61c1c SHA512 78c705f24af68ac0398a6c4327f3cf9dc09c6a04e374669d19d04dffe1cbb1fc2b711d091fac26d5f4453c3dca13c3bb78df522d3f7b21d0225fd6f7a07be872
 EBUILD zenburn-2.25.ebuild 417 BLAKE2B 1bf1b095ae48e66c7316dad62ae51e7389791a0996323c478038771298f688118ff4e6d5380cfa05dc60b510c8bda3bb8a108ca26fdce425b2c6c87fa1b1ec2b SHA512 b72d16822f01bd64b4802766861ba6cfe9ac637b06d52f5efba948483fc988502bd1c2d0125a0aa71f159f2a8e37dc7ff047131763c439c235d45cd768c18a2d
 MISC metadata.xml 426 BLAKE2B 28b2c848f25bee349d8989f99b78e02873af559f96bb06e186660e456ca4fdbec5be6418aa9be6b0830de1cecaf2d5048c08afc49d2b367ebab5ff2bffcbcf5f SHA512 ff1d80a03076e5faf82eb332be1d523f6d19c25e9f8999757b9849aecedee5b96b27ec40ff31080ea479e951bc4afcf6cfe62fb98ff818f89ab4f132093ec08e
diff --git a/app-vim/zenburn/zenburn-2.25-r1.ebuild b/app-vim/zenburn/zenburn-2.25-r1.ebuild
index 9d9803a96546..186658900124 100644
--- a/app-vim/zenburn/zenburn-2.25-r1.ebuild
+++ b/app-vim/zenburn/zenburn-2.25-r1.ebuild
@@ -14,4 +14,4 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
diff --git a/app-vim/zoomwin/Manifest b/app-vim/zoomwin/Manifest
index 55b28fb4b5c4..34ba1b3475a8 100644
--- a/app-vim/zoomwin/Manifest
+++ b/app-vim/zoomwin/Manifest
@@ -1,4 +1,4 @@
 DIST zoomwin-24.tar.bz2 7928 BLAKE2B fc841f859635c58738a52ed55fdea997eaaaa867984347a0977c0818a24517ad580bbc3386567304d5812e20fa0015fbf3cbc116b50b7a56f361d5140a25e8ab SHA512 fb20958813c1cd956c25f34c9355454b5003cf1a2d3582149c07ea3cdb4630a0407f2407f3a8f96abec37659e75facef13094d6d1ec2972b937dab8bdf9d61a9
 EBUILD zoomwin-24-r1.ebuild 346 BLAKE2B 4163e5bb5ac76ae94623fd53aaa00b75802abd2da09c5cc976dc753330347db55ff70237e907f0b6840bee1a79cf0b5ab499f4244161a8c08c6437f765ecb439 SHA512 2173e64673076fdfa5ddb3da50adf027ca21699214517b0b5606335fbe638f0a765f06efe920216f9d6aebed1f534f3b40e942ee1bc45eff9204e2d6905d6015
-EBUILD zoomwin-24-r2.ebuild 351 BLAKE2B 03fc141fb18f935c1520eace6112514ddf4a3bf54d4a0e36704f68919d54052261fafcbccae700ad5ee178b7e7c5f60664d4d593ab9fa9eb1d6cd525f931e319 SHA512 15efdebfc7d47e9d5e58fe92286361e91ee23c1eb10a0ac33eec223737289204bacc89ed7f5692d8b8ba60a35e46131e258d29c2165d9f6ff61ed0d6e87f088b
+EBUILD zoomwin-24-r2.ebuild 348 BLAKE2B 468e4b262c5d2068dec40d8ac7ce83f23761116321f01bdc1d9e621822f2289e42bb47a85d574359e24bc1287c1225967334832f2da629de78a5293d8548f1d8 SHA512 b9fa39979cfb6431f0d21e13d95ac61a70231d9316fcc7cdb3151448586c98871abf09718b0efd1501912dfd4d27ccc2b7dc8a119591ddcc08cf0a2230b3554c
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/zoomwin/zoomwin-24-r2.ebuild b/app-vim/zoomwin/zoomwin-24-r2.ebuild
index 174c3aa672cf..dcd3993f4052 100644
--- a/app-vim/zoomwin/zoomwin-24-r2.ebuild
+++ b/app-vim/zoomwin/zoomwin-24-r2.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: brief-style window zooming"
 HOMEPAGE="https://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"
author	V3n3RiX <venerix@koprulu.sector>	2023-12-09 23:17:55 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-12-09 23:17:55 +0000
commit	8fc08491f26431ec46b36d6ebef9551f3773b96f (patch)
tree	d1b5bd96d856b4ddb71d02628504d39fae5c168e /app-vim
parent	fd1ea0a53f74daa4fd860ac35a20ba1817fd20fa (diff)