gentoo resync : 24.12.2018

27 files changed, 146 insertions, 113 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index f9eb21b6ae21..0978aae5f7ab 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/airline/Manifest b/app-vim/airline/Manifest
index f6ea693ad700..8a08fadb0d5d 100644
--- a/app-vim/airline/Manifest
+++ b/app-vim/airline/Manifest
@@ -1,4 +1,6 @@
+DIST airline-0.10.tar.gz 86724 BLAKE2B b0019b07b188039a9a91d83bc240e6b2eedaf9d798483f03d252b57269c0cbbc58625b3d14e36a3caaa6fd35b65716d67a967a38511806d76bc7e76192086349 SHA512 94c87800b793d575d8e1fbf2971cc97e89aae4a6bd9581aee628d4e4f2d9e74df427fcc91b17908819b5f4793c72a9d0a827d5046d80918a52ef8e090ff2cae6
 DIST airline-0.9.tar.gz 72660 BLAKE2B d6c9762d8140b2a88a001b9ea3ae62c3c9147ccf3db90146d7fded8dcbc6062bf97c0725baa79db9d7bfe0eeaa5dc00ddfabde8ed1b9aec7f5aa24c41b11d1f2 SHA512 f3fd03c7ab6603eee6e892a1b88888d72fc43cf0a8582ad7e65152cddebb0d14be3a805529fa5467fc82e040cce2616f1693bf294c892c0849d9fb51cbbd04ec
+EBUILD airline-0.10.ebuild 758 BLAKE2B 6f9b9121a4d19c6c559a9f4a3ea618a6cb832bfd3a6700bf903f5bd25dc9b692a9ceeaefdf083dffc39c2523e2dd8cf6d03f1430ab924fe4114ae9392649d791 SHA512 bec80c27f7e2a9607fbe0d1c9421949bc202c795de731c840652181426a32d07c2b23073e7933ad053ea644eda2d4af2dd840aa4e6f0e79b0a7df30226f4bfec
 EBUILD airline-0.9.ebuild 759 BLAKE2B 436c701d3158c3905c2b00c9af14cb27637f15b54d8f4f5fb042136331581547241e74ab2c8fc8f9f782124ea4e7bc0a87186da0f7d544e5ae183cbdc3ece437 SHA512 4ea077bbe732cde3af20eab05373aca10696525de22e741140082c520d16c82d17c64c702dd62c8435a13de95436143c601f46220713b48a2cc5bfeb12afea8c
-EBUILD airline-9999.ebuild 761 BLAKE2B 8765adadb622edda9254aa516563a3230f1088a811a610ce6d9571092cfb3b29c5f2b082ea3adba859b6685a29a0b8c93c52618ba1d8a0ddd21534ae587c8afe SHA512 f3cc5f2451af1779c231ce82d955ac6a44fad7d5819e305353d1f1f8f2094207b3e2c6b0a7f6cf7403eac9456761151b414acb74967848e9bb02e9920ce621da
+EBUILD airline-9999.ebuild 758 BLAKE2B 6f9b9121a4d19c6c559a9f4a3ea618a6cb832bfd3a6700bf903f5bd25dc9b692a9ceeaefdf083dffc39c2523e2dd8cf6d03f1430ab924fe4114ae9392649d791 SHA512 bec80c27f7e2a9607fbe0d1c9421949bc202c795de731c840652181426a32d07c2b23073e7933ad053ea644eda2d4af2dd840aa4e6f0e79b0a7df30226f4bfec
 MISC metadata.xml 341 BLAKE2B 773326b7103bbac0a5d028d4269187e8acd4a7c0603cb1ccdb129c2d3cffed385e87f47fadd5fd8d68dcf5271521ccddc43412b7f8b7ab41dd7618c65f56c849 SHA512 90eec982571c778fff57d1e8a604fd994d249149846544223c2cb0c244c16632fb320fce1eda35641bc0a914cc2a9031bd2e73a1444412119690a2d3729c541a
diff --git a/app-vim/airline/airline-0.10.ebuild b/app-vim/airline/airline-0.10.ebuild
new file mode 100644
index 000000000000..5c0506370c59
--- /dev/null
+++ b/app-vim/airline/airline-0.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+if [[ ${PV} != 9999* ]] ; then
+	MY_PN=vim-${PN}
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim-airline/vim-airline.git"
+fi
+
+DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+
+	# remove unwanted files
+	rm -r t Gemfile Rakefile LICENSE README* || die
+}
diff --git a/app-vim/airline/airline-9999.ebuild b/app-vim/airline/airline-9999.ebuild
index 2b0d045e241b..5c0506370c59 100644
--- a/app-vim/airline/airline-9999.ebuild
+++ b/app-vim/airline/airline-9999.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=6
+EAPI=7
 
 inherit vim-plugin
 
