gentoo resync : 12.01.2019

28 files changed, 64 insertions, 88 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index e86eb82c307f..07272ad3e39e 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/diffchar/Manifest b/app-vim/diffchar/Manifest
index 2c461a0291a9..7f85333cfa0f 100644
--- a/app-vim/diffchar/Manifest
+++ b/app-vim/diffchar/Manifest
@@ -1,5 +1,5 @@
-DIST diffchar-7.2.tar.bz2 20092 BLAKE2B 20eef77d7019e55e466e1212e4560d91cde83f55808a4b77eb6fe2e5b7518715606d8d89c046e453dcb380517163974e173e00c18d662df2ee8ae43a6a347c06 SHA512 7c9a9239ae4eae1d325984ab40ae8d90e2dabf96dc929ed6f05c3496352aeb562452bd154fe3d1ec96353356c287604162f5b89d762b7afe26bc975449d92427
 DIST diffchar-8.1.tar.gz 440558 BLAKE2B d10e1db0db4b475af34a268324bec6f8fa1248124df2a40716406d207633f3ca0ef64e2b0673a21c24673c8d0640de936d897a9adfdebbe033ad7c4b10e9648d SHA512 4457b2f769049999c13a2a7ea5a585ba081ab18234c7bcda28e22a481b807edc0c4183229ad7239bc9d10b27270b35c6f27f27f92637693ee869eff09c22fc63
-EBUILD diffchar-7.2.ebuild 404 BLAKE2B 0e367725b5b0ba6ee4d0ab82cafc55f1e5ee429a7478d5240836475f6d1bce055b947ed51bf3cc1c7d13748f5cb4d47af4ad86e50ac847dad9553a79a06f5eb5 SHA512 bed5f93ea8048e5b21b71250b95ec5cd89473b615e65222a47366aaee6a83b582674f0314f1213ae4d204afaae60d0dfa0e77feaba95078d24ccbec025955010
-EBUILD diffchar-8.1.ebuild 618 BLAKE2B d63fe1205a37f70f5691b25079656d1727bb364eddbdd7ce2acd2037106f6a6c4b682a0a92e2d4dc36d219b37e149fdbb94314791f1f5967ae2e056b8a019380 SHA512 099a29a014786fb3ccf061b7d53dbab49e21db206af2fb5949764d45fa151275006a7a9c0c1ea97a66f6fa659732e1bb59fe663a65078d22f15d2f8391f912f6
+DIST diffchar-8.2.tar.gz 440613 BLAKE2B e440ef29512348fe82fc4b644fb5e5d9db31582991f22447f2a896180091dc3bd4e2e789ce8ca8984507fd2fe1fe8f53d37ac6913d34960a174dd9003d729e84 SHA512 ff7c01a03bd989fbcdabfda8007e177acab191e283e1617e16dc2a366869ad6946df7b25a2e514f96ad7dc69350f07ffd5eac7b7769f0e017e029343c9756ea1
+EBUILD diffchar-8.1.ebuild 616 BLAKE2B 162420bd17e6cbb2b0ae7c114648f675f6ad43a6a8b623927f7b03718b94fb4e1fd8e9df817b76d2cd3d565ac3ed27df3a27a741090e5a3dfc293786ff7a990a SHA512 046366ce2e1214237a320c4fe843c774b57d56cc14321dafcfe68857101515bbd285a1a2e6276a5c85fd549d2134d85a7ded7efc564d2580ca4238a9f031d321
+EBUILD diffchar-8.2.ebuild 618 BLAKE2B 2954818750e6594724fc544f06753501bc4bad449a183bb4412e9ceefb86d61a9ca097a96b1e49670e00433429655b9f6dde9ff448f47c515543312ff7e0b256 SHA512 d194a0adcec6f9a7d27ddb530832406e3ec06060f12df1196b2dc05d1aee39e59568319916a71b11a46951d1e28b223e0637d6fa92f566b1fe55272fb4a0c3e8
 MISC metadata.xml 345 BLAKE2B 25adb1e474dae23ba85761950707568de3a87a9f9b0b38545e3a7cb127cd1099f0531f23c04f55a0b21f42a4d5a36b2ef454f2608c692c3afe9a90068dc4ffdb SHA512 bbe312936f14ed5cda6ac637f0780480b5e82580ca79320c5503b404e0a2eb9659fb7d0dda9e83097546fa104b7b9503bb1b25b166725b045487c78d80219d7e
diff --git a/app-vim/diffchar/diffchar-8.1.ebuild b/app-vim/diffchar/diffchar-8.1.ebuild
index b3395586f7c4..b6e6ce6644cf 100644
--- a/app-vim/diffchar/diffchar-8.1.ebuild
+++ b/app-vim/diffchar/diffchar-8.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: highlight the exact differences, based on characters an
 HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
 SRC_URI="https://github.com/rickhowe/diffchar.vim/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/diffchar/diffchar-7.2.ebuild b/app-vim/diffchar/diffchar-8.2.ebuild
