gentoo resync : 25.03.2018

19 files changed, 158 insertions, 65 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index ab9a86fc7334..22be512d3e25 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/airline/Manifest b/app-vim/airline/Manifest
index 06462fcd2228..9910c89e4d3f 100644
--- a/app-vim/airline/Manifest
+++ b/app-vim/airline/Manifest
@@ -1,4 +1,6 @@
 DIST airline-0.8.tar.gz 52767 BLAKE2B 908489fca1fb31d0ee41f279b146046d50c9069055bb13645b049c4333984f0ca180315e50fe3fda13e36780dffa0b213719babbbcd2b27defd60470a05dbc2f SHA512 51ae20f7e5b869f714e9c21ab6ab8af4d2de31b3cf4fe9f6bd64e75e87e7796184d41ddd9536f3e41dcc93e9ca6aad684b286df6e5d8d6eae202f91ed8851292
+DIST airline-0.9.tar.gz 72660 BLAKE2B d6c9762d8140b2a88a001b9ea3ae62c3c9147ccf3db90146d7fded8dcbc6062bf97c0725baa79db9d7bfe0eeaa5dc00ddfabde8ed1b9aec7f5aa24c41b11d1f2 SHA512 f3fd03c7ab6603eee6e892a1b88888d72fc43cf0a8582ad7e65152cddebb0d14be3a805529fa5467fc82e040cce2616f1693bf294c892c0849d9fb51cbbd04ec
 EBUILD airline-0.8.ebuild 751 BLAKE2B 8be15c3264b648a0b319e9d716d98bb8cab064c50afcc7b13262b59fb620ae9421df11a6ab096e506f9aad84d95c7a79bcf12d6ae4d412137c2afc75e62dbc71 SHA512 b394b5a818dfb48ef8564b30b4c16bd6fa786f0975bb7bd5a3c8698d8f3138dc18191c78cc3e2f0581154927d8aafdb3ba7381f7c02f70eaf0e6df0543ed5ce9
-EBUILD airline-9999.ebuild 750 BLAKE2B 620145a57cca1495b5b7684adcb2f44ea61fad984d6a13e8514a77eb726c412c3069b1dd1c945d471f0ec80c4ca7d95fadd57f6db66d205978d6950cb0334e6c SHA512 be985fceda4bfb738887e6139fb4d21a984ef21959080566f4d269efa8602271e9dd96eec6e29fdbbb64837bf641610efb9a766d3afaba8816a406e9eeddc9ea
+EBUILD airline-0.9.ebuild 761 BLAKE2B 8765adadb622edda9254aa516563a3230f1088a811a610ce6d9571092cfb3b29c5f2b082ea3adba859b6685a29a0b8c93c52618ba1d8a0ddd21534ae587c8afe SHA512 f3cc5f2451af1779c231ce82d955ac6a44fad7d5819e305353d1f1f8f2094207b3e2c6b0a7f6cf7403eac9456761151b414acb74967848e9bb02e9920ce621da
+EBUILD airline-9999.ebuild 751 BLAKE2B 89604ccbf2b4938134a3b7174355ef8e553b1454659d5e368d6d8fb1c57d67ba4982c5bae2e94a2b89652039bb86f6deb6b5e6be754675f277c67760b611e254 SHA512 9d8dcdd96b4e739fbe0ee3b1400017110d3a5f3d69e29e4780228461f335e326931b6eae2656d3cd933ad9dd89012c02eabbf3cbfded6d6df3a866e319b680bc
 MISC metadata.xml 341 BLAKE2B 773326b7103bbac0a5d028d4269187e8acd4a7c0603cb1ccdb129c2d3cffed385e87f47fadd5fd8d68dcf5271521ccddc43412b7f8b7ab41dd7618c65f56c849 SHA512 90eec982571c778fff57d1e8a604fd994d249149846544223c2cb0c244c16632fb320fce1eda35641bc0a914cc2a9031bd2e73a1444412119690a2d3729c541a
diff --git a/app-vim/airline/airline-0.9.ebuild b/app-vim/airline/airline-0.9.ebuild
new file mode 100644
index 000000000000..2b0d045e241b
--- /dev/null
+++ b/app-vim/airline/airline-0.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 248f1fbb3ed7..8f8c09743034 100644
--- a/app-vim/airline/airline-9999.ebuild
+++ b/app-vim/airline/airline-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit vim-plugin
 
 if [[ ${PV} != 9999* ]] ; then