diff --git a/app-vim/command-t/Manifest b/app-vim/command-t/Manifest
index 11bd4e9505ed..7ec25dc98fed 100644
--- a/app-vim/command-t/Manifest
+++ b/app-vim/command-t/Manifest
@@ -1,5 +1,7 @@
 DIST command-t-5.0.1.tar.gz 81781 BLAKE2B 5d606892d9653c259525b6778cd72309da898fae787964fd4d1c9a6ebfd91e467e1f88f5756d7966c4866f721912164f0bf852efdd19209ce779a56725e2adbf SHA512 54262f4628bbef8a11878a8593510af566dabf35dd70005dc90e4abb4c4e9aebde5dc7d08d808c944980017f8f35d7e9723b0032ccde5ab6d2d2fae38e1c632d
 DIST command-t-5.0.2.tar.gz 83601 BLAKE2B 0391f010252fcd8b48909ad4a8dd504e6cbb74f1a2f776d719a8179f0d44299bfddf8161a2961c9089cbb3a4c4c944daa4adb26927f27c4c3beebceb0b938f53 SHA512 f8c8356231c3fb0f3a91cb61f534acac4dd401721a940c6ea045ada287d29395923eb46b1cb4f55b8254000f10eea9970841531abb2b110992180a1edbd66b81
+DIST command-t-5.0.3.tar.gz 84019 BLAKE2B fec893aa698a1d1bfc86cf7bd08562f19b54e58d81b7650e50acdf17bfcec54f78aae38d05ca5f93ae60c981a6e606d5c68c008be3508c7d41e74aa9f064943a SHA512 588ee1516039e6cd45210de43307c02259fed29cc7610c222fe705cdf1d5938f51f823d41b546a36320da31db12e902363867da91b18fe56ea09c1efe2bb51fb
 EBUILD command-t-5.0.1.ebuild 1274 BLAKE2B c2330d4912899a05e05f2acf5584d74342059ef6a573eb5d7fe4c9f0a64ed2225a4f0bf2d103527db7aa8f9f56cdf8339841f4e35712eb0f4f567c1744c7c5fb SHA512 4ffdedc751a9cbf8bc1a700b3220a570ff99c539e269f870f5b4a2034728243d7d261cf3c3024f0ee8d548a57c16f0745d9977be9de429896423692ea931da59
 EBUILD command-t-5.0.2.ebuild 1274 BLAKE2B 26853635b32078ee63daee365599f815186565b4295ef8db749c0dd2986e6272b1554e5ee6db78b1c65432e100f0463980966e732d47ad7fcc18034f8db9b378 SHA512 a35ba097aac85835bf0d42780ac7ae87fbfbaf960e5ca1d9f60aebcf3cc42ba247e8b4d2a0a9bbf220cb1010095387c1891156a81e1ed9d1ee6777659f978380
+EBUILD command-t-5.0.3.ebuild 1271 BLAKE2B a11eee42866864fc4ed175192cd12c89c0dcd5d8cefe3f0aa7991c4d7d8d578739ef38d60978291d3148bd0c4107916185d1a0e8a1fc13725d95ad503a930b78 SHA512 747250adc16c2434e144e76604bd928f9b2b592636714e73061aebc2b8289af11bbe0f6f1c30f6365f9f2721c8c6d5f8fdf6a8a9ec1c0cec738e1e6685632793
 MISC metadata.xml 331 BLAKE2B ce98227d75f9770a856398ac8ee677a237a2ebff220647964e59ffa6c02ae0162eef5a97b078014cf9c07fae2287d3bfcdba4af162f9d3760a96bc71f5cde6ae SHA512 e6b82ef13f3942afbb08a2d192073d5498640a719e64512c8203c15081e6873e0acb39421adcc711efc6a0f3adbea2953309da0d48acc86a92c51b6a3924f331