index 6c45dd971e77..fa01d898d5c6 100644
--- a/app-vim/diffchar/diffchar-7.2.ebuild
+++ b/app-vim/diffchar/diffchar-8.2.ebuild
@@ -1,13 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit vim-plugin
+inherit vim-plugin vcs-snapshot
+
+GIT_HASH="837334b268302cf6c597d88485aa8aad6a500b98"
 
 DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
 HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
+SRC_URI="https://github.com/rickhowe/diffchar.vim/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm *.gif *.png *.md || die
+}
diff --git a/app-vim/dirdiff/Manifest b/app-vim/dirdiff/Manifest
index eb83cc2cc79d..a2cd3ac57b0b 100644
--- a/app-vim/dirdiff/Manifest
+++ b/app-vim/dirdiff/Manifest
@@ -1,3 +1,3 @@
 DIST dirdiff-1.1.5.tar.bz2 11131 BLAKE2B 17a7adaa67f90c2e23ada8a53b10c5b50db3039bb17b7a32797870072b1b06ff14cc8b1b41106d0eadbfc9ac4dfabf1bb4e925a39ca2ab2a8b4444e64d7acc66 SHA512 d1abc7981d38eb784cec265146fb3b45af32f9df17698d133f6f001608c48d53aa2529f4d3d7204509ee26fcd84e813842b5a8193b145abe9d0cc468f69b7f87
-EBUILD dirdiff-1.1.5.ebuild 368 BLAKE2B 71dbc4958a6a7b3b17745c8f15fab89b2bacf919313e6261c373d73de67b5faf78a07f60fddabf21a72b34e70a8279f8fcbf01b1a5fa951f88a2ea798e948220 SHA512 4595aa09c345dff988be2c50c2c6d435b518954b41989604eb30a3a4b1190274d0db050e4a4237e5db9d626977538796b22cdf7e35822a321a60f6928b2f60ae
+EBUILD dirdiff-1.1.5-r1.ebuild 365 BLAKE2B 0796cb8b400c02bf77fbb12f6d3f619abc54624c8b84088a444b7de517028ff21cda6f0f89475367132e6d8c3766f1be2a971d7df465e2f84ee0b8ccabd807b0 SHA512 ca1f498b21d711495d171008a0976bae20563f3c461b284023755f9c377f52d07d759700adddc6d3df8e8af924be93816a7c84af709abae2e16351169fc06581
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/dirdiff/dirdiff-1.1.5.ebuild b/app-vim/dirdiff/dirdiff-1.1.5-r1.ebuild
index e0cd57fdb82b..e4106987927b 100644
--- a/app-vim/dirdiff/dirdiff-1.1.5.ebuild
+++ b/app-vim/dirdiff/dirdiff-1.1.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit vim-plugin
 
diff --git a/app-vim/emmet/Manifest b/app-vim/emmet/Manifest
index 9fe1e2c19ea9..c14ce14935d8 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.ebuild 378 BLAKE2B 9d232b4f3e89a913d5ce46679270baa39cdf03c83aaedab8648f95aaa1c3c24325d02f66709de1c11b5a244c9fee29dc70757b44276f585800ecf8469cb8e880 SHA512 6ea5cb5f681fe5eb8eb7824a41395670c5cdf3c2d4c715451efd513fa9bde18738378919f2a0ebbe586de46be3c43b4972391042a0be2d2a9c07d5aab625af9c
+EBUILD emmet-0.85-r1.ebuild 375 BLAKE2B d44eed4306f223fc2301cd8d32ce89851d16fbd116bad66181c8bd733d824c184442a2e25920e1b5fdd981c9064578d3488f0ef24e4b4d8cc395ae6718c7b323 SHA512 9afe6bbc7f2a81f9602b8bc1379eb321b06f420c0ef36f67cab4494dd7a63c66d400a5cb9c62a8e3f9e691e3b30e35d48d11357d60af9c3e5203177847fd310a
 EBUILD emmet-9999.ebuild 360 BLAKE2B f5aec8ce781ac38df2bd22ac221af1ef7ab0391c18ddae49eabb4f6eda16948afe29a6ca45617b69bd9e1b5a43e9453954619d6e3c827a67399b19469cdecea8 SHA512 c4a71da333a7e2dfa33a9cb73be661b605795c498be3bc1e72f2ec7c2759b572f5cef131e31fce8d58771af3c3946f08dcf2fa28288c18893229bbd2f0f13b9b
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/emmet/emmet-0.85.ebuild b/app-vim/emmet/emmet-0.85-r1.ebuild
index 3fb6d0a756ce..6d4e2ef712eb 100644
--- a/app-vim/emmet/emmet-0.85.ebuild
+++ b/app-vim/emmet/emmet-0.85-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit vim-plugin
 
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
index ff2b2ca56fb7..45d07b70efea 100644
--- a/app-vim/fugitive/Manifest
+++ b/app-vim/fugitive/Manifest
@@ -1,6 +1,6 @@
-DIST fugitive-2.3.tar.gz 30949 BLAKE2B ff62ad9f5b85fff6a06fe006884901ca0f80a5ee139032955a6af596cadf3dca18d73980da12429706102cbe8105fcbff5fb1dd6375b851f978746a5251f1d22 SHA512 8a176705c0326ac034abaf23423e58d490feb7f11dc45ad23641fafb95279094ed38475a90e7c2e7fc95c615558db75f3587740e2658f3988fa07a1957aa1039
 DIST fugitive-2.4.tar.gz 33340 BLAKE2B d5e5df47e0492510abae735dd47b51d797fe38862401f7d8e64404f6fa4e040641141c6febb13b05910cc44dc0372b084fe0ee8c3980a73d11d65e1a502ed627 SHA512 fb9d4129090bbafcace9400e9f21feae06bc9f903a54cfef7c4cbfa62856019a511b924c294e86fd26cd713d588ca0054a17d9676b59e2f406779ab5d51c3363
