gentoo resync : 13.10.2019

32 files changed, 32 insertions, 46 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index a588fac90b41..668b2b67ffa8 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/colorschemes/Manifest b/app-vim/colorschemes/Manifest
index 193630d60699..bb5f2d86939a 100644
--- a/app-vim/colorschemes/Manifest
+++ b/app-vim/colorschemes/Manifest
@@ -1,3 +1,3 @@
 DIST colorschemes-20140623.tar.bz2 683654 BLAKE2B 465c6dda4b45b847ac674d0116987723f68454a97b57471569d3d7333e64960a6ffac8a3bb4d157f2f9f87d0be9ea871871ec33de2e9e09fd67eed1ad8fa96b3 SHA512 523a1fcc5f179ede94887c844397bf507ba6432f7e8812794be3a2451f467370e0c2119000e138ca021f05eee4b3f43e34444916f3fed3eeb7749db459b502e3
-EBUILD colorschemes-20140623-r1.ebuild 854 BLAKE2B fce8820ca92c71ee2db582707f6186b1d69bb2b781580545096111c11749d183c7dcbba41e28448ade64f72ab82db2c572bd7ceb4896995898f6cfd0206a6939 SHA512 42d4e16e21c3c9b47a737831058e85a8ece8aeb6cc63bfc488ab11c1fe14dec6bb07930192a391b52db612b7ec7fed14d9de59c96cd6d271e50ffaae77dd3147
+EBUILD colorschemes-20140623-r1.ebuild 844 BLAKE2B f2ad9606ebb275e3d930a6b932cfc40f0c4d4b10f8dc24a9c4a4c878767784129558afc3a2caca350646618b36e7f96e673c16b68f9ccb0fbc6c4d9ddca93186 SHA512 70867b1bf8d396f701cb44fc941ef73e170854fca49fb4cbd645d70fb63613ec371015a3ce1f31e1be0e6d91ca773271a5f7efadca34a25419ccd5bdcbee3a77
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
index 29f54897ed03..7c04954fbc90 100644
--- a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
+++ b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
 HOMEPAGE="https://www.vim.org/"
 
 LICENSE="vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a collection of color schemes for vim. To switch
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index 067a96e6dea7..fa7c80613dd8 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,4 +1,4 @@
 AUX dhcpd-syntax-20030825-multiple-addresses.patch 588 BLAKE2B 1f38da00084f2e3c42ec7c851e0d4798782e7727f4677a289b0db9096d93bcd8fb2a28695c05f390727bca1c1f27ed7f4918472496e94e673009ca8ba40d9600 SHA512 9b6a22f50bb4402fbe63c7971b11a1b1d7dfec5976758897aebf14a8f0025c52daaed9e3c8668a93f5b2c7c61afde600040f6c64aeac62f2e0e9a6b01735a74a
 DIST dhcpd-syntax-20030825.tar.bz2 2761 BLAKE2B 95478de740c28a93e03179e576e2edf02a682a6161bccae676b379dbb5b654d0239c3f8e523925f2e6d36f949847f9ba7cefae20104196d71f42837afcaae76d SHA512 97c1706e0ab2c89ee20618ae0c854347f8674a3008a5c4414aacb78e984e35b0eb6eeb5f641363ed6601ceeac0c794577d518658db9200c7391871ffae5341bc
-EBUILD dhcpd-syntax-20030825-r1.ebuild 514 BLAKE2B 5d082b622cb6296b3ffe582121cd579776897fbfe408612e630ee25dc8675788b7b84485915ea417b05aa07f907fed47f6b554da6991846928cfd0d58bb82adf SHA512 6579a7d7537b8afd93b52766b0f079561a04b970bc8440e9291d808e9116f08b67c1f398fb28a0d17e33b7abc7580a64699cf4424ae4b029cbf75f6bee685669
+EBUILD dhcpd-syntax-20030825-r1.ebuild 492 BLAKE2B 72c9c1bcb39f96dbfce86f340777d633a995c7c48e310ef82c227315b3329e93a0c3c49407f3d69a72ed150a9b56f382630ad8e700fa10c44af07836d3884f5d SHA512 22fae6348c75418e624d8d379130f8eb1a4d05d6b6522c82bf3340fdfe226665bf9dc40854b6512ef273c1c19cf4d1ac80628f0218879329a9e5af878046d0a3
 MISC metadata.xml 451 BLAKE2B d8b36c756c321d18b52d77db7cfcd40b3ee3c9e8cdc282c090f6172f8b58b2639026650c317cbd2f4b1d575353a4b3cd22d80fbcea298d875fa5b737d69976b7 SHA512 cc138ac01df08624272da2daac14b2efd86fa8880e79b76de9fed6798fb5b8f6421fe608e2851af9c1afb7e6586f8d3f27865729960ce82ea76ac29f499e9e9a
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index 8a15c15ee645..0132957321bd 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
 