diff --git a/app-vim/dbext/Manifest b/app-vim/dbext/Manifest
index 65c1159140aa..c20764d8e8ec 100644
--- a/app-vim/dbext/Manifest
+++ b/app-vim/dbext/Manifest
@@ -1,5 +1,3 @@
-DIST dbext-25.0.tar.bz2 108580 BLAKE2B 858d9828348acbeeeeb2094f127ef4184a124443ac2b8a0a5bffe013259536c99594df8fa9284976f4528ba15e6e8e8e043103028e3bd93be693ea8fee958cfd SHA512 715d9d41be46f691ea5e635bf564c4f16d16a74e5b65d9ae12f794406a2a7815df836e34d0c415e8696847e8f36f2ceed1fda4bc688ebe0db8826dc3f0493340
 DIST dbext-26.00.tar.bz2 109724 BLAKE2B 01f1378514836ac43cbdf9ca6087377ce83118b95fba04d530854a268f22dc2dc78a5f163c75c35ed9bf76514b3889c5f420b704f105dbd88bffc17f3d3c1bd3 SHA512 02d0f75443d91d32f8a6423712fb7eebde7659b986fcca2ddfef6458a5fd5caea3c73ba21ecd7a0fd57793f0a6fbc71d81c2ee6db3b82a9d98fd84572b1df18b
-EBUILD dbext-25.0.ebuild 332 BLAKE2B 1ef70306c946cb18d2fd8a82ff1863647b640e2b5aff7d5f4c6544a4ef002db8187c3649bb6abf8c1a83bdd2040a5c480dc9f8382fbc11271d7c7897ceb64967 SHA512 b3fcc20e340b19227b1c1dc95a6780266468cb2da0a5d54beedf2f8e68c0aaf600f3d987460d1c95f1153a2edfeec1094eac0ff67a16315d0c27f50bbd735f0c
-EBUILD dbext-26.00.ebuild 335 BLAKE2B 7dd4e41963ee2a293bdc6109b0c6edd7e6ea64d3c370cbf363e8e912f551976e49d76aded845f2453e4c4d36a61864a829caa7580e4447e69b2eb2f28a1fc4b8 SHA512 08464bfd45f4b7f31eb661b1c982fac03f9f5bb97ad12c45b5a6c8328dbdcae9f2a07ad42fe602bdfc7e22ab11e5b834bebeb3b5e469140403b1547f87037fac
+EBUILD dbext-26.00.ebuild 332 BLAKE2B 1ef70306c946cb18d2fd8a82ff1863647b640e2b5aff7d5f4c6544a4ef002db8187c3649bb6abf8c1a83bdd2040a5c480dc9f8382fbc11271d7c7897ceb64967 SHA512 b3fcc20e340b19227b1c1dc95a6780266468cb2da0a5d54beedf2f8e68c0aaf600f3d987460d1c95f1153a2edfeec1094eac0ff67a16315d0c27f50bbd735f0c
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/dbext/dbext-25.0.ebuild b/app-vim/dbext/dbext-25.0.ebuild
deleted file mode 100644
index 90f05bddfff0..000000000000
--- a/app-vim/dbext/dbext-25.0.ebuild
+++ /dev/null
@@ -1,13 +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: easy access to databases"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ppc x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dbext/dbext-26.00.ebuild b/app-vim/dbext/dbext-26.00.ebuild
index 6f66ec1f03b9..90f05bddfff0 100644
--- a/app-vim/dbext/dbext-26.00.ebuild
+++ b/app-vim/dbext/dbext-26.00.ebuild
@@ -8,6 +8,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easy access to databases"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitgutter/Manifest b/app-vim/gitgutter/Manifest
index e2ae7fd57a0c..02d1fc21f979 100644
--- a/app-vim/gitgutter/Manifest
+++ b/app-vim/gitgutter/Manifest
@@ -1,6 +1,6 @@
-DIST gitgutter-20170222.tar.bz2 41819 BLAKE2B eb9e381c06aaf7136bcc40029cbee98f62be6eda66dcd63ef368bcaa9a6fe01476e90ebf0a99133bc341a129c603695cdf8173b6dfb710f224b8da9297c8a13b SHA512 970a956a839c2eaa05b699e8507b239d36ad623c40d3d05d9ce82320ec93ae733de2d40619898c5ff43074e2c8f95611b94879424767fac4f2b1fe2747611f4e
 DIST gitgutter-20171101.tar.gz 43534 BLAKE2B cb0b935c1b2d16a50bbecc73f4f8c657a9087bef56bef36af8ff52a7ff09d39293296eaf49507015eaeac7f4faba2a26a09a49296c28237029110068cb9f6048 SHA512 24d8ad740931df17c2c67e2a2a13e3bba7c1205ba5543f5c11353e639876f4a54e69170dc0a946660ee2e3a23a110c90f4195fa9a1ddfff19163f00d88528219