diff --git a/app-vim/command-t/command-t-5.0.3.ebuild b/app-vim/command-t/command-t-5.0.3.ebuild
new file mode 100644
index 000000000000..a8bbc97873aa
--- /dev/null
+++ b/app-vim/command-t/command-t-5.0.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit vim-plugin ruby-ng
+
+DESCRIPTION="vim plugin: fast file navigation for vim"
+HOMEPAGE="https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+all_ruby_prepare() {
+	find "${S}" -name .gitignore -delete || die
+}
+
+each_ruby_configure() {
+	cd ruby/${PN}/ext/${PN} || die
+	${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	cd ruby/${PN}/ext/${PN} || die
+	emake V=1
+	rm *.o *.c *.h *.log extconf.rb depend Makefile || die
+}
+
+each_ruby_install() {
+	local sitelibdir=$(ruby_rbconfig_value "sitelibdir")
+	insinto "${sitelibdir}"
+	doins -r ruby/${PN}/{ext,lib}/*
+}
+
+all_ruby_install() {
+	rm Gemfile* Rakefile LICENSE README.md || die
+	rm -r appstream bin fixtures data ruby/${PN}/{ext,lib,*.gemspec} spec vendor || die
+
+	vim-plugin_src_install
+
+	# make sure scripts are executable
+	chmod +x "${ED}"/usr/share/vim/vimfiles/ruby/${PN}/bin/* || die
+}
diff --git a/app-vim/diffchar/Manifest b/app-vim/diffchar/Manifest
index 59d4d9b8f905..2c461a0291a9 100644
--- a/app-vim/diffchar/Manifest
+++ b/app-vim/diffchar/Manifest
@@ -1,5 +1,5 @@
-DIST diffchar-7.01.tar.bz2 19950 BLAKE2B a014fa17e5b15179a4baa8e2cd4fcce36f1cc66cbd8c4ab3a13c0288a510b74f06105d2034666669e2bac2881f5bc5cd81aa1cabb3b80a91f3d67a3bf62bd916 SHA512 3f42f40ec27262f76058d9461ccde80c5badc61d0854c1ff239bea399c26e20eb5cf8960b76901223e937097e18dd7e015fc14a8f7a99907666c518d4baf5117
 DIST diffchar-7.2.tar.bz2 20092 BLAKE2B 20eef77d7019e55e466e1212e4560d91cde83f55808a4b77eb6fe2e5b7518715606d8d89c046e453dcb380517163974e173e00c18d662df2ee8ae43a6a347c06 SHA512 7c9a9239ae4eae1d325984ab40ae8d90e2dabf96dc929ed6f05c3496352aeb562452bd154fe3d1ec96353356c287604162f5b89d762b7afe26bc975449d92427
-EBUILD diffchar-7.01.ebuild 404 BLAKE2B 0e367725b5b0ba6ee4d0ab82cafc55f1e5ee429a7478d5240836475f6d1bce055b947ed51bf3cc1c7d13748f5cb4d47af4ad86e50ac847dad9553a79a06f5eb5 SHA512 bed5f93ea8048e5b21b71250b95ec5cd89473b615e65222a47366aaee6a83b582674f0314f1213ae4d204afaae60d0dfa0e77feaba95078d24ccbec025955010
-EBUILD diffchar-7.2.ebuild 406 BLAKE2B 29853c47dc16d39d7390349eb00be951c430405422dfdbcb22543a353294d20482cf7b4e3bbe30788bf8eb90a92166a0cfacbaf86695b79b6565e12ca2975d30 SHA512 52f1966646b49749170a482af5c34240f906749a3041b3bfaec482732dac24e1e4838aa5ac085c3dd52ad67fe3aeceee9563dbe55ac5241bf7cce474ed5bff47
+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
 MISC metadata.xml 345 BLAKE2B 25adb1e474dae23ba85761950707568de3a87a9f9b0b38545e3a7cb127cd1099f0531f23c04f55a0b21f42a4d5a36b2ef454f2608c692c3afe9a90068dc4ffdb SHA512 bbe312936f14ed5cda6ac637f0780480b5e82580ca79320c5503b404e0a2eb9659fb7d0dda9e83097546fa104b7b9503bb1b25b166725b045487c78d80219d7e
diff --git a/app-vim/diffchar/diffchar-7.2.ebuild b/app-vim/diffchar/diffchar-7.2.ebuild
index 7a51a1973915..6c45dd971e77 100644
--- a/app-vim/diffchar/diffchar-7.2.ebuild
+++ b/app-vim/diffchar/diffchar-7.2.ebuild
@@ -8,6 +8,6 @@ inherit vim-plugin
 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"
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/diffchar/diffchar-7.01.ebuild b/app-vim/diffchar/diffchar-8.1.ebuild
index 6c45dd971e77..b3395586f7c4 100644
--- a/app-vim/diffchar/diffchar-7.01.ebuild
+++ b/app-vim/diffchar/diffchar-8.1.ebuild
@@ -1,13 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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="057dad8c90d72af5d9bca9cd33746c3b59285191"
 
 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/frawor/Manifest b/app-vim/frawor/Manifest
index 2b65db8e7e40..fb8e942653e3 100644
--- a/app-vim/frawor/Manifest
+++ b/app-vim/frawor/Manifest
@@ -1,3 +1,3 @@
 DIST frawor-0.2.3.tar.xz 257268 BLAKE2B 4409de0fb392841676eac2d794e0e44f64e3978dea1b72b807b7660a9feb1da3850a1ba651287f624830da4d1529daea60da2b76db37e422b6a4827e73dcf8d6 SHA512 ad8c6939875b5783b3faa0a3194e187161ba10f662a896f06ea86aebf12b172bd8d419b14a95c0d14aedfb38ebc5de73895d6d472db64dc15f567509e55188b2
-EBUILD frawor-0.2.3.ebuild 376 BLAKE2B 47753081e97ee08f5287bcd25baa15dcb652bc53e20dafc8d72cc80e21f85d44edda0936be40647a1c5f8b747f64e19d4e806c890a569a1685384c12d8ba4efa SHA512 09188548e4943975314a6c2e5ac67faab27d3112482aafd6781f9330bfd381471ee4080a8d84b251f06bcee862530d70763957b226248af029ec75ed5c9437bc
+EBUILD frawor-0.2.3.ebuild 371 BLAKE2B 52bdb7fd2757213727dc3cb650035c5464fc0c4fc7f915370c182cf1cbb6d08ad59b42d273417f280241a9496cf3988f61ff43fd0f7718f2077edd1271a3442a SHA512 d9076e61edafee2e63f6fe20a119aeb88847723c95e2204210eec19e3ad8299002e94778a9cccf992fecb25168b2c7d7b1de096f592e06044bcc92a44eb07434
 MISC metadata.xml 329 BLAKE2B 17d5e9ce9b31695f1b5086d74864de622a4f36fd842f4abda1970ff98ed438f36edaaa96a4bf990a5b5cd54f59ea2bbfaa3b7da472ab570c2621ebb3cdc6d3cb SHA512 586688ee9f3cd9697e9236e9377691f5ac8c0e4ea3910020b1616a6454342021ae971ab734fb2e2ccf33d8a08fc44fea848d72f47a6acdf3b9999d3aa280ae24
diff --git a/app-vim/frawor/frawor-0.2.3.ebuild b/app-vim/frawor/frawor-0.2.3.ebuild
index 6a80c16a5951..1f54b2217232 100644
--- a/app-vim/frawor/frawor-0.2.3.ebuild
+++ b/app-vim/frawor/frawor-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 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://bitbucket.org/ZyX_I/frawor"
 SRC_URI="https://bitbucket.org/ZyX_I/${PN}/downloads/${P}.tar.xz"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Tests rely on zsh. No.
 RESTRICT="test"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index bdaceac33394..e5e3801af0b4 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 1295 BLAKE2B 5240108071b06075d11335c1877faf4a56b6065baadece201b71ae4b92ba92d098d8fd085882c0365e80f284f18c2f053b1fc469278bec7279f08f79c4b4961a SHA512 1bbacc8c4467ea60888c4d82aa767830d8acca09b532b6bafb00c978220b780c20f7c108201240cf9b638ce73ad5196e6a8c184029d22f95e86c65baef8eca6e
+EBUILD gentoo-syntax-20181023.ebuild 1284 BLAKE2B f6f66afde05a214c21f0eeb94d1381b2b3e400ec06d209032d66468a4fe4783ac33552fdc0e098981fca96381c720fc25ecfa507ebe8dc88ef3c55cd9f360cc6 SHA512 ede97dc717d702bf50a26daab6763d977310775ec5523a1eb6e94f54e56468ed6c5b14a1ffdef8fb14fc8958c2d96ce370e48db731a0406d895dde2e4a497e25
 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-20181023.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
index c40de243f4b0..6015b3f75531 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20181023.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 ~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/merginal/Manifest b/app-vim/merginal/Manifest
index 94d82ee04c23..0322260c66e5 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,6 +1,4 @@
-DIST merginal-2.0.2.tar.gz 15048 BLAKE2B 0c69f383ccb076e49b1ffcd7e74944c30b0d5e61054d636873a6391b39e4da6f1613f0f0a43d79b986a4681e4e7bd27a37f872e21a0e3df4520355a646a0adcf SHA512 fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721
 DIST merginal-2.1.0.tar.gz 13510 BLAKE2B c44f3873f36ee540e69f1cd87558e2601f944f430d15ae0e863adbba5383637ddbae2bee01cf1f7788f677a159da7870a83b909562813f8817d610e85f9d4a96 SHA512 3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed
-EBUILD merginal-2.0.2.ebuild 607 BLAKE2B 2428c2b690b515859198f6908e322c7e033162259b4e3cb5323a67df0c5f91541478d3d899f228b314fe71adb3766927092bf952faa23594108802e69dab9516 SHA512 74f35751efe11c57d54fd42ede098ff57f9736d76eea74cbc1ff047f0aa5a8a6ac37e91aef4079e4095ed60ec53c6caa493f8231c32a56d4142add3365f869be
-EBUILD merginal-2.1.0.ebuild 726 BLAKE2B 563099f5ecf0290cf8542523794ed261252dd979f006a5e65fb48e1abade837b66485d056681c2b2a849d1fdcb9c9f2c6f1cd8fa5cc7a1e564232fb73ffa7ab9 SHA512 0792f9864e98b518a3a5422e3d1803cb51921b12c60856553d97880aba8b75c95a9ee3f0906475c39461a6f3266e6df31e09c778f96d3ca7fce36670804d5895
+EBUILD merginal-2.1.0.ebuild 721 BLAKE2B 7eb8255843d8b9cd741c645096e374ba3328585fdb0818676c21b111442fef0fc76395c54d3f7e84f072b1c8c481d7933157da41351215e3c85a4eeca8ec3d49 SHA512 c1f63cf5095f0729ba39ec1eccf9eeb382bf2a1e9dfd5d9a85486f9c315d5521f2d46704cfa6adf6ca91a2e2cf319e8e48a77c7eea3b69910a58d3ae978f88b9
 EBUILD merginal-9999.ebuild 726 BLAKE2B 563099f5ecf0290cf8542523794ed261252dd979f006a5e65fb48e1abade837b66485d056681c2b2a849d1fdcb9c9f2c6f1cd8fa5cc7a1e564232fb73ffa7ab9 SHA512 0792f9864e98b518a3a5422e3d1803cb51921b12c60856553d97880aba8b75c95a9ee3f0906475c39461a6f3266e6df31e09c778f96d3ca7fce36670804d5895
 MISC metadata.xml 345 BLAKE2B d484adbd45fa9339d6199f9978129adce0a8dc2ac1a8f0edf4dee62cd115a8043b0aadd6bc7708305516fd16caa6da8feeab3270f2e7f82bb751e916c0a2573e SHA512 c86f966d8b95d7ae380395af45af1046b3102e4c921f5a4102b4d421c707659b4e5aee25765b8af1e815cb5274963bdcae482cc4700d3196259e62ecaf6919ce
diff --git a/app-vim/merginal/merginal-2.0.2.ebuild b/app-vim/merginal/merginal-2.0.2.ebuild
deleted file mode 100644
index d74ee03f7bc0..000000000000
--- a/app-vim/merginal/merginal-2.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-MY_PN=vim-${PN}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
-SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-vim/fugitive"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rm README.md || die
-	default
-}
diff --git a/app-vim/merginal/merginal-2.1.0.ebuild b/app-vim/merginal/merginal-2.1.0.ebuild
index fbe6b96d4612..747a5ef99670 100644
--- a/app-vim/merginal/merginal-2.1.0.ebuild
+++ b/app-vim/merginal/merginal-2.1.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-vim/slimv/Manifest b/app-vim/slimv/Manifest
index eb32fc60e48f..3f37ab7e0cfb 100644
--- a/app-vim/slimv/Manifest
+++ b/app-vim/slimv/Manifest
@@ -1,5 +1,3 @@
-DIST slimv-0.9.12.tar.bz2 614025 BLAKE2B 8740e905a12b28715f953fecfdde3c7d6b4eeb74fc190c433bdb7120b3a6af5d5c9c2ced3f57a43ab8b9bd1402cb15462892343bb621f8b56453d98a909ff882 SHA512 7ccf617780c5d6b8d25738546cb9df6986b4409748a5938e8d9112b057d34626a6b8525fb8622db06d0f300d6ec38f7513ef2c0e49df3bcd89614888887ca057
 DIST slimv-0.9.13_p20170910.tar.gz 634493 BLAKE2B af7963e1d1b60b20294c935ecd076220777eec333b4e91bac82a111b727ce71c312c347b865f9e0c9072c0f94b40dc920b15feaf10f8683e1bba7590a177e62e SHA512 562e08866d62a6af5c20064a4533da7f0577ceb43391fac59acc0bb9c76319e3520c951c325277edbb2d0461fa227b91456c54ec5d9d1e3bca18d344f3e9a5e2
-EBUILD slimv-0.9.12-r1.ebuild 899 BLAKE2B 778bc0eb8febd46e7b42943bb4fcc4a1257bf136a342891655b6c80f2f496ef2ac62f6eddffe5c63ea75323188a05c2eb5906951213f41b6383e638454bc0908 SHA512 6549c954e0f2f2031b32470d8cd0061f01dcc0043af885e195d1b42fb9224436e5e79ddd94328c5d357c7aaee71ea370f2f4fee0f5ee9596e4d2a5e0fbe07b8b
-EBUILD slimv-0.9.13_p20170910.ebuild 1001 BLAKE2B 598a50667d0c3155f3c516eab3a677e39c94a069ef998aa167d7feb91ff6037eab2db25728dd0db28e2f1464b1808987c2f271223896ea37e4a2736025bd7cbc SHA512 18da1cc235a2c0838e5fc1ad670d6b4afed98ae22e5c5847be636e4d29cedb0f60187d676106558047bb241c80a39307426047a79b2cf6327821fa46d773a0a3
+EBUILD slimv-0.9.13_p20170910.ebuild 996 BLAKE2B 412643972587fd97dfdcd2e61fb30ab5642be1f3fb964b955b95d656948907d13916f52a35b79c366d8231321c8191b6b1826ab3f7dd9b0b51241b5a8849d932 SHA512 5d3d6ade3c3565c34db01f21e6649fad364f323bdaff36df8e2f4b0396592a5378c043562168716ae23a2717f89e7594eccfdf7b3203df03311aed9bc865d216
 MISC metadata.xml 1220 BLAKE2B 7d60a456299acdd198b51276a1016fec37007bdb6220efaa786889b0d046de73d14724e2a8bd5efaec84e0c850ff69bdaf344bbedcafa132a0a8c0c45fad051e SHA512 11c6fb3a83ea65ea97e57e70b24d9e011d48fb456bff15ea8b501e0dab767f73c78ae1c63e662423599252dee9969c1983b17fd1505533b3ee26f3afde2a3b29
diff --git a/app-vim/slimv/slimv-0.9.12-r1.ebuild b/app-vim/slimv/slimv-0.9.12-r1.ebuild
deleted file mode 100644
index 1d601bfbaeef..000000000000
--- a/app-vim/slimv/slimv-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vim-plugin vcs-snapshot
-
-DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv"
-SRC_URI="https://bitbucket.org/kovisoft/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86"
-
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}
-	|| (
-		dev-lisp/clisp
-		dev-lang/clojure
-		dev-lisp/abcl
-		dev-lisp/clozurecl
-		dev-lisp/ecls
-		dev-lisp/sbcl
-	)"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	# remove emacs related files
-	rm -r slime swank-clojure || die
-}
diff --git a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild b/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
index 9f4e50a10ec2..ab6f8f4b3d30 100644
--- a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
+++ b/app-vim/slimv/slimv-0.9.13_p20170910.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
@@ -13,7 +13,7 @@ DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv"
 SRC_URI="https://github.com/kovisoft/slimv/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	|| (
diff --git a/app-vim/tasklist/Manifest b/app-vim/tasklist/Manifest
index 85ec58318e8f..3fa3cba6f2cb 100644
--- a/app-vim/tasklist/Manifest
+++ b/app-vim/tasklist/Manifest
@@ -1,3 +1,3 @@
 DIST tasklist-1.0.1.tar.gz 4066 BLAKE2B d55e12f28546f400b34e11636814205e94c3c82656a068c9774fb23fcfd336fae059efcf307043b6bcbaccb939a4a4ed8d02c9a5944381bece096c57f6092ade SHA512 623ec5b147e485abe3e246796a6ed67dd8325ef37708e589c4568897da10ba70076eb5dffd9fb9333fc29d045c316cf382950de13f616873334fc734875600b9
-EBUILD tasklist-1.0.1.ebuild 448 BLAKE2B 0f02ae5f3206b69f4a07d7bd34d2d902033bc072e2586acc79ae64ef9a1d4cae028697df017acc15718ac80f36ddb6664ad2a89deeac65a17c53f7fa59c18d18 SHA512 2ddd17c8ed2a27feb12eb8c6fb0e1a089d9e940a17962d34f7c54e947aa715f30f3d6267ec806ca2136f16e63ad485633e7a8efc6fd677b8a526b74031a408a4
+EBUILD tasklist-1.0.1.ebuild 397 BLAKE2B f0baba7365c46c2120083d8ad37ed1fdcd21e447c7d64ee6fa332701b8fa33dba64cc73f93d06321cb3292fbc5c945ecfc512beb5a9a5a9aeb36ada412770f48 SHA512 647a2728b9115728ffee66484604ce46c618635bde9dbe4f36674360930911c1cc2933d2801fb5fcadf128fb4bcae5225d9fe8122d36a7041ede0649175bd76c
 MISC metadata.xml 450 BLAKE2B 3a688d7ebb054fc8ee455e92001c40c1325c614b18800f6b31d7dca2d47621016fc831e4785745fae6bce770b3eec6d403b5de3a4b4cf373f60a17b97cb80e99 SHA512 2f047ee53729d6cf9fa63861c3f4246767541fbc16d21df0f6b75bb153a77f0e2b68d67e20a1544944f19ffb00e8363c6a374c9d414c242cf218aaf0f3ce69af
diff --git a/app-vim/tasklist/tasklist-1.0.1.ebuild b/app-vim/tasklist/tasklist-1.0.1.ebuild
index b855acd97181..a8060181dc4c 100644
--- a/app-vim/tasklist/tasklist-1.0.1.ebuild
+++ b/app-vim/tasklist/tasklist-1.0.1.ebuild
@@ -1,19 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit vim-plugin
+inherit vim-plugin vcs-snapshot
 
 DESCRIPTION="Highlight FIXME/TODO/CUSTOM keywords in a separate list"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2607"
 SRC_URI="https://github.com/vim-scripts/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_unpack() {
-	default
-	mv vim-* "${P}" || die
-}
+KEYWORDS="amd64 x86"
diff --git a/app-vim/undotree/Manifest b/app-vim/undotree/Manifest
index ecba8604d9c6..e95b80d20ad7 100644
--- a/app-vim/undotree/Manifest
+++ b/app-vim/undotree/Manifest
@@ -1,6 +1,4 @@
-DIST undotree-5.0.tar.gz 13646 BLAKE2B 12fb31433b95ac980cae9d313ccb7cd30d0a63a25f440027ae0dd8cd240a80aa825582f60a88b44346f392f8e52c7ff5d86a87d8891b0adc3fcf17daf0c86ce3 SHA512 093202633000c15db731c9664b606ced7dd4d259f9fac04e886509a440eb5e31de073250eb400be0b1e4cdabb393d1d88bbcb88fa162c89a3783c961b33d33a0
 DIST undotree-6.0.tar.gz 16288 BLAKE2B 38e7d185f0c2d9dd139c0c9b49593e1f6d14f7eab81b984c641b9d6917888510cda6a03d3030e051e257fde72f86d5dddbf65a8b29e4cd68323e9b976281f9ee SHA512 2654206adc8e4f021d5f2f3927ab5cb218e333a34fa5121e5ad48bf9b26e8d15c6b58cf88988407a587fb60cf406a4ed766fc4388672e93d4fceddc8712c4c49
-EBUILD undotree-5.0.ebuild 429 BLAKE2B 75a918dcac1810cd1df0b59aace9f5397a932d45596e96f7acfedae7508e90220ec05e3ce1b05ebc2e8fbceb410c39d3c9863686de27f33fcaab02548c345fd2 SHA512 f9beb5ea6481b928cfb3118b709f310328ea3e57634e9fbcd19d7383a292cd7761ba9d5c8ff53dfa0e64149d4b54d48d64ce319e4fb056401ae7083c19cb6075
-EBUILD undotree-6.0.ebuild 431 BLAKE2B e518cced54df3af8ff798787e8ffffca8e9158fad66abc0d4510d126e77e72953122161badd9559de881f213c20bb0aafac55b9d9fd643e60b87faf8130d4131 SHA512 959ab5408c8ff75d1ba0561af0c44da061a4d84b1cb12a8715a06f821084596d0c7ff992bc927692ce6041384259714cfe816e2af386a13804231c69ee622a43
+EBUILD undotree-6.0.ebuild 426 BLAKE2B 3d21aacddc751d54a9364240461fbb89ef6dc75aaec4fb4bab469f4569b200a1e0db3ba4ac86bfdf70703ceb72a231ad2339beef0548259f64355316e831e485 SHA512 ec70c0a62068b92bcd0e68a651967474ae609984e934fea98d610b7a7efba5b9714ca4a0aaedad324b243f9291457fd8265f3e464a56f7e410f6260136b86d40
 EBUILD undotree-9999.ebuild 375 BLAKE2B 8f9af682845764821ef513fbb6073ada622d71db6613535025b79a04403bebea5a20fce419472b0034908376ae24e58cd3e5647a87e132256734477251fcd34b SHA512 f9ab75289ae10de12e2a53fdf9db5df5d21dd316e9802ec4a9a946436e4c9e684910562c5b72d5a66602fcbcd45ff0087909ca27852087528f90bada84d27fd2
 MISC metadata.xml 339 BLAKE2B 3794ae7391ce0454ad19c2b24694ece64bb98808bd4e82d001de32af28e6784266ec3edd4ce275a6549316a6245dad1a3eb4e683d9a84076323b23cd5e84b814 SHA512 1a0531dae60fb8686cde296f695ededc1ac678f55672a73d802a0f6eba101d0c9bab0c4610a3d6a297e885660b635830c251b5db5c06ba8fcb126abc2df5a914
diff --git a/app-vim/undotree/undotree-5.0.ebuild b/app-vim/undotree/undotree-5.0.ebuild
deleted file mode 100644
index f494f607ca9f..000000000000
--- a/app-vim/undotree/undotree-5.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin vcs-snapshot
-
-DESCRIPTION="vim plugin: display your undo history in a graph"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
-SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
diff --git a/app-vim/undotree/undotree-6.0.ebuild b/app-vim/undotree/undotree-6.0.ebuild
index ef1f2f67d99e..af3412183713 100644
--- a/app-vim/undotree/undotree-6.0.ebuild
+++ b/app-vim/undotree/undotree-6.0.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,4 +9,4 @@ DESCRIPTION="vim plugin: display your undo history in a graph"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
 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/vimagit/Manifest b/app-vim/vimagit/Manifest
index 1e428795d22c..7f083351bab6 100644
--- a/app-vim/vimagit/Manifest
+++ b/app-vim/vimagit/Manifest
@@ -1,6 +1,8 @@
 DIST vimagit-1.7.1.tar.gz 35302 BLAKE2B e8e46f399ef700d971e61a233af41a3735faf29fe95baa53b6e0888c0b708a1bfcee051bb9afc90348585f3cb3cf9278fe47a1ed17096d956ccecbc45398c4bc SHA512 8ce2959c135da90b880ccdcd66e71661c7908f250d47a24ede025762a6e9422cebcf8fd516bf99e475605f4278e232713c66293781ceb95f47a22031e9260a71
 DIST vimagit-1.7.2.tar.gz 37398 BLAKE2B c7e0a82ebb7a1d1ae5e2c5aa0c6c8f8a2b45fa65a193b6dcd8a97822d4ecb99ba60dd86156390db4de0fb0ce39883e67a1b17157d8c259a0ad6559a52cefbeb2 SHA512 8b825da4b411732db022b1a3f25f6f779ba5e58df5ca4d404e985b16a4811f911c626674f1a7f4a285d78369f4c7ad3a33b7ffa2b50f1a4a94372a3c5fb29a15
+DIST vimagit-1.7.3.tar.gz 42325 BLAKE2B cad2adc5b61dd2abbfa2cdb58c11e293d2a0d03fd5d08c8f4a08140e5bc397ad6949a20b1c4b3076537dcf8b1b4b2f00f0a90ff62dc8a858ff5b37e0e3b257e0 SHA512 bfc0d49892fdb5c5dfc3ca971bc676081ba820420ad358a888299eb5b92e13f185b0acc6c636a493faef3dc10c7a8b56b7dc4393a08cb5b7012619234782b158
 EBUILD vimagit-1.7.1.ebuild 528 BLAKE2B ff657862f6b37886aa82517fc7425c1b4099ab6e7da1f06fc4bd9078e0732a5887a10a51f993d163d090c9a406d9597407d216598a055bb4571a817d63f10838 SHA512 c40090e5f0c543911e41d4edb33be1775806fb67ede5d32690c5513539f9861d30a8013bb2ae378ef38c4020daa7cb76d275648ecbf43721484005fbfbdec382
 EBUILD vimagit-1.7.2.ebuild 579 BLAKE2B 414fd63cd4037e489408da8cdcca4b93aeeef0a6a588366adb000cdcdd54fbe649f73ff0649409fdc74f1781f5fc6fea4ce837e15d1703b155f096d9fed15400 SHA512 52896f63772d399f5e6da40c3e622c6b87e7a8e7c65978883b60715dd4882d5aec2450bf3c766cc23de6851750030dd8bf3b26867bc963aafe1c21c59c9f6a0c
-EBUILD vimagit-9999.ebuild 579 BLAKE2B 414fd63cd4037e489408da8cdcca4b93aeeef0a6a588366adb000cdcdd54fbe649f73ff0649409fdc74f1781f5fc6fea4ce837e15d1703b155f096d9fed15400 SHA512 52896f63772d399f5e6da40c3e622c6b87e7a8e7c65978883b60715dd4882d5aec2450bf3c766cc23de6851750030dd8bf3b26867bc963aafe1c21c59c9f6a0c
+EBUILD vimagit-1.7.3.ebuild 576 BLAKE2B 3702341265bda37792bcb496711b7913af346cc346ed46512a3303b9c6ec30bb50e5bd6706662d5c5ffc5c39c1a37d0932ead968cf7481533f9bf29669142df2 SHA512 373584f5d55a70d2b5cf0c422903d2c12502bcb87bdafdaafa6746c3a3133c2a5037b455782fb766549dcd190ddc24d01c0653ce6e9acb79072cce10997dde2d
+EBUILD vimagit-9999.ebuild 576 BLAKE2B 3702341265bda37792bcb496711b7913af346cc346ed46512a3303b9c6ec30bb50e5bd6706662d5c5ffc5c39c1a37d0932ead968cf7481533f9bf29669142df2 SHA512 373584f5d55a70d2b5cf0c422903d2c12502bcb87bdafdaafa6746c3a3133c2a5037b455782fb766549dcd190ddc24d01c0653ce6e9acb79072cce10997dde2d
 MISC metadata.xml 340 BLAKE2B d17f938b8d8441774f98d8780bb3cd59d2b716a7f74533a16c54f7cf9c10b565bd0f82d513b48ffa7e10e15c8456bcaa8b51cc91b246cf5fff2e691424637be0 SHA512 f9c0871441cc968a62ebc15e75f7f3977a827b7c303b3cf721cadb5030deb9af5356667e149bdd7fb02af63398fe6226e24bc11a770e3c4d6a03c5c9d241d60b
diff --git a/app-vim/vimagit/vimagit-1.7.3.ebuild b/app-vim/vimagit/vimagit-1.7.3.ebuild
new file mode 100644
index 000000000000..2fa87c6aceb4
--- /dev/null
+++ b/app-vim/vimagit/vimagit-1.7.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jreybert/vimagit.git"
+else
+	SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: ease your git workflow within vim"
+HOMEPAGE="https://github.com/jreybert/vimagit"
+LICENSE="vim"
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+	rm _config.yml || die
+	default
+}
diff --git a/app-vim/vimagit/vimagit-9999.ebuild b/app-vim/vimagit/vimagit-9999.ebuild
index 5e291f76fe70..2fa87c6aceb4 100644
--- a/app-vim/vimagit/vimagit-9999.ebuild
+++ b/app-vim/vimagit/vimagit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6