diff --git a/app-vim/eruby-syntax/Manifest b/app-vim/eruby-syntax/Manifest
index 18641f5d30f5..3bf986ea1b92 100644
--- a/app-vim/eruby-syntax/Manifest
+++ b/app-vim/eruby-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eruby-syntax-2.0.tar.bz2 958 BLAKE2B 467e1df5bf32ad83bb427bfde6755425a752051b1532397e75f627dc084cfb6bbeba99655366698f812bd398b171fec4110af0fba28de1900a0a22aaa08b01ec SHA512 1fdf1e6ad95109528b13b30d7504da2ea8678785b1a716c33bae0b94fafb8f23d50d81022b5bc373c1970f6d3df04f2e78d87fbb2067f0c270780963b472468c
-EBUILD eruby-syntax-2.0-r2.ebuild 518 BLAKE2B d9ff3803aeb6a1b192140b93549f5ea43dce871f6bc3fd585a7b3680419450f15f89e83ac0a91241980dd7c17353e5afb0fa774e84a66119891e8c24a007aa89 SHA512 da855d113283ce2466da482b8fd298b49d5424165bb580d02b005cb0695e25c66374c2e555418a25ae9fb537ac927b67dd0d63f3e855852d7a8e6514c73fca9f
+EBUILD eruby-syntax-2.0-r2.ebuild 508 BLAKE2B 94551c7ee56ba3e4929cdee9b2623a0975832032de9b4b5eac5f0e0e521682679b6904b350909f32bde89ff03c39082d342a910f53054e08f6bebbf0714a98bd SHA512 4421f93830a6f2cdab2f04f2df154db03dc36ba6376244d7f7a98b4fe597e61a31cb25a09141ea4a39b3ca181c71e22dd169176885810b244c39c8ebf1e2958d
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
index 7062ef9a855c..a2703de17a75 100644
--- a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: syntax highlighting for eruby"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=403"
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+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 715de68da124..159f1d1e0425 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
-EBUILD eselect-syntax-20070506-r1.ebuild 594 BLAKE2B e4a83fad8a9259b14a24a8d61bb32728ec824112a44d2507207df91dddb2b5b93a54c6d5f163a997a044a582f1ddebfaa84fadd38b53fdee08b7cf6208db45fa SHA512 6aec1fdaee59ab43af34480dfd1d06def05ca4f94c3ced5650a033d272881f078097b6a98c6b7264ddc85670586a7ef537529a92882b93fbf67ddf77ca91688c
+EBUILD eselect-syntax-20070506-r1.ebuild 572 BLAKE2B 11207a2a43e96c50d79ecddabd75508cadba0504c1b75aa6b1852dad32eb6e1895661455c2db7ac269af0bd09f958e36bd2bce1208df85645a3cc7c7208928d6 SHA512 758c2d297db99a7dba703c4601af11b3725c9d3ffdf042d2be7cbde8f953dbb82b05a652a780e7aa1093437097d4af62094550cb9852cff331669a48314bcf07
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
index 3201ac27935e..b51271c6fafe 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND="!<app-vim/gentoo-syntax-20070506"
 RDEPEND="${DEPEND}"
diff --git a/app-vim/ferret/Manifest b/app-vim/ferret/Manifest
index 4da8d4955880..eb3a3c2fa042 100644
--- a/app-vim/ferret/Manifest
+++ b/app-vim/ferret/Manifest
@@ -1,5 +1,5 @@
 DIST ferret-4.0.tar.gz 36867 BLAKE2B 0c386d5ad24fcd0662108e8e6005f94900c68099af0fedd181eb63d1c0f762ece02c0daf65dcbca1205b5c3c724ed73c523089da0b3db4f8c7f6d5aed737f113 SHA512 4d3e39a172a7ef26ddfd49e0582cb11f44851a486dd5ac298e54b9879966b5d09e2f9b0a76dfb5f30157035989ccc21269c3e5adbd5a4c8c7d0797bfe729eeb8