-EBUILD gitgutter-20170222.ebuild 576 BLAKE2B 2f99f6540fe82c0fe22e6e309d208a8312ee30bba2d24ac52ab3c9bc73a090dac6d65ef07bc18c3d5dedec0d4b0e9e59fa7039153564560ee97cc868260e57f0 SHA512 f6b6f1fc620034b9e573fc826984ec8c520a32d656ffbbbb7657fd363d20245586c28e33066d711a8e46979da0b944df530e24b89a3a5bd5e57f2904c7300691
-EBUILD gitgutter-20171101.ebuild 754 BLAKE2B 177e47037f1006405b63200abf1586e26afad8798c46a264b407867cc0fee30e2fd06c4a4128b2c818d05194e1bc2307188199d83862a7fbae59a9a584e08e5a SHA512 b6aff8af940b2e9a91b61b60cee08b3d23bdc7b4747cea31b13e3a42684b067ae892d6fd3202dc7a0a0ebebc647315fb29c5da581c3388465d7011fbf415539a
-EBUILD gitgutter-99999999.ebuild 754 BLAKE2B 177e47037f1006405b63200abf1586e26afad8798c46a264b407867cc0fee30e2fd06c4a4128b2c818d05194e1bc2307188199d83862a7fbae59a9a584e08e5a SHA512 b6aff8af940b2e9a91b61b60cee08b3d23bdc7b4747cea31b13e3a42684b067ae892d6fd3202dc7a0a0ebebc647315fb29c5da581c3388465d7011fbf415539a
+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
+EBUILD gitgutter-99999999.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
 MISC metadata.xml 346 BLAKE2B 89acd12a36beb7b027e42b7f094bba4e229e345ad6f0024bbd3e550784459975aff10e88f5de53de3f2150000b7349ee97348723110a43130b213404292b562a SHA512 4ada20b8f4f308445854b0e0ab229271a603e38370675691790dce0303ca4c2a7f00b247363b0f13bcebe78397fd3ebbbd157403260664171b548b8964da7a0a
diff --git a/app-vim/gitgutter/gitgutter-20171101.ebuild b/app-vim/gitgutter/gitgutter-20171101.ebuild
index 0cb5b2aebcc9..2dada9f85e8b 100644
--- a/app-vim/gitgutter/gitgutter-20171101.ebuild
+++ b/app-vim/gitgutter/gitgutter-20171101.ebuild
@@ -11,7 +11,7 @@ else
 	inherit vcs-snapshot
 	COMMIT_HASH="1e60667322b7cd1bfcba98762fbba746a888d21a"
 	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-20170222.ebuild b/app-vim/gitgutter/gitgutter-20180316.ebuild
index 0a08a4ac7e70..002f6583087d 100644
--- a/app-vim/gitgutter/gitgutter-20170222.ebuild
+++ b/app-vim/gitgutter/gitgutter-20180316.ebuild
@@ -8,7 +8,10 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 x86"
+	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"
 fi
 
 DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
@@ -20,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/gitgutter/gitgutter-99999999.ebuild b/app-vim/gitgutter/gitgutter-99999999.ebuild
index 0cb5b2aebcc9..002f6583087d 100644
--- a/app-vim/gitgutter/gitgutter-99999999.ebuild
+++ b/app-vim/gitgutter/gitgutter-99999999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	inherit vcs-snapshot
-	COMMIT_HASH="1e60667322b7cd1bfcba98762fbba746a888d21a"
+	COMMIT_HASH="37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"
 	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -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/gundo/Manifest b/app-vim/gundo/Manifest