-EBUILD fugitive-2.3.ebuild 623 BLAKE2B d33285b4bd46225b4c6871a4a730d9db9c738a7100f423624914d2f99d0214a53db16d375701fcd4fe5c59994436fbfcb719772b9b2552fda9bd5331d56578ac SHA512 a1343ef40078b1345a163b3ae50620c2770b87cab3a360afd8b2af32a471569eac17e68a339ebb8591f012388775d09c557f3f0a2b9afc1b7510d31de22813c3
-EBUILD fugitive-2.4.ebuild 625 BLAKE2B 6e7c331e9a28fe7c67b150de5102f0cdca594eeb48a5dcd3baef0bd08463178daf17e1f8e30c8567d9424b2fb17139276ecf8c2b968c3e56cadcc6df84a29229 SHA512 bffbeccb7b980ac471f5b67cc4408aca6ee36e272ec61e7e5eeb205ec89b9999f2358e906aa49033bc2fb981717caa882de3b80086ec94d5c69b1254f6d8d333
-EBUILD fugitive-9999.ebuild 625 BLAKE2B 6e7c331e9a28fe7c67b150de5102f0cdca594eeb48a5dcd3baef0bd08463178daf17e1f8e30c8567d9424b2fb17139276ecf8c2b968c3e56cadcc6df84a29229 SHA512 bffbeccb7b980ac471f5b67cc4408aca6ee36e272ec61e7e5eeb205ec89b9999f2358e906aa49033bc2fb981717caa882de3b80086ec94d5c69b1254f6d8d333
+DIST fugitive-2.5.tar.gz 39318 BLAKE2B 437f4c36b357937fc83e0107882d535c5cc9e609801147d1a48c28e16c4f964c221ff404301e57c9d740a04caf4cf5383a1f307ad89a76294e13b784561223bd SHA512 9a58ff3fa9eae72fca3d1232d01856ef56fe38b7bbf61be44ec4cdf4f0f69fca69fafe19266d657530a6d08f856236b1d1370bb770b14402bb7e476d5ca4bb78
+EBUILD fugitive-2.4.ebuild 623 BLAKE2B d33285b4bd46225b4c6871a4a730d9db9c738a7100f423624914d2f99d0214a53db16d375701fcd4fe5c59994436fbfcb719772b9b2552fda9bd5331d56578ac SHA512 a1343ef40078b1345a163b3ae50620c2770b87cab3a360afd8b2af32a471569eac17e68a339ebb8591f012388775d09c557f3f0a2b9afc1b7510d31de22813c3
+EBUILD fugitive-2.5.ebuild 625 BLAKE2B 668ba1e4efa3a4dd956278462b24b2ca98b4e02378e2878c6ab85bfe5c13edf1336ead71aba7756e6e43af1e5dfdc9a4d678c2d2ffffbc9d9cbe0e8026fddcf1 SHA512 93a7857bee6df123e936ce6f1644b8ddd8fe5810dc3b799f71d93b4124e8277e4721b2793c2906009cf016be4119964643e168a79c0c8273e42b9991be9417d6
+EBUILD fugitive-9999.ebuild 625 BLAKE2B 668ba1e4efa3a4dd956278462b24b2ca98b4e02378e2878c6ab85bfe5c13edf1336ead71aba7756e6e43af1e5dfdc9a4d678c2d2ffffbc9d9cbe0e8026fddcf1 SHA512 93a7857bee6df123e936ce6f1644b8ddd8fe5810dc3b799f71d93b4124e8277e4721b2793c2906009cf016be4119964643e168a79c0c8273e42b9991be9417d6
 MISC metadata.xml 342 BLAKE2B cef6ff7e21df2703dc1c1138f95ad5f8e478a7c6bbd013791fd7c1b1754a2f7eaac9c84ebb42af9cef1943e7a94a880d0cedc030ff95966ac607a1b0b37dc37f SHA512 4ad3c706ea17ef2ab4e6852c6251cec3b8b5b37b687cd3ed87061adbfb791b8786bb5faa4550a73c707a0013ad8981aeda930eba8d74221cc7ca33d110ceb842