-DIST ferret-4.1.tar.gz 37793 BLAKE2B 09f53b552083c4632760064fdfa13ed241f3a3b58d366e8cd0baa32bbfed9163aa96e8d1bc0716de43f141ade75549fbf97d2c3f8e459f8f885411b19c6e9ac7 SHA512 936c62cc9e52ab3e73b1c4adbb2a8d58cb015866d8fcef23f89001255c0b57faaa0c16e129bc755ac5b129f00185e134434ddfe051fcb19f582cd4edc0715868
+DIST ferret-5.0.tar.gz 40975 BLAKE2B 75970b35852c5859ce53686eed9c8ba0d3d8599c9f53dc0a2a859dcdee8efd99fef298964db7cd9c2848180d87f45cb7e40a3352324b0530c5797647199a7f2f SHA512 882dc7d3baaa8a0e64244e8b7c3fef31088d4f89e49bf57dff85efc65f87fa6d3d8516ed3067dab4f4aa9857bb429e6f50d389d57a8895f6dab01db7e580867c
 EBUILD ferret-4.0.ebuild 489 BLAKE2B 33bdb03c5b9f8e000aa30f0179f5f6ccf06f3d0fbc14a9f4913e7b69c093a74867f6aeefb21801f8302a7f891c53fbb2c9a1da7751e1d3d48eab74b82057486e SHA512 d8c78b61b4491cadffeaded004d4cadf6c0ff967f981621d353b6ca542e9ce693484ea2488a4602b87b03d2d9f96e7261609b23cb881dda080b1ee761c9387a5
-EBUILD ferret-4.1.ebuild 491 BLAKE2B 483e7b37cbad16ab56a19b09561a3a02e6cb25d1f65e04103fff1835aac730088297c7c5069f9019c4de49ab348089a3500b30942609a81b1b65c6e2c510dda3 SHA512 78aea0281a52ad49c6a3385cc5cf715da727d121579d0a56238556723bc563e238593737ed9c2c4ee216d2dd1bd21d85f279fd1693d4fb9121708dcab408611f
+EBUILD ferret-5.0.ebuild 492 BLAKE2B 63f5b4e6dfc9d98118eaba141390806cff51640f4a224cf3623869a53308c0573585b5c7fdc495717bbf74924bc9d3edd21bba14a5e1333bfc7183a362993c1a SHA512 ad5f6c4c3789d57e7559106948a4286400ce28bb00f7537bd6fbc8a54c5e2f9b6eaa5ca8da21392826d8375c741164201837ae4eb7fe5fc394c33ac8e94ccec4
 MISC metadata.xml 440 BLAKE2B b0871983d30d46d6e350449f58f2c9b363349a3d6b564dd684e246b196e10d3539d61de4253761a3242d9eb560ada5f52b3f081c1b8c001daaf2f8959334bbbb SHA512 d7bd2e675190a561e1211895efc03cf373117842c56f6ce92a0f5e421f4a5cccf3ba2cc94deabe063697612ff3bad3eb0d7ccb620715119c34811f4128aaf81c
diff --git a/app-vim/ferret/ferret-4.1.ebuild b/app-vim/ferret/ferret-5.0.ebuild
index 143a9d7ac040..5505a7cdb547 100644
--- a/app-vim/ferret/ferret-4.1.ebuild
+++ b/app-vim/ferret/ferret-5.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit vim-plugin
 
@@ -17,6 +17,7 @@ src_prepare() {
 	default
 
 	rm -rv test.rb doc/.gitignore || die
+
 	# See bug 612282.
 	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
 }