index 4ab49a03c174..df9979976a02 100644
--- a/app-vim/gundo/Manifest
+++ b/app-vim/gundo/Manifest
@@ -1,5 +1,3 @@
-DIST gundo-2.6.1.tar.gz 153125 BLAKE2B c08016986dee222bd1f508776765f2f94fcef76178c5d9eea92e789b359e95d699b5540f5646b5825879f725c9ad91b7034192f807f923fde9e6d4314cbb7b5b SHA512 c8b9b20ff8ef24bd94b0adc18b2cf912cbd0a07c5a70df11be39fbe69d81306027b73d9a60c9127c658c913602a819774c7b1202a8db704677da59cb9916532b
 DIST gundo-2.6.2.tar.bz2 144107 BLAKE2B 7915a60a77e07e49cc1a214c6e250028e61ff33e6f085960836a3e49c1562f4ff713ff4c57125f677d352ae3477bb514fd94d636ee5ba9afac5d23c4ecd70029 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4
-EBUILD gundo-2.6.1.ebuild 719 BLAKE2B 9c9b9d69cfc9d616e48506b8b85508fa4b9e215ce4ab43db69a1167562f4f7c53a05a71fa7175a5a812e3d30445a73b216ba4996b45101e500a274d96f13e70a SHA512 637fef965a372b43d41ae6b027682512c3c70d2ccfcfc7125ae70ae859c7a8d830b5df5f0ec51e3949817179f9b2b8663e52f69be571255fa3862f8748e3d5c2
-EBUILD gundo-2.6.2.ebuild 728 BLAKE2B d1641234ee33ffd91b8fd950a5b210e9ea05b7fef715cb4ce942c2fc40e75ddcf0bcf73236eeda3f2acb5dd760ba8b731d6275788327f574e240327a267d3e7e SHA512 028e89fc1572ff43baf89abd1768c667ea9a81098785cefa2397c12577494afcbbfcd7194f05baed2bbefcf637bf3a7ca3fde26797b6a32bdd00d8a745e4fd31
+EBUILD gundo-2.6.2.ebuild 726 BLAKE2B 67919bb9e15cbd444ac7732b8eb9c8bd52929b589693ad252106e376698a6a5b70b9885a5976c07fc53f0f8f5386f1adfe4434e03ff8e672fe9d1d7ee95b725e SHA512 4f5e6929413654e8cf8d11e0f6cf316c82e89763b63940f0d67b95968382a85080bc5668373fc8183d0a8a70358ab93a19bce4e529071efa6bf88a729d5baa83
 MISC metadata.xml 337 BLAKE2B 08b3c90ab9c289b83c58c3c67fa09f3306082e9d660b8ac81e75f14a44d434fec2657ca4f21ef6660ae46923abe92053a22b404ee9fd443b34775191a999a7e8 SHA512 14459476fa97a611646909941de602646af184e1de555dfff407e71b8fa935c23b5f863b58432be84c31378badabecf8893eafd454d06f8c57759a3bb8035854
diff --git a/app-vim/gundo/gundo-2.6.1.ebuild b/app-vim/gundo/gundo-2.6.1.ebuild
deleted file mode 100644
index 86515acdeb8d..000000000000
--- a/app-vim/gundo/gundo-2.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="vim plugin: visualize your vim undo tree"
-HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
-SRC_URI="https://github.com/sjl/gundo.vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86 ~x64-macos"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${PN}.vim-${PV}
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	rm -r .gitignore .hg* package.sh README* site tests || die
-}
diff --git a/app-vim/gundo/gundo-2.6.2.ebuild b/app-vim/gundo/gundo-2.6.2.ebuild
index 28f68459e8e2..6822904f1e76 100644
--- a/app-vim/gundo/gundo-2.6.2.ebuild
+++ b/app-vim/gundo/gundo-2.6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
 SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-vim/nerdcommenter/Manifest b/app-vim/nerdcommenter/Manifest
index 6325794824fd..2eac4cd5796b 100644
--- a/app-vim/nerdcommenter/Manifest
+++ b/app-vim/nerdcommenter/Manifest
@@ -1,4 +1,6 @@
 DIST nerdcommenter-2.5.0.tar.gz 36834 BLAKE2B 517988392e0ac508f18819a088588d3ede50b634268109ec2c67907c663fb6713b55f45cd2562236c481dea86793ab5999a480f2be309e12cb43b5ccbb34d552 SHA512 8616f56d90dfe2fece0a82b888700c4c762c75b7d1cd30e32a3294d1fe7b65d506a13cfead534ae0f11a2384593d246a723e9a0042421691a5d6fb44969e7ead