diff --git a/app-vim/fugitive/fugitive-2.4.ebuild b/app-vim/fugitive/fugitive-2.4.ebuild
index 3ec007ea68be..51d8b9f20974 100644
--- a/app-vim/fugitive/fugitive-2.4.ebuild
+++ b/app-vim/fugitive/fugitive-2.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	inherit vcs-snapshot
 	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"
 fi
 
 DESCRIPTION="vim plugin: a git wrapper for vim"
diff --git a/app-vim/fugitive/fugitive-2.3.ebuild b/app-vim/fugitive/fugitive-2.5.ebuild
index 51d8b9f20974..fe8da7842fc2 100644
--- a/app-vim/fugitive/fugitive-2.3.ebuild
+++ b/app-vim/fugitive/fugitive-2.5.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit vim-plugin
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
 else
-	inherit vcs-snapshot
 	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
 
 DESCRIPTION="vim plugin: a git wrapper for vim"
diff --git a/app-vim/fugitive/fugitive-9999.ebuild b/app-vim/fugitive/fugitive-9999.ebuild
index 3ec007ea68be..fe8da7842fc2 100644
--- a/app-vim/fugitive/fugitive-9999.ebuild
+++ b/app-vim/fugitive/fugitive-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit vim-plugin
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
 else
-	inherit vcs-snapshot
 	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+	S="${WORKDIR}/vim-${P}"
 fi
 
 DESCRIPTION="vim plugin: a git wrapper for vim"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index e5e3801af0b4..d7424a736043 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-syntax-20180821.tar.bz2 18361 BLAKE2B 4134fd0a3d75d86f3984f135021063b68588083f191efcb94d7b599460703d6eb501bad7de2aa0cc9cdc4447d73b83e4b36cee2acdd113e7d0a879e1e864e2fb SHA512 09c70ded667b489e03f02e0e72fca32f13a40501a5e319b387967e75f616c7f3dc44ceab3a46b776a509263f58668223eb85d51ba58ca3fbc48e4c05d7345dfc
 DIST gentoo-syntax-20181023.tar.bz2 18299 BLAKE2B ea037425ab00b05e4a52f943817fb264492793c842b6c9250450ab715fafebc55d0b5b95ff49945f62258f2dc70f357eeef3a5d908592c995cdc6e940f2f15af SHA512 a6bd592dd46ad80a4126321826dbbc4c130624027e7e71f0ea87fb164963e980e3ab3e1db1e87ee0ddad602f2ea2e9e7d955a0016c00eb8aef4c01c29057b737
-EBUILD gentoo-syntax-20180821.ebuild 1283 BLAKE2B 833c4fd4b2bc85a87359f188f86db454dafb1938183c4b65905d0cde2dc4099a0ba4e5cfbc4a99a18bd89f0d57ff47df48f4ad3a687b9aaa2309d22c57a1624e SHA512 b7af1703f420fed2e2a890e86e78e68037ff1405f55d7c8ec56a63c7466b998f1c9f024ae342ef45e301f8fe2acb5731c2bf941fb7a58ffdb67986dee9d4c69e
-EBUILD gentoo-syntax-20181023.ebuild 1284 BLAKE2B f6f66afde05a214c21f0eeb94d1381b2b3e400ec06d209032d66468a4fe4783ac33552fdc0e098981fca96381c720fc25ecfa507ebe8dc88ef3c55cd9f360cc6 SHA512 ede97dc717d702bf50a26daab6763d977310775ec5523a1eb6e94f54e56468ed6c5b14a1ffdef8fb14fc8958c2d96ce370e48db731a0406d895dde2e4a497e25
+EBUILD gentoo-syntax-20180821.ebuild 1282 BLAKE2B 6f6542618489fddeb1de17173abefa5915cc6c67f261d99b57358769d70d4607400a767ce7d3230a61158c38ec7ee3b3978cc58e21111ee95a872117d08d2284 SHA512 524b92e9ebd90271c26ad14f46ab716554dd141cd6f368257ee10771fdc5dc14932d831705d3cc89cb5d6a2d5083d00d90ee667426bc3e4a7aeddaedae2f23cd
+EBUILD gentoo-syntax-20181023.ebuild 1283 BLAKE2B 2bd7bc2ad1256759862e6edc8e06885d6a93fc2a5b0d9ac8d92cf98a4c492bc4d1d90c4d605d05b8050e934e235ec4243ea10acf9b4df8831a2f379927eb28de SHA512 cd43a7f59d46317361273fce804183eb58dd67521e1914ceebbcbb1cd77c0366256d4c1c906638f770a2bd25c5121e369c4e023ea8d3cfb19fe2a7ca7bcafe56
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 560 BLAKE2B 21f954af20949469ae0f30a81743d9bdd1114b64b51b640d0da2d294897a885878a13bb1d408c69cd9e1afe936fd02c1ae7170e48a2f5d2280afe525266e448a SHA512 89d979077e4171aece29bd44f3d6ab6a84261dfa8eaa655b5b5d77dc20c5e2ea7cd361002e0f4d8212793449bd86da03e2d2e59bc6d23a158dceca1d60d416fe
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
index 31b2eb13b129..f1c1d58814db 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 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 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"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
index 6015b3f75531..a2883aec426f 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 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 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"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gitgutter/Manifest b/app-vim/gitgutter/Manifest
index 02d1fc21f979..4c0502c0a020 100644
--- a/app-vim/gitgutter/Manifest
+++ b/app-vim/gitgutter/Manifest
@@ -1,6 +1,6 @@
-DIST gitgutter-20171101.tar.gz 43534 BLAKE2B cb0b935c1b2d16a50bbecc73f4f8c657a9087bef56bef36af8ff52a7ff09d39293296eaf49507015eaeac7f4faba2a26a09a49296c28237029110068cb9f6048 SHA512 24d8ad740931df17c2c67e2a2a13e3bba7c1205ba5543f5c11353e639876f4a54e69170dc0a946660ee2e3a23a110c90f4195fa9a1ddfff19163f00d88528219
 DIST gitgutter-20180316.tar.gz 46344 BLAKE2B f981753a0f8d066b7cb5c16c49cfdd1a1aac1c6623b4645b8b1abd5719470ac181e09c8b736f8b8a14e6098b60cb8f97b114dc5c2a587b6d1875fcf27b4b12cf SHA512 15873b2cccc49f8aec9de312efedc615d6fa822b45ca8ce53cc6cc878fcaf3a6ab3f02eb5d082ff329528cce1b48358846b0aba3f9d3bc8aadd29aa57d3b1a30