diff --git a/app-vim/fluxbox-syntax/Manifest b/app-vim/fluxbox-syntax/Manifest
index b88dfaf2397e..e952ba84bed0 100644
--- a/app-vim/fluxbox-syntax/Manifest
+++ b/app-vim/fluxbox-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST fluxbox-syntax-1.5.tar.bz2 1376 BLAKE2B 2006668a89077febb4ec919354359cae1170156950abb553695d6424cb277bca69a5e8ffa93a9e4b09b990e96f9ee34654d34dc15320140dad589808ef9960dc SHA512 0567af6fe0994ea228ac56c3a26485ba5cce7762e3d70d6dced978e56017f6769072c83ae68125de3e03190562a7a10102bef038c02ae148cf70cc0c5951b8df
-EBUILD fluxbox-syntax-1.5-r1.ebuild 897 BLAKE2B ea7e6b5dc33b1a6ad8ad5c77688d9602461c11b69fd3e4f72b9ac9f619ed5e3fbf5485e2805a03c647d2045b452b57205d2207d138f156a25928b4959eb6d78b SHA512 b45cc6079fa5637af6789f7f614488074125fec3413dd31697fde305408fa406a1bb950cbafe071f48ad6f8404348915224af11127ab7e0b52fe2e7b65b9afbd
+EBUILD fluxbox-syntax-1.5-r1.ebuild 887 BLAKE2B 31aeed0df1e08e55fa34da96dce79008e33eeb3a9601969f9508ac1d4ef2e19bfd8dabb07e2621cdeea9f0fc1b5883882ddc9a2a13066a26c6fee2030183c23d SHA512 118677adf471d24c83c96724320a9289e21610806c6085e344a6c3cdd5e21bb01206172870439976529d5dd919bc5d6b410556292efc5609981a924b753315e9
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
index 1165be5cb0ab..cac117a4fd89 100644
--- a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: fluxbox files syntax and indent"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=679"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-vim/genindent"
 
diff --git a/app-vim/genindent/Manifest b/app-vim/genindent/Manifest
index d6b79d44a8ea..e7f022e70800 100644
--- a/app-vim/genindent/Manifest
+++ b/app-vim/genindent/Manifest
@@ -1,3 +1,3 @@
 DIST genindent-1.1.tar.bz2 1248 BLAKE2B 761b5285ba8816ec8b64542d9e6784f9d771be8d02fc085dacfc8422dd636be600c44c973089b1922d19e8b2ec0256f66d547f35609db6d3f08eeb0998fb69e2 SHA512 aa90cfc988b08708bb25352b66196191e6cc322f2072a771cf768a0e2ace2e4e193e2e34dc0556266bd84c49055ec1d4183f1aec3d89fffc29f5ded88c26a2af