+DIST nerdcommenter-2.5.1.tar.gz 36889 BLAKE2B 997fa853ea3b6950de864afc1bd7777a71085154dee484ad07b03e8d0da101151f5df5c4ffc4404714c95c7632ac7678e18eb0ef72d238403c708f7faed8aff2 SHA512 84638a3b216f7bc1535030eed8d766c30d5d7de7f6339fdb9bde65561abfa7f1f660cfa81dc057ee2d146af6df26076880b057a7ff7868e9bc55ab53291e9445
 EBUILD nerdcommenter-2.5.0.ebuild 700 BLAKE2B ce6a3b2077cc5af0638b6b9b3f85b26ee87c6797e45f43d1966c94cdd8a5739d12717bddaeea96935a546ebcf9398caae8bee9d87aff7b912026c86d7adf81a3 SHA512 ec7d771ebc2e4a446a1698ae1e145bea999a7d1969f2052a081dc41792267a55e0df334ec67db20af70815560c4966564bd1a876c89468dcc2cd30e20e95646e
+EBUILD nerdcommenter-2.5.1.ebuild 702 BLAKE2B 23d6be5ab27752b61d4e05683a7ee75b2215e4634fa19cfc168ada658e9bd9dd9ad13a2f195fcde897c5b90bc3f6ccdd2ad6a47b50141b3c6088342ae1f55671 SHA512 d40dffb035f647352c2027e0a02324c061432d869a87801e303adef3b3eaa83d259cb803541ff44da16eb2e6c69f7f470e6a73a0e3953345741310446ad070f6
 EBUILD nerdcommenter-9999.ebuild 702 BLAKE2B 23d6be5ab27752b61d4e05683a7ee75b2215e4634fa19cfc168ada658e9bd9dd9ad13a2f195fcde897c5b90bc3f6ccdd2ad6a47b50141b3c6088342ae1f55671 SHA512 d40dffb035f647352c2027e0a02324c061432d869a87801e303adef3b3eaa83d259cb803541ff44da16eb2e6c69f7f470e6a73a0e3953345741310446ad070f6
 MISC metadata.xml 338 BLAKE2B 654c3b28cc5544f0f9b62d9b6c75f5e3a87e6e13e775ab2d4d0c65a276403c1b8cb0c3e49c72aed4564c39561a395d2dc621efbfb158caa1c28b1cdb79cc7800 SHA512 fd7585ceac792841d94bd11039d0f2367ecbb2a5d297213b6679aecd22a3f64d64f627421e3447ae6f01035bfb1ab7208b5d0c53a9d402085c9c5bf48b43eedc
diff --git a/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild b/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild
new file mode 100644
index 000000000000..e698dd51a16b
--- /dev/null
+++ b/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/scrooloose/nerdcommenter.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos ~sparc64-solaris"
+fi
+
+DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
+HOMEPAGE="https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218"
+LICENSE="WTFPL-2 "
+
+VIM_PLUGIN_HELPFILES="NERD_commenter.txt"
+
+src_prepare() {
+	default
+	rm README.md Rakefile || die
+}
diff --git a/app-vim/vimtex/Manifest b/app-vim/vimtex/Manifest
index 7562b1779e3b..69aaf348dd74 100644
--- a/app-vim/vimtex/Manifest
+++ b/app-vim/vimtex/Manifest
@@ -1,3 +1,6 @@
 DIST vimtex-20160324.tar.bz2 95040 BLAKE2B a6ea2c0ace2aea108545347e0dd624dd838005d752d3e823d230f6fff04ba37f82c98ff472b06b6b5b58a8481824ba1ffad3c756d50a96ea9c79e8e506783131 SHA512 0c0d2a95f3b62239f47113f5b8876728d6d9fddf7e526477e92ef1f09317cb607ddd3b2aa07f6e8bebd357308adf21e4c353795952dc30372b493963bd0554ff