-EBUILD gitgutter-20171101.ebuild 752 BLAKE2B 02fecaa88d65823737070954f3a392036694794537c1953ea218d16952a659ad5813e6e67e348c9d56e70b392e10f954dd2c31ad95fb95833e7901cc7b1d3eb1 SHA512 8ce0c16f4f4942f8e0b33790601d42b2652d8310a496bb8d2f61713c612d210a93ac9be1aa9ed88bc99da088feafc9da9967285528d55701437465bcbb06ebfd
-EBUILD gitgutter-20180316.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
+DIST gitgutter-20180815.tar.gz 46741 BLAKE2B 85189390a2d8c5feaf8d2fabfd2c72bf79954fd1e9f2c3ffeca748e84caf13924f71ef5837ab62aef0ae003a01304305e73bbcb12dca27294c8164e960249fec SHA512 b6d3bd0f779d9afbd38df33888ab3ee0f1d8d10de0a6c5c6766f7f73a292cdd589a6774faa2871877075f6cedd29f14bba07c9a769d706e0e67d8817db86cfaa
+EBUILD gitgutter-20180316.ebuild 789 BLAKE2B 5117f2eef5b3fac7d0edd8c84bce91362c796a28b6c75deb880741c7524da061c9060e3e175c7ffebd35bcd7b81fbfbecfad73585027c784289869ea99d1a56e SHA512 bef6a4759f414ac8d01bd7214fbbb868b5fdccbf2f68fc58aff2f1591a5e552cb912fe0e61ade6f25f287843d65760c6fcba04b091af1a726cd495e42211b253
+EBUILD gitgutter-20180815.ebuild 791 BLAKE2B 43ecb9ad564614b597a3af65e92ff79e43910be3a3bb8303f26668bd26da7b5541c96284274c16f89f5708dca1d12fc3c0e2459777c46f7c1a4565442b7145dd SHA512 b032fc92d27d6c23ef0ce7a80e2778254fdd1a1d25f4f9a4f097050fcf6849afe55939575160403e784f32d46b12b0380807d5201b4db2c912794b9045868a0d
 EBUILD gitgutter-99999999.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
 MISC metadata.xml 346 BLAKE2B 89acd12a36beb7b027e42b7f094bba4e229e345ad6f0024bbd3e550784459975aff10e88f5de53de3f2150000b7349ee97348723110a43130b213404292b562a SHA512 4ada20b8f4f308445854b0e0ab229271a603e38370675691790dce0303ca4c2a7f00b247363b0f13bcebe78397fd3ebbbd157403260664171b548b8964da7a0a
diff --git a/app-vim/gitgutter/gitgutter-20180316.ebuild b/app-vim/gitgutter/gitgutter-20180316.ebuild
index 002f6583087d..c7ba8deee65e 100644
--- a/app-vim/gitgutter/gitgutter-20180316.ebuild
+++ b/app-vim/gitgutter/gitgutter-20180316.ebuild
@@ -11,7 +11,7 @@ else
 	inherit vcs-snapshot
 	COMMIT_HASH="37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"
 	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