-EBUILD genindent-1.1-r1.ebuild 510 BLAKE2B fe55619751e34fe4996867d32113ee1a97a4f9980ba376c34ee65e5b7e3359f0eb05418782d2c76f1ef3051959d1db4c101a7462bb7155dc4ba3395f60172960 SHA512 35029df226de286c3cb0432ad872bbb664bf948b7cda43afe6a8466e7aaac6b952ec4d47231d52eb7ad6dd14e45cc7491f5f6f8e1ce034139abd436bf96e1eb0
+EBUILD genindent-1.1-r1.ebuild 500 BLAKE2B d11fd1a17fcc5e3874d3de48488b2c76db319241a3bb5209ac1ac1a89868031116212ee2b0803b93682e2dc30466b8f1a0300f8f4ed0d7a14c38bd7cf91bd577 SHA512 3895b29d8e0b125ab877d8ef528518719dd6268a52ed81ab43df6e4eccbe3b9692597cc7d4ff4276456beced0b70f2c1087693dcc5161159a1c670b5dea61e34
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genindent/genindent-1.1-r1.ebuild b/app-vim/genindent/genindent-1.1-r1.ebuild
index 86333788f2f0..910248ae4516 100644
--- a/app-vim/genindent/genindent-1.1-r1.ebuild
+++ b/app-vim/genindent/genindent-1.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for simplifying indent files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=678"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 9b33793775ae..da4b62d6c44f 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-syntax-20190609.tar.bz2 18401 BLAKE2B db738540fc85d8edd0269ade33e174db08b9231237f1138da9a3f6ecff7c188a041b312975629be652a5384d0c914ad8d7a3ac5ef14670e4bc0859fbdf3dcbc7 SHA512 70fbf6e37eee2e5b007eb59b76492f41046884a8310a6074ca5fbab666ec74d46ab3e57bbf2ae784db2e17bfd1c4801b18b71cf37f746e02ff640de1f6821ec7
-EBUILD gentoo-syntax-20190609.ebuild 1289 BLAKE2B eb217dfaed0680a9dd2e4c6727ee4f07255b04187887f5cff6eada0b56a77ba290173db5394212fe6700750bf9dc73d68170be347f2590723b8c381d2e0e42c9 SHA512 0992ed4df494b14567d259b65e6d15978e3f92f29d54f72c7f72920bbdb2d8fa796d4bfd659b5653c522998eb7f4073a688da84aa1637fa2f6409107f8a880f1
+EBUILD gentoo-syntax-20190609.ebuild 1267 BLAKE2B a78aa52041af1cce8f0fd9b751a8f1bfb18675195cb5fd63f9a9de4059574b81e6c054a3fdda37f069b1f5423645fcddf2d700f4bc40807b8f6a41a245c8f8fe SHA512 e90b92d6cedb72ba2e7867e230d26c5640d25fa2a15b07ef558d9c82ea352a5095ccc50b9adfcd9deb11a0982d74db1e193d12bb2f30a915d3e273ac28180f40
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 585 BLAKE2B 7f904a47ab12627ae911fa96328c50af2cb16b785fa0b60cace8a586b17de344625b749b52ef6b89b4751aba74bc25339b3e6c9105ee47d15b5c6539b5d902ee SHA512 dfed3c4c2b3697b00896591dc4b23eb6433ce77b4aaaab05119ca0b11e355e321b2cf5f0ab5e0b2dd075abd1a266908e07b80846a11d50f17155d7ab35e6c742
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20190609.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20190609.ebuild
index f1853ed776bb..25bb619ff727 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20190609.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20190609.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gtk-syntax/Manifest b/app-vim/gtk-syntax/Manifest
index 24c4eda9a5a6..01ce767f9676 100644
--- a/app-vim/gtk-syntax/Manifest
+++ b/app-vim/gtk-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-syntax-20130716.tar.bz2 234878 BLAKE2B 0d412e1a04f4cfa0303108bf7e83e21332e1ef4d84f6f65054b860db032aa65bcc0c1ae827ba4968e650114343eeb444bbf9e985e6c4cf8cf4f69b957936a100 SHA512 a90bdf84765ebaf10946b974c7720ebb9366f7ae5e360c8254ffd54bf9eacf1d0e35cf2061ef42727ffd7df3b4d78bb9e5f3ab7392180c435f8eef06c81ff5da
-EBUILD gtk-syntax-20130716.ebuild 461 BLAKE2B 2b430ba58025a81bf77b35bdc81e48d32b408bed9a4aea30eb6256154a06ef4b5af5afc0a68e2ee0f9b5804f88c081d2e2a6290ab3f116b85d30b82d202a43b1 SHA512 de981dae8d0756100dff9ee794e5a6fc6dc0efc65d915d8bece70bba33f5b509a2c959268418713118f2f50afcb0323e9e6d5a0fee19c6f5acebb3405427d803
+EBUILD gtk-syntax-20130716.ebuild 439 BLAKE2B 494be95a3dbe1461ff9a9a66733abff49bf819a54fb5abfb8f243245c684e0921e17e509b2603cae81a585e87e2e77c1c4ec9e7e2891e03021e48eb26c621cce SHA512 6eee54e74a1f0b47569d850de891ad5a6f627d6a4db5cc8e76cb343fd399ab767324a98fa066381522d8541cd6065742286d9132f04926eb5661b610a0dbb157
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index b016461d42f4..cf82bae1635c 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
diff --git a/app-vim/nginx-syntax/Manifest b/app-vim/nginx-syntax/Manifest
index 136f2e97626a..aae677709e48 100644
--- a/app-vim/nginx-syntax/Manifest
+++ b/app-vim/nginx-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST nginx-syntax-0.3.3.tar.bz2 5675 BLAKE2B d642a6f34b10f1f4d32c772a3c434e30cba5a26c03234c76658c15a9216723a12893414699db9c998e31445c658db0d33db0e4967713b2863b73e71a059e09e3 SHA512 0142c9b825b9f9c262145c0d202651f020e5b3f3f3548ecbdd713cf66c5f7098b974e7d16eedfa9d722c2efdfbd9732097bf8b293a610a64c21571ec66a5886d
-EBUILD nginx-syntax-0.3.3.ebuild 355 BLAKE2B de8ff25a6ab1c969c10868a3165c9025069667bb2373924aed59d0c69f0d15578328f112e549f82c6b9828710fbb804919c0b8471fca67b9270f79cee3e33f2c SHA512 c098336b0a7932e64eac0d4c7727a3f5c2b557cab8a3a851d409fdb192860bedf26003df23f7d2ee9abe1b8e937153dd79885342295843025c404c8d9803d4e8
+EBUILD nginx-syntax-0.3.3.ebuild 333 BLAKE2B f94da7a2d34ab86cfa1ef4f624e2fa1da87bab8b93c01c1e88a694c49b2b8adb1b6901c9caa760437125df15958a3ca9c02ba6b2a5e6f119762a7dfda8850345 SHA512 8bdf1a08c317b2d648d1e89f8627e48afdaf3852658b031d06ff0f8feed5ef34fd92e18b978b96f7eeca08fb24df9bcb333b658ca542e83be45af565f02eae49
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
index 0b7197d395bb..179ee7a1d011 100644
--- a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
+++ b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Nginx configuration files syntax"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1886"
 LICENSE="vim"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux"
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
index 45addccd44bc..6fe1e6e55f7f 100644
--- a/app-vim/ntp-syntax/Manifest
+++ b/app-vim/ntp-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST ntp-syntax-20031001.tar.bz2 1636 BLAKE2B 43cf45ba4d6096c1f07a89c8e006d3fb6ca1b81e6d0e25a11541ea17cff96979e1221f48141799fb26655b3337017dd06d900bbc087b25efeb666cb45dbe5de6 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8
-EBUILD ntp-syntax-20031001-r1.ebuild 450 BLAKE2B 69319f939bd4d2567af71c11fec0047efc757d73ed075f919f2012920b3bb50d6d92c4de219fabdca201d73ffde60da401309a2684cede5c1b32ae0e4828ebc8 SHA512 992c5dcbb43d6f3274d41fca6124e6796018eff863864819bec5a944958dad6c8bd11e7e18a83a1da87e19e62fa993382e497fd51a1b2e333f44034b72491a50
+EBUILD ntp-syntax-20031001-r1.ebuild 428 BLAKE2B a43d799a35b670a3628865ba1e85ae52014e0c6b2c22b6580da48d1cd928a42afd6f59bc6b07569cf4a3a00dfbe38603a0351d1d1f1f8a4e0201556d3afd79df SHA512 1a846a2b46ac9a2a32885421cb7c15ece6b446c0656664f884318bbd522b0d2a66e4c9fd267b45da217346c74a1bbbf29b2e3dcf812571261a845c841eae6390
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
index 89779d1126d1..74f867a5e412 100644
--- a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=778"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/app-vim/securemodelines/Manifest b/app-vim/securemodelines/Manifest
index cbc834309e92..85bbd2348cbc 100644
--- a/app-vim/securemodelines/Manifest
+++ b/app-vim/securemodelines/Manifest
@@ -1,3 +1,3 @@
 DIST securemodelines-20140926.tar.bz2 1562 BLAKE2B 14b58973e25eb91970f62733840a8db20680cc57266e68129d6a490fac970951044a350d936e497797892bf428de737226c9c57c986de5816c0e771bc65418e0 SHA512 15a948781751998d832f445e7c3ad936e5c034fcc9936d977c5cf05215dd541a235fc066f7e774b151fac2afb2b0a59665d13f6f981cc59d4e1135f06f6cdc35