+DIST vimtex-20180324.tar.gz 684092 BLAKE2B 4472c9e62c5795b621a9230fbd7ea1f018c6df440f58065e7b439f64ae67f4064b158094c8d0b8a6eba6202bc9e6729b792fced02ea9deeaf400f0240537795d SHA512 59038aff6ec761a9f73db7d638a70e9ea5ba4d3ef4bd9283f3a62beb5e412f1a3c752dd0d739dc4c9c5e33e4a00a84a91da56e8fea2b8113b7ef73d219997409
 EBUILD vimtex-20160324.ebuild 427 BLAKE2B 54ac66daf12d36f6311b0afe67b4c4e3b754c1327af576c01a7b2d6968229b2804ed716216e973deca59d294e5502a79bf7ee935f26cb8093c810ea5dc09c26f SHA512 6445a566b4cee4841ce7c40b96610d4b3e5e3f60e4eb35aac6e525c2d1b7ef9d79c6281e00f2e5fbb7d0f230fc5109e221d35769d4a957f21cf36d95767a379b
+EBUILD vimtex-20180324.ebuild 777 BLAKE2B f8d569e8e090bf9ba22ff28ad2f4a41098cd3eead7207f1c3c117c3c7ba366b0bd51623c2d96a4c21b55c19d84e8953c2f4a2a9ef74c56eb0eb33bf92cfbdfca SHA512 15f6d678fd0f06df76e0e6a59d483e57a22c7b4c25d707bdaabf5fe4750da076daec9a4e674fa70e4b76e40d7fb44c1b375371a88974c677d9e4c85f490f7a87
+EBUILD vimtex-99999999.ebuild 777 BLAKE2B f8d569e8e090bf9ba22ff28ad2f4a41098cd3eead7207f1c3c117c3c7ba366b0bd51623c2d96a4c21b55c19d84e8953c2f4a2a9ef74c56eb0eb33bf92cfbdfca SHA512 15f6d678fd0f06df76e0e6a59d483e57a22c7b4c25d707bdaabf5fe4750da076daec9a4e674fa70e4b76e40d7fb44c1b375371a88974c677d9e4c85f490f7a87
 MISC metadata.xml 337 BLAKE2B 7cdee52f7b90fb4f600900bf2766b17b00992c1f947bb590a95d17a83ea6d3a9d48d7da4dfef2de1b2101118729ea95298fab28798dee7ec77977fdb659a3e27 SHA512 d2be801e0e552815e32e818ed13172288ebaa4505d6074dcabfaac760fab3227d019e4ddb8610062ceb5680e8b0cd543bd169333eefc80cefc6f5bf790801a0f
diff --git a/app-vim/vimtex/vimtex-20180324.ebuild b/app-vim/vimtex/vimtex-20180324.ebuild
new file mode 100644
index 000000000000..d4031034c014
--- /dev/null
+++ b/app-vim/vimtex/vimtex-20180324.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/lervag/vimtex.git"
+	inherit git-r3
+else
+	inherit vcs-snapshot
+	COMMIT_HASH="17d809706edcb277f1ee7fa5e33aff3619926fe4"
+	SRC_URI="https://github.com/lervag/vimtex/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
+HOMEPAGE="https://github.com/lervag/vimtex"
+LICENSE="MIT"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="
+	!app-vim/vim-latex
+	!app-vim/automatictexplugin
+	virtual/latex-base
+	dev-tex/latexmk
+"
+
+src_prepare() {
+	default
+
+	# remove unwanted files
+	rm -r *.md media test || die
+}
diff --git a/app-vim/vimtex/vimtex-99999999.ebuild b/app-vim/vimtex/vimtex-99999999.ebuild
new file mode 100644
index 000000000000..d4031034c014
--- /dev/null
+++ b/app-vim/vimtex/vimtex-99999999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/lervag/vimtex.git"
+	inherit git-r3
+else
+	inherit vcs-snapshot
+	COMMIT_HASH="17d809706edcb277f1ee7fa5e33aff3619926fe4"
+	SRC_URI="https://github.com/lervag/vimtex/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
+HOMEPAGE="https://github.com/lervag/vimtex"
+LICENSE="MIT"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="
+	!app-vim/vim-latex
+	!app-vim/automatictexplugin
+	virtual/latex-base
+	dev-tex/latexmk
+"
+
+src_prepare() {
+	default
+
+	# remove unwanted files
+	rm -r *.md media test || die
+}