diff --git a/app-vim/gitgutter/gitgutter-20171101.ebuild b/app-vim/gitgutter/gitgutter-20180815.ebuild
index 2dada9f85e8b..38fbbde158d1 100644
--- a/app-vim/gitgutter/gitgutter-20171101.ebuild
+++ b/app-vim/gitgutter/gitgutter-20180815.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,9 +9,9 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	inherit vcs-snapshot
-	COMMIT_HASH="1e60667322b7cd1bfcba98762fbba746a888d21a"
+	COMMIT_HASH="50a7062909d91a290fae04219887b1b45f3138db"
 	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
@@ -23,6 +23,8 @@ RDEPEND="dev-vcs/git"
 
 src_prepare() {
 	default
-	rm LICENCE README* screenshot.png || die
-	rm -rf test || die
+
+	# remove unwanted files
+	rm LICENCE README* screenshot.png unplace.vim || die
+	rm -r test || die
 }
diff --git a/app-vim/nerdtree/Manifest b/app-vim/nerdtree/Manifest
index 86c4fab7baea..3d573b1c379e 100644
--- a/app-vim/nerdtree/Manifest
+++ b/app-vim/nerdtree/Manifest
@@ -1,4 +1,4 @@
 DIST nerdtree-5.0.0.tar.gz 56162 BLAKE2B d4451ae6968454c6281e63233db13f0c5c834eab1a69662b2850d0cfa91f7255a51cbe5113c16224a57eef86862a032607c6eb1a7cc300af169491ce40e9cebe SHA512 7de6e7978604e89e2c03cadf74ff4a57545ff73a643039fdfe76f277e773374b5b5f9bbd5d8f3307df4af867f88fc687f9bb5e28ff9e90d11fecdef8bdb83d1a
-EBUILD nerdtree-5.0.0.ebuild 523 BLAKE2B db5eba02fb0e36219d1f5dcf163405599417964731240b80e8b299539a3a2475a6c9ef5ec3d05831f1af527cedd37a8f3d9cb1bd125d30f1b9151d9280e3592a SHA512 629735c0c41c0ec4ebec6b7ac4795402ba64c635af602ea9f6bee6e4526a5aa8cbf2705d99583e519850064348787f260b7223b05b94ad5a28b33d7f5c5268a5
+EBUILD nerdtree-5.0.0-r1.ebuild 529 BLAKE2B 2dbec1ec982f417e0b30f6656ea589f13dbe96c6ded8ad6e1a668183f55cddef5f8a634ab0eaed0f40874b439b43723bfb1d5e93ce41a73d745e0eb957201dd2 SHA512 dee101c05177325dc89c21b2804b194cce5002ca3726a0c02b88a807afaf6633c9e7d555a6159a3d2f315725b9c3d252193d63f9117a13b03aad0a257f03dfc5
 EBUILD nerdtree-9999.ebuild 668 BLAKE2B fc7d8bb32d825138c13e015ca6ca531caa547fa87ec87dc61bacf0897e8259ea675d6509ae7768ace8231dc29d2c99fe7cb236cf83a061857525195d3afb4398 SHA512 c6f79c9053a1f4dd98fb25345adfc992765544638402df0e0e6494cc5230d7901df53399eb9279b35d8d9064ebcca1e829a321ba1ad429af48f175a9efa7b247
 MISC metadata.xml 333 BLAKE2B de49a7c07d2268dc5550bd2bc842240e53a087e370a093dc08a5360b157e0411cc9dc99e210f1012afeee6123a55f46fda13187a9e6d857b5429e336f5ef6ae8 SHA512 703134609bdd4d7ed256d4c6e3f045fec2ad056d0348af8e97bf6513c5e63139ce0084e8ebca8fe56c925d5ad7fb7146256f932094ee21846a0f8915f0dc5dea
diff --git a/app-vim/nerdtree/nerdtree-5.0.0.ebuild b/app-vim/nerdtree/nerdtree-5.0.0-r1.ebuild
index d01ff3cf26ae..b07c2abb249c 100644
--- a/app-vim/nerdtree/nerdtree-5.0.0.ebuild
+++ b/app-vim/nerdtree/nerdtree-5.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit vim-plugin
 
@@ -14,5 +14,6 @@ KEYWORDS="amd64 x86 ~x64-macos"
 VIM_PLUGIN_HELPFILES="NERD_tree"
 
 src_prepare() {
+	default
 	rm LICENCE || die
 }
diff --git a/app-vim/pathogen/Manifest b/app-vim/pathogen/Manifest
index 93c658b45f22..2824d2d8d1e3 100644
--- a/app-vim/pathogen/Manifest
+++ b/app-vim/pathogen/Manifest
@@ -1,3 +1,3 @@
 DIST pathogen-2.4.tar.gz 6458 BLAKE2B ce28371994938ab4386a6e0a45a9b096443129b7e8de47c92a4c1fa819b7c2aef1e32153866fd1d86a60f7ee2fe2c59ae972700cc22dec263364ef8f51ebe24c SHA512 54da8755991e5c52c5a9258c92ce5731434a15873df44d12e9491ed9bff1f9ebfe2a1c1b94a9ea3615b38aa1833d511bb03c65e85955d96373b6bffceae89fbe