-EBUILD securemodelines-20140926.ebuild 515 BLAKE2B 87bf25ee67f4c45771d8ad0b29fca69e2920c2973cf411600fdc565d7d5d10431186ee99a69e1bffbc0f00e0eb5b6a7328f704b42a75b5de9b84ddb8de4761a5 SHA512 de5054e7363f275d53ae8cfb407a938d7bb30b5b6c9bd9263a7fee1e798d46cea69e5ed988d1fd3ad7b6e580ba2383dfcd4bd916ca3dd98a3dcab2b6a5f179a1
+EBUILD securemodelines-20140926.ebuild 505 BLAKE2B 6d45e1d53115c2dac537c0aea68e2f80b9f3b29a1354e1df2d6aab10cf571fb09fe1997800a67abc4827ee12c84f833618489128bcbdf1eed102f891414d7f59 SHA512 33611d85071f783d555ab7297d74cab2be01815a2265abe3f5acd8d6604aefbf724d62fdf0e3f406d594f33f87496cf5191b3028a27c979e1cd493059f98d552
 MISC metadata.xml 621 BLAKE2B 1917398769758c657f0975c986e7ee09056ad2a87782a47523bcc558a2ac1644da90c8310add6e86b29c697264ef817f2bb6f08738cb9df3668a9ed13d416bb2 SHA512 ca9e3cce0633bacbb643201bc746e9c6397e9803c6b6c717c1a6e8fd2582e85e61f9fe7c8ea3ea575de6150ded96a0d26ce0fb6ac973884c37c19ce28ded9204
diff --git a/app-vim/securemodelines/securemodelines-20140926.ebuild b/app-vim/securemodelines/securemodelines-20140926.ebuild
index 1027ea74755f..9d6b2045f0fe 100644
--- a/app-vim/securemodelines/securemodelines-20140926.ebuild
+++ b/app-vim/securemodelines/securemodelines-20140926.ebuild
@@ -7,7 +7,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: secure, user-configurable modeline support"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines"
 LICENSE="vim"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 VIM_PLUGIN_HELPTEXT="Make sure that you disable vim's builtin modeline support if you have
 enabled it in your .vimrc."
diff --git a/app-vim/tt2-syntax/Manifest b/app-vim/tt2-syntax/Manifest
index 39e640ade629..6efd034de562 100644
--- a/app-vim/tt2-syntax/Manifest
+++ b/app-vim/tt2-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST tt2-syntax-1.13.tar.bz2 2991 BLAKE2B 07efcef9b28b8c44ff55d970dec2a9bff73c6e67adc3f03e6c09beca5552599b87150af08f82211f48ff79fb595f5324c60d1917a5f0378e769643b80c19b503 SHA512 0e7f5ca2b5dd53598778bb85a76fbb8be52ce789221342cb5ab51a5084c7d679b8b2f5cee4f8f05db9648a5828471eeba3d0367959f09d280d9c098a9c21e52e
-EBUILD tt2-syntax-1.13-r1.ebuild 448 BLAKE2B 32e1ac14ef797b4a77d61fc931f4ea607741c368dbbab99f2b18c5ae6bba259dc809a30f96534aa7783dd74114fb88f20dd98c565a3fbc05a330ab5a3bb038a2 SHA512 f9f4b031a7ca398f93d0cd9ad8a66b2787e8d5da8eae9e9a1a1c0a761a3187d114cd223cb0744340d553bdd8fd6540bec500f7672f0d09f7656132e7045148a6
+EBUILD tt2-syntax-1.13-r1.ebuild 438 BLAKE2B aeb12344df6e87a51ddda4772d0602c44eee28de10ad800358c7daa30ff98ccd959308a6807bba2021d92ba5d395b2bcbb86b3a520851da6f7253fa352f3c6c9 SHA512 675109e058b387b68c1ccabb00dcb7be1ebf8d22c6521530af9813771fe326db482bdaaede2d136ac36a23ded68319f31dcef1446b62c18a708b6207654dfb01
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
index 3671775ee279..791a8d791b15 100644
--- a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 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 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
index 150aa822e51a..395942527f0c 100644
--- a/app-vim/vim-tmux/Manifest
+++ b/app-vim/vim-tmux/Manifest
@@ -1,3 +1,3 @@
 DIST vim-tmux-3.0.0.tar.gz 9658 BLAKE2B 188485b4c74e60292aa153693246c9e612cbc4736accb7aafad3ee901084023b3f40374212afe2139c634b8457c2ec871f0cf5e6d02beb69fc3c433f26b8610d SHA512 d251ff07b0702e4f9969d02a9c32924db62f77b71250fda175053883abc35c18932f9869ea0514df1b7acb9cc65f6b39e2b8c640ad77ff36a19ceaa74d13d77b