-EBUILD pathogen-2.4.ebuild 444 BLAKE2B 5a59957e8a27c402f4879183be28f52ccc74e026454b4832a06717ce3b1bb872ca3951ca8b21fb2f19453e13b7df443d10ae212a9e2da6de58b09025add38cde SHA512 b8ad5bce4f40f0037d1a36936c3ff4fc0b3b06dfde995cc07302e052dd5673d8a50b385085f2d4cdd0f261f1c71a10dd63e5cf9101501ed6c1d22c86cebb92a0
+EBUILD pathogen-2.4-r1.ebuild 443 BLAKE2B acec344c87596aacf47ba943a1d5f4f1526bb5354c49ca73bb784b143d25b05f2a5f943ce162c3bf6b73db5168ab2d3a7a2b745cfca723cd15697b835f7cdc42 SHA512 17d3f17e5ab35f40e21b420542e4f4920ea0aaee075d6527de5308b209c4e7ca66fce0e5ad52bd3d8853711ed73b33ca598d4236fd1e38192166868ef3898cbb
 MISC metadata.xml 342 BLAKE2B 19ba916c65add7bdf0dd77211eaf660c28cf2c377ec2a81b852745a5cb2c9576d8555619f7855a233af89e0460176761d80b751f8db7d76f1044efa665a52443 SHA512 c4839875a6c09fbc05ba0f94aa1a5b9f81c4f22c9972ac96113c48266a3a7b0f0417c8198b9df181eb0c7374960d8e49f241cc75a4efff598a821914f5560425
diff --git a/app-vim/pathogen/pathogen-2.4.ebuild b/app-vim/pathogen/pathogen-2.4-r1.ebuild
index fc4009c0861d..94ac011cc1c4 100644
--- a/app-vim/pathogen/pathogen-2.4.ebuild
+++ b/app-vim/pathogen/pathogen-2.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit vim-plugin
 
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="vim"
 KEYWORDS="amd64 x86 ~x64-macos"
 
-S=${WORKDIR}/vim-${P}
+S="${WORKDIR}/vim-${P}"
diff --git a/app-vim/tagbar/Manifest b/app-vim/tagbar/Manifest
index bcb5ecc3b2ac..53dc2aa23159 100644
--- a/app-vim/tagbar/Manifest
+++ b/app-vim/tagbar/Manifest
@@ -1,5 +1,3 @@
-DIST tagbar-2.6.1.tar.gz 51639 BLAKE2B 623f56dfb1ce7abde3281d9e1564e300f30cbfa9242772532025dd3d85640118b85ad3f68d20d6806ff3d994ba753722e096098231f750195569afc47635487e SHA512 eb0f29dc2f08d943e1ac0c0fe97ed72a49b85e22d105815a5557e205532be379d3ce8429c5303b917c005b465a7385161ff2edc96efc0fc312178155c67a7c22
 DIST tagbar-2.7.tar.gz 59027 BLAKE2B 6966ee9c412b0e7c9dd562f479ab4ae3fb4574034a32e33257ce95850f2861e333682d01d605f1c39dd6675a506e1792fed8a470b08152d14046bea215292698 SHA512 d964d3055f1679aad86b0756cc444a4857eb29ca22f2bd3567ad6c8d073e75d0c8823109038415f5bd1d269bbf8e36da6f34d70fedee54c10f90535ef79ff3c8
-EBUILD tagbar-2.6.1.ebuild 500 BLAKE2B 84300000ac7c06dcc5b1c2576022bd6918f475977de6f7eb1becea74fcb0cf3ddfa22bdef017572446fc4d3e2453683df706fc3ad5552ca432a0fbcef7680b65 SHA512 ebd88ae5174fa3b8438f3e77d088c0606d1148c4ed494395ff97908525a1d81f2d87d2001a9fda08c2b15ab0c9624ef6c437dd61c5358cf650962059ac50527e
-EBUILD tagbar-2.7.ebuild 549 BLAKE2B 2d0ccd8b0f6bc4e0e6d4407c20f7f608a88345e7e4f9a40fe544a9805d38d825ae8ba0e987a4e3e95b8e89b9de71a7237cdc45665fbc34aee67a073d10d0887e SHA512 53abc5047d1ad81ce73a8761d65ca969c3f17c4e37333a417a4568915a8edd38f3909fe400f3e5fe8ce2aea51bf55a4d0572e4b363ec9403954fba2eb41da47d
+EBUILD tagbar-2.7.ebuild 544 BLAKE2B fb11f3502be125f9acbc5d2e3749c6259f7fce141cc6d4d383f3833f8dc0681862291d197d42b3717760d14df288a6d529f675aacdec7866f440f3db7caa4168 SHA512 26e397d763e188f6faeb8ec832441bd0c36462a32e9100aa8b1053491895255ff63bf45f51efc82b4289501dfc9573981f9d360847b81b222b4cef3f3e1bfa81
 MISC metadata.xml 341 BLAKE2B 4a1c8210c02cd207a9772371a9f4a02308352360991a6d8734579a3fe79a40716b6fd310b16ba6359e869843cf8b3e80be9dbb62636cfb1eaa924d3217a31e65 SHA512 adfd265c7224b9d6f4013721066f15e26baf908c0c89b0357f0a6d92797ee08eecfaa6b3c28d5117b88e258f6a0eb2fbd2704c701a11da6dd6095511a298eefe