-EBUILD vim-tmux-3.0.0.ebuild 435 BLAKE2B 42b2d0a2b07e4961bbaf455bc3e25d240ed7841ba3e6c69adf5aa1ff9325850311c94592f3e58063b16f6b71a274d960c2fa55d524794ada9c52336848459312 SHA512 659fdff02da8a946ef863e95dfcedecd90f1df7ebf323d07c6443031afbe41dbadb9d66ae4974096ef884213dbc5f98590724fe0b08cc6c2be6cc0c3e6b5ab2a
+EBUILD vim-tmux-3.0.0.ebuild 422 BLAKE2B c8925d9db9009e2ad38e220aefa1c0a5aac0727228df8713c163e5b2d5d3aa4324d8ff0bcbbc5eb6c06d41162af820e86eb9697623c0375e19acb8d4df29a5f5 SHA512 172340a2e7ed4eba0edda04d6cd52d1f4d2a5f5d25154ebd30a1900be8f3c4b962ebea7387188c5e68e0f15f2a36f5a63527057e6683e19e413da7194f4f6f92
 MISC metadata.xml 556 BLAKE2B e9419237fa1f3b2b3c15d1adf7ca5afdc0da4a1fd051a4b46d839a67079170487c85e05e121c64b4ec4cc82064e217898831db1ed0a2018c345b227c44554ebe SHA512 181979dee06b24a1d4f1b3b325558c628fcdb0ee4d628c7002777f7e460e8a35026f021bb21c79db243fd067d16168c7db804a33c10be0c59f6bb22d46cbf9a9
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
index 5f796471c670..8031580eb1fa 100644
--- a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
@@ -9,4 +9,4 @@ DESCRIPTION="vim plugin: tmux support for vim"
 HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
 SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="public-domain MIT"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
index dd98aa64c14d..7f15cf98080f 100644
--- a/app-vim/vimpython/Manifest
+++ b/app-vim/vimpython/Manifest
@@ -1,4 +1,3 @@
 DIST vimpython-1.13.tar.bz2 4270 BLAKE2B 7973aea8ea397f3f2edcf8a2845ab47cad3015925dd9e42e37a7ada47f25073b68d6d8f8c378a86d90e39c0aae63aba784753679b4d04a5aad268db157400ae2 SHA512 467217ad160f02d3ecdc8c43e35966e496e6c5f99bef115bd4905795c0fd5b8f68f68bc8edd64ca1dbb1c6fbc088ef6ae996f524f0343943702f2a92dcc144ce
-EBUILD vimpython-1.13-r1.ebuild 385 BLAKE2B fb67a5dc1f6072159f92d02dbbc205e8869ddbc8b62669098cae1533f7b7fe5fd80e2783690e2b504ea4a5cf390d1a3a7df4a9d98ed9a97a47b42ae749f0c15a SHA512 5427cad779f09e12eb12510db56ebd6eee635127725120a0a95276de44121a9d757223eff8e2ec52b7ef44b64892db8ed60628c00acd31e52c3309c6d5cdbfa4
-EBUILD vimpython-1.13-r2.ebuild 479 BLAKE2B 2faef39f1207b4bbad70251fb373c13e6a6fcf1280e1ab8a8ceeb0b6111ed95c1c1de0903dcb23354a3397f2af7a27e05b71aec6a7e7fc3efa4bfd839266ef8d SHA512 4cec1c9c4a22d0a7641da4c6199fa273bb8217bda44afaa0b061e61dd4b93149a8e16ad06fdaa9ab3b23f7ce62c0d5f81425e7762d88ffa9ff45fb51a407ccb1
+EBUILD vimpython-1.13-r2.ebuild 478 BLAKE2B 93c7b579f0eb40c4efebc18617b769a37f5ed28ce3dbe3b1c8107179648abe85ce3a134cef15c27b361d034a53b1662ae7cedd60e1f72a1b1450c858e3872ab4 SHA512 aa200dcc46fb2000448622d083833c19295eacffe9bfabdeeb1bf9226effb60acaf4486c5d89ae39daca8fcc57791e880ace22df37479768813590c585e96d6a
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimpython/vimpython-1.13-r1.ebuild b/app-vim/vimpython/vimpython-1.13-r1.ebuild
deleted file mode 100644
index 1801d3944d58..000000000000
--- a/app-vim/vimpython/vimpython-1.13-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=30"
-LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-lang/python:*"
diff --git a/app-vim/vimpython/vimpython-1.13-r2.ebuild b/app-vim/vimpython/vimpython-1.13-r2.ebuild
index 3713d9288a6a..6631841a4fea 100644
--- a/app-vim/vimpython/vimpython-1.13-r2.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r2.ebuild
@@ -10,7 +10,7 @@ inherit vim-plugin python-single-r1
 DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=30"
 LICENSE="vim"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"