diff --git a/app-vim/tagbar/tagbar-2.6.1.ebuild b/app-vim/tagbar/tagbar-2.6.1.ebuild
deleted file mode 100644
index a1c2e7fb7e0a..000000000000
--- a/app-vim/tagbar/tagbar-2.6.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: display tags of the current file ordered by scope"
-HOMEPAGE="https://majutsushi.github.com/tagbar/
-	https://www.vim.org/scripts/script.php?script_id=3465"
-SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-util/ctags-5.5"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/tagbar/tagbar-2.7.ebuild b/app-vim/tagbar/tagbar-2.7.ebuild
index 211696e57ae9..6820a54e5e04 100644
--- a/app-vim/tagbar/tagbar-2.7.ebuild
+++ b/app-vim/tagbar/tagbar-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://majutsushi.github.com/tagbar/
 	https://www.vim.org/scripts/script.php?script_id=3465"
 SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-util/ctags-5.5"
 
diff --git a/app-vim/webapi/Manifest b/app-vim/webapi/Manifest
index f042d0b4bcf4..1a1f93e7d338 100644
--- a/app-vim/webapi/Manifest
+++ b/app-vim/webapi/Manifest
@@ -1,5 +1,3 @@
-DIST webapi-0.2.tar.bz2 20690 BLAKE2B 5438a88c94f77cbe5ce2a79b11c4da31199cc071b35a22fc78b01c9f4c1195d830353639ca05d3c95182fe3ae5c177cddec9d6acd0b2de198a3f77de5e1ad92f SHA512 ca513053c361041bfaeeea11a0bb70c8e6e011985dc5ba801c654f919dd7d94304b6ff475ce49525909b575e7cc0d9233b56cab2326adc6a689e05c5faf4a3da
 DIST webapi-0.3.tar.gz 26388 BLAKE2B 878e9f760f9940b81647359fb8779d6386b4bd2d2190c77f2ef886a12a6d293f6f0e5829e05fe98e0c842cb927186f9e4a02dcddcdfe99d5e13d52ae43e7f775 SHA512 215516872a32f8d967a9bff6d13916d6571399184728c422babf486152fc4c3f57aa4a7fa7591d7205d4b2dd99138c36796d1f2d186d494d74cf5dd2fa7cdec8
-EBUILD webapi-0.2.ebuild 328 BLAKE2B 1dbcbbb4a1ae8fa48871f527564061c5c1b8a4ba3ccb846ff82e4496af55bdb2f2834a7b79f6c4795517af4e0dfb8be3fa9f8cfcb1a59ed92fa38f4ac8935330 SHA512 3621693275ed6aa6b0b9ab14c79648b8d5cabf609e7ff2ef5df3d45b85de5d58c6560df7103dfc4b2a2ba67dbbaefcaf19f8651ad045ba0af6f76d726e7814e6
-EBUILD webapi-0.3.ebuild 468 BLAKE2B 81ad741b8522f2557471e33fca8e53184b1150a1ef54f61bebf5687cfb5eab502b3d1d2976c0568a0ee34d5d1a7c24f1372256faa579a1b58f5e8215b5af6ad6 SHA512 9c92be9f70769f76b709f8e8fc73de3db05bec9299434dab5644941617f95cc619ddeac137d13c998f4ba5daaacaa68a982fa6e001b43dc0a7d9d2d345970a30
+EBUILD webapi-0.3.ebuild 463 BLAKE2B 85fb64519b0859d04ff5779f4f8860a2e3d448c79728ef4f4bef31e454cdf2d2939d1281c81b451016729c1c1442b812450aec3d9e9a2bcdbbf589e38f91b42e SHA512 bfab8ea1cac08de5d3a0cce970958215df10a7138283b8fa829f267b2435916c84292b8135d3fc700db345a38dbf3e6c75b026f5d3886cc5ae48da7ca4d407bf
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/webapi/webapi-0.2.ebuild b/app-vim/webapi/webapi-0.2.ebuild
deleted file mode 100644
index 220b40e270c5..000000000000
--- a/app-vim/webapi/webapi-0.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: interface to Web APIs"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4019"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="net-misc/curl"
diff --git a/app-vim/webapi/webapi-0.3.ebuild b/app-vim/webapi/webapi-0.3.ebuild
index 7a9673e4e753..84d31825dee7 100644
--- a/app-vim/webapi/webapi-0.3.ebuild
+++ b/app-vim/webapi/webapi-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: interface to Web APIs"
 HOMEPAGE="https://github.com/mattn/webapi-vim"
 SRC_URI="https://github.com/mattn/${PN}-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 
 RDEPEND="net-misc/curl"