reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-vim
658 files changed, 9618 insertions, 0 deletions
diff --git a/app-vim/ackvim/Manifest b/app-vim/ackvim/Manifest
new file mode 100644
index 000000000000..0dfb9e89bb3f
--- /dev/null
+++ b/app-vim/ackvim/Manifest
@@ -0,0 +1,6 @@
+DIST ack.vim-1.0.9.tar.gz 9361 SHA256 598af55eed01886428027ea26f3f99a5029ece88c28e34c22fb94d09ac552cab SHA512 42c931433ca2554cee0ccdc576891ba82efaebb0e5301ab279b3db8160816892b6f6232da7389058177ef9640a07e9582409c852ee5b55f3c9ee0b6f547ae8d0 WHIRLPOOL eea0a155e3249cde98072367b7bcffc063f22ef250125c46e3a5b0713267a353bd30275e4d8f169087e5108c1734b16796bb836b249dd6663868b6164d051154
+DIST ack.vim-1.0.9.zip 11910 SHA256 b479b04a94ddc4dd29bb9b525ba5e35f4925a96e92dd90a65120f225fd4fb241 SHA512 fc973144e4f82ee76f72709ab3755ed8c8fae0e3f9058d97cb4a19fb81cfb21aac4f0976e2fabfdbed67b9a2220732e335b81666ee42a31d9b4339881024cf10 WHIRLPOOL d4b4864d8dfcb41d0222a8f5bd81f3f3d64d4796b09ed3aff0ac347fb424246e165f6dfa2177723fa7805bed4b07c0973febbff9b7525bf0d6e4aa8467e8d8b1
+EBUILD ackvim-1.0.9-r1.ebuild 527 SHA256 74cdbd871b7fef4f7fb59d8c23bbacfc205ea5f787f917cb75fad1e39d94c0e8 SHA512 ad5d330bd98b620e0e8633e6ca964af68f5aff89f80aeb6e4611003fcd57069493aa02e55fbf5ff7579fa8ec2b911861c74924d8c0c40123d0d8c0adf38ac1e8 WHIRLPOOL 9e5948c9b6d6fd028be6d3ce1000fc3e4cea93ce4b65a5ae23968b8b4814eb5066e404e208730409215bca9f34d00938d4925ab88d1d64d0434845cc96dbe238
+EBUILD ackvim-1.0.9.ebuild 457 SHA256 3de156bc82736f392f40016c4ae3b8836749ccb028fab7e5b2e0bd47058e0f61 SHA512 922a620c3c3761f724133aebc407f55771effe7b97e11bc01020a9259b674f67ab708c603c701e716b84d6c34bd4ad43b825509647ff9f4158aade2201ed9280 WHIRLPOOL 7130b80ba46dbb2cb25e0708b141b2588281dd2a9f6afc3a227046b982356ccf5e50c9f3285a73bfbff79ccc147450d189248107be7dae9223664432c8e1b434
+MISC ChangeLog 938 SHA256 dca2d568aba2913dade646459e59886cca4933b5488ca89f6336c46a8c2eb9e0 SHA512 42b5ccdbc62d4561e7442e94ab7facada774f7c37e837820f836c8fd7330f44625da415a372a268ec3661be82c75c3441d3f96e0f082cbd4d6ef479720162484 WHIRLPOOL c67ed2afce3c783bc62dc01fb4adc3de6cd0fa7ed2d2cdd6ebf21e1ba8e92d0f8ef9f3c23a337d98fbb41be1df1f604b7f95c7fd121849e252cf7d1e34db5c7c
+MISC metadata.xml 441 SHA256 74e85a553f3be32577a0b61571560cc942fd88f9541152091b9b3e8db1125001 SHA512 2d1dcc58aad00a20900a58a57a4a560adef15405ae2c9a04e52cb82504e8999bcf2461cd39d8bec8211c1815cbe82ea8dce35970e83ff2357f8e0974c38a9d6d WHIRLPOOL 7c6977e0eb1005ecba410be2dede2727f0b31e539dac15e0373202d6413605509cd8687c9b0c22398b1eddae97e13ac0203fac792aa75ee6ae2aa923bdaf86e6
diff --git a/app-vim/ackvim/ackvim-1.0.9-r1.ebuild b/app-vim/ackvim/ackvim-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..2157915d1aa7
--- /dev/null
+++ b/app-vim/ackvim/ackvim-1.0.9-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="ack.vim"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="vim plugin: run ack from vim"
+HOMEPAGE="https://github.com/mileszs/ack.vim"
+SRC_URI="https://github.com/mileszs/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-apps/ack"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# See bug 584768.
+	mv ftplugin/qf.vim ftplugin/ackqf.vim || die
+}
diff --git a/app-vim/ackvim/ackvim-1.0.9.ebuild b/app-vim/ackvim/ackvim-1.0.9.ebuild
new file mode 100644
index 000000000000..21d6e2a00073
--- /dev/null
+++ b/app-vim/ackvim/ackvim-1.0.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="ack.vim"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="vim plugin: run ack from within vim"
+HOMEPAGE="https://github.com/mileszs/ack.vim"
+SRC_URI="https://github.com/mileszs/${MY_PN}/archive/${PV}.zip -> ${MY_P}.zip"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="sys-apps/ack"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/ackvim/metadata.xml b/app-vim/ackvim/metadata.xml
new file mode 100644
index 000000000000..d5118b2c9442
--- /dev/null
+++ b/app-vim/ackvim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mileszs/ack.vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/airline-themes/Manifest b/app-vim/airline-themes/Manifest
new file mode 100644
index 000000000000..ccdc397bb30a
--- /dev/null
+++ b/app-vim/airline-themes/Manifest
@@ -0,0 +1,3 @@
+EBUILD airline-themes-9999.ebuild 408 SHA256 d8bae663eb91448aba2dc68ea9760dc51af28a53e974062c5185b9e29416430a SHA512 4f96d7819deafa452e8efdb4531208a19fad406e96cbfd2765ff216ed0f191cccddeedc4cfa2b4346ed1896fa2424aa4064a833444f0b1a3e4957dc393a391de WHIRLPOOL fbc3782bd81e4b6265c0a586a58bff924aa1efeae4ccf84dea1d8bbd7db0e3c3effcb55b85e44c08fad6e933944c4c3c1dfceded4d2d877bfe7484dcefec746f
+MISC ChangeLog 394 SHA256 123028aca711aec070c008b2d7fa9c1514da40f5e24f2eb970dee1bf50a284b1 SHA512 15c6d897534a230ee5759fb8f6f9dc5a8512427a49547a88cdb8e814dbabd0de36358e640304c19ce039a73435f8fce7a0ca926248da16e576e5a4cd39fcd305 WHIRLPOOL c0a45110c33ae2f322ce3a4b266c88b4ad0eb82c26ca2c3f8856ddd7d6318ed97a866e16b62dab9b58e7b41fa56c0b4549d726ef76d8ddf4baa537f194f95223
+MISC metadata.xml 439 SHA256 95c5a31685d3655cbb145685f28369840bc39728605b3cf9915becd751b39763 SHA512 d652a18b151c701e17191e1dbe3dc57f6b8cd02ec2107ceef4dd9ae7164724b62389872025f473cc85c328b8552b9e16eadc2103080488e296e2d81253ce08f4 WHIRLPOOL 5ce5baa01be4c39b9ea37611d6d39ab7e739ec2a5bafd3e6e1fee990d7403b5d7904d3ec6be3c6e1f422a54d22302e5c64b6ec2c1abd5632ef3efc8c56377419
diff --git a/app-vim/airline-themes/airline-themes-9999.ebuild b/app-vim/airline-themes/airline-themes-9999.ebuild
new file mode 100644
index 000000000000..a8942956de4f
--- /dev/null
+++ b/app-vim/airline-themes/airline-themes-9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin git-r3
+
+EGIT_REPO_URI="https://github.com/vim-airline/vim-airline-themes.git"
+
+DESCRIPTION="vim plugin: a collection of themes for vim-airline"
+HOMEPAGE="https://github.com/vim-airline/vim-airline-themes"
+LICENSE="MIT"
+IUSE=""
+
+DEPEND="app-vim/airline"
+RDEPEND="${DEPEND}"
diff --git a/app-vim/airline-themes/metadata.xml b/app-vim/airline-themes/metadata.xml
new file mode 100644
index 000000000000..6eadc4d2435b
--- /dev/null
+++ b/app-vim/airline-themes/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vim-airline/vim-airline-themes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/airline/Manifest b/app-vim/airline/Manifest
new file mode 100644
index 000000000000..5706bf8d2386
--- /dev/null
+++ b/app-vim/airline/Manifest
@@ -0,0 +1,6 @@
+DIST airline-0.8.tar.gz 52767 SHA256 5fb1cdcd9a760516a050bd0e3fa4cae04291cfccd2bcf58f2facbd2a07767a14 SHA512 51ae20f7e5b869f714e9c21ab6ab8af4d2de31b3cf4fe9f6bd64e75e87e7796184d41ddd9536f3e41dcc93e9ca6aad684b286df6e5d8d6eae202f91ed8851292 WHIRLPOOL a5ccf7662267c25b6855d6df81c4c3f35bffe5c2001f05808c1e0a861bb6b04b0bc04d979b04a060992626406cd84d7ac8aabd73f29afaf286fbf4dbc3dec47c
+EBUILD airline-0.8.ebuild 750 SHA256 bf7a94e0b7471ebceb2d57b308af67b58b57e4ffaf37adb9b7b9fe4ac94be64d SHA512 4cef4ca504e0eb4e028a20011ee5dc3b1a1b4989efed4343e4ed2ee0dae14d8c7d9541cc8835124601e64d9ff3c826bc4b6e9520b894baa04cbfd768d6726af6 WHIRLPOOL fdc15fc122db67102141ac839595077e0f40491c9f2492f0b18296db9e854994dc6a947e48defd264eaa8bc98b05ead91138f11fdb8797c1754172d21ba56a22
+EBUILD airline-9999.ebuild 749 SHA256 ced9a6dbeaa19b59e79614ae40873099da64f657309f0408b39c0f84b9550dee SHA512 a9fb9cd9f871836d400f1b63d7a901f5668f75d1e18a7dd89de5e86761d496e051f438575998e2a2597f5fc00a52f9cfe6cbac6545d9735f9ec3ffef95e19cea WHIRLPOOL 7c994619fb8ac8f7c578383db22c44768c336364b0498245473a75e526c57eae266c18fd74ea9e6dc3183498f02b6ac99303cdb35fa27fea023ad68e78345786
+MISC ChangeLog 3476 SHA256 e57871063444d64ef773b4673f0e17cce77fc9755ba20ce5f58936e665901e3e SHA512 cb4439702283d7124333f502d8203a0443b2f7593ed0b130152b33a12c3f68204a383ed2fc71202f217c0dc6131f3f308bf3c462c5bd8f88bfaf95afbfe2b703 WHIRLPOOL b037df07edfd2d3c4a1b52abfb6be8981f49e81b2a24c03fb188e6f52229065299d5978e0e8576e1ce68df78fdd04d7e3e93e80b0358a359e16aa0e71ea01f34
+MISC ChangeLog-2015 990 SHA256 976dbc3536d228c32ca0b9fcd8f4ba67d19529254482ebdb70ded1a193d4eb78 SHA512 5df94b0f00689b0d03e35a878e4f5379f1135695ed461f91432dbdd425180bc169806b21d7a850877f5abf88f0e2de04bd23254cda14cc6e222dd71efbcf4c16 WHIRLPOOL cde2967222e778e7edf2b3a362ec2abbb0cdb2f09a1d527dcddc53a74f48899c2b8736f279274f52f7477a28532ff44140cfcb711b235d1b59d41766e778ad65
+MISC metadata.xml 341 SHA256 e6e6695adbf23867ef394e9b424c9a6fbd500731a36711787f8a36c6454d7dad SHA512 90eec982571c778fff57d1e8a604fd994d249149846544223c2cb0c244c16632fb320fce1eda35641bc0a914cc2a9031bd2e73a1444412119690a2d3729c541a WHIRLPOOL 922984f26d0325f153d805e5c511d3c0cb733a771df1479dfc5baf13562e4756168eb46b11927b0e8fc70b2c199fe4599df5179e8b12ee6c67e0c10f6aba1fd7
diff --git a/app-vim/airline/airline-0.8.ebuild b/app-vim/airline/airline-0.8.ebuild
new file mode 100644
index 000000000000..8959016c24a0
--- /dev/null
+++ b/app-vim/airline/airline-0.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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/ http://www.vim.org/scripts/script.php?script_id=4661"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	# 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
new file mode 100644
index 000000000000..82c71b13e2ec
--- /dev/null
+++ b/app-vim/airline/airline-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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/ http://www.vim.org/scripts/script.php?script_id=4661"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	# remove unwanted files
+	rm -r t Gemfile Rakefile LICENSE README* || die
+}
diff --git a/app-vim/airline/metadata.xml b/app-vim/airline/metadata.xml
new file mode 100644
index 000000000000..9135445654a8
--- /dev/null
+++ b/app-vim/airline/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bling/vim-airline</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/align/Manifest b/app-vim/align/Manifest
new file mode 100644
index 000000000000..ff45da4cc577
--- /dev/null
+++ b/app-vim/align/Manifest
@@ -0,0 +1,5 @@
+DIST align-43.tar.bz2 34490 SHA256 d778ee6e5d4e017d5cce6c20ac2f24c1714cc5d8955d28112110024f8ff46f68 SHA512 b796ce56a60982a1b974a55e6b3ec74cd13ad8b572b00f49d814f22385d76441cb244c913216af3ef0d2ad128d5871eb60e5fc70343e55ce88453356941b0ecd WHIRLPOOL f3de49c6ad69944eed6e0cf02270dda05fb182a670c4e8f92fff09dbb162f471d8bddb989314882e96ba8df3e7d6c6dd455c22792001ff312c4de8ed0b428a7f
+EBUILD align-43.ebuild 391 SHA256 7cd0d51dc7706962fc00c2acb1742b9a93c7281806f309b1eb5c7233d5e75fed SHA512 4c410b686ad7b3526fa5aaf9ce53701c88cc44d43aed54dc77321fb218feb5d221378f89f10b6da511d9d1abdd5622c1e018c5da1fce7a55a08fa28170933d70 WHIRLPOOL 9b2b6c36b33dc6d1557c92650008f9851b9331dd7f4470601b07b248ff6dd873008db39ff344d3c33e3fde0bb73b061ddb61f370ac1d2287fb3cb98c935601cd
+MISC ChangeLog 2537 SHA256 002c1d5a05e073622bf545397dd764ce87241c6374077912cc9ece7a05d0f8d0 SHA512 bc7b1997f156befb9ae73844b692a0db1e41ca70f9c51e413939091b34a26b7e9ea7cf2994d56cd853cb228f2742016c2f943fa1239f52a773fd7d483d454b7f WHIRLPOOL fda9db0545bb9204911c74d27e65c05f5108ef3fb1e6af5a930b9110edfcc0693c9e1eecc5c908dc4d85d8486c9e092d646b2a539d4a6c7c1632a6327ff85386
+MISC ChangeLog-2015 7374 SHA256 3b39f4cb7f3c2e09c28cd3f6874a50affe4e9fbfcd64491011bf74861fd54a1c SHA512 a9d8a6fcf8cdaa8b11361690b97c495c229ef90cc092f5a366e5fcfb895bb3f13f903428013a8fe23ef5a69183ae85b7f217f6e58af76e100e65086133ed4d12 WHIRLPOOL a29a8974c9f9fc1da33e1de7b8dd63574763547b7d830dd501f836dbcf80ff6967e018ce51b66c747a3e96d1ae43197c696477e49bb931d715bd29b1838fb9ad
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/align/align-43.ebuild b/app-vim/align/align-43.ebuild
new file mode 100644
index 000000000000..5286e61a8ff4
--- /dev/null
+++ b/app-vim/align/align-43.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: commands and maps to help produce aligned text"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=294"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+RDEPEND="app-vim/cecutil"
+
+VIM_PLUGIN_HELPFILES="align"
diff --git a/app-vim/align/metadata.xml b/app-vim/align/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/align/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
new file mode 100644
index 000000000000..5e15b3e10b64
--- /dev/null
+++ b/app-vim/alternate/Manifest
@@ -0,0 +1,8 @@
+AUX alternate-2.18-hh-cc-alternation.patch 918 SHA256 cff1d008e790a3f3608552f7bb690a32e079ac889f772221e22f756a3b423a68 SHA512 b1f524d47785e7482791b56f891e624da2a06739483d0584d080f691eaf89c9a350e708fd1369c41b6f99a263d7395b25572366e0b90b0349230079fbdcea4b9 WHIRLPOOL 09199267b161cdda351da2505680d4a62cff49a6efa9d73ee5a515e04fa9080ca045af05f7c269f745f9e177e4e68530213cec625c7c45fa21b85eae8c2828ed
+DIST alternate-2.18.tar.bz2 7907 SHA256 2367638f93c6ce3681a6ad6d5c83f586cd6598abd9f0b20bf02c740ac0efb59e SHA512 397d39a5c5fd186f32f3e0a1651f9b9f739899ffcfdd344e85117c4bb676d8fb8c668410754fefe8934ff1a57537387d49d115dfa17bdca896e423935840ae3f WHIRLPOOL d7635d1812b311232fcbee42d94ad9a0b86176f789d5f9336eb40d2efe5c1a2f660008b8facf5dbba8c094946a574e6b379dd7262dea4aff278c34b7cbe25ec7
+DIST alternate.txt 8897 SHA256 a8fb8daabeee00b7a5c22b65f76dc0758b3e5fcfb95297235ec3ce102bdc4eb3 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651 WHIRLPOOL 780ae8514b65158a4872821f6847d0186d0ccfdd8b2b232617926aa2d907fb59a7d55abfceac96118565799cf6fc14b4def15ba32c1017126f4ff9f948ae3882
+EBUILD alternate-2.18-r1.ebuild 689 SHA256 fbc5a9040bf9d4828c996b734a529efde7dfb110ecea1ad8e151e85716abea20 SHA512 957ae30088ed8242bc3b78b9f2c655b51ceb2cf9a8c2a7e7ef0b77cd1838345668a5860aa7172dc15e6808a3e62404c0225cd0b996556fb881228449b9773f72 WHIRLPOOL 0ae2f92c326828184c9d521761fade8fcfa05749f3046edf3685ff88fd57d95c60912f8faa2c711fa7223f9bd2e60415ab00d1676b3df4c8c0dfa29806d89dab
+EBUILD alternate-2.18-r2.ebuild 934 SHA256 cc5d973f7823fc4d2deec53bf37a8106963628c042c64c9f2a37424e0db5db7f SHA512 e06f8b7a890b2a1d80ef6fc020f36cb5a71fa05570eac1bc0ad8be9fa1b1728f2ef321943bb5ebac40489974d9d668e6b446419fb78f692369e57945ef9cd58f WHIRLPOOL 97ccb5dc96be7c451b1348d3e39f80d65fb3bff5ce374aee6a520e5aabef815431e705f7956eace3568ab6e9f45b975fcd6e90b6c0f655c0355e40da90a1c7d5
+MISC ChangeLog 2919 SHA256 501413ad1c4423288ca8c7c911f1761c50dd972da94c497f9d0b3721ebd179ae SHA512 867e4b621186c840b1d7bde08902636ce7fbdcfcd87b736a34a7d650b28a3edbfb98ef4c859b467fa3bc140f08c186f4016ac3f981b02a2474fe993996776eed WHIRLPOOL 2ad7ed41f1e3ab7ecffa2ccac352ec090b9e40e70558ef35ffd0fd82984a9d65ca5b26aa9647ec22918574d4e319dfeb98bd275f3c6b067f9c54ed6af1e4cee1
+MISC ChangeLog-2015 5945 SHA256 7395d651fa2ed975c2d892edf25b57d772ec0fa1fe74a6d223e038d1389082d1 SHA512 913e11f078018ce71e8a6f7131b6c7116140076783875277fdc6a6f3d42afb0b89217d2ce5dcb779b54c6ede8f04f6af10e92e74f73748e820a9ed08e3584d0d WHIRLPOOL 4a65bcea8e5fe9d4653b924b9cd9c4eeab23d9defd34fb9c03a660df2791d5fe1310df0fc05386785398172b2c570202cee693ae74ae6bf0182a58b94c89caa5
+MISC metadata.xml 331 SHA256 d446615278cc7260fa7dc47db1dc077b806860e294a347293d958bef13e09831 SHA512 ef4ca068ea9f5409c814ca371c0f68456799bed2bae3019cf2ea3af5c2d13750a059f1d885e2c901cc6549cb7915dcb48abb9d5ce7d67210d89b73d79a2e319d WHIRLPOOL b5a4ea4c739370ce41fce4f7b73a54b1a913d1f9e0f4862a6b2ebb0223bf4de495033f2245bf81879d46b1bf53f3afeb98d72764e9ecdf448206cf62ba750f55
diff --git a/app-vim/alternate/alternate-2.18-r1.ebuild b/app-vim/alternate/alternate-2.18-r1.ebuild
new file mode 100644
index 000000000000..5fce4fba8e50
--- /dev/null
+++ b/app-vim/alternate/alternate-2.18-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: quickly switch between .c and .h files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=31"
+
+LICENSE="alternate"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a new :A command which will switch between a .c
+file and the associated .h file. There is also :AS to split windows and
+:AV to split windows vertiically."
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hh-cc-alternation.patch
+)
+
+src_prepare() {
+	default
+}
diff --git a/app-vim/alternate/alternate-2.18-r2.ebuild b/app-vim/alternate/alternate-2.18-r2.ebuild
new file mode 100644
index 000000000000..53430a53691f
--- /dev/null
+++ b/app-vim/alternate/alternate-2.18-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: quickly switch between .c and .h files"
+HOMEPAGE="https://github.com/vim-scripts/a.vim"
+SRC_URI="
+	https://github.com/vim-scripts/a.vim/archive/${PV}.tar.bz2 -> ${P}.tar.bz2
+	http://www.vim.org/scripts/download_script.php?src_id=6347 -> ${PN}.txt
+"
+
+LICENSE="alternate"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a new :A command which will switch between a .c
+file and the associated .h file. There is also :AS to split windows and
+:AV to split windows vertiically."
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hh-cc-alternation.patch
+)
+
+src_prepare() {
+	default
+	mkdir -p "${S}/doc" || die
+	cp "${DISTDIR}/${PN}.txt" "${S}/doc" || die
+}
diff --git a/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch b/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch
new file mode 100644
index 000000000000..14b314aa0e0c
--- /dev/null
+++ b/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch
@@ -0,0 +1,18 @@
+--- a/plugin/a.vim	2005-05-06 22:20:24.000000000 +0100
++++ b/plugin/a.vim	2005-06-20 15:45:45.000000000 +0100
+@@ -57,13 +57,14 @@
+ " Mappings for C and C++
+ call <SID>AddAlternateExtensionMapping('h',"c,cpp,cxx,cc,CC")
+ call <SID>AddAlternateExtensionMapping('H',"C,CPP,CXX,CC")
++call <SID>AddAlternateExtensionMapping('hh',"c,cpp,cxx,cc,CC")
+ call <SID>AddAlternateExtensionMapping('hpp',"cpp,c")
+ call <SID>AddAlternateExtensionMapping('HPP',"CPP,C")
+ call <SID>AddAlternateExtensionMapping('c',"h")
+ call <SID>AddAlternateExtensionMapping('C',"H")
+ call <SID>AddAlternateExtensionMapping('cpp',"h,hpp")
+ call <SID>AddAlternateExtensionMapping('CPP',"H,HPP")
+-call <SID>AddAlternateExtensionMapping('cc',"h")
++call <SID>AddAlternateExtensionMapping('cc',"h,hh")
+ call <SID>AddAlternateExtensionMapping('CC',"H,h")
+ call <SID>AddAlternateExtensionMapping('cxx',"h")
+ call <SID>AddAlternateExtensionMapping('CXX',"H")
diff --git a/app-vim/alternate/metadata.xml b/app-vim/alternate/metadata.xml
new file mode 100644
index 000000000000..e9468b3dde77
--- /dev/null
+++ b/app-vim/alternate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/a.vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/ansiesc/Manifest b/app-vim/ansiesc/Manifest
new file mode 100644
index 000000000000..a1b2a1961992
--- /dev/null
+++ b/app-vim/ansiesc/Manifest
@@ -0,0 +1,5 @@
+DIST ansiesc-12.tar.bz2 8647 SHA256 21f88922b1a49c214d0075604a614ce42fe6c7e6e5274a6a551e3701c1011746 SHA512 e699974e3b2e532e3c6dca038a148dca8cc3d3a7efa65d63de63e259a34958f62bb7e43b1078d21fcab4603c856dba392e6e82ddb90e2335dc714e9ad60e336e WHIRLPOOL 6a897ca35131b6dd07a2e6e55328440e2ba70703aed80816d73444738e117b5c91021ca5f933e85f3eef49bf355e2b4bf0db79fc1a44342df7debc60080cd53d
+EBUILD ansiesc-12.ebuild 395 SHA256 1ab367acbf17f9da60c9da74f6a65da46f11db09c3dcb2093a25769f1e85b517 SHA512 4e51e63d74fab6f9fab1353e8839b84310ec361923f53137bcad2cda87d3048af75d19c594784fd8e0b43a24798ceaab298438bc36424d3fc7227d5f367267f1 WHIRLPOOL 16c449a353e8d237f1e10fabc00c563e2faf9ddc4c66a7ccbb69ddf6b1fb5b187ec9b7456fe21f19eed44128806d2a77512ad130ee777b4cd6f829cc9e8d813c
+MISC ChangeLog 2501 SHA256 f6791a767efbdea1e2b26f6d03c2f181aad311678f70ab89cbf73d87741ca4c6 SHA512 78982b4e397892e9b254ea2c637fcca9992349e90e1d705993f3ecbb79580125e90b176fe06b1b6edceef6693e4fc4ad1ffddfa378d1cb3a2ebf3d80f856eae3 WHIRLPOOL b594cb05dddd086b52ab139929db09a1ce22d594d067f9bd10e32122f122665b587a2a312fcc9e0bae730f18fb1921e4b1a3425235be0a7d18bd10bda5f27a88
+MISC ChangeLog-2015 546 SHA256 1e64eb2e7204fa3a58dbdb13e50e3df632885cbf7ae87e0f2a5b0ecb4251916f SHA512 fc08625c98bb93c437579fa4fade76b60d1caf47f7a1868e580b5b0cef74c9ebce91c2faa018ed4dc225dfb8a962ea7dbb15bb9332990700b694ecff00ac7f57 WHIRLPOOL 23feb17468c997261c65224738654a254b15be4a71d7d1104676ccc4604a6470331bc2cc4f319cf93dd29f7868d5ec07d52a74fc8b9cb42119158bc081646ab8
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/ansiesc/ansiesc-12.ebuild b/app-vim/ansiesc/ansiesc-12.ebuild
new file mode 100644
index 000000000000..54b4ae24985d
--- /dev/null
+++ b/app-vim/ansiesc/ansiesc-12.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ansi escape sequences concealed, but highlighted as specified"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=302"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-vim/cecutil"
+
+VIM_PLUGIN_HELPFILES="AnsiEsc.txt"
diff --git a/app-vim/ansiesc/metadata.xml b/app-vim/ansiesc/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ansiesc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/ant_menu/Manifest b/app-vim/ant_menu/Manifest
new file mode 100644
index 000000000000..b13aa0aabdbb
--- /dev/null
+++ b/app-vim/ant_menu/Manifest
@@ -0,0 +1,5 @@
+DIST ant_menu-0.5.7.1.tar.bz2 3786 SHA256 fade7ffbdf6bb38b1aaa9ba531d420f803c1ea01c955279207958476c21dbcde SHA512 e8cc2bbe416d54137839e6f122fbcf52398321c8faa5b3a83ba42661c889c29af44029a3ffb386667228950c49d01247703cc6dce8101ea622cb3586c9a07fb4 WHIRLPOOL 56f30df8c667da3e00edfb2de47f2e5e22d0cb660e0858ba9b511c9270b3704d7eaa5ce503277533447e1a233b0c645e8a9b55e70847cb38ce7fdb3c249c314e
+EBUILD ant_menu-0.5.7.1-r1.ebuild 437 SHA256 bff5662503341bb7aeb6158ae74276df5ff7f3637744c989bb87ef496f9929dd SHA512 1f9db13e1d03c599ead53a26b1cdaa4b763e80bf9d3f80e987353aef1f423f7ffcf62d7e76a2913454a7ddfa5b9cd74a6565045b2654781ab683058b6bbc1e92 WHIRLPOOL 341b710398aa21483c3abae4c46ddbe204ce82fb6af24bbb50f59d32189cae145698cade10ec3c83421da13a6746dbb210d57871325bc71a0eafe77096a5cd4d
+MISC ChangeLog 2880 SHA256 4595bc5b01d6b78c5391cee536f883cf1493d8f04ce028c2e93642dde7e9802e SHA512 ef12cb017e3f8d1ceabf053d903462703e959a2c31e0baf927e87281db7c98f5571690f5b26d9c771a430d3794594d2febc13d9e5ae8a5dc8aae396e0a1af717 WHIRLPOOL 33b22e2d75eef1ef8861a7250f059c7196a947764d198e7c1a6af2e7e411dedf098431a58a71aa460bc12ed8990b47100078feb06cc5f27eaa13fa71ca7396d8
+MISC ChangeLog-2015 2279 SHA256 76c1dfd092a0c4bc3a86ffa666933f2020602fe8f8567d0e270454e1f21a9ea8 SHA512 a639b55592be3367618ed08d24159803619cbc8364364e5a643207131cced5617f27b9d7e822f2b99e3b2ee9dcb6790fc147c4f6e17249ff814e2ce5139627a3 WHIRLPOOL fef38f4e71ec66ac888d0ffe4d76b24ec530fa7d2f25719800050bd87138b453cc1c9774fabc00bac3409c31ffb15b7cf6ed7a3df2def493b383fd2daf003bb3
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild b/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
new file mode 100644
index 000000000000..f6f0d904911a
--- /dev/null
+++ b/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Java ant build system integration"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=155"
+LICENSE="LGPL-2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+RDEPEND="dev-java/ant"
+
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=155"
diff --git a/app-vim/ant_menu/metadata.xml b/app-vim/ant_menu/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ant_menu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/autoalign/Manifest b/app-vim/autoalign/Manifest
new file mode 100644
index 000000000000..4a533b15de07
--- /dev/null
+++ b/app-vim/autoalign/Manifest
@@ -0,0 +1,5 @@
+DIST autoalign-14.tar.xz 13400 SHA256 7de8566fad877554b83e5c268aa7796d20a32c7b211fe01eb11ac35ee4bf3536 SHA512 40107b8e12c4190c4f31c740d9b7615eb0836f4d159e6071526de768e6f7726849cb0cd93af8674aff7d6cfecc1b7f27d5b894628f426c51941bb914b92944f2 WHIRLPOOL d7db1aacc8068bcc6874721aa1547797551a0b5300fc9ec31cb091cc858a8105aa4feb14c9edb4ad4a592b3b98600ebdf88226622d189cd2849e7fd2a18efb8c
+EBUILD autoalign-14.ebuild 770 SHA256 5fded1e56d74b35b0b0bbb865fdefd6b67a79de0036d000da91a60d58d1a5243 SHA512 62a85afb448d4bb17d9cedaaa90485cf8753473ceca6dd305cd24d02a56eb4e4b1dabac8b65a77c7bce54a8234bf2b2779354188285bfe4070ab6efea1f8cfbb WHIRLPOOL 6e2fc8dfd6b35222f478601119f74d3724bfb75a6513501e9f7d2e2659fae855844adf4045f53b4067afd1d3b14f499c9623f2a891245cfd7f393c11f8371c13
+MISC ChangeLog 2926 SHA256 56d7b2aff7ab30dd46bae11239995c18f62b063e00da4833d962722bf4aa1c1a SHA512 47a965de3449cb51e43c927963df895770e1d37782779f5faec7eaaaee4692501e42c1a810430bec2a915ba596c414f32b6fac4e8900a35fd59b99524d6a7d21 WHIRLPOOL 8352e35b402ac3480ebc383353c5772ee392a666551aa74ee25e1cb617274b6c0ed6c53b2613af3b5d2cd52f13bebca0b88114f0bcce2ea3ca9614a5ce6d5405
+MISC ChangeLog-2015 3547 SHA256 648d1add1bb493dc1cfafedbc5e22d79aaad417f0c94dce4fbdde612b9243508 SHA512 39ed99472af746253eeeb07e7f143b30276d598f6e6e337053074a6e92f785c2442721fbb69303f4379acc32bfb67d5d2704ccc1af543f4b5f1aacd5fffa1939 WHIRLPOOL ed9966a2f1cc1d61f72072e483b06be2b2e5b3114a082fa03b6c1860788afd1f74a1c23e71deadea60ab763d5f2bb82d259cf1281823e8825b96e314cf3be469
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/autoalign/autoalign-14.ebuild b/app-vim/autoalign/autoalign-14.ebuild
new file mode 100644
index 000000000000..970009cb14e1
--- /dev/null
+++ b/app-vim/autoalign/autoalign-14.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatically align bib, c, c++, tex and vim code"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=884"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~chutzpah/vim/${P}.tar.xz"
+fi
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+	>=app-vim/align-30
+	>=app-vim/cecutil-4"
+
+VIM_PLUGIN_HELPFILES="autoalign"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	# Don't use the cecutil.vim included in the tarball, use the one
+	# provided by app-vim/cecutil instead.
+	rm plugin/cecutil.vim || die
+}
diff --git a/app-vim/autoalign/metadata.xml b/app-vim/autoalign/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/autoalign/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/automatictexplugin/Manifest b/app-vim/automatictexplugin/Manifest
new file mode 100644
index 000000000000..148334c66135
--- /dev/null
+++ b/app-vim/automatictexplugin/Manifest
@@ -0,0 +1,5 @@
+DIST AutomaticTexPlugin_12.5.tar.gz 442431 SHA256 1cec0d1573f33ec1afb1fb4171d12713f4b7e55841d16b0895805333eb781449 SHA512 93e48b3d7eb9bdc0319bf03d0ddc59f49c2aab63170030b4234fa83aa3aeb739f1384c4a94e09e630b82d328d9cbfbbdfbf493e6decff915ad9cd4d5b2fc3a5b WHIRLPOOL 3924add4e702ba5f5f08c21d06dea32ddf4c1d3f922536e14761b36d36b5408af7f252afba1603d49b5aaa456afb54c5457a9f9110c9bb61259c1aa6c53c4b90
+EBUILD automatictexplugin-12.5-r1.ebuild 825 SHA256 a26eaf0b39bd2bf841105d16f65a3f86b31cc07a668564dbd25a696908266fb8 SHA512 129af107a67db846ed10fb3b82b2e08e141d836b5d1ad673266457c5d3d05a658c6c48ccfb7efe722f229fe9baa376733efaad28bf72787b74a6ad36d3cfb442 WHIRLPOOL 54f2a58fe21e888966fba73a9fa687b099379411e0e27894ca93eba26b07d5afe00d43ff51655a46b6811f5ed1d5131d5a05932a10928a6f4d0bf9edf3310af1
+MISC ChangeLog 2463 SHA256 8f2deb27073156d32a1edc6947688de45b15da49a0589088c0b04291bb01e413 SHA512 5546e090bd1f789256630b0896cd1fea9cbf9875e41966f92c60d9b0e450e553fdfe1640e4f2d6be4c1f08fed90581ce775e9d6e7eeecf02fe611c2a1bc58a46 WHIRLPOOL 138a665794c1885ebfa9d4933b1a965c0797a4e704d0d47250cd42e7ce86bfaf93f3fbaa16837d902c0a86e4cd17f21f901fc25b13d3863d4bb1b757481b6811
+MISC ChangeLog-2015 7523 SHA256 4d1f01f5fdc7a50089ca09a12479d686ec5cc8a1e657f48da0b8ee5542c7f96a SHA512 ac8eddc33dfff7385a1410a381718a705023ae77048749ad3ea93ae8ad933946d7150cc7e98b90e6e4585015a4161a2eeafc8861fbef19cfdf6883d98850f0f8 WHIRLPOOL 8f22930deee544903782be54521dcf85ed6d34cced8b7ae43337a0fc963db8f1e602954ea162f2b6586d422f2633b76585b716570537815f13d8a466788ee1df
+MISC metadata.xml 326 SHA256 27dacf3c06002560b380705b40f93b9e3244a663d75aa580d14767a49624e6b3 SHA512 8ed4ff2cf60c6e0c39bb3c60c4f9ad4f1a5b6888192bb43fa9f0fb45efd89a549de839c60678bfbe6ed2353f594ea6b28b53f63ae2530650c0ea563325a0f5ff WHIRLPOOL 91500d7f9a3bf59354a52bffcc354148529b6699f07aa832ffae676cf8058d7a6bd4f8472b741fdb8a311c1236dca6cfc7b1bb38f281c766cb07904a983a78c2
diff --git a/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild b/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
new file mode 100644
index 000000000000..d3a67dadea3a
--- /dev/null
+++ b/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 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
+
+MY_P="AutomaticTexPlugin_${PV}"
+DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files"
+HOMEPAGE="http://atp-vim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/atp-vim/releases/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}
+
+VIM_PLUGIN_HELPFILES="automatic-tex-plugin.txt"
+
+RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+	!app-vim/vim-latex
+	app-vim/align
+	app-text/wdiff
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-tex/latexmk
+	dev-tex/detex
+	virtual/tex-base
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	python_fix_shebang .
+}
diff --git a/app-vim/automatictexplugin/metadata.xml b/app-vim/automatictexplugin/metadata.xml
new file mode 100644
index 000000000000..037d63f53966
--- /dev/null
+++ b/app-vim/automatictexplugin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">atp-vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/bash-support/Manifest b/app-vim/bash-support/Manifest
new file mode 100644
index 000000000000..e7dadbc28e38
--- /dev/null
+++ b/app-vim/bash-support/Manifest
@@ -0,0 +1,5 @@
+DIST bash-support-4.2.1.tar.bz2 115200 SHA256 a231394928bb82db90bb9b6b39b32843fd706998abce07ec712125a1fa968fdd SHA512 12ab39f5cffb58e4adb2137265d6c4f1a61b5f2e360f6866c21ead0a67e02a5445bd12fec5b00b26e5d6102b3aaab99b8b13539a67575067c3ef9b26c4ef8fba WHIRLPOOL 5e2dd6579033d3febbc70a02c6b6aef61cfa27ed6fb185a8a54ecbbe150a953a8ec618d61768023f4c22e8430a88e6aac17539bff92dda5b65c5a764935f91da
+EBUILD bash-support-4.2.1.ebuild 466 SHA256 ac670dc55a3e527b1339e082e801dc345ba42a10b5d12245eef40fc0fde55467 SHA512 75c945faf31f789acdfdf1c7bd834ac34fe0654572626901ccba2f24cf824249852c63e7ebc8f0939e586210077b103f325f191119723baecee0041767e2ddc5 WHIRLPOOL a20fa739a18a7ccaf91d6a04fd3fabe01ea7a7d13fffa403a18060a21b2c8a26465d38b4e5dd5c3abd27178577a93a9f975a52e2093542610941eca70cfa3d32
+MISC ChangeLog 2942 SHA256 0f6879a1df878c0f22b41dfc2a3ac1a480fb295edb02898efc2b19966706c30a SHA512 fc0473b99b983221d581bce9e6d6465cf5a41644ea779b065681e48ac16949cc6ca980857b1ff80776ddf657337665a92c9741f5492470d3611cc0cd8c977ce1 WHIRLPOOL 9320bad720f49a38fe2eecf26dd2fde9053470813d0542f3732acfcd0120b98ad298dcde5f8a85e1d95250af6bc5f5fcd39e8d5e6f02daf3e82f35bff46ee14d
+MISC ChangeLog-2015 2389 SHA256 554323bf3621b6381e29a0fd55ce8622dae5f23151640ce8c26acc8cf5fe438d SHA512 810608ef8351579a04dd9c9cdbc36811d1acd6917fb65a914e1b3afbf94912a23d5d887fada03f766e721e01b818d2b7fd336023fdb72dc5578b270b440b3aed WHIRLPOOL 136286c3efe8fb2f086576d8630f5fbbd2842f2ff624f8de7a4bce1e2fc62f543e748cd10a523b3c2cc18c1731a158af5f67ee61fee09767e472d87928b741df
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/bash-support/bash-support-4.2.1.ebuild b/app-vim/bash-support/bash-support-4.2.1.ebuild
new file mode 100644
index 000000000000..b825e918d5e5
--- /dev/null
+++ b/app-vim/bash-support/bash-support-4.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: write and run bash scripts using menus and hotkeys"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=365"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+	dodoc ${PN}/doc/{ChangeLog,bash-hotkeys.pdf}
+	rm -rf ${PN}/doc || die
+
+	vim-plugin_src_install
+}
diff --git a/app-vim/bash-support/metadata.xml b/app-vim/bash-support/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/bash-support/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/bnf-syntax/Manifest b/app-vim/bnf-syntax/Manifest
new file mode 100644
index 000000000000..48c0a6306531
--- /dev/null
+++ b/app-vim/bnf-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST bnf-syntax-1.2.tar.bz2 887 SHA256 f61fdcf8a6797c65f338f22df9634456453c3d72b24a4d98d2320a5c6d12ec65 SHA512 e073866a8dd41bc0ab982e250bf2a803d78916dbdaafabe504a6854f67255fe4ed84a4db426f1cbde77c9b0a059070fda666338c53b6ddcc7e46f04d9f0265d6 WHIRLPOOL 87e96001099eebede18bfa97e876068be0bf089cc408cec066f107c40b0c8464cb1beee458e92d2822596683e8e4617800a9f83da1afd7c5024e715742bc396b
+EBUILD bnf-syntax-1.2-r2.ebuild 555 SHA256 c8b6f2586b9828ff0799feef858988ab37d68dce6cb6854a9f7d633bda216e83 SHA512 056ec7016a7b8704a15b091c93420d775d79fa23cda6016b16e8485c8874970078079c94bb1ac7ab73e22e74c80ca32a0fb2c819f4705fc8fc707410f153ba9b WHIRLPOOL e5ddd9b98ece89cae368e3b51125b777aa7a6d8a94c58f027409743a941120c64ae41910b3de8c2d55cec4dbc7608151891bd620a2b8397e7bea9f59a96c8dd8
+MISC ChangeLog 2959 SHA256 927155a448ffb3edcd6d8d30cc99105d4685ac3b030b5438cb461bab6bd35d91 SHA512 8a3ec1dd79f77e42b98037ab344f0a28607b3570a820837d61b6bae0130cad1830edba32f20c284a5a216cb0b10fdb085ff072e261bc03ee682b40804f9699c6 WHIRLPOOL 9bd3d03ebede41de761322231c3bdb3fbf2889f30c18be5c0c8bd7ca4faae63c8d7035d40af4630a62d1b166b34f4f571aab18c9a45841145965d1172632e169
+MISC ChangeLog-2015 1982 SHA256 db2c3ff3597e53197af062defd147a987e499a0d4a8b8d29a568a39be1ca236f SHA512 fe1e401c6f142ce1b704a4748b5cca24810b8a381e990119bf37cf895f376d86e839ca1fa838e08d7862e3d4c2cc1a42da35238ea7f32e16cf48180f8b207c81 WHIRLPOOL bd09f1c024ebf356f2290b6c3d1a82b2cbf453885b5e6b05273367638484fbb1bc4d37d3419df7b44a393ca2bc86aec2e5a1e42832edf9983b4bb9f83a71ca68
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild b/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
new file mode 100644
index 000000000000..a509cf39fbc9
--- /dev/null
+++ b/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: BNF file syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=250"
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for BNF files."
+
+src_prepare() {
+	default
+	# fix hi link to use def, bug #101790.
+	sed -i -e 's,hi link,hi def link,g' syntax/bnf.vim || die "sed failed"
+}
diff --git a/app-vim/bnf-syntax/metadata.xml b/app-vim/bnf-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/bnf-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/brainfuck-syntax/Manifest b/app-vim/brainfuck-syntax/Manifest
new file mode 100644
index 000000000000..ffcd923bd57a
--- /dev/null
+++ b/app-vim/brainfuck-syntax/Manifest
@@ -0,0 +1,7 @@
+DIST brainfuck-syntax-1.0.2.tar.bz2 916 SHA256 256a0f43be2da9af5a3f7bc8af34083a374cf711186d9ca921b63a7dd5f9c84a SHA512 d01e544e45d4ada1c7ed8ca02e72d888fdcd374be8ee45c01d7797fc1e32457be94e0429dc3fc88f12fee063bd70d06af8ab4238795154a82793b6abb42dd974 WHIRLPOOL 71b8be951bd07d9df149a5ef4f205a196fb4153d33087414fc3df4d0436dae1526134a65de7dc6355ba3a34a25f92b3f2e82c02339f148b5076e4bf09f9bf9ed
+DIST brainfuck-syntax-1.0.3.tar.bz2 926 SHA256 10f52e0d1d017f78479bb4c131440fc7d8789fdf24261431b586969f9663e23b SHA512 42dbcbe916b19bcb30cadf929cb71aadb7032ebe38c26b1d5fa2fc9d8513d3dda275df289cc5fdf094f9fccd5f4e720e6c24d006d431fd3668f73d2c44e8b82a WHIRLPOOL 9e0094b1d3d8b1b93f70240edca5409f08f701d0e6acac3e5541074cc71c107490b27d0bbe9206f1a034f4826dd03f3cd33394abf8bcd4d66ce4519879008eb4
+EBUILD brainfuck-syntax-1.0.2.ebuild 416 SHA256 8de12860e8d91130e8737cb1151ca2ae73c0ffab3c32d4ded47901849816a787 SHA512 8b160299e932dd5b8d4f85b4d50689ce9eb9457f13be639ea4b9b02bf9e833601126ac9db358427c4dc110059ea41b6ecaef88e2a3bad6fa56da6c219f59cbb4 WHIRLPOOL c5e5c5e2ff34e0d79aa01c528ba9578ee97a38c12bc6e3c444246cbdfeee113ef8ca5526cfd61b820e8bde09eaa85e8ff8ed88606128c51f7e4c0a3d99372858
+EBUILD brainfuck-syntax-1.0.3.ebuild 415 SHA256 b2cb0baa473c6f8f3b31c6e0beae7b6a0e6e9d2250f33fc231f75f3196ac3e41 SHA512 5b42d8b4377cff247fe100c748169524f19c6cbe86d22ffa6d34cb6e9b7e4fdb69f1bf8dd7e3ea8ada2b45c294187b7db6a07b834ec5fb06e1fccda8bd741025 WHIRLPOOL 2c08abb1e5b4baab327abbf351d922d12a96bee3c8a589bc5832cc7bd94b13064b92ea0058cd4460a8dc28a5bcd01dbe593af16fa43d53b06ed0ca4dadf8ed87
+MISC ChangeLog 2724 SHA256 c9b8e01781d6346467810d2309bf0f9eba8cb6f77c4c6b0c761c6e0e2af42165 SHA512 278d2e71b5d246911176dd74c131996e54914f0507cad43a190e130dd1637771ae89fbc850edc7f56fc5ddaaf6e8eecb4e06490f8931f4128205c20cf3e8bd1c WHIRLPOOL 140793908bc7508984b30e87f4d1f54c8e9906e357a2b188acc5bf39e02cb571a65e84bbe6ed549d6e34357e7e2ce4f8315fed160c4e1f03e6bf99140c65fa5a
+MISC ChangeLog-2015 2363 SHA256 9642259a5e79acccaaf6c466cb8a26ec1b37839e2bef1f48baf8ca7dd6a6bb57 SHA512 5e308a5f230da0792f62ba937a58a7c99402bd82c7475fda765b22d6f496a2bb1a3bf74f272297e3f6455987851ef724c62fe7d64dc2e65595cfc87c2c7a3b4e WHIRLPOOL ac6d753be724707b6f039c95f41fe1fe5cd8ee057978df53140c8b56fe2312e7b4fb9ef375ef27c11057d2810b1a32c758c25067b111962ef0568cfc96425146
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
new file mode 100644
index 000000000000..11b0f9b837bc
--- /dev/null
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=716"
+LICENSE="vim.org"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for BrainFuck source files."
diff --git a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
new file mode 100644
index 000000000000..106e5aa0416c
--- /dev/null
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=716"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for BrainFuck source files."
diff --git a/app-vim/brainfuck-syntax/metadata.xml b/app-vim/brainfuck-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/brainfuck-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/breakpts/Manifest b/app-vim/breakpts/Manifest
new file mode 100644
index 000000000000..a841d65a24b6
--- /dev/null
+++ b/app-vim/breakpts/Manifest
@@ -0,0 +1,5 @@
+DIST breakpts-4.0.tar.bz2 17349 SHA256 ef2f7b1ba7d1b6c7e691c028599c5b531bc78aeb79001a724a0ed1c22e237d79 SHA512 a480bf32cd3e756ac25849b1d5fd20521bd8c965454bb94c33810c9d1d4464762a731d08dcae858c59853a6cf41ab3cb6cddeda440c8b041cc8ec192ab2bd2fd WHIRLPOOL 7114a7aaf9d5f6bc991392dae8e7b2ee6b83e89e08a9146dcd3d2d1e6d15dd8d5b9a985d10cc5fbf304e4108e3e8f70c85789eec624e1983fe49c3b0cf238907
+EBUILD breakpts-4.0-r1.ebuild 681 SHA256 98939dbaf7302f018d0e63f596889ca50abbb8344c706e7e5fc4e0bd7c72ccb1 SHA512 f5a38360a5f83dd56015cff26fcd8305e61042d58b74f01b264ba8fc7dec21d8f6c4df299d994461be48b1d5f98d8eef7f4a992598d483c1d68499352bb14095 WHIRLPOOL ca437cb598aa5102747a0487bda59435bedd1f6145bca059c9d8a4ea041b0378ff32e69a5249a6e4b7c0c4a1f4b20760251a3a1fd59af8da98a383d08df820d2
+MISC ChangeLog 2715 SHA256 da06d52e664aaf823ac59f5106561eebd57009943002d6810ad4de62df6ca07b SHA512 5cf34956f63d9dc575142151a1dcc31f4463599b8a0943435bed5bb389ebe751aec7b44e120637a943773e1d866276e7ce686824e298dda3a096eb2a4b0c51da WHIRLPOOL 97b2fe4318bfd4d611775f4e4fd45da4e1938c4913a1704569866221150ace938db5681a40c1553bfad5095ce9f79b2ac27ceb18c6e5cf1c3c8f11b0f7511ed1
+MISC ChangeLog-2015 1609 SHA256 63bb085340c268a60fb28a3b1ba405636b19d2c410ab6629a9cd3da718e6e93c SHA512 f3f8b56855169c8571338bce584583769cf75df20e3d727d3617c07b1c2d95314bc4190636d747aa2784ffa08f927fd568b20e957cb1f1a05a53ddabcb7b695a WHIRLPOOL aea88c6e37b7b6eb70bdc67d3d5833a13f1f2838a29ec40ee2f207acf0f474b45f1eec00108e6d0991b1621501bd18927487c1c6501527f378077ab6b2f15cec
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/breakpts/breakpts-4.0-r1.ebuild b/app-vim/breakpts/breakpts-4.0-r1.ebuild
new file mode 100644
index 000000000000..5dd9d271c7f8
--- /dev/null
+++ b/app-vim/breakpts/breakpts-4.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: sets vim breakpoints visually"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=618"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+	>=app-vim/multvals-3.6.1
+	>=app-vim/genutils-1.13
+	>=app-vim/foldutil-1.6"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin allows breakpoints to be set and cleared visually. To start,
+use :BreakPts, move to the required function and press <CR>. Breakpoints
+can then be added using :BPToggle or <F9>."
diff --git a/app-vim/breakpts/metadata.xml b/app-vim/breakpts/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/breakpts/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/bufexplorer/Manifest b/app-vim/bufexplorer/Manifest
new file mode 100644
index 000000000000..3a3164404a71
--- /dev/null
+++ b/app-vim/bufexplorer/Manifest
@@ -0,0 +1,8 @@
+DIST bufexplorer-7.4.18.tar.gz 25117 SHA256 6cf21e3d36d8832cca9c53bbd44021aba437d0cebef5cf95576ade79750d8280 SHA512 420e3d352bb31a80311c3ab8ad62f7a6530fdcf78eb0bc45717e075f81a3d1a42fef18d756c129d2c25e8d5f7d8e1161affae905cfa7d8b0d1d3c9245c9f1bea WHIRLPOOL 798e5c61c0eafaeec73729dccfd9be38637174d32b958fa729893785d946b31cc9c593f2bd86d9a24b5d18e06850ffe5b5803cb0328396cf7bb5d46250ddfa74
+DIST bufexplorer-7.4.19.tar.gz 25679 SHA256 27840064ae649b00ebb2300fd91aab9c9068b13d97c17ce88fd86d977286c962 SHA512 d38bcb52a50cfcf6d0b66ca6f1290a6be53d5cee98b3d2d7a93e01b5ef904af53c6cc8256e667bdeeb23a58344f5d69838bb7b5d71d225a83d1e173b99344888 WHIRLPOOL 575c39a1985b466909bd1f281993eca38185964a2da921b4a2253cd56caccdd112c69bbebbefcc75526bdd656510e9416bc88bb68d47bc70587d503954322745
+EBUILD bufexplorer-7.4.18.ebuild 503 SHA256 4d40e8ff24cd07b740c8cdcf783e165ea1c5cc03e4ca8374fc2f0c710a8925b4 SHA512 268fb5dda23a8a25085da25a4c485ebd4ad51db2cf4a61f6d9970bef28e432e3f53eb40390eac359c698c9938c69baf36ca3def2c5889288cd90f51492bd8cb4 WHIRLPOOL a84b0774d46ca1630ea914f7a8896b56be7ac0699d4b90ee6181945fa6e454612d35e1acb16f155b914b778ebbe7d07606fbc2c35580e3d5a50632e51c5ebca9
+EBUILD bufexplorer-7.4.19.ebuild 505 SHA256 34992c71aa1aaaac40468d10ccab16b32683664144a9749f97e0238816bc20fb SHA512 14f292dd10a2e1c5cf17192d71dffe34c33c60c31a33647016c6c064f3fe82e8a86708be4acf739497208ced5eaa2183ac265e6d07cbe808ef27fb393a18a9a2 WHIRLPOOL 1397cb5ed5af1d146587d2e07a555c2e5a1c4d1a51725f9f6c2fe4db7b927f96a3b238d45aad28ff52b6a809510583bb3dfb9dce5e143d457fee3616bafad72d
+EBUILD bufexplorer-9999.ebuild 628 SHA256 5369fc279bbefffb0addc9f66fb78e21b04dba211073bf85c08b73d5d5f38299 SHA512 8b6d39ed46164135c8816efc5daedcceb072ab5ffa6579a1100d5e1cdf54e579039eb2bd7500138c744045709228f8e41ed3f9e98da6b0eac8cababf3a893ac1 WHIRLPOOL c2adab135cfb8de4e54dd0d194ee52a05fd0de5e0c22a398c9cc61f7e5edac5f06450f492eb904189192aacd2efa2c08bb190e0cb3b23f2fd86bd7a68d89a43d
+MISC ChangeLog 3450 SHA256 58a394b11981ff8a606bb42aae9788f4e8f218fe3548123cf771ef9123d477b4 SHA512 ec2958d453c4f7eae1eca73ac3254e51bb225428762fa7ecf83f9aeecb87954171647a50a875b7a42f0a3156675026b2e9a161d535579a2c9cea327149a291a3 WHIRLPOOL 7f632edd720ccdf296a3b12812dd44082884d1fa15c63b73bd1606510a8529bb82501c40bcbcddd5fab7bca8c50a549b964c5064a9d1b52d92ed808329eae4fa
+MISC ChangeLog-2015 2182 SHA256 d37dd23d42d69bead215dea0c6b0e7eeced50e87783dc6f4d2948fa7eb547d86 SHA512 d3931816a75c49448a898ffe04f0950153eaa90dc3b9d610250173fd833eaae11c8c323741a5db903196c7004aa99887d4f68e82b3bd5664a47bd4345bb1d78d WHIRLPOOL deb2c20f691e2c3ba9ce5a1b72b2edffaccb956c71a7feed206cea3c51fc4d82f7373a9dccaaf3c3a08b12fa08b29a161ea481e736ef5813f2404fe12ceb44e0
+MISC metadata.xml 337 SHA256 9b68b73892ab71c070801ed223c30a8eb24899e3a2bb783fd6d1787f16d44167 SHA512 31c66f4059fd32f6521fa33b6d655d6d006a71b6d14fc008e4dbe2cc1b93bd3fe5a8055105afcef07f38845377ebee7ecb41d0f92cf7da73e020dcf72216590e WHIRLPOOL 9b07db9b5c67c872b883582460751bb0e11c049bdf756e84c9128538346720255511427f1261cf43d8852221a9e174ec0d79d3f614003aeaca20df77d8ec1e0d
diff --git a/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild b/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
new file mode 100644
index 000000000000..86bfe82b862d
--- /dev/null
+++ b/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easily browse vim buffers"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm LICENSE README.md || die
+}
diff --git a/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild b/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
new file mode 100644
index 000000000000..320b746f4db7
--- /dev/null
+++ b/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easily browse vim buffers"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm LICENSE README.md || die
+}
diff --git a/app-vim/bufexplorer/bufexplorer-9999.ebuild b/app-vim/bufexplorer/bufexplorer-9999.ebuild
new file mode 100644
index 000000000000..cd3d232d76ee
--- /dev/null
+++ b/app-vim/bufexplorer/bufexplorer-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 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/jlanzarotta/bufexplorer.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: easily browse vim buffers"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+LICENSE="BSD"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm LICENSE README.md || die
+}
diff --git a/app-vim/bufexplorer/metadata.xml b/app-vim/bufexplorer/metadata.xml
new file mode 100644
index 000000000000..5c41162e1690
--- /dev/null
+++ b/app-vim/bufexplorer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jlanzarotta/bufexplorer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/c-support/Manifest b/app-vim/c-support/Manifest
new file mode 100644
index 000000000000..383feb98b170
--- /dev/null
+++ b/app-vim/c-support/Manifest
@@ -0,0 +1,9 @@
+DIST c-support-6.0.tar.bz2 130832 SHA256 8dfb9c283967906f3a1c6d251a7d4734b58debc6da6ed4fdb0788c526492ed72 SHA512 280e8e91b8961ad856524f1869ecd580870ccbb6064c02aefdd5cec7f55a7bf12a17c76a4de91c8d2a7fed25bd96e793909f7cc258b9664f295e1324e0b392da WHIRLPOOL 5743eec9901453007a65d056cfa061f23d6f4326338071ec38748590202d81988b4699c3329d58f94334434f4506ba34b87273618e806efa2484b8ec93e83b08
+DIST c-support-6.1.1.tar.bz2 167371 SHA256 fdb8fe02383f2e998b2549194bbb6d0cb0a13d3141ca0c4d8d422b6117e83c86 SHA512 dda33732505341bc260b9c3f73f95c70c3ee6f0eb50b9d1fd534fc8e83fb21d0caa3feea0ae50cf59da4abbef455c31fe1c02c80bb9168423cfa332941ff0886 WHIRLPOOL 3a409cd378eac9e29b8e5c2fc7d9f95bacdf1dcb3c7a860e2e0c9af8fa29c1ec42129e0916ecbcd158cfb1d5bc3d0c72c423d2f661120ac860baa74f1047e5ac
+DIST c-support-6.1.tar.bz2 164255 SHA256 00cf3d664e6414f332535acd769ffadfcb68c4c1c5a85aba8ce5b8124e97dd72 SHA512 6fdc4f757ba0febfebe0c8898b6b0d582e03d6f7d08523e8663368011c41d6444df2620f96c6276d959b4a05b7c83a0e377bc5a8e75aaed5cf478f8bc83ce9ec WHIRLPOOL 01f2f5cf934882eb4c57a363e4cdaa2b7f43494cb6fb4324dcd2f679ad5e0a31698dc13b46a7f5ba5287cadce68fadb4258f6dad7ba051f9a62247d599d73150
+EBUILD c-support-6.0.ebuild 481 SHA256 79220a6b00208dd3eb9868a409bf6b462a81d5f7dae6a75a1e63a5477ba783b1 SHA512 c65f3a0f0661f38b88f3ebe77ab6a42596cb8ad060e632127244577be020964ab7aa7e33f4157ba7c9b61d41e915f27d0ae16383fa713cda0bcec73312ba3b7b WHIRLPOOL a7c43b20ae93c88d99ea93a705c02cfdeb2fca975bb810eb280753c1996fb80c658496cb2f2788ddb36d91d3fcee4755ff129c58d0f63d68c9c7ce21db086818
+EBUILD c-support-6.1.1.ebuild 471 SHA256 3873755295bad0628805b41f96d930b20ab0d6bc0c5543967e3184d453f09de0 SHA512 1b6f8749273e6548135e5cef6a13f91ca663650568c4c03786cd5e164178c3ad9c73839ef038667103d5f01118d4ab9f81043436e2cbd187a2d4feb79ef52242 WHIRLPOOL 4a9ac1ff16d9bc661647a5db354cf663b2d76e7386c598c341761f332c85d45cf8f3529e0f858c538272dfa56806f8d4f551bc1a95eed768ee007439cad47c9e
+EBUILD c-support-6.1.ebuild 473 SHA256 c838fd3e36825626e0af45e9338c1126bb8b54c363b303bbe8e1cd6b258b68fe SHA512 21a89a0d0073afed5d6a333a8c9ab94120c993977f0cd72eefbf5939e55a7b8ae4da5bd9c48564c0b9d63083b223bb1e48d85a5bf26c2a417bba5745e16626e4 WHIRLPOOL 995ea205af4d3417d794b445a7c5a79f620341a039dd359983c5a0ad4572393429d761094a98efe65764c5168e1bc6c48fbe7c53edf12f89201b97947ff18c71
+MISC ChangeLog 2536 SHA256 30206876304cba0aea99a53f63500392b71a455fe7c3882488e44c5bbf6c80ee SHA512 7552177c2052f2f05e51c1c21c43240469f9564edd0c2f5428300c01b9c0a2ea90d5b7217b907e2c487689d3d05ce9f15e8003550c848b519408dac81e4c2067 WHIRLPOOL f8f5e2d94ae476ad56733d6bd08df2963136c5e8b176d3002ad5888140aa640dddc3de2814a8ac38b450110cd8fba1647286b574510ec401bcb8e31b099137b8
+MISC ChangeLog-2015 1894 SHA256 23d8ad984d038db94b112397ca548b227f44026b87953b5480e917d4ca9dde9e SHA512 27e1081f70379dd0e59a55289ac6e33692e914fab06f99e7f898f6ee09220b33e1ba3dc18351770f86704dabe7b6bd6745bce6fd4d5d2f10114da26e927d5c06 WHIRLPOOL 987078ac373ea3759d6b11a075adba04cdd3d80bec461f020252bc5e427f24b62d8fc070ca1d40f0b25cfb16d8eb5fcd680290165e3bbbdbda242e6a3230c362
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/c-support/c-support-6.0.ebuild b/app-vim/c-support/c-support-6.0.ebuild
new file mode 100644
index 000000000000..ed67e2ba8354
--- /dev/null
+++ b/app-vim/c-support/c-support-6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=213"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+	dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
+	rm -r ${PN}/doc || die
+
+	vim-plugin_src_install
+}
diff --git a/app-vim/c-support/c-support-6.1.1.ebuild b/app-vim/c-support/c-support-6.1.1.ebuild
new file mode 100644
index 000000000000..e629fc851643
--- /dev/null
+++ b/app-vim/c-support/c-support-6.1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=213"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+	dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
+	rm -r ${PN}/doc || die
+
+	vim-plugin_src_install
+}
diff --git a/app-vim/c-support/c-support-6.1.ebuild b/app-vim/c-support/c-support-6.1.ebuild
new file mode 100644
index 000000000000..7b3a03ddceb9
--- /dev/null
+++ b/app-vim/c-support/c-support-6.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=213"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+	dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
+	rm -r ${PN}/doc || die
+
+	vim-plugin_src_install
+}
diff --git a/app-vim/c-support/metadata.xml b/app-vim/c-support/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/c-support/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/calendar/Manifest b/app-vim/calendar/Manifest
new file mode 100644
index 000000000000..bfe110c18a0a
--- /dev/null
+++ b/app-vim/calendar/Manifest
@@ -0,0 +1,5 @@
+DIST calendar-2.9.tar.bz2 11070 SHA256 144a657523f20514290092b4e17b307622e259838f1ba6f59c0bacb4a0bd3c52 SHA512 8d1c29cb1e7b8189447d60bb5e8940b7ed52837c9039bd8ff8e3ce19c5fd7a9a8060291bb8a0c0bd2a2bb677fce388bb7f807f25358f3903c28b07c715ae1a07 WHIRLPOOL 703075efc70b13d19e925ab395a94940cb242c56184c2d30c3e83fe834b8188b977706207128b115c623d591e41ecc85a46c5fdec2649472d4b1504d830263de
+EBUILD calendar-2.9.ebuild 319 SHA256 f46b0f64d1c80ba7afb844c34174701d646bbacd91e48a961a1886714e8003f3 SHA512 f3a151058db9b4805dc5b4f877885f11902d2edc5d41cd3694e2f2fbeda90bc39cba62a407b46a4a027ea65ecc14dc76a8b01a69b28cbefca34103d9aa44f7f0 WHIRLPOOL 5a876cb78db6948ab9f88c25c3c9b6cf93987d24594a7a48e0931ea1d68193266f54b7368a01ba155f58ab3e62665a3491962cc944d4076e7b306b9ac26ff772
+MISC ChangeLog 2647 SHA256 91d2b269135d2867dbe93e9f79c3c2cfc61c58f13881985dc38b0d02835e6c53 SHA512 48062d19237041a1ec3c8445cb0abbd038cdc40762a31eaac2e61616cfc8a17ce61f7833abbabc6d95d4dc9dc320e0f530420c68038b0aebbb6c1bd64723390b WHIRLPOOL 0502f8202aea2b0f08134421615a01e0add89aecf384a4b541bad34fdd2bea236199d02cc25821acf613ffcefb9baf610a68dc92535fce59fa9fbe9c0d51fbd4
+MISC ChangeLog-2015 4947 SHA256 af863741e62686b3c68fa90dc774ffc4332bd003f38c1f2417ca5f78243ba978 SHA512 92b3f80287c5df443e6355e9ea43a31f915b631837fc6e3494db04e689d95e6f0d60a719e18e38405820e26362df818e317e251b9b2c82d7ffdb7c33c14a4116 WHIRLPOOL bf3235e8af0f1c57fd3f415cc7df49bf950856b22c4a2f9524e8231202465ae7b52290f231e1457419c941cd2229c7edc37d8a6d1e605e94650a42b32c20bf6a
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/calendar/calendar-2.9.ebuild b/app-vim/calendar/calendar-2.9.ebuild
new file mode 100644
index 000000000000..9219fbfb3ce0
--- /dev/null
+++ b/app-vim/calendar/calendar-2.9.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: calendar window"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=52"
+LICENSE="vim"
+KEYWORDS="amd64 ~mips ppc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/calendar/metadata.xml b/app-vim/calendar/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/calendar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/cctree/Manifest b/app-vim/cctree/Manifest
new file mode 100644
index 000000000000..538323247e34
--- /dev/null
+++ b/app-vim/cctree/Manifest
@@ -0,0 +1,5 @@
+DIST cctree-1.61.tar.bz2 23243 SHA256 b5651bd274c6c7c126c0a5a20579cfd953d1fee1f98989a43baa4e1350e68765 SHA512 9d29c573ef3cdcde1ec91ca34684c84c8beb3b89669654b1f9dafab928a11d8f1df77294af06c7612ba8aa7d65dfba69352f3f74dd11c98d22a300907d8a6b0e WHIRLPOOL 6dd6fc055644d4bc963c2d8adca45cd24f71c319deab6a868e0b542f5076195a99ea0c400593d1bad2f64f50f7b7efbe0ba32bfff166a069dedaf7f50676b3db
+EBUILD cctree-1.61-r1.ebuild 804 SHA256 0de5fe7ccf0e4c0807e533b9e0086c73a0eca3a26deae164a93d8d8073207e20 SHA512 0eb287aa4d494e57248350888c311ebdb92dc4e86c3bb79b45da4e25fc9313dd115717a7f9e8522f254293ef64ef9446dd19689eff66a679798ebcf687b0aebc WHIRLPOOL c5d705ad00b550e5026f8b1eb96b4e8f127301bf2fb9439fbfbf37cabd1ec0c930d1268609ba1187e362917f99e50ec506c9414eef893c17ac1ec564844a4cbf
+MISC ChangeLog 3705 SHA256 330549598b94414ede6c5d61342726c48ae84cf4568d04b826dccb4290d319e7 SHA512 887dc733d8686af14d5b7d269795d743b4cbd5d1c9f1f3a580fed6459d0d5e076c3c343b123ee5330ed435fd46d2929e6b481901bc9649771a2762ae9ebc9ab3 WHIRLPOOL 916c01ba60dad8318bc89f015c5b621268c76ca023f5b387dc47bf25fd764f08e423e42aeb7f57421d4301af47efd7aa323fba45e9f0c07e0b7fa51226382da6
+MISC ChangeLog-2015 1024 SHA256 6611825ef0e7e7530084fb711d549fb3149b5c41aab518506ffd8e6ffe126b2f SHA512 7e594aa7f8d91bae11d67c72dbf2dcb05119a8709dac79ed3816c0b3e77292c9de392f81dfeaf1737375c8cae8cd26c18585cbc0882f4677729369281147f425 WHIRLPOOL 03bc6619ec6596b283cd515a21035aa9177d983187328237ee34afd73f0f1cb63e1a843a0a9949f25bb91ddf044a296dfdafef6edb9da05a7a3547ac9de2f7dc
+MISC metadata.xml 332 SHA256 403c2b788c43882a9adce6078d39b8f4a39a74c5fd4fade88fe527daa1fd6154 SHA512 c1338d54664a59c207fe04fa762db7c824c289912564cb1ef206fde45883e6741426e9967efc2e1fd64594d3c89989b227c702caf45283aef658a03eaf443979 WHIRLPOOL 93c8ee5529241a455fa45ed698a012d02c0ca258b24821fa53be3c6d492bd4c5e1865094c631779b7159b03faefad52f9acbc5fa472c93ef938b61d5001d73d0
diff --git a/app-vim/cctree/cctree-1.61-r1.ebuild b/app-vim/cctree/cctree-1.61-r1.ebuild
new file mode 100644
index 000000000000..1cc0cf069e51
--- /dev/null
+++ b/app-vim/cctree/cctree-1.61-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis tool"
+HOMEPAGE="https://sites.google.com/site/vimcctree/"
+LICENSE="bufexplorer.vim"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-util/cscope"
+
+src_prepare() {
+	# There's good documentation included with the script, but it's not
+	# in a helpfile. Since there's rather too much information to include
+	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+	mkdir doc || die
+	sed -e '/" Name Of File/,/".\+Community/!d' -e 's/^" \?//' \
+		-e 's/\(Name Of File: \)\([^.]\+\)\.vim/\1*\L\2.txt*/' \
+		ftplugin/${PN}.vim > doc/${PN}.txt || die
+
+	default
+}
diff --git a/app-vim/cctree/metadata.xml b/app-vim/cctree/metadata.xml
new file mode 100644
index 000000000000..8c235406518e
--- /dev/null
+++ b/app-vim/cctree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/CCTree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/cecutil/Manifest b/app-vim/cecutil/Manifest
new file mode 100644
index 000000000000..6119970385a5
--- /dev/null
+++ b/app-vim/cecutil/Manifest
@@ -0,0 +1,5 @@
+DIST cecutil-17.tar.bz2 6985 SHA256 2fea0c8f5b0b6222c5c4b7e19a462fa08b50d6a36f1f1dd310a5da44190dbc3a SHA512 2ad7963e5928d3d6b46fc4a8eafe1927445c73e54b8af2869253a8223aa3dba7776a118085b4e7b517845c3872bdac96978981004e863da5a7ff8716acea1393 WHIRLPOOL 8468794bbcd0cbebbb821b756dd348e9093e0de3f290b923945bd1c6f525eb34021d208b8c1d0ba99e10b7c1724bc31631f5a99d7f712df11f646fd7a7af670e
+EBUILD cecutil-17.ebuild 373 SHA256 90ea403d6f339efc6479195d0c772eb3bd6b1b9661334495e152d757f6d09783 SHA512 9b01587b1f23122826ec7dbded9c5810cb33003a2c1c4ed38e255eba0df8458f2c0f686cf6ec4fa45bec7770141d3d1792bd989e4c8fdfac3092be9369c73b29 WHIRLPOOL c57b7f87b971d9fbc9acb74055242e1bb70bb97e2ddd9d97d37f0d316b6e969b226542771ec589a2b9b5203378ac6882ee0ac42cbdc5bf0c550390080e7e9f11
+MISC ChangeLog 2501 SHA256 f8288344bac40c8e6269c9049905483a5ba9285bb62edf7ef6d893c78fab7f7c SHA512 3954617bda11064129e42e618e0423c6678a1e6859c8a7a1d83184aeb98bd4273dd64fd1983b5fd4d6c4b1e679d53856ef9dadf7776af1e1b537fb78fcf1ea6c WHIRLPOOL e3184dfcad3895940e73dff6b75c2b6367323789503bf323c5f17017718eff53b12b1a9e1a4effdec6d2ddee8a6f59c1d6d43117dc73e9ccaef505412071022a
+MISC ChangeLog-2015 3389 SHA256 f1d6abad9ca56682f7bf6b239a6d3bc283c7114b10c2847f19a4bee26f3c232d SHA512 5d0ab8df9ab93b67e27a750e575c4b32b05b4ca4ae41b406d28372e0912cb4f64dc9c699050e349835472d295904a03f677e0caf74e4efe64694ff69ec4fee8e WHIRLPOOL 0c231baa6f28d083dcb90c8bacf4be11a9ca020106b9a9e8b40c08e49a8d8f0ba1c78ea91d0bd39bbf1971c8b9e7014ae2713fa309bf70ba31bdb928b4c29975
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/cecutil/cecutil-17.ebuild b/app-vim/cecutil/cecutil-17.ebuild
new file mode 100644
index 000000000000..d0bf08072ed6
--- /dev/null
+++ b/app-vim/cecutil/cecutil-17.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library used by many of Charles Campbell's plugins"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1066"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/cecutil/metadata.xml b/app-vim/cecutil/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/cecutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/cfengine-syntax/Manifest b/app-vim/cfengine-syntax/Manifest
new file mode 100644
index 000000000000..a7b46d23a865
--- /dev/null
+++ b/app-vim/cfengine-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST cfengine-syntax-20141019.tar.bz2 7611 SHA256 1ffe84c5b7e0de85d4aa965bd0574c58deb5bc7df6d6150866266332f559644d SHA512 c8987073b9cc9b1494b0d3cb8737a5b99f62c1b99f5b1e84ce1903e37a924ec9b3e2487cb3b72c75dfba40528809289efdaf3641bf6c059a668c6bf073bcb83e WHIRLPOOL 217bee66a0680b67fb95f8cc6a3fabd9c59862bd61c1fe1e1169f758d7d30d1e269451455490bc4bcd20768be89cdda7435a1742c5c3b0c53329a3b2da0a269f
+EBUILD cfengine-syntax-20141019.ebuild 532 SHA256 b011e705a3d14662852b55c2d9ae78e770d17fdedb8a022bbc29049fb64d020a SHA512 ee948490888d4d952b2743731b557ab6468286c18888c3526fc3c79d294a0faff1c8e7535a9cb4fd7bdcc7181667c8e8b6687a9c4ca76f4de76dc139b3b6e717 WHIRLPOOL f00be7189a5a7ba7510a1bb48f298c05a20cdd6cac1e6854e217c6efdd30bcb605d2f7e0afaca3b15346f70877e4b82fa1c01cc8d53c12bece24ccc2ece864b5
+MISC ChangeLog 2456 SHA256 181d624d1539dcb0d86eb0b847acd9a6f7d5c2fd6dd0692d402588cba70d1378 SHA512 7f2a0b4ab905b194f473e90e7f0e9fa45e140553e6a6db22971c0c60aa4c7d772b2b0b0eec6d194bd719a85a42552a483999de2d7338078ed98d8cef1e36f328 WHIRLPOOL 4872ab0be211f4ca3231751e26345525ceaa0f5ab904f5c21dba3b2ca48f655ab3930b35c2653b497df8355c029578abd89580cacfd4de5039b291f40ca0ff7e
+MISC ChangeLog-2015 2466 SHA256 6a2ebacc6803326f997a176e77c251928b4a22cacb21aa95a1f5be7c51b888fa SHA512 c114af146df8abb21bee7094bf46d789e05769ead6089e7c3ee7257357ec1a84538d5ea930bfbe360b18b4d2a393aace410f97a8fd3f00451e18291a18654a65 WHIRLPOOL 5ee08c405f0c354327d7cf908733e16d5dd510f81eb21057591cde70ac7b02ed13498fdd94c25f86b912ba1a53352c0d3d3cb81909b39680452bf4b7e98af3c5
+MISC metadata.xml 538 SHA256 48b0b722cac0b56e1f05290cfdd4150af0459cda463f31c8de033e7d67825213 SHA512 64ce2e382ba91771caf3d654164d111191f65cbe281d8525ce4ae683ee3148c47f8514e1f01dcc9ec052e0db6ab75c5b2453dbbde5f0e00bd1b4b6da5b0433cc WHIRLPOOL 0500c9470807dff5b109538ac5f4d6d7405e59cd66c80d319027a31787663ac1ea2ce30b3835e91a5ec448d637a00b499b3b644e79f967e50b3612648f287892
diff --git a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
new file mode 100644
index 000000000000..86d6c12ca69d
--- /dev/null
+++ b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Cfengine 3 configuration files syntax"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3"
+LICENSE="GPL-3+"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Cfengine configuration
+files. Detection is by filename (/var/cfengine/inputs/)."
diff --git a/app-vim/cfengine-syntax/metadata.xml b/app-vim/cfengine-syntax/metadata.xml
new file mode 100644
index 000000000000..ee538625adbd
--- /dev/null
+++ b/app-vim/cfengine-syntax/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package provides Vim syntax highlighting for Cfengine configuration
+		files, and automatic filetype detection for these files based upon
+		filename.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">neilhwatson/vim_cf3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/checkattach/Manifest b/app-vim/checkattach/Manifest
new file mode 100644
index 000000000000..b0304e262733
--- /dev/null
+++ b/app-vim/checkattach/Manifest
@@ -0,0 +1,5 @@
+DIST checkattach-0.17.tar.bz2 6491 SHA256 297c4e45ac8a7ca64e2a620985f6e862d42b1dd2afc9fb85814e6353a0be56c3 SHA512 98ac172a5fd84bacda8cd682dfb320aceb799098bd1f5a5abcf5834c2a883e7269b0fafbe1e77d2215982ed0548d592c32e80fc4aa67ae3e87c6a69ffc75cdbd WHIRLPOOL cd2f23b04d7eb4e60336bd8b600749dbb4a71b54a774554b5138785bb9d1e1b837805eb37e19792363575dffca8d81db4dd3f40d5c83580eb9b4c26f337a63b0
+EBUILD checkattach-0.17.ebuild 392 SHA256 f2e7c0bed071413a5e000d6762e47f827094acf16c9becadba26ec44f2d817a9 SHA512 541395384b42a9d147de6652dff4cc4cc6c6230552b193f9d2ea3c4618f883864903d47bc21ef0004e475f87d6447c8c4c276c3c7ea49d56d09759c36498a1e6 WHIRLPOOL 78544395965752076686892c4f405536905bb43d73a50089e8ffcca1e241078b9a307d9a67079ab1f5f318330da467b94c3735d31a111088ff2926f58330f10d
+MISC ChangeLog 2808 SHA256 34a33c049c75b26d35070506b88c3b03dc96701424ebbc448caf7f35adffaae5 SHA512 b7f91ad48e7ea806919e5b0ac36f75baf34edf0f84b2b6f573893f256bb761a2058bbdb7abbcd1c2125ba3c10ab0c9f8c48968d7c19e6c038fe5dc584e7e253e WHIRLPOOL 05c516c00332273cafeec8591e77a760d3595a52ef7d05b016df113fb893c4ac88ce6dac059ce3b2dde0b9fa9a819fc0bfab82067123c88eff949d38957e13e4
+MISC ChangeLog-2015 706 SHA256 d9236988212b71ce8f79b4bc392ba5c0fb33a87b89d5b0fada91b8e2128edf4f SHA512 156de60d75182e99ed4cbbafca6e0e1b42b6c9147806252a7d1abf9cb89eb50d1209bd6143491a54645b50765bc64b8b3763fc0a353638c1bffd4ffa61be9961 WHIRLPOOL 9d33ee1f9555e416878321643f21af01c7adcb96d0e2a58dbeb3c538f39b37e2cc285a25017cfceaa29c6cb1c97bfbaaebf011239fec01c0f0ace97992bff0f4
+MISC metadata.xml 344 SHA256 1851f57dcf481ee148796131ac87d501602b83ae53ed9607375abaa87fa0a7dd SHA512 53935b44d8dc0efeb033c8326cd8b4776d863cde5267f3ff03aa2006a825a1f1c94e95b94cff4a0ac9ee25b35219d02fcfc0999f8e4a7f0ce1bbf98c2ba289c7 WHIRLPOOL 02a163be4060114259f79b6a2aeff5898b67c937996665d9f46482094ce263769c1d082c66a606abb7ff19f1f520da5f8597caec44c707c7a242babb7225d9ed
diff --git a/app-vim/checkattach/checkattach-0.17.ebuild b/app-vim/checkattach/checkattach-0.17.ebuild
new file mode 100644
index 000000000000..068bce07d813
--- /dev/null
+++ b/app-vim/checkattach/checkattach-0.17.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: check for attachments when writing mails with mutt"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="CheckAttach.txt"
diff --git a/app-vim/checkattach/metadata.xml b/app-vim/checkattach/metadata.xml
new file mode 100644
index 000000000000..b5f3123eb17b
--- /dev/null
+++ b/app-vim/checkattach/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">chrisbra/CheckAttach</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/closetag/Manifest b/app-vim/closetag/Manifest
new file mode 100644
index 000000000000..1eac457c138b
--- /dev/null
+++ b/app-vim/closetag/Manifest
@@ -0,0 +1,5 @@
+DIST closetag-0.9.1.tar.bz2 4717 SHA256 d300b6bd0ec3836e4d906dc2c4cdf43b1fa90b4d5700b959d3ebeb4c0603e791 SHA512 67e10871c98716bf65c1c1f3e07cb65ebd158fb058ee4e51e189703a5848e5f35066fa492c9614703936add21fbb34a387e9cf4a82043d794f3abb62d6c3ff38 WHIRLPOOL 128b4387e78164f9220c1e5c3b40aa76e55543d195f5620f6ae0e27cb5c53ab5032672192a6c245cc1e5cbff6dc7813ca6a9bd5bab9fd4697cca13120aa2b06b
+EBUILD closetag-0.9.1-r1.ebuild 417 SHA256 2f0af3f06cc54d4f2a40f6dfef1135ade0918cbeccac806d1c06bc458ef59f37 SHA512 27aa0156755a4c6bdad31715fd70e61ffa395e415e05fe0e062e2aff8fe75c997a400d4014e13d2e0aa0a8d7a573a4c7b1df96a26140f351221c401847d04263 WHIRLPOOL 5c3b98c9ed0c1fd1ad7cd2297feb81b3ddf6148067f7ae737901eec2e785c890f8fb3c59d7eeb453ef9a9110652a6a53eba3db38178fd22ad607e38ff6816715
+MISC ChangeLog 2946 SHA256 8f9fb4969e40934bf9e43897ad42b57a9313b9a224a667df956b7f31adb225a4 SHA512 bd35645f1c3bfdcab35bfa84d08e911edb05f5a94819f7fbe8994600eadae63148a88979e3243d2c85e7beac6acecc80c65ad3f62ed4956fd33dd1813cbc0f26 WHIRLPOOL 9b8b249662547b29b5a02aef98ffcd56fe11e917473ead31b0fbaf00369aea8f48255088ba295aba2b38db2eb28ad22253c7f26f4b92555590051f7594221db4
+MISC ChangeLog-2015 1960 SHA256 0261d6083cfad95e203ddd34e5e0423a93916cfc6e34924494e23199d29f3c70 SHA512 1f8b89a06dcb196ff6530cdf69d6c9f022ad91e72d60f6d7cff5e98faf70418d9ce198fbbe3421a1271677345080d5447883db6cd9a53b2124c0b65fd5763cf2 WHIRLPOOL 521c370e8af98be974cefb64ce4b758d4f0d0bc5e01bf7d5bfdf378a26a326ab64026698519452de0297e0fa39e7124ba76b0b37bef72934426bd36c2bb820af
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/closetag/closetag-0.9.1-r1.ebuild b/app-vim/closetag/closetag-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..feae211a6346
--- /dev/null
+++ b/app-vim/closetag/closetag-0.9.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: close HTML/XML tags quickly"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=13"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a <ctrl-_> mapping for closing HTML / XML tags."
diff --git a/app-vim/closetag/metadata.xml b/app-vim/closetag/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/closetag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/cmdalias/Manifest b/app-vim/cmdalias/Manifest
new file mode 100644
index 000000000000..3efca2229df7
--- /dev/null
+++ b/app-vim/cmdalias/Manifest
@@ -0,0 +1,5 @@
+DIST cmdalias-3.0.tar.bz2 2601 SHA256 d617e2d4754fa339d89f37ec1b859934ffeba3141274413b8e86684ec26f5452 SHA512 a29b8b588c662ca48e8208422e4592e4d2a2908f23ed123b0b2aa639e6c05725dcc6ee0179418dbfdc39108953de064f5da5eec4261f7e9db5efea0d91fe58aa WHIRLPOOL 4c9d1e043e8583f76c09456a23103efccd6a49dd89be85e6e85fca4c16da3315059f6ebba01cb57604533e7f6de53eaf2c6c82bc7619112582687e3b996a5ea1
+EBUILD cmdalias-3.0-r1.ebuild 441 SHA256 fcced8978bfb30776937c444b8e5a4a23e659734706bc5a4a45e10bdee2bfe89 SHA512 bea86a2cbf8700deecbd0590245c3c3ceaeb1eee0819048edfb60dae67102048dbe7820f942ce68f85682d99f51395533166a1fb47ac3d57d3261d21662be91b WHIRLPOOL 5c47f3b5be9de3c610431d2903f2e862d76b5c04ad79a83fdba7a2625fcd9575a452a4cba8d20402ee238d2f70192b52c309f7c3d218c9ad7a7518f9dd1ab66a
+MISC ChangeLog 2930 SHA256 c2a4dbe7c5eb387f1206e9e9c1c950f4382e94d6942b8a5ffc3850aaee47b0ae SHA512 2f75f9fd705174ccc42492a098de37747e6b6775e56c6598fe305d3c8c8fe4aa67c4d92226927c9b489c126e5a4dcbc86f755276f7d5993193a5507c285f39a7 WHIRLPOOL ea815936a99bf4d9c9e69f1641613456c55bee956485e03bde1218cd8c88e971c76d6280e5230389fc4707d6a8becad8d4716753bed1bc8231670823672855b3
+MISC ChangeLog-2015 1998 SHA256 50955a02f71c1db62bd85538d43fae0ebe7bbae1f4a0d9e56e1be6429681fed7 SHA512 79ba232530beaeeaaf133e5af0f348055728e5751dfd7d7524ae7448198d9d246edbd96badc3f802eeb34d0a48a95d3d01dcd99707cd1f05383f6a7fd484539c WHIRLPOOL 1db36eaf0e43dc9b56331adca11a19bb1aec7377350430cd341b049b9548706fcf7e39ff9b7532462f626facef137962c51433bf3f8fc093a05cdb03158586ac
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/cmdalias/cmdalias-3.0-r1.ebuild b/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
new file mode 100644
index 000000000000..b8d1a7e77b23
--- /dev/null
+++ b/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for alias creation"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=746"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/cmdalias/metadata.xml b/app-vim/cmdalias/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/cmdalias/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/colorschemes/Manifest b/app-vim/colorschemes/Manifest
new file mode 100644
index 000000000000..ebb9d969ef0a
--- /dev/null
+++ b/app-vim/colorschemes/Manifest
@@ -0,0 +1,5 @@
+DIST colorschemes-20140623.tar.bz2 683654 SHA256 9096b0843e2bffd0183fc8ce356994e24016fb046621d80b9efff068542c2f08 SHA512 523a1fcc5f179ede94887c844397bf507ba6432f7e8812794be3a2451f467370e0c2119000e138ca021f05eee4b3f43e34444916f3fed3eeb7749db459b502e3 WHIRLPOOL f6813827370e3fd023c720c42c2fe5d4f865f2393dcec582b9d1b80d5dfdb9c848b21b73a182a434595f8594f053f27bf0e93219817a009ce5729f804c4d5168
+EBUILD colorschemes-20140623-r1.ebuild 853 SHA256 8ce4507893b6899a3347b992e8e3cd96d7c0eba0fbe444a43e7a2becd4f4e872 SHA512 dee1d21fb5a15c227ae804d5eb6e316000869e8ce681ca1c6cc0eca2212e90537c63eec2c1b4884f251a685e26a67112100806654611c78f5cf83563feb0ec47 WHIRLPOOL 5301db5723e94c9d1bf597294a70022fb6f22b56942f83b949067716884f3d0dacad2f559c5db726115630b0b25e7a693ee2d4a781f5541fc320adfe85a31138
+MISC ChangeLog 2453 SHA256 5c86aee2b3227148ac285c6bb4efd3d82bd45efe64be30189e9f7d9f2aea4fb5 SHA512 e6422fb0bce3be13bd37580145d15149da1ec1cb797826a46d463ef6be152f5c0cd1b315b5140931f02910246e427458a90943e1988256e49344bf4b77f15153 WHIRLPOOL d4a1b43d618aaff25a40cf68f3b226292a9253144d37c177685b7212be5cf5c46620f8e0dafbdaca5e238f47ccfe07919b06817d8d557542f171671aa3eb8b8e
+MISC ChangeLog-2015 10548 SHA256 ecc28feea01022569aa389052e9effce629eef04f1bfad504a8c3cc85eb47980 SHA512 067488c3db20dd8955ca27d436fc7a989f46d021bd950ca62a817e3b4b7b7b62ea906530384a7a0457f4b669a376bfb155517e4c8d5e494f88390217ea623f66 WHIRLPOOL ff5c976383538bc5eda2d75c9364f10173a4496eba521994ca23b174e029aa4ccee2c4157c8068b458e579e3f038cca4d7de297b78963903360aee93f53c35e3
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
new file mode 100644
index 000000000000..528a8076f7b0
--- /dev/null
+++ b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
+HOMEPAGE="http://www.vim.org/"
+
+LICENSE="vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a collection of color schemes for vim. To switch
+color schemes, use :colorscheme schemename (tab completion is available
+for scheme names). To automatically set a scheme at startup, please see
+:help vimrc."
+
+src_prepare() {
+	EPATCH_SOURCE="${S}/patches" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch
+	rm -rf patches/
+
+	# fix line endings
+	edos2unix colors/*
+}
diff --git a/app-vim/colorschemes/metadata.xml b/app-vim/colorschemes/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/colorschemes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/colorsel/Manifest b/app-vim/colorsel/Manifest
new file mode 100644
index 000000000000..3fb8c352fdae
--- /dev/null
+++ b/app-vim/colorsel/Manifest
@@ -0,0 +1,5 @@
+DIST colorsel-20100406.zip 11216 SHA256 6e5a5254b871761b46bd875813771fa1806e7ce548482af3cf3c6d8f4b765ad5 SHA512 628c2824ce0c5524f45eac209010873324111c33697fd4e36a71d7dbe7aa83f388caec46cdf18224faaaf5480fb671e2e0fa241f0ab4379b276354217d5587cb WHIRLPOOL 7a248c9945b242a6e21914c913ad1a7a66a78f5ee820065b1b7b389c7c639a1b3bef938f3375dfb94a402916cacb6961ac57d76dcf871c38448454237860385f
+EBUILD colorsel-20100406.ebuild 510 SHA256 b6f622b2081e359542a054477cb1b28b681102bff6e3b76ccf472c042c15c9fc SHA512 ad494c24b52d3f7b29705743f8e278ec9ad026cfe19a34664518ccb57e43049970e05187485b1fafc503afcd08bc3bf6d5e2d61a4c411914bc5aab13f48d80e0 WHIRLPOOL 99e243426548cd491c9cbcd8e73e30b2263c3bb8c59531e52274a2405177ad6b1d6241eece4b8c61eb0ce26d3a6b40c737a9637fccca1af04eca5e1f5df972b8
+MISC ChangeLog 2523 SHA256 61a00ab1cf5ddf6d7ba97988cb26af724baccd600a161ebe1de0d15fc4de6a41 SHA512 9236af0e63c1f8c53a03f0a1762a94e4a20d78a25bc6e081aec36b51501de22222ba2c9315eb40a3ca928dafdc01a77ffa8831727e7a32b8aea485cd2ab14ec6 WHIRLPOOL 712b35900f288f5e0d49b7c75880d05d21bd3d31d59dbc4f72ffc68179626e798d5faf776d9e39af52ce37459aba30b7f003978366b6b48318702c2ad303d36a
+MISC ChangeLog-2015 2232 SHA256 951f59fea8f6eacd96d92c86ce205c68b771e514a7e8aae107fc598d4b4ac725 SHA512 d7a10bc5b7a692895f56866dc9f1badf055d859224a05f1b0f52941b58f782d98167054da814db638033a8fc5d44048602b6268802f5212d25c08c158646e1cd WHIRLPOOL 82df0c6fe6de415ec2b49588d20c04002b53f56525c7ff10b3d9b6368bef50846dc2507904be2c241a833fa4232ec26df0810113beb75fd95e12ac1ecf4312a5
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/colorsel/colorsel-20100406.ebuild b/app-vim/colorsel/colorsel-20100406.ebuild
new file mode 100644
index 000000000000..ecdc50440661
--- /dev/null
+++ b/app-vim/colorsel/colorsel-20100406.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: RGB / HSV color selector"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=927"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=12789 -> ${P}.zip"
+LICENSE="public-domain"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=app-editors/gvim-7.0"
+
+S=${WORKDIR}
diff --git a/app-vim/colorsel/metadata.xml b/app-vim/colorsel/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/colorsel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/colorv/Manifest b/app-vim/colorv/Manifest
new file mode 100644
index 000000000000..aa7914b14479
--- /dev/null
+++ b/app-vim/colorv/Manifest
@@ -0,0 +1,5 @@
+DIST colorv-3.0.2.tar.bz2 47059 SHA256 75a570021678a58225b346fa87aa13919ef84757a4cd5344855d101835ab231b SHA512 cb4a893d65bbada5cec27c0810bf3e78db3c64e64f4179529d5da30402ab65b141f53dd7f2a9e8bbccf3d5f7dc5843afc7cab0d908e66a86fc41a5c38c9a848e WHIRLPOOL 5fd18f5d6686717e628e136c8025041cbc0820ae394e3c7e1a19245fe02142770d911d505c1cc5efcf9ea29739faae31d72ef83543b833f116bd52f4ad9c37f0
+EBUILD colorv-3.0.2-r1.ebuild 949 SHA256 8097ce0b95d2106fe69c86c8ff66dd819bd2bc450687dbf66cc5774d785475a1 SHA512 f1672a381e9740e50199961912acfedb65541eddd6891577e1f645848bdaf50b8d1e045677fd01c4798c5368e1c70e8e78eeeadb3aa60035075ad681a8e0d98f WHIRLPOOL cefe0d7dd1ebed0b63575ce72b5061831be632cd1a960fb86c0065a619cf06fea7c04a2f6028d99b5053db68d70e414e4ed5fe85a0bbc57ee109159dda06d6eb
+MISC ChangeLog 3462 SHA256 f31ab81d17f442cd397fad6c4d7f4513ca4942fb76fdc0f3e6d860814e7f205c SHA512 b4f2cd2b268cdde4c36a72af5d7faedf5ecf8db921863b1881b4c7f76dc05a8054bb19be7cadd913db14c9768523f717adeb0085b381eff55a1ab1eb82985ef6 WHIRLPOOL e3897167cd4ac8113153c1d300a2ea699ef41acf2593ee87b2056a17e2fc23e6278e03dca30f8b1a14fc28edc269ce15e6be1aed21f7bc84860ea5e1c1ecfefa
+MISC ChangeLog-2015 977 SHA256 46e7e57651e01676a47b8b056b198fa8060f14f90aa4a96925b741df24dcd139 SHA512 98c4d1c26db5abb77db5082b65179325f727a2b64044e7f009c34443b13707b5e6637bc2c2790c392f26482c961dff1c4180714964c45e5a3fdadbca8ec2c8d9 WHIRLPOOL 8e0da8ddb13b60c43b9038f7e4dddf49194aa73b7dccb14e9d2013239356b52fb6a24f84bb1ccd642ad481d31b88960768b872c6c8659133e8b658014ece18cd
+MISC metadata.xml 332 SHA256 5868babc9d1d523623d761e11a0160e5a08dfc2f0271d30949d4639572661628 SHA512 f7665a682723f68af0fb47584b8442216937a348a9bee52959209cdb44de6d79453ef4029c0ae536371e5a2292624d1cad8c2058d569c703d4f2fa17c0eef0d9 WHIRLPOOL 43165fe29d7cc37ecd363359c35f6b9dfe424c46d55372b5abb25b443e0c704e363fa2f765445415ce4806deea13626e95750502a58cc2633fd5e7112cfb3269
diff --git a/app-vim/colorv/colorv-3.0.2-r1.ebuild b/app-vim/colorv/colorv-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..104df9cc3bf3
--- /dev/null
+++ b/app-vim/colorv/colorv-3.0.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# TODO: supposedly supports python3... but that conflicts with pygtk
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: a color tool for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		( app-editors/gvim[python,${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	)"
+
+src_prepare() {
+	eapply_user
+
+	# fix shebangs in Python files (note: one of them is python3...)
+	sed -i -e "1s:python[23]:${EPYTHON}:" autoload/colorv/*.py || die
+	# use python colorpicker instead of C-based picker
+	rm autoload/colorv/{colorpicker.c,Makefile} || die
+}
diff --git a/app-vim/colorv/metadata.xml b/app-vim/colorv/metadata.xml
new file mode 100644
index 000000000000..c96bbcaaff6f
--- /dev/null
+++ b/app-vim/colorv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/ColorV</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/command-t/Manifest b/app-vim/command-t/Manifest
new file mode 100644
index 000000000000..e2fee62f8c95
--- /dev/null
+++ b/app-vim/command-t/Manifest
@@ -0,0 +1,7 @@
+DIST command-t-5.0.1.tar.gz 81781 SHA256 7ac1e4c2bd9bf87c788be22fc24cfc2a4993c30365031a2b15ddff79d8b00e3d SHA512 54262f4628bbef8a11878a8593510af566dabf35dd70005dc90e4abb4c4e9aebde5dc7d08d808c944980017f8f35d7e9723b0032ccde5ab6d2d2fae38e1c632d WHIRLPOOL 240cf7a171c848d8201929c8e02d0db3e74ce64b5117aff4f12c8e7b320c08f2cb944ee1bd44a2f3681706d533698e792bfd5f0487933d04b88699aa25c6a398
+DIST command-t-5.0.2.tar.gz 83601 SHA256 0cccfd1fc70aee55bb1002c53ad153a395722fdee34badbb8e21e099e2f4c01a SHA512 f8c8356231c3fb0f3a91cb61f534acac4dd401721a940c6ea045ada287d29395923eb46b1cb4f55b8254000f10eea9970841531abb2b110992180a1edbd66b81 WHIRLPOOL 80508a5d18cb3e1e6d067ddc40ac4ae4664a68b96ec14b93abef4ea4afb8cb21b8c3defc39bfaa6b4c1dc3c889d2dfb7a10cd252a8e970564d59bd11be24abf8
+EBUILD command-t-5.0.1.ebuild 1266 SHA256 593e16b9eb1250c81893ed9bb92416d2bb973e92afa0069cb9f6b925a72f54df SHA512 4a2067a95aca0326776e6f8d885758cacca10a5227edfeb9e600d34e6be9f7cdc6bbf4f6c1d1ecb8bb60581a213ca1f9d5f68dcdaabbf1c057e552646f1f9577 WHIRLPOOL cf5590b7ed7c81a0544b8c8ea763c3acc36169506860626118be84d15bff5c1dd1489b41d7db2851b771ec752c4b7b032f0c93d221b6fa92e0ac21290dc94ad1
+EBUILD command-t-5.0.2.ebuild 1274 SHA256 e30c57cb78943c129a5206bef48a17f51e58679a7c1a8a25b39766c810af2a5c SHA512 a35ba097aac85835bf0d42780ac7ae87fbfbaf960e5ca1d9f60aebcf3cc42ba247e8b4d2a0a9bbf220cb1010095387c1891156a81e1ed9d1ee6777659f978380 WHIRLPOOL 05eaf8d1127936238cc61d039217ce41a6287ac7472cb463b5d0e59ffb2d9a20d1d86b3a4de16f382210ed0a6670fde701758274185bd503cdc5ea6565a107f4
+MISC ChangeLog 3297 SHA256 608f4049fc9b4d2ceb3e42ad14793fdceb9793a6b478afc687d3e5a50f69aee4 SHA512 8d0adcb254fee91c32691e876fe9205cf53540fe99b2ba8a9fcd3236e6857c664bc3f1cf58ebdabc0f5d3c14b427a4a879fa3aee629e64d3667d6e5cb924c111 WHIRLPOOL 608c464cf2db1243ba13d992919d716c14ce17c4ea3c184c1e0d4a659f03167ec326e6cc4eae9e8b522c6e2b5edaa551ef23c91f1b73726b0d17c10893f1eb7f
+MISC ChangeLog-2015 3170 SHA256 499407d264dd764a806b789bdd3bc9b05288ebbf1165d8b3d9a976a47d9197f0 SHA512 2a7f3fe58f0178ef6df7f62d497c9f8015d499ee7b3d2f0fc71f45d9120a2582698f52af925b620b615e1b0ab96e37be082ed339fb7a706527b567a29162b8e8 WHIRLPOOL 9278f866a84fa1f739a8fe01b1cb0c58728aaced041c208c8b7e90e4be1abb2a4f5c156630a77f6116e5bce84bdccc5e2a3158bbb3dbf2b652c8114510902137
+MISC metadata.xml 331 SHA256 cc2015fc890b27abbe75eab6ea3062a3d076a72f94ba92ca7a424153f77977d0 SHA512 e6b82ef13f3942afbb08a2d192073d5498640a719e64512c8203c15081e6873e0acb39421adcc711efc6a0f3adbea2953309da0d48acc86a92c51b6a3924f331 WHIRLPOOL 31933b3e6b1a152a44873a540be9c5f7d3fa97d01a88a6140eaa62554b318b1a445d83d45327b556d05b9731a28387a4d245ab66d157e07b95c2d943f9ceac94
diff --git a/app-vim/command-t/command-t-5.0.1.ebuild b/app-vim/command-t/command-t-5.0.1.ebuild
new file mode 100644
index 000000000000..c9923ecdfe3d
--- /dev/null
+++ b/app-vim/command-t/command-t-5.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit vim-plugin ruby-ng
+
+DESCRIPTION="vim plugin: fast file navigation for vim"
+HOMEPAGE="http://www.vim.org/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/command-t/command-t-5.0.2.ebuild b/app-vim/command-t/command-t-5.0.2.ebuild
new file mode 100644
index 000000000000..82f1973dda57
--- /dev/null
+++ b/app-vim/command-t/command-t-5.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+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/command-t/metadata.xml b/app-vim/command-t/metadata.xml
new file mode 100644
index 000000000000..26f6f323f397
--- /dev/null
+++ b/app-vim/command-t/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wincent/command-t</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/conque/Manifest b/app-vim/conque/Manifest
new file mode 100644
index 000000000000..c2c5198645ad
--- /dev/null
+++ b/app-vim/conque/Manifest
@@ -0,0 +1,6 @@
+DIST conque_2.3.tar.gz 52195 SHA256 cf00f05e73c4296462cc1219142a5d1c9a371e93a1c7eba3a672caeff02f55b9 SHA512 b69c0564ccaf897ee2f18d0769877986e67006cf33dbefe2bbc85261726372f09669d19aa118de58ccfb847cc8b7e670e25c030128eec665e1cecf0a96cb4b89 WHIRLPOOL 5bb507012bf02bf189bf59ff11ba51df5df4e33d922f1cdd663a1ea14b8cd80f9f3a20c1ac98b985bf42070ff1059d7e9ea6d17dd2349ffb7ce45ca22f9732fa
+EBUILD conque-2.3-r1.ebuild 679 SHA256 1c500baccdb0e6261ff2b395ee8b96e029c9297c1f38d2062d435387117d07dd SHA512 25dd890235046296654394595c91e7db6dcf91820aa44c040162942d0d621d89c796bcab6e77f1d65d4b348fac14077993b12275831b2d704c474d7e656d9f1f WHIRLPOOL 9689a5b8c59f25b6cbcedbdd56426cf08edb029b05675dba53282be2bab3750cf6a78dc958bc4531395f158842db468f51c45f3e85add54885917a9bbddc0d89
+EBUILD conque-2.3.ebuild 554 SHA256 f456d62c9cb7c6b7d35ed873f48d7e4a52f23360c603761e25dabd471422a940 SHA512 c1934cab70cb7d9be06247e853ac5b32f7f131177b862639e90cfa35a2267ba7fa1773b5607bef7affc361a5f381d35e800da1dc65f4a9a6097bc40587740efc WHIRLPOOL 3949d6e05bade6b474845747d70bd373c326f76d3ead9fcfc0eea109faf867ab6354ad2f35258ea2eddf94531a903252eedfdc859049f389f34a7f0ce027c526
+MISC ChangeLog 2959 SHA256 59e6c83a2df2198ea6b5a767d4e1e852cee28a9f17519daff78a83a143a3b073 SHA512 04ccc36429dc326735673b5c631ced191e4ef4921100638da55eaa41092d37691e984de237e991bd7496dfa46ed07f07adca335e15909f71af7f30f679972514 WHIRLPOOL c6ea96b19ef200e186420c120d5c8c57b0be94beef36297e85d6015affb2f1e015c48b51ba9d38cc0f15902d05f28a93607a55e201e279ff07b017d40c8899f2
+MISC ChangeLog-2015 1886 SHA256 1d80b12a58e27251b7de8c52faf406ff45b8bcbf5fe20214c4cd8ad19b2c8926 SHA512 ab4a4d0e9986f62c03ce2f7143383ce79481d5b7f9c359a56955dca6ae47245867068c9ddade890b2ddd6dcaf41ac32770266cbf292abf7ffd69feb767667111 WHIRLPOOL e9ccfbc243a1220e944f86c3ebc503defee344f1503029e91433f5bf9e7c92c8c768b7b9b78cc8a424ef31598fb658d9c009e33ba3ea056f054eb1e0a4861bec
+MISC metadata.xml 325 SHA256 e58b81eee032cee2522ce4bf28d2a08f83d37347754704adc3006975be808213 SHA512 6bbcbd15af2e070d8b377cb9ce8d267b4321c895375a874d77cc85f6d9ec5aee8787415f3799b93801aa748d10a15e64968dab7ace10d9f19d48c252d2b2e4a3 WHIRLPOOL e29a522fc37f2042ffbfa56765cbccd80d924bce9f3073222c23f6a0517b1f240f4ace9be996afd25ce507cd0b9c5c623a5df1b5cb91d7136834b3fde3c33f63
diff --git a/app-vim/conque/conque-2.3-r1.ebuild b/app-vim/conque/conque-2.3-r1.ebuild
new file mode 100644
index 000000000000..93ff4281f401
--- /dev/null
+++ b/app-vim/conque/conque-2.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VIM_PLUGIN_VIM_VERSION="7.1"
+
+inherit python-single-r1 vim-plugin
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
+HOMEPAGE="https://code.google.com/p/conque/"
+SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="ConqueTerm"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/conque/conque-2.3.ebuild b/app-vim/conque/conque-2.3.ebuild
new file mode 100644
index 000000000000..c16c2d156302
--- /dev/null
+++ b/app-vim/conque/conque-2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+VIM_PLUGIN_VIM_VERSION="7.1"
+
+inherit vim-plugin
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
+HOMEPAGE="https://code.google.com/p/conque/"
+SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
+	>=dev-lang/python-2.3"
+
+VIM_PLUGIN_HELPFILES="ConqueTerm"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/conque/metadata.xml b/app-vim/conque/metadata.xml
new file mode 100644
index 000000000000..6fa1407c232d
--- /dev/null
+++ b/app-vim/conque/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">conque</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
new file mode 100644
index 000000000000..9731dadec9b0
--- /dev/null
+++ b/app-vim/cream/Manifest
@@ -0,0 +1,12 @@
+AUX cream-0.30-ebuilds.patch 435 SHA256 b85b565e4430100fe5a41d6d1ba7c5c2de41b6c4712db8d8e5ce4a46de90adf4 SHA512 96cfee5d25267dc19c47ee953cf29e2fd43e3b0ba5b7d25f72f25901e52733fb3b2b707c233b1b091d02740fcce2462b37efb28ffc3b28dff42f574b41204167 WHIRLPOOL f5d15ffc5f180b37281f32d019887dc93fef684f4e19d26f27841e08ec893c9ecd00a2f2cec37cc12c7814a5ff7d60afafa97e6d56da6ab3d8239eaec207f712
+AUX enhancedcommentify-2.1-extra-ft-support.patch 666 SHA256 27868a8207886bdb31bc96ad22ebb461725c1d90a74a203c18bf35c1706ea75a SHA512 a3450231dc95c9e82eaf103c2da0d6cd7b7e21708f1680ecd4fb08157e1bcdb0582c1c16972a3e55d0ecfa6227ad9484f4cd4ef71e01f8154d75e0103966f21b WHIRLPOOL b90a6e1529bd9920ca40d14e0da6a8146eae51a59fd6046dab176cb77e8d91cda38e8cfb5b81692a78888dea63a6c1f4f840b78e44a59c4581b4aa0a9868c69f
+AUX enhancedcommentify-2.1-gentooisms.patch 809 SHA256 bb0a2f338c5481e5e15afb6d438addc087c7fb7f594c28addadcde4c6de9e102 SHA512 1aa085e1a4bc90ec40f3f4118f8800f36b3e0e4d69625ed72cc660514074a4f3abfb0f564f45c3c187fdd9e8dbf0dd1b2974aeac14f830360e20862e32280749 WHIRLPOOL df9513518819b53e58802bc8b65efe13e10c2ca1f23ac45a7f0d036dc2713b93df26799f7f72ccde919e0d4875336582105ab2772e626fb00bdb3d9465fd81b7
+DIST cream-0.43.tar.gz 785889 SHA256 b7adee33d5464f985a71722fdbe133e726bffebf34eae14c33674c4c5327d777 SHA512 6e6c139bcb5f1ed8cb9718f2c1453a69453c87f2588b6074264f94877dd5b7f78842f5a7c45df693effc2249020e5fa61a88ab5d4e3e13806e2674f1f57dccb7 WHIRLPOOL 726a7134874d515444029fdbe7ec21f8e40f0cb2467388db36548958c49749b4a7638b932272669d883826023722fa73d70273dffc9f1d2e43932f88d400d2de
+DIST cream-spell-dict-eng_2.0.2.zip 1778434 SHA256 fc1a117fa2ebf25254c503e31969f3b5584648965e3fdda3171995f64793ef51 SHA512 72ea2c4d72fc39aa80d9f47762f42ec3fcc4251cc27a9dc62a8b8f8f4b66340df7c15afd603a0e4a12805770606c09e462be548f5203feba76badefa27321b1d WHIRLPOOL 22e506f2c625c68f78f445008268652ff3370d8027b78483ed323177d5ff1f2bd7a5031514dc2c2a6e29d3fa2b4d51181a7538cbd7026424531604ca84fabf86
+DIST cream-spell-dict-fre_2.1.zip 872841 SHA256 d15039be170dadba0011915609446aa48e82e27d692c414be6427caa6134b0b7 SHA512 d34773e3ec2bd905a669175680f91146ead8dc0a7d3de8fa668c56e550eed23ac6c8678b2e7b3c642b756d6eba97b815494395c07b3f28cb54e3a01cf8f5b1a0 WHIRLPOOL edc438ba65d67b74964b28972a365d8e298fdd24bc2ce883e99e501fddd80fe2f2b176bafea87ced4de2be907819da04a0ccbc5cc062f3928f54cc6cf1e9461f
+DIST cream-spell-dict-ger_2.0.1.zip 894848 SHA256 62fbfa9ab7a42c4c0d8d7723f865be7e8c216b5215a15d7430ed0cfb3c993eae SHA512 1fb1a797bfbcd0516d8124daf1256b27a356ef3eb58887c2a55fc8537f211faa60dcba713935b2fa5595ebf6bba07a1463819060018f725e5cd0952b978a342a WHIRLPOOL c1ffd84a2b7cacc3f5a7b46ce9c55b2e9c898dc70986cc4f7b03d29bdc44a4edebe618debf3f53d33ce90da0e3e13c8d9a97bdb9c1691239a13d609a84f0d0b1
+DIST cream-spell-dict-spa_3.0.zip 1710280 SHA256 b26ac0bbf905508b446cfb4424fad5923d4e5e6afe5cd20a313be67269485602 SHA512 27de9d920afe191ae4e7d5267b5ad6fb14a6e4185d474c09d17af1eb45f926dab2d4696080cee25d1591bf0b588234a20778e9b1485927dfffa8595b19e247d2 WHIRLPOOL b85c80f55f7acdf95ab60ac5b631b4ef19908f781584cacfa4dfd2fdbb67e9395769aceed8026a7f494ff5744b84cf65f6a6b8674478e76425c9544a90c09a0a
+EBUILD cream-0.43.ebuild 4279 SHA256 bd2d880e8750016d677a4fc4a6b2ef3849ca20502226bf81db8e7e862e3a793c SHA512 e126f9ef16ca5b6b9afb4ce985631e3d88eeae2ffa35c98b6c7af1ce1ab5ec61827e99ae615f236fa38fa2480c3776a452c1c104689bf718370cd1b7be5252df WHIRLPOOL fe2de4f965578cae1f8e207a13b94b43d953c58a3858753b102a8b5ca6290c3f6858b7b5cb1d6b7039868ecbf669701335b996ca1bb24fad2a0424cb19dfe9df
+MISC ChangeLog 3029 SHA256 717b41540ace90cf722ff177fc86f1201b8091f4047ffd490e2930286890f582 SHA512 db821827ae293ff4c872bfa970ed5c388a82fd6738bc24d35c85a5dc057db28672934606de980877329df2349f1777933ff7eb64c7ad3ff92e4294f3cc24ef62 WHIRLPOOL 685ff3dd261d0b66ab2fb2d27cd9252ee1ae2044cfae423fa526d425f70347b0e877d1d04b74061d18e3e44af3e992bd73b999ce43980235c1047a0de10b4b85
+MISC ChangeLog-2015 8267 SHA256 5ba177e77f71be51ccd23df45711151802ff3e0df5df58629615cf403677faf0 SHA512 d87ef2ea1642bd69902eda74cf6b081492ae2186ee902fbb4261a59dd8b29fb94cc014b27b699f39a0a74ef719a882670c191a1ee468b7cbf1cd318bafbbaeec WHIRLPOOL e27b9c19c304739b6601a0dc82dfae1017edd54810d62f5b6122b0c76f221ff46abd576f87f4a10aece03d8107318da57d4067bdd29cd0a7f1c07180d90f6cfa
+MISC metadata.xml 324 SHA256 38b843a8178430d570bdbd312bb77f016227ff3ab8f47414cb96df3cb2fba36b SHA512 0c3e2ef2f849117218de711a2952e6571f92a5bd768c61004284bfc72f8945c77174fb3f83bb70c69ef030dbcab467eb1a531e09a0baf7d85167c3deade5cf65 WHIRLPOOL 2798f7a473535bc8933206011d245f79180b37e99a5a8e99b34ed4ba9db46b412fe80abddd0912c0d36ddc5c7efa2b0a25ca957b380808845856fcb5ba7d1751
diff --git a/app-vim/cream/cream-0.43.ebuild b/app-vim/cream/cream-0.43.ebuild
new file mode 100644
index 000000000000..2d8b551361c0
--- /dev/null
+++ b/app-vim/cream/cream-0.43.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin eutils fdo-mime
+
+DESCRIPTION="An easy-to-use configuration of the GVim text editor"
+HOMEPAGE="http://cream.sourceforge.net"
+
+DICT_EN="eng_2.0.2"
+DICT_FR="fre_2.1"
+DICT_ES="spa_3.0"
+DICT_DE="ger_2.0.1"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	l10n_de? ( ${HOMEPAGE}/cream-spell-dict-${DICT_DE}.zip )
+	l10n_en? ( ${HOMEPAGE}/cream-spell-dict-${DICT_EN}.zip )
+	l10n_es? ( ${HOMEPAGE}/cream-spell-dict-${DICT_ES}.zip )
+	l10n_fr? ( ${HOMEPAGE}/cream-spell-dict-${DICT_FR}.zip )"
+
+IUSE="l10n_de l10n_en l10n_fr l10n_es"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+DEPEND="
+	>=app-editors/gvim-7.0
+	app-arch/unzip"
+RDEPEND="
+	>=app-editors/gvim-7.0
+	dev-util/ctags"
+
+VIM_PLUGIN_HELPTEXT=\
+"Cream is completely independent from the rest of your Vim/GVim setup.
+To launch GVim in Cream mode, use this wrapper script:
+\    % cream [filename...]
+
+Cream's documentation has been installed in ${ROOT}usr/share/doc/${PF}
+In particular, you may want to read:
+
+\ - the Cream features list:
+file://${ROOT}usr/share/doc/${PF}/html/features.html
+
+\ - the Cream shortcuts list:
+file://${ROOT}usr/share/doc/${PF}/html/keyboardshortcuts.html
+
+\ - the Cream FAQ:
+file://${ROOT}usr/share/doc/${PF}/html/faq.html"
+
+# Utility function to rename a Vim help file and its links/anchors:
+#   prefix_help_file prefix file [pattern ...]
+prefix_help_file() {
+	local prefix="${1}" ; shift
+	local helpfile="${1}" ; shift
+	while [[ -n "${1}" ]] ; do
+		sed -i "s:\([*|]\)\(${1}[*|]\):\1${prefix}-\2:g" "${helpfile}" \
+			|| die "Failed to sed \"${1}\" on \"${helpfile}\""
+		shift
+	done
+	mv "${helpfile}" "${helpfile%/*}/${prefix}-${helpfile##*/}" \
+		|| die "Failed to rename \"${helpfile}\""
+}
+
+pkg_setup() {
+	elog "Cream comes with several dictionaries for spell checking. In"
+	elog "all cases, at least a small English dictionary will be installed."
+	elog
+	elog "To specify which optional dictionaries are installed, set the"
+	elog "L10N variable in /etc/portage/make.conf. For example, to install full"
+	elog "English and French dictionaries, use:"
+	elog "    L10N=\"en fr\""
+	elog
+	elog "Available dictionaries are:"
+	for dict in "English en" "French fr" "German de" "Spanish es" ; do
+		elog "    ${dict% *} \t(${dict#* }) $(usex l10n_${dict#* } \
+			"(Will be installed)" "(Will not be installed)")"
+	done
+	elog
+}
+
+src_unpack() {
+	mkdir -p "${S}"/spelldicts
+
+	# install spell dictionaries into ${S}/spelldicts
+	local my_a
+	for my_a in ${A} ; do
+		if [ -z ${my_a/*spell-dict*/} ] ; then
+			cd "${S}"/spelldicts
+			unpack ${my_a}
+		else
+			cd "${WORKDIR}"
+			unpack ${my_a}
+		fi
+	done
+}
+
+src_prepare() {
+	# change installation path + fix the wrapper command (disable plugins)
+	cat > cream <<-EOF
+	#!/bin/sh
+	gvim --servername CREAM --noplugin -U NONE -u "\\\$VIM/cream/creamrc" "\$@"
+	EOF
+
+	sed -i "/let \$CREAM/s:VIMRUNTIME:VIM:" creamrc || die
+
+	# make taglist ebuild aware, bug #66052
+	epatch "${FILESDIR}"/${PN}-0.30-ebuilds.patch
+
+	# more filetypes for EnhancedCommentify, including the Gentoo ones
+	epatch "${FILESDIR}"/enhancedcommentify-2.1-gentooisms.patch
+	epatch "${FILESDIR}"/enhancedcommentify-2.1-extra-ft-support.patch
+
+	# rename vim help files to avoid conflicts with other vim packages
+	prefix_help_file cream help/EnhancedCommentify.txt \
+		'EnhancedCommentify' 'EnhComm-[a-zA-Z]\+'
+
+}
+
+src_install() {
+	# install launcher and menu entry
+	dobin cream
+	domenu cream.desktop
+	doicon cream.svg cream.png
+
+	# install shared vim files
+	insinto /usr/share/vim/cream
+	doins *.vim creamrc
+	local dir
+	for dir in addons bitmaps filetypes lang ; do
+		insinto /usr/share/vim/cream/${dir}
+		doins ${dir}/*
+	done
+
+	if [[ -n ${L10N} ]] ; then
+		insinto /usr/share/vim/cream/spelldicts
+		doins spelldicts/*
+	fi
+
+	insinto /usr/share/vim/vimfiles/doc
+	doins help/*.txt
+
+	# install docs
+	dodoc docs/{CHANGELOG,DEVELOPER,KEYBOARD,PressRelease,README,RELEASE}.txt
+	dohtml docs-html/*
+	# html doc may be opened from Cream GUI
+	dosym ../../doc/${PF}/html /usr/share/vim/cream/docs-html
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	vim-plugin_pkg_postinst
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	vim-plugin_pkg_postrm
+}
diff --git a/app-vim/cream/files/cream-0.30-ebuilds.patch b/app-vim/cream/files/cream-0.30-ebuilds.patch
new file mode 100644
index 000000000000..30e310387005
--- /dev/null
+++ b/app-vim/cream/files/cream-0.30-ebuilds.patch
@@ -0,0 +1,12 @@
+--- cream-0.30/taglist.vim.orig	2004-10-02 00:12:58.400215576 +0100
++++ cream-0.30/taglist.vim	2004-10-02 00:26:28.535056360 +0100
+@@ -205,6 +205,9 @@
+ let s:tlist_def_cobol_settings = 'cobol;d:data;f:file;g:group;p:paragraph;' .
+                                \ 'P:program;s:section'
+ 
++" ebuilds
++let s:tlist_def_ebuild_settings = 'sh;f:function'
++
+ " eiffel language
+ let s:tlist_def_eiffel_settings = 'eiffel;c:class;f:feature'
+ 
diff --git a/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch b/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch
new file mode 100644
index 000000000000..597518a6d547
--- /dev/null
+++ b/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch
@@ -0,0 +1,13 @@
+--- plugin/EnhancedCommentify.vim.orig	2005-03-01 02:28:23.409962824 -0500
++++ plugin/EnhancedCommentify.vim	2005-03-01 02:29:45.695453528 -0500
+@@ -740,7 +740,9 @@
+ 		\ 'psf\|ptcap\|r\|radiance\|ratpoison\|readline\remind\|'.
+ 		\ 'ruby\|screen\|sed\|sm\|snnsnet\|snnspat\|snnsres\|spec\|'.
+ 		\ 'squid\|terminfo\|tidy\|tli\|tsscl\|vgrindefs\|vrml\|'.
+-		\ 'wget\|wml\|xf86conf\|xmath\)$'
++		\ 'wget\|wml\|xf86conf\|xmath\|fstab\|apache\|resolv\|sudoers\|'.
++		\ 'ntp\|mailcap\|ssh_config\|sshdconfig\|mplayerconf\|desktop\|'.
++		\ 'gkrellmrc\|pf\|ipfilter\|grub\|fluxbox\)$'
+ 	let b:ECcommentOpen = '#'
+ 	let b:ECcommentClose = ''
+     elseif fileType =~ 'gentoo'
diff --git a/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch b/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch
new file mode 100644
index 000000000000..9e45142ff8ae
--- /dev/null
+++ b/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch
@@ -0,0 +1,23 @@
+--- plugin/EnhancedCommentify.vim.orig	2005-01-27 00:20:00.049461056 -0500
++++ plugin/EnhancedCommentify.vim	2005-01-27 00:17:57.617073608 -0500
+@@ -628,6 +628,10 @@
+     " letter.
+     if match(synFiletype, '\l\+\u') == 0
+ 	let ft = substitute(synFiletype, '^\(\l\+\)\u.*$', '\1', "")
++    " work-around for gentoo-syntax stuff ; won't work with the above
++    " case, since all the identifiers start with a capital 'G'
++    elseif synFiletype =~ "GentooPackage*"
++	let ft = "gentoo"
+     endif
+ 
+     if ft == ""
+@@ -739,6 +743,9 @@
+ 		\ 'wget\|wml\|xf86conf\|xmath\)$'
+ 	let b:ECcommentOpen = '#'
+ 	let b:ECcommentClose = ''
++    elseif fileType =~ 'gentoo'
++	let b:ECcommentOpen = '#'
++	let b:ECcommentClose = ''
+     elseif fileType == 'webmacro'
+ 	let b:ECcommentOpen = '##'
+ 	let b:ECcommentClose = ''
diff --git a/app-vim/cream/metadata.xml b/app-vim/cream/metadata.xml
new file mode 100644
index 000000000000..a882b886daea
--- /dev/null
+++ b/app-vim/cream/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cream</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/csound-syntax/Manifest b/app-vim/csound-syntax/Manifest
new file mode 100644
index 000000000000..497d991cf35f
--- /dev/null
+++ b/app-vim/csound-syntax/Manifest
@@ -0,0 +1,6 @@
+AUX csound-syntax-20160804-doc.patch 388 SHA256 76e599395b4e9d74e2b220b9bb390e4e08baa82d56b1ce1ff1d9f297764a0099 SHA512 a05e5bdb3165bdb3c86fd963e9767eaaca7c7047dffd73d239fa58248ad24f78667ebea6106777123ea1e366ba4c72387b5765ead760acbfc881d581691920bc WHIRLPOOL af5b9215bd8dde2a14be9381d24dc5136da402bc09edbb1c14839e26c915af765706a571edf443684e537e953f1c73b00a87856eb979498419ef3ce5032258b3
+DIST csound-syntax-20160804.tar.bz2 326658 SHA256 b222e1b55945e4ccc1c11c55c3e9c8dae4c2a34c61bda80efaab508896416935 SHA512 83ba89768be3d9e5dd701cc8323fbbff75ce399210891fc1e5676e278c39cfdb4b5e4a354c93c1f439a667d0ea65f459aea0b6f79740a061381e22d2557c0eb8 WHIRLPOOL 61963663791405565263dcab85f8be64d45fffa522ca7a7e7c749c8d8316943bd215b04266eac92171a5f942833ed3455f88893198adbd605ed0b092d2267dd1
+EBUILD csound-syntax-20160804.ebuild 422 SHA256 2e5acada40fd486a95eac779392b9482c3a5e338104b9b4211c1151435283627 SHA512 a1b2c9f4fff3e4399feaa556fd0c0dd973f4211c92b409f4de0cbfa6bf14b99180b4d7a114dcd1dddfcbadbc0ba809c1bcd5fbe7be907112caf6a4d723bef077 WHIRLPOOL abf8e2a492238e86981bc3814a0f4e92f2592c98d259b7ac4b72514451210629ebf1816b49c7d621ca8531572927e93725fa1c13b14349eebdafd99261933054
+MISC ChangeLog 2885 SHA256 4624a0959a69b7023e5f6db2953193200a3f7bf4a141ce5809b72fdb34a6e9d6 SHA512 b56059f35dece91f6d0d2861c8813150e705064307ed935a9721edd6ae88301d4e8ab145f80145e0de52b042e6a6d60384cf97c05c7df546fb9d3c76ebc9de1e WHIRLPOOL e1024e5a0babd157fe73fcbde0a2ff8d0b6c7b6805f38958ebf7ea15fa02f00900d06ebf17b80ffbec05ceb15083f3f2d64b9983d9440cd056cae53acaedd8be
+MISC ChangeLog-2015 498 SHA256 a814200b7ee07ad0d95ba385d874c4a22bed223aea72d0f3f2aeb66230740ec0 SHA512 e72c1e14b2f5d814af3883ab3247b7405c7293ee3e7a147a4d48e73ee11f53a29a400206fef76b2efdea6fb4cd52e3f1e20268c929cebc47899496c62d0fc009 WHIRLPOOL 80f96af0238ed294556a58f9e7a65c62e04d8204b0e546311f9fb01ef88cb6f69126969ec7f53e14760535336723751d33d2fc6724579af3cdac3288266e7ebf
+MISC metadata.xml 329 SHA256 f7f4c0415e0490ec176cd0ce987050cdaf09347e6b5a4a9907d95c09900e6b7b SHA512 5caad244c40e0c4a7db09f340c0119758dc579db6bfc5a82e1e0023e7cc63964dc85b4f35546155f15c1f858991d8ed428910bb5b7c41d5538b34bbeffa8354a WHIRLPOOL 85eb2c9525ea17a986bc850ca3520e1cab56f4ebe83937b0468e595db44ab157c9ec1e528bc9aa0787e5c5035e4e82128cf666970c18ce65e22164d02eed9468
diff --git a/app-vim/csound-syntax/csound-syntax-20160804.ebuild b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
new file mode 100644
index 000000000000..1562317fb7f5
--- /dev/null
+++ b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: set of tools for editing Csound files with vim"
+HOMEPAGE="https://github.com/luisjure/csound"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+PATCHES=( "${FILESDIR}/${P}-doc.patch" )
+
+src_prepare() {
+	rm -v LICENSE README.md || die
+	default
+}
diff --git a/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch b/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch
new file mode 100644
index 000000000000..c2cc7eccbad1
--- /dev/null
+++ b/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch
@@ -0,0 +1,9 @@
+--- csound-syntax-20160804/doc/csound.txt
++++ csound-syntax-20160804/doc/csound.txt
+@@ -1,4 +1,6 @@
++*csound.txt*            Csound Syntax Reference
+ 
++                                                              *csound-syntax*
+ ===========================================================================
+ !=                                                                       *!=*
+ 
diff --git a/app-vim/csound-syntax/metadata.xml b/app-vim/csound-syntax/metadata.xml
new file mode 100644
index 000000000000..a734c4404129
--- /dev/null
+++ b/app-vim/csound-syntax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">luisjure/csound</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/csscomplete/Manifest b/app-vim/csscomplete/Manifest
new file mode 100644
index 000000000000..7bd91937c5c4
--- /dev/null
+++ b/app-vim/csscomplete/Manifest
@@ -0,0 +1,4 @@
+DIST csscomplete-1.0.zip 18057 SHA256 e8a0b0356a986654d3d1acef11da99dd91f01c80f49ccd6f15b78a0c31735a55 SHA512 63b8b9a31d09ba6ce8195b524df5785cf5da73db7b487b68bba291fcfb62af0ea8e595f1aed73d657b8343775bacca056185dae9fc22d0dbcad1596653f94a81 WHIRLPOOL 7e3c19a05e0fbcc7e82be2b0cd44e71b7fc573468f54c701e49889cee2cb9101091aaeaf9481f1ce409a592dfd56185a84871ed62b26b63dca848be4cdbda3e9
+EBUILD csscomplete-1.0.ebuild 501 SHA256 cd03e36a93d82e1ad1853423e6f59443e33f853a24673369f841d5d9b954eaed SHA512 48470b066d5756db5bf30fefdb681e4aa6506a12356704595c1dc501b4701618e3c79f5120bb0e095b722069dcf1fa3742b479400e970d5772a183a8df0f9c8c WHIRLPOOL e6417afa3928e96aacc4053a0625344d7ff34b5e70c8fe6ffb65f08e9c6de2fce439afcd7b139816fa2b58b921ffc485e72731587652f3364daaba4c5c0757e2
+MISC ChangeLog 817 SHA256 64ee1012a018985db89f775b0d8b4e5ad07b3f413294f0bce3f3eeb57bbac6d9 SHA512 bdfbd03b4026dc427875bea4ba952cb9ce6349ac3cab2a4b161ab25eb5b512df37bbca5fa41451e3180e588d99531b1b7609b9de6f163d44bbbe318258bd97ae WHIRLPOOL 66b134ff7389ac15fc81b96f72db743b86de959f1eea67669c64c11c405a1f9e190cc9693df7013b77da5fcdfbe26bfda56c1ca06442d5e766d8a61176a564da
+MISC metadata.xml 431 SHA256 a6bebb16683ab1ac802c428c22a4a9c265afebd1fab5f2eff9ea553e0b9112b6 SHA512 18a9dd07313408b87c59fd36d268004d5d8c4370a377e524e1c62aadbe1d7bd6f677524912b71e5eed7ae421ce4eba60c9581382b97666cc5ed70dc88ca9b69a WHIRLPOOL 9fb68378e99cff1852619a4375fa638894e2475464aab7532d4f82b340ffb6fe9b342376ded263c5adb2ed8665b7ccdd1bb278eeecdc2ecc874e2e0a5626bf8e
diff --git a/app-vim/csscomplete/csscomplete-1.0.ebuild b/app-vim/csscomplete/csscomplete-1.0.ebuild
new file mode 100644
index 000000000000..13028dac1e33
--- /dev/null
+++ b/app-vim/csscomplete/csscomplete-1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: CSS 3 omni complete function"
+HOMEPAGE="https://github.com/othree/csscomplete.vim"
+SRC_URI="https://github.com/othree/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
+LICENSE="vim.org"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+src_prepare() {
+	default
+	rm -v config.mk || die
+}
+
+src_compile() {
+	:;
+}
diff --git a/app-vim/csscomplete/metadata.xml b/app-vim/csscomplete/metadata.xml
new file mode 100644
index 000000000000..373d7ca9fa23
--- /dev/null
+++ b/app-vim/csscomplete/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">othree/csscomplete.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/csv/Manifest b/app-vim/csv/Manifest
new file mode 100644
index 000000000000..285117dfba86
--- /dev/null
+++ b/app-vim/csv/Manifest
@@ -0,0 +1,5 @@
+DIST csv-0.31.tar.bz2 38537 SHA256 8f7970a2ca192e1e35f3a5932992c60e3ec0b23f90afa5cd775f07686bcbd52a SHA512 1d0716765e3268e20ef7b2ed822e7322febbe2c9e9b775e79a2628c4641f157084b6b24d999b051657881acaee5ae8dd36a558ef31e5985bf7bf14ac894d5677 WHIRLPOOL a3866cd8c899565fd5a01bdd79d74a9543a155a308f8cc3f7413c91b1c7b64ecdd0a289f7060c19bd20d6bfbc1df00dc53280828cdf26b7c26bbca7767175c36
+EBUILD csv-0.31-r1.ebuild 324 SHA256 26b6836e67ebf9f80ee2246f30eb3c263d6e445346312396f7b54ab82f1d94c9 SHA512 0d16794876e71347b322c973902d2ba57b8da719fb9347c414edd87164e6e0849fead087f6b99e56f93ed4702233aa95e6051efd6a22add10dde0a5cde2fde4f WHIRLPOOL d72d1128a091868a1a7d4ffa6df262ab28e2264015660b07710ff83464174d688c9eeef91278b2e483bd57479a7b4a2307bce4a7dad3f4596264cbcfe33bea03
+MISC ChangeLog 2919 SHA256 d5920c82b87c491e45901f7979f115a277d8a9a3fe2fdd4f6dbc1ffa2ff87e11 SHA512 af444d94d774f7e5444277891a36daa9531a3271df44269fa26a0b38d7594341eab7e4ea0b925b557dbc6cf26a723a6bf264c8b9f9beb401cf3ec305de19c07c WHIRLPOOL 3b530a2c334cbd28a4af0d730623795acca85b79806de8bb4873f1cf3ee84c3f700fe0a46d2132fd1554db9713c6b2eea737b9d725733132af5dbc087b787ac9
+MISC ChangeLog-2015 2363 SHA256 02c9033bca14baca08df88147f0c98000b05ba6fac6381901591738c200453f4 SHA512 ff3e31c99b8b7498f371d09cb08d0b2060fe3a40e7e274efd4cd6728fc6ad0d057de16d1dcb3eed90525e486e2fc3d082973339b38e3dd5b3095051b9a2a2759 WHIRLPOOL 6f758098e600835d0fdfdfe7691b202092ae315a6ac85e40e7214a89770d4dcc88e98a910d8963f7fe7879b999a2b74753519c1d0af48fb2dccb8c20018f8b7a
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/csv/csv-0.31-r1.ebuild b/app-vim/csv/csv-0.31-r1.ebuild
new file mode 100644
index 000000000000..cafcbed622c9
--- /dev/null
+++ b/app-vim/csv/csv-0.31-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display and alter csv files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2830"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="ft-csv.txt"
diff --git a/app-vim/csv/metadata.xml b/app-vim/csv/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/csv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/ctrlp/Manifest b/app-vim/ctrlp/Manifest
new file mode 100644
index 000000000000..54d1e8085df1
--- /dev/null
+++ b/app-vim/ctrlp/Manifest
@@ -0,0 +1,5 @@
+DIST ctrlp-1.80.tar.gz 75269 SHA256 65762884e4787bb6c13812ea2a0b82ec3bb1e5e552a43aea4a0e9700c2f0b1f2 SHA512 40175e64bb9c4ccdc202bc31b8956b96ede5761a3a4f17706c4d915f8083991cb7729e33c79d021bf6faff00f381fe9272145f852981e487b279f0471b86cadd WHIRLPOOL 3294650925a015450e732ecb12b705e72643f0b0beaadcad23433d9ac161fb4cc30a7cdbefaf45b592b0553e51a34c0da378c0e0e268d386ada51e71cb4d6fcd
+EBUILD ctrlp-1.80.ebuild 456 SHA256 0d7f98bb8328f0dacd2eaa20976ae0831fcde008eae4f0c3ae9ad4df2b7e5fc1 SHA512 9f8a52fd5d00138b7619b7d8c0ff2d166f48375e02ca4ca872d7ed655a2bcaf80282bd71bd4c122d479ad33c395cb57bee6421497d4da34e857663c9dfc283ab WHIRLPOOL 27770462be3dd3b18d18e481e8ea49340fb573b9dd0a9289ad0ef5cfe84ea58fb78e2fbec1c76e58a726c8a89b1df2deddfa33d00176ba2fb312e461ba8f28e6
+MISC ChangeLog 2792 SHA256 53bf74d307d99974367df718c7d7c4a575b5ae5dc02c65270648d7e21dc7e8ab SHA512 54ff2bec9aa04082731e311b437ddfb8b874b22f1881e4cbc3ec3b473d7ec23b63a8e8eb0584864a4f1b048eee14defd3b7c5ae4122d57da0465f237e6dd0425 WHIRLPOOL c91c64379fc52c1b89a4fe7883b8cdc33c7edc1cdec321cd732312b5afcb026d148762581f8af8313160340150b94ffe3175a98947094f6bc9657d69a32059a5
+MISC ChangeLog-2015 659 SHA256 acd1e64755b2a60e06cdbef6d05a35c82b5749a70d336477d95082b82b5e37bc SHA512 111e7da62da2be755fef7f45d3ccc80db4cd9ab848f838e2659fc34ebb118f406613f50471034fcf776f7bf435f04d148bc050560240798fdd770385b9965a90 WHIRLPOOL 448f543c8daf146d94bbf5507ecf08afb7cfc16b0c85a19311c827e04e0315fe636298c5181117453d4e5db0eab8a690ca99319facd2622fef4a92ca839e49a6
+MISC metadata.xml 338 SHA256 ec77b9259b9515a3924147b10638d8379a6ff7115f2a66b91cfe1df9579d2fe4 SHA512 5167190c5206fc93a419c088f08ff5fd89ff0f12198824576f652973baa99c16ed8b8856e7afb2ba8c7e1bf9c90d4c94b83ff38dfd1ee63c06d9a69d57b07d45 WHIRLPOOL 874018d80755a2b0589b1ee6ba078e73bebff2042e53285677cc387cdb860aafa3cf4053a8452f514d45bf6748554c136f462b8410cac9104cb2adcfae23c09d
diff --git a/app-vim/ctrlp/ctrlp-1.80.ebuild b/app-vim/ctrlp/ctrlp-1.80.ebuild
new file mode 100644
index 000000000000..2c42572f0e5a
--- /dev/null
+++ b/app-vim/ctrlp/ctrlp-1.80.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support"
+HOMEPAGE="https://github.com/ctrlpvim/ctrlp.vim"
+SRC_URI="https://github.com/${PN}vim/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/ctrlp/metadata.xml b/app-vim/ctrlp/metadata.xml
new file mode 100644
index 000000000000..edfbc7a37966
--- /dev/null
+++ b/app-vim/ctrlp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">kien/ctrlp.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/ctx/Manifest b/app-vim/ctx/Manifest
new file mode 100644
index 000000000000..8746ec056e49
--- /dev/null
+++ b/app-vim/ctx/Manifest
@@ -0,0 +1,5 @@
+DIST ctx-1.17.tar.bz2 4391 SHA256 508394d3a1f152874f4b5b8499e00ebef9ec2953a4bed46e95280837904ce1bd SHA512 35839f005cec56baf90ecbf46ce28530f9d3a18d8a538323d3f1d2134fa392a9595d95c3258c9ce2320381a69b1fb4a61b2ad2cd9d4c581e75bea378dfe7e13c WHIRLPOOL dea9537617dd6a6f18a98ca90b263f1c9170ec47f7cbc3a59109b40a79f8db098db39224b41685af6c1d4b92616661b25ca27cc495f9e399ad6921074e7316e9
+EBUILD ctx-1.17-r1.ebuild 434 SHA256 9880acd8f2727dda45e2de11146cacc0defec57c7e615fa17907765e459b438a SHA512 0bb9506805790e0df7bb8b0c391f6527eb88a0d5fd80ad50044bb32cbb87d88df24cccf4dea015b25692c08cbf762f696261f6deca0f419ccecbc888c588a678 WHIRLPOOL 26be62aea40eb1af013e24190ada1a7a5adf7bc62498276dfae3e7df5dd551030a2ecb4c8e1191afc917fa39ecf510f55ff3e2d53f9a06a22ae5e5c3703dc929
+MISC ChangeLog 2776 SHA256 457296cf65538b0f097dd10a320b90f721c27846daf20d3644874e5c38813e24 SHA512 1b2449a9a2daccfd27a38def0a334c29958340eda88d55575c8366dd7c26687eecb83b251773f9ec90edd8b0d30d9005015e0abd05d5f6e0ed59074d27f49cd4 WHIRLPOOL 3f29013f3a3dbfef8b9338eb6ae354344d7490c728e3454105ef1aead6191f9604bbae967614b3667fd366e2762e2b4f083349b2ddf840b903720378520c9c61
+MISC ChangeLog-2015 1272 SHA256 1925e3ad42905c609a10f9fb9af83861e336903114466271ff262629a8d86af0 SHA512 d4eef9df325ac6ed1cfa5033dc5bcf7009ca0c05544063088f9b59d8f5f54ded2aeac6db5c5fa164c4fab8f404983a894ed0988b783e12a5295b6e80f69b9110 WHIRLPOOL 464fb3961320ed31c663ea30f384f0945f9f42434a3d79506e2936d661fda533dade1e73ac5bcd2630eceeec30f4236c3bb1c966e5a986b833efe1182c234760
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/ctx/ctx-1.17-r1.ebuild b/app-vim/ctx/ctx-1.17-r1.ebuild
new file mode 100644
index 000000000000..0077c3235165
--- /dev/null
+++ b/app-vim/ctx/ctx-1.17-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display current scope context in a C file"
+HOMEPAGE="http://www.bluweb.com/us/chouser/proj/ctx/"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ppc x86"
+IUSE=""
+VIM_PLUGIN_HELPURI="http://www.bluweb.com/us/chouser/proj/ctx/"
+
+# bug #74897
+RDEPEND="!app-vim/enhancedcommentify"
diff --git a/app-vim/ctx/metadata.xml b/app-vim/ctx/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ctx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/curcmdmode/Manifest b/app-vim/curcmdmode/Manifest
new file mode 100644
index 000000000000..dc574c45ce70
--- /dev/null
+++ b/app-vim/curcmdmode/Manifest
@@ -0,0 +1,5 @@
+DIST curcmdmode-1.0.tar.bz2 3566 SHA256 2ea96f0c0d84d2e43de642bd2179b6e52837d942d5f108410e7636c040e75a4d SHA512 eae4e7cc92ae3838ffbdb507fd51174daf2fcd05d23f418555ac9ea3dde5562e49c67ee7b27dfcf6bf2088dd335ca97165835919dd804a86fca581b4d6bc0ea2 WHIRLPOOL e3767d6c53a7f985a976fe4251c98f784f5f91e3d7644640dcac8e6ceda36fac6eaca42cd409e75615407047fd3d246788e34751f8d7bec36a9bf11b09d08d98
+EBUILD curcmdmode-1.0-r1.ebuild 486 SHA256 867398d3bccbb2a9fca0b170b670c410f3c7350a58858463570ba66f7429a668 SHA512 6124618abbfb67a5207cf2b06385b2cee807039459302e865512041b993eb6db2ad58f10d4d8bf038f28c5c5c8e417a97932626ba173c3b5463f5315efc577fc WHIRLPOOL aafd2d315efd608cf57dbdfebd23fb9d39368082acb7de07b1535741af67b44d09b9a457bbb80947b9b5fb013c3ca089bcf145e8566b83324a61b213043d2663
+MISC ChangeLog 2599 SHA256 a347ca23916078f656632e19dde900cfdf808c93e2c996b3108030d55bd6bdce SHA512 d5ee46785e46b62ae10ce2260f6821b21feb0180cdec704c3867e21c5ea996d910b6760518fd0c1af58e47a4bdfedae5703cc248f55e0322d8b4f3de5cef929b WHIRLPOOL 7d4ace1bfe6e7e351b766db602faf847a19d847740986e4014b645265caa72705c375ff9db86ce4071d9bb43ba3c13adee404ad1c72831d86ef9a053b51745f7
+MISC ChangeLog-2015 1173 SHA256 a0b26156287a254e1414bd6b45c7c3992b03d7abd14a685159a0cc92ac2df4da SHA512 7f685aa615274411415e9f6d28865010fb6230ebd0cff3afbe7f260f2f7a7128a3164393b95a3cdff7312143bbd4ef1d70612873c6cd56ce981640a62860e8c8 WHIRLPOOL 76edef7c67d03425d7e1f067359b7fd084c0d17580c8d7464cfda0e3c312242d7599df2563da4b5039ae8a3ed6b74c7633247a4fa4ec3270f04192f23a7d90a6
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild b/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
new file mode 100644
index 000000000000..66e3878fd404
--- /dev/null
+++ b/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for extending vim's mode() function"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=745"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="app-vim/genutils"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/curcmdmode/metadata.xml b/app-vim/curcmdmode/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/curcmdmode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/cvsmenu/Manifest b/app-vim/cvsmenu/Manifest
new file mode 100644
index 000000000000..10a0e0ca253e
--- /dev/null
+++ b/app-vim/cvsmenu/Manifest
@@ -0,0 +1,5 @@
+DIST cvsmenu-1.147.tar.bz2 16440 SHA256 a04867208d8660f82a94eafb844211d53b5bcf9155dd967656e4b2ac3d137ba4 SHA512 ca25c4b6d50d0d82ce179a76a8993b1a7a5ef72d032639ec9cf16fbdeafd87eddf7f89214fa8d370d330f5f7501e1265f1c5635153cc387e23191ab81ce56c8b WHIRLPOOL 13b2066a610f265b907282486e0d79b09492e6d8074af112d305af299bbe4aa436b914cd025e1721ea13f3de0333fd265e64eab5679b3e8bfb0cb497c8be716e
+EBUILD cvsmenu-1.147-r1.ebuild 479 SHA256 f6511ce5ba7c157ed24da6909ccc63287f9841f4907e42d3dfe3a9aadec08f2c SHA512 98840dea131530ba4f23c740e966d9ce241e990c198bef9943b87d39248c21afa749d1db85c97f49fb4c928d31313c6edd83edeb6e385c6aaa8a7620c04fd55d WHIRLPOOL 96e0f9ec18ef7db9f1fb7e68f74dc49b83d45def6782bd663d9848502315c80a4fb6d0725438e9d2248721abe865bd4ba1764705e7fc6cc6cb4133bedee18018
+MISC ChangeLog 3106 SHA256 cb5c7641de815ff43640ed9477f8a108e01a78681983802c0400d48c91182e24 SHA512 66265ed9b2e0cb0ccda17e07aa70339272a4b8d1f5f449ec4a420dc7e576d35dc78adb90e609a822347c847e85135cd9ff86b805e8b3fbdf65347c6f6f540e42 WHIRLPOOL f87d76367e919cfc9bd0e25af474ba798a80d812163effd1d0ab4b8dce9e410fe036cc34d42a46e5cc6df71a05ad0994aec282789f2af343106fdff3b5384f56
+MISC ChangeLog-2015 2057 SHA256 20218681f57ec81ab2e87d28f1b1816ccb6089e76c0feb7f45c296a2c9f1b098 SHA512 34911ec99c4ee78b85461e92b18dd4f9f1eeab3b022fc866b4e0f5c9c7cb7dd86fb344349267daec4ccbccda5dd22398deb0fee1a27c0467c8ece9c4e2b6b92c WHIRLPOOL a7def62b57ced4731941c6ca64ad886f3f209b6f718783bdc4efd208620e2961b49bef6777680244e7b420763656fce849c0c6249694b34dcc430e0033776abf
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild b/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
new file mode 100644
index 000000000000..ab6ca41381a8
--- /dev/null
+++ b/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: CVS(NT) integration script"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1245"
+LICENSE="LGPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+# Note, this comes from CVS on sf.net
+# http://ezytools.cvs.sourceforge.net/*checkout*/ezytools/VimTools/cvsmenu.txt
+VIM_PLUGIN_HELPFILES="cvsmenu.txt"
+
+RDEPEND="dev-vcs/cvs"
diff --git a/app-vim/cvsmenu/metadata.xml b/app-vim/cvsmenu/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/cvsmenu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/dbext/Manifest b/app-vim/dbext/Manifest
new file mode 100644
index 000000000000..bdbc22cdf846
--- /dev/null
+++ b/app-vim/dbext/Manifest
@@ -0,0 +1,5 @@
+DIST dbext-25.0.tar.bz2 108580 SHA256 2e9efdd5161c4225aaf6649990cbcf1d8dfa3dab7dbeb468a3329138cc229dff SHA512 715d9d41be46f691ea5e635bf564c4f16d16a74e5b65d9ae12f794406a2a7815df836e34d0c415e8696847e8f36f2ceed1fda4bc688ebe0db8826dc3f0493340 WHIRLPOOL dbb0eef4c9bbcbef6218537b77f989fe4717c9b6b25cbd7509abd8e6708a4755df0fd3555a5131d5efb5550f18f340c55149eb8487987dc3bfc263e370759416
+EBUILD dbext-25.0.ebuild 331 SHA256 dbc36ef066cd131b8a73349eb1ead3cf38e88b1f00b0ba5180d277950226640b SHA512 48224738e3241c65ef58031ba0cd7e3bc8844772ef1449b360214993b10163e1a7115a4341f49232a523e9952ae82c0715180b2b95b8e606e90cee6a96810053 WHIRLPOOL 08dee1f9ba5b4bda452afe8faa043deed459e021508db86870e927ebd6c0ca55dc0be067e8b0c8ab62f8b5614d020d352665c4ba6d3dd1375c62d5968fe39c27
+MISC ChangeLog 3643 SHA256 2a4de949910029bd23a6a9bc79553a6cbdae1495f5ed8c2e2d3f872a7fa7d794 SHA512 355fca4a6226c9381a3ee9f7f8ecc7dd9ebd9520f2f2c6272157e1e5a44e3d88ada97bcf7d4d4386a9ef7622173b5dc8947fea306a8bd549df0b90a9c45b8111 WHIRLPOOL c800f55f30ddd932162c94500d3904688d2c8fccd1c73723174d3d62660a589bb64ac98bc66bfad48a3f506698d652dde4478b4f7e633b8be4f3b201b7dbf01e
+MISC ChangeLog-2015 4612 SHA256 ad9adb97bae88ae315a4b52875d0c69bfe244b7d5baed9e418edef04fec66f8c SHA512 6ea7a134b1f2e1dd6f828eb85a6cf768adcb529dae2d0d99d5a65c149300c917ff8a3ed9526945ef837350cba5aa16de857186b256c4c8239deaadff1a0827fa WHIRLPOOL bb452ee21849c1a29d2dd5098c863e41061b487afe985711c5cfe0e31c58fb6364af188a8738aa1efbb7a369ffe25c78db670a05156b01ef4e7acada41dae68f
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/dbext/dbext-25.0.ebuild b/app-vim/dbext/dbext-25.0.ebuild
new file mode 100644
index 000000000000..7f4f03480746
--- /dev/null
+++ b/app-vim/dbext/dbext-25.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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="http://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/metadata.xml b/app-vim/dbext/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/dbext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/detectindent/Manifest b/app-vim/detectindent/Manifest
new file mode 100644
index 000000000000..09aacafb05a4
--- /dev/null
+++ b/app-vim/detectindent/Manifest
@@ -0,0 +1,5 @@
+DIST detectindent-1.0_p20150908.tar.xz 2788 SHA256 2f2e124777940f1efc621e50a679956650348305cf76be8e5c35c0a17b64c041 SHA512 d828d04871e6eeeaa11c109e137fbe70a3b7fa265f569e45d77b8b185f380a200b009aa0a2f0825afdbf344b12d7b8922050c4788decadcb7640bbe3fe9ca8de WHIRLPOOL a7b3c70476a3c35ebb4dbe9bae24307a4f3ed56f0e4e160b6f2f55045a96941a6d4d99ac6513f23af27fda0a8bb98c893588e9261709e7267f75706f0447de8d
+EBUILD detectindent-1.0_p20150908.ebuild 513 SHA256 8b0e2b6794946e2257411e0cae384db55e77b515ca44b25b54d598fa62283aa2 SHA512 243929e04d24e04d23a37bf1e4aeb7257cd73b6cbdbd45c9a88817be9938d8fec3332b7a9a0abee5224e8c11281222b91f4f2b5e5466c7b7622b7a3c637acf73 WHIRLPOOL 4b2323963cbd77158cc6d25948638c2998397a3e49d13a99dd5f4c0c248208e2a9b521ab4e32711dd48055deb0ffab933753ab88cccf4fb9823d114a892f57ec
+MISC ChangeLog 3349 SHA256 0173951fe091546020ffa73c9bf58feab03c9ed5c6611894bf720e3d9514ccbe SHA512 8a04f83d625d1e8db628546e14071050cbd2bbfecf615cc84d6af31c4c3aea9991c1415463222391ccb4e391cc46d1caab0522e6c5d5206a054b6f0ae6262900 WHIRLPOOL cebf2496e3d0f500a0dbcc778cc65eeeea53f1051b7b38607da14225695d69acb2a72ae326a0fe1a2f7ecfea826d395cd8948e66c93b62a81ff71b508dcbfc59
+MISC ChangeLog-2015 1191 SHA256 963a660c2098aa6668a2207bf926319e36064500e8ca89662a5c6e37d3c24ca1 SHA512 71dcad724dec08410d77a70ae07b38f64d54ec8c61f0d68592c8f7405f57bd5b7c3fb30c444db7131c5a2ff57f3cd7a6366e93d14d861a3ab5974c2aa6eab486 WHIRLPOOL f85ad5be3749ff60cfed3767c113057fdfe2225003b872a82fbb9abcf4d9ae0ec5bc5912f12b1c80e02abbb2949d7380a0c4bf85ff9b21df74894ae519bff1f5
+MISC metadata.xml 481 SHA256 f366e90dd6d6d72a27935df6c7d3945c928f388eab4b78ab13f584992351d60e SHA512 b4dfde13c17bb38d66031284c72288648992cf1157bb253c7cae53ad179d097ee05fde55333b9ac660e748298ab84b767976c5c8bb03a0defb7e37a5087031b2 WHIRLPOOL 57cd6d74394053319ed4137f03a434e13acf516800b1d4a756742e22c1cbf96da3454f168d593dc207967ad279d1860de2a58a3435b5279a732032dc51e057d2
diff --git a/app-vim/detectindent/detectindent-1.0_p20150908.ebuild b/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
new file mode 100644
index 000000000000..232c7a61e1a8
--- /dev/null
+++ b/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatically detect file indent settings"
+HOMEPAGE="https://github.com/ciaranm/detectindent"
+LICENSE="vim"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
+IUSE=""
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~chutzpah/vim/${P}.tar.xz"
+fi
+
+DEPEND="app-arch/xz-utils"
+
+VIM_PLUGIN_HELPFILES="detectindent.txt"
diff --git a/app-vim/detectindent/metadata.xml b/app-vim/detectindent/metadata.xml
new file mode 100644
index 000000000000..34279beb870e
--- /dev/null
+++ b/app-vim/detectindent/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim plugin which automatically detects indent settings for files which
+		do not have modelines.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">ciaranm/detectindent</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
new file mode 100644
index 000000000000..89a9541e6489
--- /dev/null
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -0,0 +1,7 @@
+AUX dhcpd-syntax-20030825-multiple-addresses.patch 588 SHA256 86438fa4879e03854c85ccde7da901af9095c77e765f9e76e479b609451d0474 SHA512 9b6a22f50bb4402fbe63c7971b11a1b1d7dfec5976758897aebf14a8f0025c52daaed9e3c8668a93f5b2c7c61afde600040f6c64aeac62f2e0e9a6b01735a74a WHIRLPOOL 2d790bdd4a871bd2ab294ade5c4f0c1c1135693bc12613768326fcc531b8c039699c419823c36f4c06ea4b5800df422b2d9e1ced4840dedb3b34efd7ec8f3c24
+DIST dhcpd-syntax-20030825.tar.bz2 2761 SHA256 4f25a880a6505f33c6235b07851ab9eefc0c336500630d6fc80347ecde1a281d SHA512 97c1706e0ab2c89ee20618ae0c854347f8674a3008a5c4414aacb78e984e35b0eb6eeb5f641363ed6601ceeac0c794577d518658db9200c7391871ffae5341bc WHIRLPOOL 5d7dd6218ac881d17ce0351ba4c116587e5aab6faeb64eaca5e7cdf87be0b539128e9e203011921c17a74150efef204bd5b1c3f38f7fdba452b3355fac2aaa7a
+EBUILD dhcpd-syntax-20030825-r1.ebuild 528 SHA256 a93c1ee1db4404bca5dfca0c89f92ada84626ad83c033f60e95ac7b27ad6d278 SHA512 44abe22346d9826d2e748adb968b468bcfa50bf63a6507e964986a853f192da5a88f5d672796822723b76052b0142d68d77f0ddb31256847774fa60044afc489 WHIRLPOOL c9c249d92723916fa3c5ef44c7c68eaa1a207170f9101726471e4ee9c1da8742b3d7bf6b872dcf810deb21a5cfd9dda801e822b3e6e365ccb1d85ce5ff07c49d
+EBUILD dhcpd-syntax-20030825.ebuild 563 SHA256 32ad27175d8f457e9efea77610aa612ae0edbb4bd5460435a9d83113abdc609e SHA512 f934aa5c06d9aea2af614a1319295965b9c032241596d7af6440b6cb23e346bfbf1fcc2aabdd1943b9cd558a20935a96fc8b390692e0636833a70d4cef275f94 WHIRLPOOL e47bf4038f56c2915675f518e88e62f9749ef3f9f9464e7e922d1a0e7aac49af3bef0aafbd78a361ea199e2a486313d2a70e48654264a32f129d16876421d3a6
+MISC ChangeLog 2504 SHA256 05d97685b43635d49ef07ea139cf0b59583f3f8f10e2d830a6135b105956194e SHA512 53b75205e0b85f6e1ddb059bffc51d938bf59eaa9f5be29afd554cf0a19f155e40378a85814a8ca84af7c754b37930a633d9ad6e595353657f0c86e3af4be757 WHIRLPOOL 36a5ead4b319a4a4657b3a36b327d95ec190f1f7586f2fe42922af3500ef4cd2fedc4c52aa82f60f4ac7aa65f255ccc047e43378f3c4a604c767cf6a3605384f
+MISC ChangeLog-2015 2442 SHA256 f702d23c1279a3a6a6f2acb8a65ed53b3c1548feea6643ef1998207c91aa49d5 SHA512 6e3b8425f41ee910477305ab9fea8fbf307f23e2a8a3f73800a57f1a08f32e1d1995021225bad35b4290cb66711c941ec4a02c4449e00c164d41971076cf5f38 WHIRLPOOL 03043a581bbba8126f17315f996df561f3c224f799f4550fbbd55f38ea7b7f17977e7170c0fa8e3c4b6e88abf501d52266f57f5fa54ae4c461e456dc5e498a49
+MISC metadata.xml 451 SHA256 bff88be84ae9a3e291aa37ea4680d13b1dc948066adf2866bab8f2da34f6b343 SHA512 cc138ac01df08624272da2daac14b2efd86fa8880e79b76de9fed6798fb5b8f6421fe608e2851af9c1afb7e6586f8d3f27865729960ce82ea76ac29f499e9e9a WHIRLPOOL ea43a5ba704b23ba076504d83d96d28fb99beea3c3e1cd0e1cbe59d7573971521bd58578a8b239fd279a3598a71b85f100df6cf042747a8faad9c06847aefa81
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
new file mode 100644
index 000000000000..b5d16e15beb2
--- /dev/null
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=744"
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
+
+PATCHES=( "${FILESDIR}"/${P}-multiple-addresses.patch )
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
new file mode 100644
index 000000000000..6a4bdb499cec
--- /dev/null
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=744"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for dhcpd.conf files."
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-multiple-addresses.patch
+}
diff --git a/app-vim/dhcpd-syntax/files/dhcpd-syntax-20030825-multiple-addresses.patch b/app-vim/dhcpd-syntax/files/dhcpd-syntax-20030825-multiple-addresses.patch
new file mode 100644
index 000000000000..b783792d4cb1
--- /dev/null
+++ b/app-vim/dhcpd-syntax/files/dhcpd-syntax-20030825-multiple-addresses.patch
@@ -0,0 +1,12 @@
+--- a/syntax/dhcpd.vim	2005-03-24 16:41:59.755564944 +0000
++++ b/syntax/dhcpd.vim	2005-03-24 16:42:15.894111512 +0000
+@@ -33,7 +33,7 @@
+ " Base constructs {{{
+ syn match dhcpdString +"[^"]*"+
+ syn match dhcpdDecNumber "\<-\?\d\+\(;\|\s\|$\)"
+-syn match dhcpdIPv4 "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(;\|\s\|$\)"
++syn match dhcpdIPv4 "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(;\|\s\|,\|$\)"
+ syn match dhcpdMAC "\<\(\x\x\?:\)\{5}\x\x\?\(;\|\s\|$\)"
+ syn match dhcpdDate "\<[0-6]\s\d\{4}/\d\d/\d\d/\s\d\d:\d\d:\d\d\(;\|\s\|$\)"
+ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
+
diff --git a/app-vim/dhcpd-syntax/metadata.xml b/app-vim/dhcpd-syntax/metadata.xml
new file mode 100644
index 000000000000..ab33f6f8c5af
--- /dev/null
+++ b/app-vim/dhcpd-syntax/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package provides Vim syntax highlighting for dhcpd configuration
+		files, and automatic filetype detection for these files based upon
+		filename.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/diffchar/Manifest b/app-vim/diffchar/Manifest
new file mode 100644
index 000000000000..d8557dbfa9cd
--- /dev/null
+++ b/app-vim/diffchar/Manifest
@@ -0,0 +1,6 @@
+DIST diffchar-6.9.tar.bz2 18030 SHA256 492c69e8e59ddae62693d0d54e48ae15d8392aa771e266b6cb5697496e57b343 SHA512 1e87d9b4190eb9a1ce8ce5a4ac5b0e5a8528868655abc367c5ace96d94b3f01ceef065ce652b811509b742f9e55ecfba820f72970ed872b0f694acc1e204a575 WHIRLPOOL 1a64471027669f87f10ccaf786d569514af6a0e8b5b818461bdf0d5eeefaca53e5c75e41039d2e1c17e93198155162fd587265668ad22221cc8f950b558116ec
+DIST diffchar-7.01.tar.bz2 19950 SHA256 2bd38b4e3fc964c4c21de0009a65c68fc827fcaffe3806231e446c7e8ea43f4e SHA512 3f42f40ec27262f76058d9461ccde80c5badc61d0854c1ff239bea399c26e20eb5cf8960b76901223e937097e18dd7e015fc14a8f7a99907666c518d4baf5117 WHIRLPOOL d7ed035d6fe3c0d36ac479f2f9e9662ff11fba9b995877b5edf5b5337f11f61b0646696a700e70a256bcca58f24b0081d1eb72a37a45fd89ce1f7c14812a307d
+EBUILD diffchar-6.9.ebuild 403 SHA256 3c733d16bf87e1f1138ebb6370bf32cd50d9e3b5d655e30b296c29cd1752330e SHA512 d55b3dc9e0ba654d4d23108f8f29bef93062b261c0ee5c30625a5786a43531686b24b69c6baa0de97dc87a7c8bdf19ca2ed9101ecfdc3c70d2813b9ae46a8d05 WHIRLPOOL 91afe2804f201cfb05dfb9aabd9aca064c7fbd46ab6a73565f698d863324e4a410e3323bbab4348fe000bdecbf17aaf199b59a6152fe02949a3642687cfbcabb
+EBUILD diffchar-7.01.ebuild 405 SHA256 3ec7e9161a33569ae20f3031afe02a44518fd28f65a364d575c8e595c5a9a5b8 SHA512 95a7bb6babb873b24636b72fb1204098a2038f6f348b83ca1507285bbbbdd89293a542215f0aba48a2b7cf3d607ef34dc62609f0dad9609e99d2edac09d2c505 WHIRLPOOL 11049f69f45a64d384f587a1099ee89e2e482e621b1e2ff3c705bfc7163f83a49fdb83aca619036465412758b529ee4e116f1968e1f1dd672a6d50ddd0298e09
+MISC ChangeLog 790 SHA256 d0a571a2e2fcf398a96ab5752187ce33b3f31e81a95327aad67a8661996dfc90 SHA512 8895189eb31a3d14f610b25566d7d342fcec9b9fb92fc8a26aefa90f6f48ff0d364ff4f3129f1f004a2d35bbd991af09a6c3d35c6179d861950a75efb15067ed WHIRLPOOL 562088f731381df6383d29d99523e0a44fc8ad5481a4451c1fc7aea8e2a510c07a890eb87abe12f82b6dbc4c5b0423ccaead85fc3bcf0c77cfe4f03b4e88c690
+MISC metadata.xml 345 SHA256 606b4637e74a2832f91c264039bdb3b4221b64346d5de50b7df1212e1d130227 SHA512 bbe312936f14ed5cda6ac637f0780480b5e82580ca79320c5503b404e0a2eb9659fb7d0dda9e83097546fa104b7b9503bb1b25b166725b045487c78d80219d7e WHIRLPOOL 41dc5687da5ea29f27c1463a689f06b7aa0dcb088abe09c6a2a2384bb7d8174caee130bb86c56dab038a462e7860da6e1e1a82fe5975314e06e3f35c604bd19e
diff --git a/app-vim/diffchar/diffchar-6.9.ebuild b/app-vim/diffchar/diffchar-6.9.ebuild
new file mode 100644
index 000000000000..c7ec4e2fdc9a
--- /dev/null
+++ b/app-vim/diffchar/diffchar-6.9.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
+HOMEPAGE="https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932"
+LICENSE="vim.org"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/diffchar/diffchar-7.01.ebuild b/app-vim/diffchar/diffchar-7.01.ebuild
new file mode 100644
index 000000000000..6790b0da6cf5
--- /dev/null
+++ b/app-vim/diffchar/diffchar-7.01.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
+HOMEPAGE="https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/diffchar/metadata.xml b/app-vim/diffchar/metadata.xml
new file mode 100644
index 000000000000..33e52c74c3ab
--- /dev/null
+++ b/app-vim/diffchar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rickhowe/diffchar.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/dirdiff/Manifest b/app-vim/dirdiff/Manifest
new file mode 100644
index 000000000000..0950611a9072
--- /dev/null
+++ b/app-vim/dirdiff/Manifest
@@ -0,0 +1,5 @@
+DIST dirdiff-1.1.5.tar.bz2 11131 SHA256 82b250d37ea973118cd4b146c8ea5e936bf5618a4b78b26d6e4d320c44a678b1 SHA512 d1abc7981d38eb784cec265146fb3b45af32f9df17698d133f6f001608c48d53aa2529f4d3d7204509ee26fcd84e813842b5a8193b145abe9d0cc468f69b7f87 WHIRLPOOL 3da0721c3926bb22f041f199d5be7a8d3e7cc0d2029d929cd9927f403a83feab0e701402cda62a6a3f44adbe0ea091bfd6ac519de4a9a0e1e3e3815a45d6d5c6
+EBUILD dirdiff-1.1.5.ebuild 367 SHA256 11a31bf746561048641037846ee2ee0ced1cb27b47a64e2a73315f0f17c8be5c SHA512 f4dab2d9aae65e15c1f449f74c50951f048ed323e2f6b49e2e66dc8366bb37b06bf474ccbc73ab3e201c2150570adcf31c3ef913315d0a82f8d55f2e830223bc WHIRLPOOL a4980a95251e95341b1920e2087fd8604b16c3cc4737ea9e26d68c6489545830985bd996bf075037be8999a3b4ef66e7f968de2e2fa10ad9741619d29eb1c362
+MISC ChangeLog 2654 SHA256 4822625423e19ae613e3e11f8cba389a700f652b2c1f1ab916b22d13d9023dd6 SHA512 89896f72c65cf2d2a7d1205d34f296464b2dc6832df6bc108be56219804a8a69743218e0033285adb7c0a7b90a0e882572120327c6927ff3e75d649b9df56a52 WHIRLPOOL 7e707fcd66aa5c3b3e2bb548bc3ca2f10a69e09024e8cf2c73a5185e9b67aa844516caba567f3832a5289050bac09ada9a4b2973ea2ee64257ff9b8a62f2fc5c
+MISC ChangeLog-2015 733 SHA256 2c8e90019922f8ed9d7a157c643a87c9933b0720cccc7d013614f9c7564bb4bf SHA512 f7210c6d797c0fd59026bab87e5ae465d49c71011206c7dcf07a5951fe817a59dff51df8f8d1b35621ce6d7b890b8bfd0b8badb60e410d45e0a96cad97d695e3 WHIRLPOOL d7d011a3fd78d637c5b08c617f2ecbe8af71f259d0529392b97e26d84b7be68901ca4b8fd8192e5fbc9a84e3c2526d436bf4fd172e474ee00445d829f9b87573
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/dirdiff/dirdiff-1.1.5.ebuild b/app-vim/dirdiff/dirdiff-1.1.5.ebuild
new file mode 100644
index 000000000000..5f26517162ea
--- /dev/null
+++ b/app-vim/dirdiff/dirdiff-1.1.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: diff and merge two directories recursively"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=102"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+RDEPEND="sys-apps/diffutils"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dirdiff/metadata.xml b/app-vim/dirdiff/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/dirdiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/easy-align/Manifest b/app-vim/easy-align/Manifest
new file mode 100644
index 000000000000..7cbd210a96e5
--- /dev/null
+++ b/app-vim/easy-align/Manifest
@@ -0,0 +1,5 @@
+DIST easy-align-2.10.0.tar.gz 20056 SHA256 c6a4e0a360aa8e642f5c628ae273bfbe7e513a394302eef8c668e16949bd2cbb SHA512 4a6a46db96b78d830fc0191b77b2226e9c1a2de585b731d1997f69ee31c8c76038ceb14f18e13f30fee00b5ce9ca7aed4241db06cac303b8ae903a856e4baabd WHIRLPOOL d9fae82909535a849a9ebc937f5c74674df3375f29f5ee8fccb420c00b2d1ee75842fd6f6ecc592c9e986244b415a785eb4623083cd6339db9e2a5e4d3131987
+EBUILD easy-align-2.10.0.ebuild 550 SHA256 288b28f12934655f6edcf9dba55d96ba545ed2f72583323f8228bdafe1d8f10e SHA512 0e9498a552059cae6508ff0e06e8d5cacb70f8c96f6db014a61831e59a7fbe49322f6ec644b42fe3b87143180c00017964368ca95924f423beaa14d2a515c0fe WHIRLPOOL 951cfc8d890917abad29ab3c7df2dda901f350f82dd322100d03b8af1f81419652f449e84c256fdd27affebfc87873adb13de5c7d8889a2f827bdf9d87286702
+MISC ChangeLog 2987 SHA256 28af686e6547b53f4aba72f9a59abe85a26b9583c4c33c1b2f66b22ad3e25704 SHA512 9523b33aecbfa2dd9c38003655b35928c5d179062472f40d09df453dde22aa6fa8e1cebfec92ea17846854ceb57f47710c93ea8662354fe9edc7e1b4e3dea012 WHIRLPOOL b70ad5cde5247cfc785cef7ca160aa96323f59b0b4ee92c6f1a23da9e92d3bf857dc81b742694ee2efa647c6ad642304d6df80dbe97c360c4db9d7a758a4e2ce
+MISC ChangeLog-2015 1705 SHA256 ae5801aaaec8a4fa82bb6a17c70c61f03f046bebf31a9b6020e98e15161652de SHA512 4b51caa1544d02bded84d089d56cba4e5c3390140998f6846154af2c33971971f30b63ee20baeaa0320c7fb494e70bc1ba1fdb4ec9a8ad1f70ffe31936a8b724 WHIRLPOOL 5b1784a207c0ae4fabe26ed539ae17b908d9b685651fbd53bcf06fab78abf93674a72bc4cadacf4d46ac6d244ef8731bafc3c18afefa15f99a165aa72c6798c6
+MISC metadata.xml 347 SHA256 6b5ce1c1ba8408598e7965745ef02e21320f8031c69f68751dff3950fcdf6623 SHA512 4b687e38ddec009ffc0ab3effb0f1d4d46d8a576812b73f3526bf13f0facef23525b75765ac7c56e9c541d66b0cbdb1f3f46a0907d3688f91576cd0a6bb67c92 WHIRLPOOL 46dacc224e99286f3da99e0a6bed02f085e9b727f77d7d7a8d68ae7a1a06763fc7bf7d99454ef4074a56bc9f1898ee606fdbb9e82f2264a8f1cf1f65bc661c4c
diff --git a/app-vim/easy-align/easy-align-2.10.0.ebuild b/app-vim/easy-align/easy-align-2.10.0.ebuild
new file mode 100644
index 000000000000..22705144e805
--- /dev/null
+++ b/app-vim/easy-align/easy-align-2.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: a simple alignment plugin"
+HOMEPAGE="https://github.com/junegunn/vim-easy-align http://www.vim.org/scripts/script.php?script_id=4520"
+SRC_URI="https://github.com/junegunn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	rm -rv test || die
+}
diff --git a/app-vim/easy-align/metadata.xml b/app-vim/easy-align/metadata.xml
new file mode 100644
index 000000000000..0c9042ba210c
--- /dev/null
+++ b/app-vim/easy-align/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">junegunn/vim-easy-align</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/easytags/Manifest b/app-vim/easytags/Manifest
new file mode 100644
index 000000000000..6273c60a2472
--- /dev/null
+++ b/app-vim/easytags/Manifest
@@ -0,0 +1,5 @@
+DIST easytags-3.11.tar.gz 40572 SHA256 3c365ea1fb7598f93976e9abd5734eb9b261de2951701c450e2ad1e9186a9b10 SHA512 9c1985a02b2718315d825ed29c06cbf78050e693893a9a7530a774031cbe9e6a27ee1dc91878950a1fbcaf7ea685faeb799d1e5b218b9ce25718783409f66130 WHIRLPOOL f216ca697b4e23a20e968bc3639bb238c037ce05225528b8051b885f19d9f72f2e8d49f6938325abf439b7a45fc14405d399f6a6bcd1929ffb114a745b552052
+EBUILD easytags-3.11.ebuild 928 SHA256 6dcc7868ce5b84985c1bb53b424f1ab800a712715036906481f0302ca1a678ce SHA512 1d303ae9bb1a8f031dae2fb6f8131c672d3e4bda3e534909e3d4a0fc6d98e10256d585f0644b5eac19140368cf4f164c529a85bd76f25773b3b55c6ed9b139a3 WHIRLPOOL 5d6ea090d6212ab80376a5a24aa061c72b52f918dd2345894e97f59bf34de7b835622d6dc6721d7d4957b3ddf2d76e458bc7a4321c68d8ab7a854a28f4782920
+MISC ChangeLog 3058 SHA256 b7edd2710d53d3eeffebbbc768dcdc5db274c03aae2cb29a4d26912ac3ea3d05 SHA512 0bc9322e38890e67249f6dda588605b96b5a263d8a7525086196507b4f8abfd5c8b404ec3491825e919d40c10e36eb36ace901a0df4eb7c84f930d8b609419a8 WHIRLPOOL f7ab3b03c0611bcf918993fd06b21d4c2211b3f529740996039236abf9b0b2f64d71d7ddc3b23d8f0839e8388a9bbc9f8e4d80b6227949e0fc068978cfe53298
+MISC ChangeLog-2015 3472 SHA256 6764e668ddf440133b16e387ab9e0a83574b01c6dbd26fe38cf5b74e9bfc7432 SHA512 511edc7720d66ef37825c858b1b0250c1026e56b06df673c302fec0d0cb9eea02c9aed169bc02a37ad6c0602de4f55b58142b71c02b180c08a866568b2aad601 WHIRLPOOL a7a51e7c098e1c4325f6f09ed4402861c834b6eb0e575d6ce355a860f7e4df7020936d8e7b9beeec94e5dcaab15552748bc4ed14d051fa2ba8f75b478046b959
+MISC metadata.xml 342 SHA256 aa67aa36d804e38fe89f285187b7e806d8f7c6b454e761a27bc0b1aa7d145f88 SHA512 0f4fbbedc023ccccc74ef8e020c3a90a0ccb0184164a52dd733699c5d4bf729d09478ea87fda093197679f7b44b3c1b64d3c64845d91d3fb92f9e3a1eab8fc78 WHIRLPOOL 54755d41ae083685f965842760924efa25a59809cd9682b6b238186dd331fd369c8fd5f982a212b7e4a76e5d1871497fc65e08a3047ae09e4527efc4b2dfc777
diff --git a/app-vim/easytags/easytags-3.11.ebuild b/app-vim/easytags/easytags-3.11.ebuild
new file mode 100644
index 000000000000..e7ddf382b0fb
--- /dev/null
+++ b/app-vim/easytags/easytags-3.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 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
+
+DESCRIPTION="vim plugin: automated tag file generation and syntax highlighting"
+HOMEPAGE="http://peterodding.com/code/vim/easytags/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-vim/vim-misc-1.17.6
+	dev-util/ctags"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/vim-${P}
+
+src_prepare() {
+	# remove unnecessary files
+	rm addon-info.json INSTALL.md README.md || die
+}
+
+src_install() {
+	vim-plugin_src_install
+
+	# fix scripts
+	fperms 755 /usr/share/vim/vimfiles/misc/easytags/{normalize-tags,why-so-slow}.py
+	python_fix_shebang "${ED}"/usr/share/vim/vimfiles/misc/easytags/{normalize-tags,why-so-slow}.py
+}
diff --git a/app-vim/easytags/metadata.xml b/app-vim/easytags/metadata.xml
new file mode 100644
index 000000000000..f13cee8dc033
--- /dev/null
+++ b/app-vim/easytags/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">xolox/vim-easytags</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/ebnf-syntax/Manifest b/app-vim/ebnf-syntax/Manifest
new file mode 100644
index 000000000000..3f401b0c46dc
--- /dev/null
+++ b/app-vim/ebnf-syntax/Manifest
@@ -0,0 +1,6 @@
+DIST ebnf-syntax-1.1.tar.bz2 981 SHA256 34f602ef43fb5679d55a26a62ba5c17e2efe75dddfad91224bbf8901a86c2067 SHA512 0fba3be91e998b26a3011bfe18765a3bc3ebde6aa33e96580dc0529d79a067020cfeee614dfa40126a1a968d3ca8e77711eca096095675cf6072061c9be7c083 WHIRLPOOL ed618e736337a9fa19ee27b90f556f3f7fdbee0200f4f4d257f3750a4071905019c6a9498794d47309b329bc192b376e668a65dbe1c9bd19cd8dde989b575acb
+EBUILD ebnf-syntax-1.1-r1.ebuild 586 SHA256 102fdf8465788180f289abf597b2668e15379fc3abf609f7f8a12d1f0f2a1fc9 SHA512 a0e19fbb29b09bb1b0ac55b4d9486ad58fff5d8dbea91d11cd8af470a9710b98e9b2dd0d31c0d6d0f3b9d5611e452d5b1f46905afc949c49239de77f371b52e5 WHIRLPOOL ec2f53f11c77c0b6fa883423820df2b32c02a8d686b24a8b436674692cd2063cdbcb8daed1bffc0f115f707fd0f5efbc5ff7f7b175f8eead106d725407eb26a4
+EBUILD ebnf-syntax-1.1-r2.ebuild 588 SHA256 ec410c88dd08ed026feb9879b99d620d47d18909caa1e95ce6b160d099f1ef11 SHA512 085509d4509a001749b64a3237b1babed57b04e096a9d56e5d8367e4935597958ee8005390d5f541494d9500b5c0be155944ee9274b0ff685b1d88840a834659 WHIRLPOOL 8356fc2028c74897dce0ddf2b018775a6bcbe0aff0646c15d77b3c9a4e8e89b909ad2b3b67c16385d00ddcf43d8507d34e4f0054b7f956527ac332ddf931cdfe
+MISC ChangeLog 2610 SHA256 209ad4fde3af8a673d585367a62c81269c0bebb8e4dff48fc24eaa67e5c27b21 SHA512 1ddb4261ef4c8fb40c1bcc2393685893a9ac93196f0db8e2494ad887529980cfe8f5e1cf4e3165aa3f120b06f9253950e122cb44effe3c1545f225dab4ae290c WHIRLPOOL 00516c4dc1a74146e3b090909d4effe65f7b89e231b8b819ec9b2305a923dc9c0116cb0a708aa79fc074a898b4a9ccd99bccda94ff728c23ac46349611fc16b6
+MISC ChangeLog-2015 2181 SHA256 615edcaad0a96cb0463d98614c9c50a041a4cb8c07e523503e37a2d840247834 SHA512 edc78e2e83baeca727dc9212172f7e81c7c287cfdaf28ae8f5aa72f0ead1037bc5c29cdd8b727650f36647f2fbb3760601207b4dbe2ebffeaa848ce5c825039a WHIRLPOOL 956da6100dd949725007fae8c4e8dbd99932c9ee7168ad880f460d2f4cc4d389a0404fea392aca8774025594e850e3917f58dd0956ee212afaec7fbdc6158a0a
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
new file mode 100644
index 000000000000..887c96824fef
--- /dev/null
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=545"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for EBNF (ISO/IEC 14997) files."
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# don't use hi link, bug #101799.
+	sed -i -e 's,hi link,hi def link,' syntax/ebnf.vim || die "sed failed"
+}
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
new file mode 100644
index 000000000000..f628efe94fd8
--- /dev/null
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=545"
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for EBNF (ISO/IEC 14997) files."
+
+src_prepare() {
+	default
+
+	# don't use hi link, bug #101799.
+	sed -i -e 's,hi link,hi def link,' syntax/ebnf.vim || die "sed failed"
+}
diff --git a/app-vim/ebnf-syntax/metadata.xml b/app-vim/ebnf-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ebnf-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
new file mode 100644
index 000000000000..d3f928e9c266
--- /dev/null
+++ b/app-vim/editorconfig-vim/Manifest
@@ -0,0 +1,7 @@
+AUX editorconfig-vim-0.3.3-fixes.patch 3434 SHA256 413611c7ba7a541dddc33a1ffa1a3ee10d664167d894660e4c67cc13a58a703a SHA512 3133dc753c46dbb66d833cb58bf464d37cbd05f77fc9a4a29b9fb9b3eea39b990df2020c7604e881031aaa1cc6cf11b0d42b7ac186c56736721341750d15a81b WHIRLPOOL b371f8949aa5674f657e8ad0a3613b55765e4dcea902b35e32bc64fb3f7d25d8400fb2234b98bcd4e0428e1aaa6064151d1d4afab146ca19582224629309ac1d
+AUX editorconfig-vim-0.3.3-max-line-length-off.patch 735 SHA256 47718be46b93ef6bf5981ffa711ae3e4a58c0682d81afffe75f7a89e506f5299 SHA512 7657b145d71890f0ec12b142c8edc21558171d7cc8f8392912c0fb2e774799d5e57bf06999d48dfce7bb6402bf05ba7a7bd2d613efb5341bebf223a50135ab1d WHIRLPOOL 526028d39aa7c8cb227ee9013423f9cb001a6ac63388eddb25d1809acb642255c52bc1bc7b05f2a4c5aad49e32d20ab636217d95e409ba11d2e35d40fc9ebc24
+AUX editorconfig-vim-0.3.3-python3.patch 5601 SHA256 405e9dbbe2b38dee30d8021adc4548a7f5de3dff04dbf531f8509d6378ec5cb1 SHA512 10a08c795a667c92e0667f292472c5704c43915868fc8c1f164898feb4c4e7af71ede553f5aa874b19e2b4c48f89313bfb90494e0d5d2dc4b7cbaa049d5df2a3 WHIRLPOOL 5b599fcad4b806be166368d631920a3dd9a6d24bdb0b802b7dab900afd9a659e0e93ec826b5ccaff32e6309d07f62224ada2da514f373fc26e662372f52f1c2c
+DIST editorconfig-vim-0.3.3.tar.gz 35395 SHA256 fd579672c426a089835e9bc57a1fd5fc18dba77c014b67141153372e83c92c57 SHA512 2dd968cf6bb162db8e6242ffb60cc61fb05a8042804b6b46b9f9cd35be968f83b473f04797e47c5cff11d7c052ff523bf8ba1d568992d44b72b97b54a81425a1 WHIRLPOOL 580e4ee8a5dc3bd2c17334ba40f7e89436111c26cbdf4c2f248f4c0a862739c3e3a17124b0750a791bbb4e8602484c33da4fe0ea20c5988ae94485b181fe4e8b
+EBUILD editorconfig-vim-0.3.3-r2.ebuild 966 SHA256 803690ad28b7fecf1e041ad5869b474a1fadbdc4e4bbe387e93967a0e3ca7bc5 SHA512 f9c8a2b72d7732708ec7aab2c547e24021b8d6167fd13f38223b2b05b333ecdd1b44127f58d3ca788cc433abbd85b423d6c7c996b712e54dd8ac2e41649e25be WHIRLPOOL 71b2b28c4ddb19e63701409c5f5f97d647ac954e60918bbe4b70366e1f70e2ef1d6c921db5a627351ac501499f98c239a39162a2f26785def322b97d8631ba28
+MISC ChangeLog 1047 SHA256 546e19d1d7b25f554d5a0931ff69a03c09f69af93f9625c6b631ce0b1f65f4f9 SHA512 aae7772503bbd967699d73722f69a8046e873d10d18e6dc3b04f1e025a85ddd44550a0aca6d275d83cc779abf0fbd497601789c285a7b33dbb0feb8ded7c0d5c WHIRLPOOL a8310b21dcb323ac4b0e722eb88517f595d7690eef7e9082e74d71d52bf07095e71f107b7d5bb37c7c00105af8e63300ff2b28f73be8c6a842cb4abf13bde64b
+MISC metadata.xml 419 SHA256 91450e11b62f1933d58190c74d1fbf64ad0380b9f3338dbefb0412a13058f0c4 SHA512 57167b4b86b6bb89094b28341476c03f8415c1dff97fd90f91c882991afe5e33fbd14edd38a18e07d06f3498f070ced5ca9e598b66e7e615c37146b598b6282d WHIRLPOOL e1b86f8118ef68641662c849d7a0dcca6b108bef917a8a8e369447f23be581ef9d4f45e647125cc1728238af18ea185b78b099ef8159e3463643bcff86e3afac
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..af1907546c70
--- /dev/null
+++ b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python2_7 python3_4 python3_5 python3_6)
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: Support EditorConfig files "
+HOMEPAGE="http://editorconfig.org/"
+SRC_URI="https://github.com/${PN%-vim}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-python/editorconfig-core-py[${PYTHON_USEDEP}]
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3.patch"
+	"${FILESDIR}/${P}-max-line-length-off.patch"
+	"${FILESDIR}/${P}-fixes.patch"
+)
+
+VIM_PLUGIN_HELPFILES="${PN%-vim}.txt"
+
+src_prepare() {
+	default
+
+	rm LICENSE mkzip.sh .editorconfig .gitignore .travis.yml || die
+	rm -r tests plugin/${PN%-vim}-core-py || die
+}
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch
new file mode 100644
index 000000000000..955560088735
--- /dev/null
+++ b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch
@@ -0,0 +1,92 @@
+diff --git a/doc/editorconfig.txt b/doc/editorconfig.txt
+index bd6173b..3b32012 100644
+--- a/doc/editorconfig.txt
++++ b/doc/editorconfig.txt
+@@ -79,7 +79,8 @@ empty. There are 3 modes currently: "external_command", "python_builtin",
+ "python_external".
+ 
+     python_builtin:     Use the vim built-in python to run the python version
+-                        EditorConfig Core.
++                        EditorConfig Core. In this mode, Python 2.5 or higher
++                        is required.
+     python_external:    Use an external python interpreter to run the python
+                         version EditorConfig Core.
+     external_command:   Run external EditorConfig Core.
+diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
+index af4f630..9abd008 100644
+--- a/plugin/editorconfig.vim
++++ b/plugin/editorconfig.vim
+@@ -121,15 +121,15 @@ function! s:FindPythonFiles() " {{{1
+ 
+     let l:python_core_files_dir = fnamemodify(
+                 \ findfile(g:EditorConfig_python_files_dir . '/main.py',
+-                \ ','.&runtimepath), ':p:h')
++                \ fnameescape(','.&runtimepath)), ':p:h')
+ 
+     if empty(l:python_core_files_dir)
+         let l:python_core_files_dir = ''
+     else
+ 
+-    " expand python core file path to full path, and remove the appending '/'
+-    let l:python_core_files_dir = substitute(
+-                \ fnamemodify(l:python_core_files_dir, ':p'), '/$', '', '')
++        " expand python core file path to full path, and remove the appending '/'
++        let l:python_core_files_dir = substitute(
++                    \ fnamemodify(l:python_core_files_dir, ':p'), '/$', '', '')
+     endif
+ 
+     let &shellslash = l:old_shellslash
+@@ -247,7 +247,7 @@ function! s:InitializePythonBuiltin(editorconfig_core_py_dir) " {{{2
+     " The following line modifies l:ret. This is a bit confusing but
+     " unfortunately to be compatible with Vim 7.3, we cannot use pyeval. This
+     " should be changed in the future.
+-    execute s:pyfile_cmd s:pyscript_path
++    execute s:pyfile_cmd fnameescape(s:pyscript_path)
+ 
+     return l:ret
+ endfunction
+@@ -327,14 +327,19 @@ endif
+ 
+ function! s:UseConfigFiles()
+ 
++    let l:buffer_name = expand('%:p')
+     " ignore buffers without a name
+-    if empty(expand('%:p'))
++    if empty(l:buffer_name)
+         return
+     endif
+ 
++    if g:EditorConfig_verbose
++        echo 'Applying EditorConfig on file "' . l:buffer_name . '"'
++    endif
++
+     " Ignore specific patterns
+     for pattern in g:EditorConfig_exclude_patterns
+-        if expand('%:p') =~ pattern
++        if l:buffer_name =~ pattern
+             return
+         endif
+     endfor
+@@ -386,8 +391,8 @@ endfunction
+ function! s:UseConfigFiles_Python_External() " {{{2
+ " Use external python interp to run the python EditorConfig Core
+ 
+-    let l:cmd = s:editorconfig_python_interp . ' ' .
+-                \ s:editorconfig_core_py_dir . '/main.py'
++    let l:cmd = shellescape(s:editorconfig_python_interp) . ' ' .
++                \ shellescape(s:editorconfig_core_py_dir . '/main.py')
+ 
+     call s:SpawnExternalParser(l:cmd)
+ 
+@@ -445,6 +450,11 @@ function! s:SpawnExternalParser(cmd) " {{{2
+             return
+         endif
+ 
++        if g:EditorConfig_verbose
++            echo 'Output from EditorConfig core executable:'
++            echo l:parsing_result
++        endif
++
+         for one_line in l:parsing_result
+             let l:eq_pos = stridx(one_line, '=')
+ 
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch
new file mode 100644
index 000000000000..be5d736a385c
--- /dev/null
+++ b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch
@@ -0,0 +1,20 @@
+commit 6e7011712398e53671e5a44edefeb68914562a3a
+Author: Hong Xu <hong@topbug.net>
+Date:   Wed Apr 6 00:34:26 2016 -0700
+
+    Support max_line_length=off to leave the decision to the editor settings.
+
+diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
+index 9abd008..0e9d647 100644
+--- a/plugin/editorconfig.vim
++++ b/plugin/editorconfig.vim
+@@ -563,7 +563,8 @@ function! s:ApplyConfig(config) " {{{1
+     endif
+ 
+     " highlight the columns following max_line_length
+-    if has_key(a:config, 'max_line_length')
++    if has_key(a:config, 'max_line_length') &&
++                \ a:config['max_line_length'] != 'off'
+         let l:max_line_length = str2nr(a:config['max_line_length'])
+ 
+         if l:max_line_length >= 0
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch
new file mode 100644
index 000000000000..848582ab02e2
--- /dev/null
+++ b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch
@@ -0,0 +1,213 @@
+commit c2b7a104b826b7ff9283d32cb95a039ddccde79b
+Author: Shunsuke Shimizu <grafi@grafi.jp>
+Date:   Sun Jan 10 00:12:10 2016 -0800
+
+    Make the plugin to be compatible with Python 3.
+    
+    Squashed commit of the following:
+    
+    commit 0973c5179e504ffbd74a38d6557bb49fe3bf8b5d
+    Author: Hong Xu <hong@topbug.net>
+    Date:   Sun Jan 10 00:11:11 2016 -0800
+    
+        Some minor corrections
+    
+    commit ca17e97e86bd6379bcf3782adfa200c1589cab69
+    Author: Shunsuke Shimizu <grafi@grafi.jp>
+    Date:   Sun Jan 10 15:24:13 2016 +0900
+    
+        vim 7.3 support by using `py[3]` command instead of `py[3]eval()` function
+    
+    commit c51ae80ce0ca8fe24c014a7c2d54a85d604d3c88
+    Author: grafi <grafi@grafi.jp>
+    Date:   Sun Jan 10 14:42:38 2016 +0900
+    
+        use print_function on python2
+    
+    commit 401a9486bba7528aa4d54b06b8ef3ace582829c9
+    Author: grafi <grafi@grafi.jp>
+    Date:   Sun Jan 10 14:33:25 2016 +0900
+    
+        assure that sys.path is cleaned
+    
+    commit f3bf442429d9579a336a1bb8f98fee82710fbd1e
+    Author: grafi <grafi@grafi.jp>
+    Date:   Sun Jan 10 14:22:45 2016 +0900
+    
+        python3 style print
+    
+    commit 8e059379328b23e4253f76cbd72d3ef484501d42
+    Author: Shunsuke Shimizu <grafi@grafi.jp>
+    Date:   Sat Dec 26 07:54:49 2015 +0900
+    
+        Support python3
+
+diff --git a/plugin/editorconfig.py b/plugin/editorconfig.py
+new file mode 100644
+index 0000000..21ea9c7
+--- /dev/null
++++ b/plugin/editorconfig.py
+@@ -0,0 +1,42 @@
++from __future__ import print_function
++
++try:
++    try:
++        import vim
++        import sys
++    except:
++        vim.command('let l:ret = 2')
++        raise
++
++    try:
++        sys.path.insert(0, vim.eval('a:editorconfig_core_py_dir'))
++
++        import editorconfig
++        import editorconfig.exceptions as editorconfig_except
++    except:
++        vim.command('let l:ret = 3')
++        raise
++    finally:
++        del sys.path[0]
++
++    # `ec_` prefix is used in order to keep clean Python namespace
++    ec_data = {}
++
++    def ec_UseConfigFiles():
++        ec_data['filename'] = vim.eval("expand('%:p')")
++        ec_data['conf_file'] = ".editorconfig"
++
++        try:
++            ec_data['options'] = editorconfig.get_properties(ec_data['filename'])
++        except editorconfig_except.EditorConfigError as e:
++            if int(vim.eval('g:EditorConfig_verbose')) != 0:
++                print(str(e), file=sys.stderr)
++            vim.command('let l:ret = 1')
++            return
++
++        for key, value in ec_data['options'].items():
++            vim.command("let l:config['" + key.replace("'", "''") + "'] = " +
++                "'" + value.replace("'", "''") + "'")
++
++except:
++    pass
+diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
+index a21b103..af4f630 100644
+--- a/plugin/editorconfig.vim
++++ b/plugin/editorconfig.vim
+@@ -36,6 +36,8 @@ let g:loaded_EditorConfig = 1
+ let s:saved_cpo = &cpo
+ set cpo&vim
+ 
++let s:pyscript_path = expand('<sfile>:p:r') . '.py'
++
+ " variables {{{1
+ if !exists('g:EditorConfig_exec_path')
+     let g:EditorConfig_exec_path = ''
+@@ -231,48 +233,23 @@ function! s:InitializePythonBuiltin(editorconfig_core_py_dir) " {{{2
+ 
+     let s:builtin_python_initialized = 1
+ 
+-    let l:ret = 0
+-
+-    if !has('python')
++    if has('python')
++        let s:pyfile_cmd = 'pyfile'
++        let s:py_cmd = 'py'
++    elseif has('python3')
++        let s:pyfile_cmd = 'py3file'
++        let s:py_cmd = 'py3'
++    else
+         return 1
+     endif
+ 
+-    python << EEOOFF
+-
+-try:
+-    import vim
+-    import sys
+-except:
+-    vim.command('let l:ret = 2')
+-
+-EEOOFF
+-
+-    if l:ret != 0
+-        return l:ret
+-    endif
+-
+-    python << EEOOFF
+-
+-try:
+-    sys.path.insert(0, vim.eval('a:editorconfig_core_py_dir'))
+-
+-    import editorconfig
+-    import editorconfig.exceptions as editorconfig_except
+-
+-except:
+-    vim.command('let l:ret = 3')
+-
+-del sys.path[0]
+-
+-ec_data = {}  # used in order to keep clean Python namespace
+-
+-EEOOFF
+-
+-    if l:ret != 0
+-        return l:ret
+-    endif
++    let l:ret = 0
++    " The following line modifies l:ret. This is a bit confusing but
++    " unfortunately to be compatible with Vim 7.3, we cannot use pyeval. This
++    " should be changed in the future.
++    execute s:pyfile_cmd s:pyscript_path
+ 
+-    return 0
++    return l:ret
+ endfunction
+ 
+ " Do some initalization for the case that the user has specified core mode {{{1
+@@ -388,41 +365,22 @@ augroup END
+ function! s:UseConfigFiles_Python_Builtin() " {{{2
+ " Use built-in python to run the python EditorConfig core
+ 
+-    let l:config = {}
+-    let l:ret = 0
+-
+     " ignore buffers that do not have a file path associated
+     if empty(expand('%:p'))
+         return 0
+     endif
+ 
+-    python << EEOOFF
+-
+-ec_data['filename'] = vim.eval("expand('%:p')")
+-ec_data['conf_file'] = ".editorconfig"
+-
+-try:
+-    ec_data['options'] = editorconfig.get_properties(ec_data['filename'])
+-except editorconfig_except.EditorConfigError as e:
+-    if int(vim.eval('g:EditorConfig_verbose')) != 0:
+-        print >> sys.stderr, str(e)
+-    vim.command('let l:ret = 1')
++    let l:config = {}
+ 
+-EEOOFF
++    let l:ret = 0
++    execute s:py_cmd 'ec_UseConfigFiles()'
+     if l:ret != 0
+         return l:ret
+     endif
+ 
+-    python << EEOOFF
+-for key, value in ec_data['options'].items():
+-    vim.command("let l:config['" + key.replace("'", "''") + "'] = " +
+-        "'" + value.replace("'", "''") + "'")
+-
+-EEOOFF
+-
+     call s:ApplyConfig(l:config)
+ 
+-    return 0
++    return l:ret
+ endfunction
+ 
+ function! s:UseConfigFiles_Python_External() " {{{2
diff --git a/app-vim/editorconfig-vim/metadata.xml b/app-vim/editorconfig-vim/metadata.xml
new file mode 100644
index 000000000000..ea346f7a9329
--- /dev/null
+++ b/app-vim/editorconfig-vim/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">editorconfig/editorconfig-vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/emmet/Manifest b/app-vim/emmet/Manifest
new file mode 100644
index 000000000000..d2a89f3799e3
--- /dev/null
+++ b/app-vim/emmet/Manifest
@@ -0,0 +1,5 @@
+DIST emmet-0.85.tar.bz2 31274 SHA256 738204ed94354b4c7ec9f72e2139459890d160c276c7782c158c9ddce6f8d499 SHA512 567f79c43ac0d5560dea2130e6fb6d32f25d35b20c3bbf8fc40b7cdc8c20e2d9352b9e1c03e57de2077ac192915ab174a6bee442d5311f01cc79c3fe6e10af56 WHIRLPOOL 835b4360f71e3824145c722f0f203f0941598ec9709d68cff67ddd253b82719d4e8bcaafe61efcd19d0ce21ac0e5e907083f2347ba534ed968580bcaf6cf774b
+EBUILD emmet-0.85.ebuild 375 SHA256 6750659658e2c57799743b7d71d567b60a82feea36d87c74d05f5e2a7830e718 SHA512 1440ff6d619eeb1d7e58790549f466874de8e01688f8743b752bba71d1426db01c32796e49df93a358efc700993603b99ef60d30702ec8d3e84b5b7af1a3f450 WHIRLPOOL 135d3504ddff85b2d36d7b0c6b87dffe3f0c0e54f94d5fb0307e3299fcc730d67b8bff55d92505d6d595883a571b35e87a5df50083178bf3f7abc765789b178c
+MISC ChangeLog 2418 SHA256 a1f7065b1a77804333a0e33640854f6c4d906594199558f070e1f37466219ab0 SHA512 d2aecab4f141f7c2b472d4ea7bb92114c81b8b89c3974a240ca63e62c46ebb079c1fea379a9cdf3a4435d8b76348dd19255ff4a416b1cced43f64d6fa97c86f4 WHIRLPOOL 4c13487365d7c50933afcb2e75f58bba328c2f924faf25a0823bbeadb521d9c6464a7d58553ba2e6a436c6c2ba40f9ee98699277394db0f82fb30f07c14c9f20
+MISC ChangeLog-2015 451 SHA256 48f39fb45c80d984fc44a764e6530395f35c788c65d1a29cedafc431fe6ba099 SHA512 165403e4660c757c0ae003d53513b2157669ad3a7600b195fd6f2b662eba8ef6fc94b0176827a0de98a8ba79885206bcf273c3cbd8b93bd1b21f25a79d0311d7 WHIRLPOOL d862a729bb211c05443bb0c0f1fac53c59e42cd8e291f8ab0a6d920fc1c84d9f17f1c9b396439ec563a4c3737e8b9d0533db7d807a483ae294b171b5a7e49525
+MISC metadata.xml 245 SHA256 a8b1695a5ced5d18651f2c27eb007b4eaf4af0a421f0cbc21e2be1d9282d9e62 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2 WHIRLPOOL 5bd04d29b34b35ffc355cf4fa5048b94bea046b3bcd327674a05c25d5ad3f8a131a1ba4c06e0f897be0037df160acdb82303be1c89057e7ed3586d0bd493a47b
diff --git a/app-vim/emmet/emmet-0.85.ebuild b/app-vim/emmet/emmet-0.85.ebuild
new file mode 100644
index 000000000000..8a9e6e3125fd
--- /dev/null
+++ b/app-vim/emmet/emmet-0.85.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2981 http://mattn.github.io/emmet-vim/ http://emmet.io/"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/emmet/metadata.xml b/app-vim/emmet/metadata.xml
new file mode 100644
index 000000000000..f1abc6411341
--- /dev/null
+++ b/app-vim/emmet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/enhancedcommentify/Manifest b/app-vim/enhancedcommentify/Manifest
new file mode 100644
index 000000000000..06791f8a97e3
--- /dev/null
+++ b/app-vim/enhancedcommentify/Manifest
@@ -0,0 +1,7 @@
+AUX enhancedcommentify-2.1-extra-ft-support.patch 665 SHA256 9f279aa5e370f92a35d09ac7dea2cd86b61e9c80d6dc072e0f83a8e90c5dfa4e SHA512 44adbcbf9fcb993db85e56853cc0eaed95fa9b194bec1a1be71523323ffb6640fdbedafd94b4f336de105c0b1b07c6b479a6f40a5a15bb6baa5a22644e33946b WHIRLPOOL f566ce9ce1828bf9a712cf22349de7c9361c313e8fb2e6ffd69b930c78ca70b82c04f73d4ab43f69f8278e21bd324947badc7ce5cf21e22d530ce35a9e691dca
+AUX enhancedcommentify-2.1-gentooisms.patch 808 SHA256 a7f5416623a2c4bec212f5049639fa688b5f1504679c8c9dea89b59ed1d54eba SHA512 974ae98fedbc4c3ea75499d615066efaef5dd8e03ebe00bb20a5fdc6dd8d5cc7ebd0f34e86cb587175f0c3e26d04bed4d09561216dedcc7757d1e9266dff0046 WHIRLPOOL f48627c9248f37d2b87eba6b4c8ab6b923de22a32aa92749c8f3316da187ab8f089a8deaec2c93551c650603535f4a26ab1031c827e872544ff2ba0d96e7aae6
+DIST enhancedcommentify-2.3.tar.bz2 17005 SHA256 38ed6366a9b1d77320514df48c6a86b2a80552cc7d7fba29fa46f3d1abbfec10 SHA512 673cb42fcc5a2d23ae404bbfa4664f388901249d3ed8315f77227f3fa42f3c267d69eda7554347b4e70de81c9bd58437c243a42d62218444063d5235fe22a171 WHIRLPOOL ac46f5a371dedc0ab1997b60f7832b10d6068c8926d1ecf3d3e01894e5097b28050e81745aa0153844e23859bb2d12aca664e87ab81dcd64199aed51fef42956
+EBUILD enhancedcommentify-2.3-r1.ebuild 556 SHA256 9ac60a64be269845eb0f8bb24757841483f92f4350d3a920d7466907b0a72f5d SHA512 9aa88dffb7deb1de74811551cb88ad8245ffaa932998e7a053482a857dbee96c1e52b2761c655683118cc660db087cb6406dee3bc23cd29db93c517bb9474771 WHIRLPOOL 4e5ec01e574f9de081734392e78107e03b78874a1606011490ac05c28ddc666bb0ac075f04cbd70da319a3166ddfa14660a5ed2109aa124db730ffa317fd8b13
+MISC ChangeLog 2745 SHA256 8a823ad9823b0c769e7c59f129a5b69dd8ad8322982492496d504fc7fd52f34f SHA512 533631b00e9569ec0b53a48802fd5d80740fe45ae413cc2f712e66d405279bc6abd4b9369452bb91f21c7ec45e5131a1ab1a9256ea2e1ec91f98faef754e8911 WHIRLPOOL 062c3443e370fcd98e747fb9134dd1ff0e4f59184572b3ef530053122decc49d1e5dd2ceff862d8739a5c6b3bfb5aa7ec3e13f8c5b996e95a23f7a0821908508
+MISC ChangeLog-2015 4935 SHA256 c3e6af0fccf3bc7399d9b2c40bbc7454eb628df03fdbcf9314abdd0cff9ad601 SHA512 8932b79da861bcf15bc40fefe506a05c18486772f8db63bde09bcefae45566d86920c38cef13cdc66c8abd17ff351d55baff06fd81b711c43fceab4382228d2b WHIRLPOOL a94b2e3474ab23497eb096c99a5fd99acb0adfa89a5ccc4fe9bed5b24de6d8aedf8caee89330bac6676ad6310988f772a00da9923ee4eeb0dd7b6ec807c950bc
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
new file mode 100644
index 000000000000..4f88d8f11279
--- /dev/null
+++ b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced comment creation"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=23"
+
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="EnhancedCommentify"
+
+DEPEND="sys-apps/sed"
+
+# See bug #74897.
+RDEPEND="
+	${DEPEND}
+	!app-vim/ctx"
+
+PATCHES=(
+	# See bug #79185.
+	"${FILESDIR}"/${PN}-2.1-gentooisms.patch
+	"${FILESDIR}"/${PN}-2.1-extra-ft-support.patch
+)
diff --git a/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-extra-ft-support.patch b/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-extra-ft-support.patch
new file mode 100644
index 000000000000..7c350a5310e5
--- /dev/null
+++ b/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-extra-ft-support.patch
@@ -0,0 +1,13 @@
+--- a/plugin/EnhancedCommentify.vim	2005-03-01 02:28:23.409962824 -0500
++++ b/plugin/EnhancedCommentify.vim	2005-03-01 02:29:45.695453528 -0500
+@@ -740,7 +740,9 @@
+ 		\ 'psf\|ptcap\|r\|radiance\|ratpoison\|readline\remind\|'.
+ 		\ 'ruby\|screen\|sed\|sm\|snnsnet\|snnspat\|snnsres\|spec\|'.
+ 		\ 'squid\|terminfo\|tidy\|tli\|tsscl\|vgrindefs\|vrml\|'.
+-		\ 'wget\|wml\|xf86conf\|xmath\)$'
++		\ 'wget\|wml\|xf86conf\|xmath\|fstab\|apache\|resolv\|sudoers\|'.
++		\ 'ntp\|mailcap\|ssh_config\|sshdconfig\|mplayerconf\|desktop\|'.
++		\ 'gkrellmrc\|pf\|ipfilter\|grub\|fluxbox\)$'
+ 	let b:ECcommentOpen = '#'
+ 	let b:ECcommentClose = ''
+     elseif fileType =~ 'gentoo'
diff --git a/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-gentooisms.patch b/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-gentooisms.patch
new file mode 100644
index 000000000000..a22b30ebcf31
--- /dev/null
+++ b/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-gentooisms.patch
@@ -0,0 +1,23 @@
+--- a/plugin/EnhancedCommentify.vim	2005-01-27 00:20:00.049461056 -0500
++++ b/plugin/EnhancedCommentify.vim	2005-01-27 00:17:57.617073608 -0500
+@@ -628,6 +628,10 @@
+     " letter.
+     if match(synFiletype, '\l\+\u') == 0
+ 	let ft = substitute(synFiletype, '^\(\l\+\)\u.*$', '\1', "")
++    " work-around for gentoo-syntax stuff ; won't work with the above
++    " case, since all the identifiers start with a capital 'G'
++    elseif synFiletype =~ "GentooPackage*"
++	let ft = "gentoo"
+     endif
+ 
+     if ft == ""
+@@ -739,6 +743,9 @@
+ 		\ 'wget\|wml\|xf86conf\|xmath\)$'
+ 	let b:ECcommentOpen = '#'
+ 	let b:ECcommentClose = ''
++    elseif fileType =~ 'gentoo'
++	let b:ECcommentOpen = '#'
++	let b:ECcommentClose = ''
+     elseif fileType == 'webmacro'
+ 	let b:ECcommentOpen = '##'
+ 	let b:ECcommentClose = ''
diff --git a/app-vim/enhancedcommentify/metadata.xml b/app-vim/enhancedcommentify/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/enhancedcommentify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/errsign/Manifest b/app-vim/errsign/Manifest
new file mode 100644
index 000000000000..124d4c9a9c4c
--- /dev/null
+++ b/app-vim/errsign/Manifest
@@ -0,0 +1,5 @@
+DIST errsign-0.1.tar.bz2 599 SHA256 3ab88b44dc784844bae5a5287ccc24e34bb75c15d0fe6756e8660faf803ad794 SHA512 ccf1136043b5a54614ef90190c157c02fa5470bd79159b8ba6f7a7cd95bdd0c0dcc41eb993d8a26d2b308012cd400f4d3168f4e7dde7bbdbe8dcedcfe5d1c929 WHIRLPOOL fd5c685e2dbcbc116056e6f7d402e7eb16c132add403ad75c6bb75cf882a30c19d4bd781aec4e6846bfb2a90726830fe0588212bfd690b5bcce2df183cb1ef68
+EBUILD errsign-0.1-r1.ebuild 547 SHA256 c1edb91fb964d385f9d3dbc51121f43de690f559ef8a112f3f4fefb988edde07 SHA512 c2be24c7d4c28cd5335300ccea227fea21fcfd16a187b034b3dc9df138ad0d5256ffc623b2ae7ffb483040b025a0ee1c6cc1234a79ac3febbdae3571992e63ca WHIRLPOOL a1d9d722e52231b98da5046c55649545adf5b4799e388f462e6f890cf1de35b0c47c20008fdc61133addbb42a93e41c3959603f4ef95c9e9f7fb40b59d4b811c
+MISC ChangeLog 3043 SHA256 f7949e390477e179266e3d42cd551962957dd79aff49f4a6141bd19d4a542b84 SHA512 41226284097acbdeb0bade41e9c645d789721a3a262f2755b3627fb556ffee275835da9414ace2956271c8f2c2875d070d16f6a3988814bead2e1a04d38838c6 WHIRLPOOL ad49df1ed7ebb0b3f021fcc558c527f4eb6a3fdee352df1ac14b85d95789cfc6ea43644dc0414ac9222eb43b7b6a5a73fc928ce67cd692fdcc8de5c068fda6ef
+MISC ChangeLog-2015 1081 SHA256 8e851fcf9a7b6410fadcd6850977dcb9c7ee5e97e27a68edd2a76bffb1ee25a4 SHA512 b2a68ba3423d11ec36bbc64f60bbb33428027ad9ebc5450d046aca161451bf3c0f79f837a253f2b5274a30b425d6ca8842ff6627e9a8e02c83b8d4ecf4a7b476 WHIRLPOOL ec8b4d9f44388387c2394c74d1d9ec14fbed9b100ef6866523bd9958dd717c0d8b1b4543374922e13ed5972ef3406a46c2a323fd2109ae5cddc169829fea3c86
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/errsign/errsign-0.1-r1.ebuild b/app-vim/errsign/errsign-0.1-r1.ebuild
new file mode 100644
index 000000000000..1fa7a1eb8cd0
--- /dev/null
+++ b/app-vim/errsign/errsign-0.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display marks on lines with errors"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1027"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+'To use this plugin, simply type \\\\es in normal mode and any lines which
+have been marked as errors (for example, via :make) will be indicated with
+a >> mark on the left of the window.'
diff --git a/app-vim/errsign/metadata.xml b/app-vim/errsign/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/errsign/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/eruby-syntax/Manifest b/app-vim/eruby-syntax/Manifest
new file mode 100644
index 000000000000..705f2afb260d
--- /dev/null
+++ b/app-vim/eruby-syntax/Manifest
@@ -0,0 +1,6 @@
+DIST eruby-syntax-2.0.tar.bz2 958 SHA256 9541e8f0ac72b609d7e50c0b90694daa486f09d572f55cbfdb72dede39ea81f9 SHA512 1fdf1e6ad95109528b13b30d7504da2ea8678785b1a716c33bae0b94fafb8f23d50d81022b5bc373c1970f6d3df04f2e78d87fbb2067f0c270780963b472468c WHIRLPOOL 1cf1c26f4734ff7a0f4907e72a93d7e9459e5e008b055d4c397efa76932bcd729dc51810ffdeee58cc12daa92bc783d887ed593c120761cacf474d2ed4c92907
+EBUILD eruby-syntax-2.0-r1.ebuild 531 SHA256 8d5a3be55070df7aa74ddac1c5612524021ecd5e73758c7da29b237d82d94d01 SHA512 fe16be5f248dfcdcd212a497854eee9cc51154367f4a4794547441ee6d71c9fdc97e3d5cf910fdb92b99696be5d1ebc73e33de8855ca9c0798bfec8c95ed36d2 WHIRLPOOL f61ce70402b4c1a8770436a9c1dedda4b277ab49522e22e3cc3ff7eda869b030b928acc314c9ad95fa332faadad4b528c56c3f2524722d5bc99b8c926cc767ad
+EBUILD eruby-syntax-2.0-r2.ebuild 525 SHA256 a1c55904890df8ed837170a823846ed2ebe5f807766219a8f3f6e1572cd43d21 SHA512 51b92fdfc888c066f36ff792e4ead4b1deed30e833826e760dfb918e58eaec5e1a4feb5f15beeab8f144ce27331b8b944d42bf42820657cfba1c1f326b063487 WHIRLPOOL 34a79f6fef4dc21f6482048b6e3ce1d27305e3758e2cefd0063ea13e856004ce0fb9baf7e1682ffe921ae1ab98900086c4128d4fe825cbac453162338c3e0ce6
+MISC ChangeLog 2443 SHA256 11a51ecade68a63a15729236a4e77d2e4c844cc00d86b18baf4dfa80f8d5e46d SHA512 8f714eee918a3532c12d9971c5dcdd506a88293930f12505c8e31a5f3b33240124bc057b361aafb5c0165c0b63759a2294278bfbf2c688f4a083be3f195420f0 WHIRLPOOL e9da50ca390721d4b89a5f2be065573ef847ef527abcaaeaefe9d2df8ef1ce2a58db62ae840e0c6ec68df6105b67bf46b8f2aeb9927f82d6a01bb7da40a99d2d
+MISC ChangeLog-2015 2226 SHA256 f6eff927bc0cacab38e8059b4cd0e1f0cd1b9fd7fb6daf8be00b5db78a1e59d7 SHA512 d30421785dde5c13e03f466f94adac7b05cbc0df90b057f0712d25533b3a4a4abc9d3dcda77aa319636dd38e5e513a7c673c379ab8ff665805a81413893698e1 WHIRLPOOL 57b545d13b344184dbe784fdc199a44f563f214c159ac5202375e0f8c7475c59b6366f12c8c9474b880ff32d06d7117cf0814e341fbe3a76ec449f8dadf2e1ff
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
new file mode 100644
index 000000000000..6b501debb743
--- /dev/null
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for eruby"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=403"
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for eruby"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's,hi link,hi def link,' syntax/eruby.vim || die "sed failed"
+}
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
new file mode 100644
index 000000000000..6e87f0279590
--- /dev/null
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for eruby"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=403"
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for eruby"
+
+src_prepare() {
+	default
+	sed -i -e 's#hi link#hi def link#' syntax/eruby.vim || die "sed failed"
+}
diff --git a/app-vim/eruby-syntax/metadata.xml b/app-vim/eruby-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/eruby-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
new file mode 100644
index 000000000000..57bfc535bbad
--- /dev/null
+++ b/app-vim/eselect-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST eselect-syntax-20070506.tar.bz2 3006 SHA256 a9d9d8213ab626b59d917871850491ee189e4cd2c8f56839171181c301973111 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0 WHIRLPOOL fceebaecc5e9b9fd1ead2e20d7f27c44db06872d78bf8149bf019b461e4dc4d888dde9b6931861ecfde4affd3f89e46360a4ec04bfad357356eb5ed7937b2795
+EBUILD eselect-syntax-20070506.ebuild 604 SHA256 ffa724b4e8631a10b7c002eb30a64ad6af790163e818c250bcca9e5ee781a33d SHA512 6db6a31e6b4afdaa2e4a802fcbcb30e9ccec4f3c8e04426c56c2449eb1fe3c06fb44f757b830ea214c45e387e92f534cede91c80596f2b833780edbf22b7de14 WHIRLPOOL 2f50a88ff2e76a23ded9ffc720eb7d843341576a4520b622b8f695fdbc4b8e6cbac67461800ae37037565a820ca2b1daf021ae491aa73fb9e052e585f049d6a8
+MISC ChangeLog 2487 SHA256 e0347144b12b1c08ce4e76651f91928aa4178c447e659100e87ad0561ffbe52d SHA512 7ec4970df939e939b4870c4e4005a25bddb1bc57212f8a0cad0174c6511ddf3eb809292e69d925d9376123270dbefb5e31219878fa0acf902d4cce1d3f3fe055 WHIRLPOOL d940b882dadeb166d0a5d7d63681d9bc444cd9e7171606a787d06445022fc43c05b26376192aaa6b0d6e414cbc708230ae6505408a287d778fedb6dab39430eb
+MISC ChangeLog-2015 2033 SHA256 fcfdb39f901388544955a4bf6f884af4e29621c9397be6472a78dc5ad5678f6d SHA512 ace83df1350e8f20145c1a08a73f3c643aea33acd31edfef1dafec6426750f5bda431b14da8f2d60a7c1424dd25f07b3a52ccbbc253f27a3d8c2f964b978aea1 WHIRLPOOL bd13fb29e970a9ffb7e0455e802057b4972a5c8f50da2815c168000405cce039695b0a3c0988222d12e4afb04bff4d53d1bcc81ea1b36863e80e9adb2742e040
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild
new file mode 100644
index 000000000000..f3a308afbc65
--- /dev/null
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils vim-plugin
+
+DESCRIPTION="vim plugin: Eselect syntax highlighting, filetype and indent settings"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+DEPEND="!<app-vim/gentoo-syntax-20070506"
+RDEPEND="${DEPEND}"
+
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}"
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/eselect-syntax/metadata.xml b/app-vim/eselect-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/eselect-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/exheres-syntax/Manifest b/app-vim/exheres-syntax/Manifest
new file mode 100644
index 000000000000..9e9db748f4ee
--- /dev/null
+++ b/app-vim/exheres-syntax/Manifest
@@ -0,0 +1,6 @@
+DIST exheres-syntax-20090310.tar.bz2 3670 SHA256 45e6b60101679b5d8e2f93024a78f7ce15087dfce8e4d06fa52adb2281416ed3 SHA512 616ef17367c68157d715321e457aaf0c65c97329f0848cb964d8974b6a85b4147f2e192b2ea3fcbfa3970e095bd9874203ce9723c73d1ef8350200732198c79f WHIRLPOOL 75622f4a75c7bba7d224708babc6c95e985b3dbda415a064d2f157394ec90e8c957f6f9f28093ac1c51a2e3f3f4824b3daca3724ea2341e2fd91829b71398c2b
+EBUILD exheres-syntax-20090310.ebuild 421 SHA256 2d94ef9899612f9e76aeaaeb39b1916640d300d26f88f15af7085c0eab45bdcb SHA512 f0db326fb3f884bbeca9d47e592712304caf6e5ebfa73b7d68a7155d7b93a7248fa984d5d89c966dff5288174b47dc1d3572ac77c9c4797aec0731bf5e19301c WHIRLPOOL 4c2486341732a0b60d1293760cb42160d78f5fe2f95a600e3a36e004139bde5ab760979b4d469c63f0eeb79ea5928dbc096ef5fd382a8f4a1156d3bb2bcc5514
+EBUILD exheres-syntax-99999999.ebuild 534 SHA256 059e31e6ddfd8fd6b2486d71093b7418887bcb25c8f26a7fe988ce900d7a1d54 SHA512 c10c375fb2743cebd415753cfad22070eae9f265b8474406e05008eb1a2c965f711d4e7e6a5bc0f869da55f2fe711545e5c5598e30f4fc2408010107cf5641b3 WHIRLPOOL 45b844a5b97326e73403a3b97a3517ec7717f5a4d85ac762bd866853dc2e42fd4832db514539e6271cd3f7c624116eb612a1459a1fbe6358858c296a00cedd35
+MISC ChangeLog 2877 SHA256 1247328b28469baa0ea0eb08900aa3ec97a6141a75cc4af21dddddfe9784e822 SHA512 86c587d041d5165be120b53ddd720436858b3cdb5d207f6adf89705aa70c610f8c1d3219d72444bfca323098e3e1fd9ecc06494730b56e9351e2adaf85fdb831 WHIRLPOOL c292219ebeba0e34326239128520a24261db68b5213f4262fb0903d62f15f5b88476c29732bc0d7cd1ab39e3cb067de6f6083a936ad84385025bbe89b5b0ed3e
+MISC ChangeLog-2015 1750 SHA256 ec74c262d4690cae52ebe70801264dfd11522069c9847aecf35533b23c0a6b30 SHA512 431d8202553b0ed5db767ade058ecf749124e77b6301c41d4493c9cc6f3785872eeb983a98245bb4d9a8f7f6253e1fb8c303c98d5caba8dea305a3840d88b61d WHIRLPOOL 0d011251f4cfdbf28a41ff52db0d161d11860018691c38baeff515fde49a5b02c218aee0da8a092937b5ca38a699411c2cf43a54ce62e34b6af07d7b1c47a7a3
+MISC metadata.xml 251 SHA256 dee93318950834fb3070635d3e52a341e9b4aa2b423a4e2ce448f3ab24f529a4 SHA512 5c10f22ced866afcb94b97662e270d3d4164ca9f988621c13d6a7c4508da8d9e9bbb804798cd468a2cc84ae9fd61aff32c782a372b0b8de145c1ea71751bab34 WHIRLPOOL 09030caf79f07fcbbb9cdba8617452f34bdd4646c243c34bf9fb7734c304fed2330f9f23129a71d72894f3efa10599c874d5176ab7df2ede27495ab8e71d3216
diff --git a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild b/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
new file mode 100644
index 000000000000..d7afc8d55ad1
--- /dev/null
+++ b/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: exheres format highlighting"
+HOMEPAGE="http://www.exherbo.org/"
+SRC_URI="http://dev.exherbo.org/~ahf/pub/software/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="exheres-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
new file mode 100644
index 000000000000..dd2c8f010758
--- /dev/null
+++ b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin git-2
+
+DESCRIPTION="vim plugin: exheres format highlighting"
+HOMEPAGE="http://www.exherbo.org/"
+EGIT_REPO_URI="git://git.exherbo.org/${PN}.git
+	http://git.exherbo.org/pub/scm/${PN}.git"
+unset SRC_URI
+
+LICENSE="vim"
+SLOT="0"
+IUSE=""
+KEYWORDS=""
+
+VIM_PLUGIN_HELPFILES="exheres-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_unpack() {
+	git-2_src_unpack
+	cd "${S}"
+	rm .gitignore Makefile
+}
+
+src_compile() {
+	:
+}
diff --git a/app-vim/exheres-syntax/metadata.xml b/app-vim/exheres-syntax/metadata.xml
new file mode 100644
index 000000000000..bf51ac0c6417
--- /dev/null
+++ b/app-vim/exheres-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/extra-syntax/Manifest b/app-vim/extra-syntax/Manifest
new file mode 100644
index 000000000000..ed690cbab81e
--- /dev/null
+++ b/app-vim/extra-syntax/Manifest
@@ -0,0 +1,4 @@
+EBUILD extra-syntax-4-r1.ebuild 780 SHA256 8ddbd92f6caebf9c8f6f96cdb769160e038c2094be716fa6cc6bb304337927fc SHA512 bf87175769aa6ec32fcebd3b779fd0dbd68ae4dbc6df8a114119e378d7ef4f8e09c24c5a3d549b21e5799569af3bd6b53876e12052915d37de37bccc811e3fd5 WHIRLPOOL d154ba58070c3e3b465a93dd5e5ac11737d65bd86098ee0d435e18ef221332b230dbd9f1083ab6a160063a1daf99fd6411ce7426db1f633508e47f8ce9dca5d7
+MISC ChangeLog 3057 SHA256 9c723ad410051a80813bada956a45887e143c6d3f1f18f89176c6a5faffd0ce1 SHA512 1faae2a2e634c62ff11432dc83d26041bafc43f0f12e7b96c837d3c66d0ecd196a382c6d37f36ac67d17f4df30a1b54aaefcda0838829fb3943164bb466234dd WHIRLPOOL f1f033b4cf35aa38b59405ebd82f94d8c83844747fac6082e6572654c3a3126f22a5ca1a49bd7bf13a3d98ec0b8b7685d6dad4bbffcc4990607c766b9fd6bb1a
+MISC ChangeLog-2015 3276 SHA256 769f72966f224bc230c8a9bc3f6967701afd1c8329f232d3fb33a8f16ae2c236 SHA512 6c98a9a72a9d96d1dc779fde031d21113d2f682823539353f62c3b035ef2daa6aafc55bdb271b3bdafc047cbce72a06807cc69a01f7e91da839232cfcba144c2 WHIRLPOOL 85409af6ef53fb161365f7b3433f42d45d2f77b79f035718a6fb38f0c71cd9058519b1ad534a1086e37de17405171884976843c8beec01804a5ce7f15b87f0ae
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/extra-syntax/extra-syntax-4-r1.ebuild b/app-vim/extra-syntax/extra-syntax-4-r1.ebuild
new file mode 100644
index 000000000000..9c88ee7d91b3
--- /dev/null
+++ b/app-vim/extra-syntax/extra-syntax-4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: metapackage for all extra syntax packages"
+HOMEPAGE="http://www.vim.org/"
+LICENSE="metapackage"
+KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
+SRC_URI=""
+IUSE=""
+
+RDEPEND="
+	${RDEPEND}
+	app-vim/bnf-syntax
+	app-vim/brainfuck-syntax
+	app-vim/cfengine-syntax
+	app-vim/dhcpd-syntax
+	app-vim/ebnf-syntax
+	app-vim/eruby-syntax
+	app-vim/fluxbox-syntax
+	app-vim/gentoo-syntax
+	app-vim/gtk-syntax
+	app-vim/help-extra-syntax
+	app-vim/nagios-syntax
+	app-vim/ntp-syntax
+	app-vim/pam-syntax
+	app-vim/pgn-syntax
+	app-vim/selinux-syntax
+	app-vim/wikipedia-syntax
+	app-vim/xquery-syntax
+	app-vim/xsl-syntax"
+
+S=${WORKDIR}
+
+src_install() {
+	:
+}
diff --git a/app-vim/extra-syntax/metadata.xml b/app-vim/extra-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/extra-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/ferret/Manifest b/app-vim/ferret/Manifest
new file mode 100644
index 000000000000..7054291c2e82
--- /dev/null
+++ b/app-vim/ferret/Manifest
@@ -0,0 +1,10 @@
+DIST ferret-1.4.zip 38210 SHA256 aac505465ba66f0e85b500b6585d2b2454b91ab662abfaeb4beecbef510e61a8 SHA512 e4dacfb996c98be2ae922520387b2b37511fbe33cc934fe89d1bc3096682d74e649fc6a1ba469e1e2efe01bdc11526f0f72d06354b28fd74b884db215068655b WHIRLPOOL a3c92c952b864b3f620c5075624e18c1a1ae95e58e70c83a9233a4f0612333c01f78b11dabd7feba83fb2e7a1e8b469873c2b2314a35d2dd7ba8abc9264443fc
+DIST ferret-1.5.zip 41822 SHA256 b22c317ceae3f604a91c83c968f7471aebd0fd981e012e4459b066dce7a09adc SHA512 50ae3cea72b681507f76e7fde4cb5712305bc3b9e3a98d9fbfb3797d8834d7792967e76d87435442b7809b800c739108eaea1da52c7c5c7495710b564a41718a WHIRLPOOL 56c983a37299c33702b372683db641a9405ea9852a9cd5a052ee9960c6875ab5217b014dc9e0a93987be44516b02750dc680eb88ff539ab02933985d5b0e8d78
+DIST ferret-2.0.tar.gz 33070 SHA256 ca7824dbf9e0e2d51b33e40c0bc24bba43eb46c2cccc1bd52fffd6127060c60c SHA512 305784624c06b662e83712e2348619bc5998e85553dc860681177278a766f2a315920913593108fd147f2d4bfbb5bc02f064fba628ffad05b965814b52a1ca71 WHIRLPOOL 4d9c1befe59a369cd274ed0386dfe7c365afb25b083f678ae788213aa989481fae4ee38420f2907b5497d6eecb123719214e639f9d33dfa424998fb3a6cb3e6e
+DIST ferret-3.0.tar.gz 32291 SHA256 fabc729d82abd629b0662bdbb0b316fd891bae2df39cd1773003293b5395c053 SHA512 f88575654c1990cb9c943b36242ee9786a5c234a853fc6fb321cdbf4f8b13f066fe0bad93bf80e94be407ecdba5014ac39ea0727df775ea2b3af4699a9fc4c03 WHIRLPOOL f9402053f1ee68a9949d95816887cb5c53177a506cfc6079952fa743b97df296e1fd97176db15f259ce458daa1f5ac12b1bfa621121b9c0447a990867d57cd90
+EBUILD ferret-1.4-r1.ebuild 513 SHA256 18b16bf1fe8340cbf97efa5caca1261ccb2a88948afa18e29cde931e85cef5b1 SHA512 61ee591d10d86b3576b55da4570cf0c1ce2e4d0775cebf8249e53b571a1e688382e036d6b87564fc4456936b548874c15695cf5b29362037678c7912b2023e4f WHIRLPOOL 13e8b0a7aeffe709d139ac5b2984fa14ab72cfb42e88d09ffedd7c8ba3045bb97753709d114dcd673d4a5ee2cc2fe07525b946597232147ce2d4fbb2079225fd
+EBUILD ferret-1.4.ebuild 429 SHA256 e38fdf2eb90169b68ba00211a5b3beabaf623967f5606825621bc5e760023b08 SHA512 b0a5634b21e4aa90a62a7ac33fcf273240ea8245494eb46cf3cc9234b8cfb4a3df8042feade4d4b72ec7a8bdfbaad19bd6371bba7a1803eec948c395d9878212 WHIRLPOOL b76d68cb1adcee7c5bf5b12797a5aa85ee6d7dafc2d12eb6af043df7b65184fec2a803f5c26bb74333a10d62d94c5b37518f0d7a69484bf963ba5425e666410d
+EBUILD ferret-1.5.ebuild 513 SHA256 18b16bf1fe8340cbf97efa5caca1261ccb2a88948afa18e29cde931e85cef5b1 SHA512 61ee591d10d86b3576b55da4570cf0c1ce2e4d0775cebf8249e53b571a1e688382e036d6b87564fc4456936b548874c15695cf5b29362037678c7912b2023e4f WHIRLPOOL 13e8b0a7aeffe709d139ac5b2984fa14ab72cfb42e88d09ffedd7c8ba3045bb97753709d114dcd673d4a5ee2cc2fe07525b946597232147ce2d4fbb2079225fd
+EBUILD ferret-2.0.ebuild 494 SHA256 a09bf6d338cb72ad9d12300fd63b4c2106e0ea37a3660c8c938f4e32f4693b46 SHA512 d059d8b78bdc00f983f6387ad0ffefe485734df13e53ca65ffb3c138a057879dbf9915e6a826fb6971399b2565a2748a5f436d0af34447b4b04049f0f3ee7333 WHIRLPOOL de886770c8a6f7e0c144442292e1ece1058e721301d1761d3ddeb2777c049b976d26006536fb50712927da83bdb2c3eb93cf822bde70248cd93b1b19c8eeefa3
+EBUILD ferret-3.0.ebuild 494 SHA256 a09bf6d338cb72ad9d12300fd63b4c2106e0ea37a3660c8c938f4e32f4693b46 SHA512 d059d8b78bdc00f983f6387ad0ffefe485734df13e53ca65ffb3c138a057879dbf9915e6a826fb6971399b2565a2748a5f436d0af34447b4b04049f0f3ee7333 WHIRLPOOL de886770c8a6f7e0c144442292e1ece1058e721301d1761d3ddeb2777c049b976d26006536fb50712927da83bdb2c3eb93cf822bde70248cd93b1b19c8eeefa3
+MISC metadata.xml 440 SHA256 3836db218124a9e987b1b72d5991f623d3b885f8e5c0ca7a8ca67a61298918b0 SHA512 d7bd2e675190a561e1211895efc03cf373117842c56f6ce92a0f5e421f4a5cccf3ba2cc94deabe063697612ff3bad3eb0d7ccb620715119c34811f4128aaf81c WHIRLPOOL 030becf00d2b56d5202fbf9c08f8a2782e2b92a0ad4369c4eda8f36d76a98e483a8b11b5ba47181a2613e00f042ece65b51863d08f9839d3ab50157f0521897c
diff --git a/app-vim/ferret/ferret-1.4-r1.ebuild b/app-vim/ferret/ferret-1.4-r1.ebuild
new file mode 100644
index 000000000000..1ff874a4a8d1
--- /dev/null
+++ b/app-vim/ferret/ferret-1.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	rm -rvf test.rb doc/.gitignore || die
+	# See bug 612282.
+	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/ferret/ferret-1.4.ebuild b/app-vim/ferret/ferret-1.4.ebuild
new file mode 100644
index 000000000000..c6e382c72335
--- /dev/null
+++ b/app-vim/ferret/ferret-1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	rm -v test.rb || die
+}
diff --git a/app-vim/ferret/ferret-1.5.ebuild b/app-vim/ferret/ferret-1.5.ebuild
new file mode 100644
index 000000000000..1ff874a4a8d1
--- /dev/null
+++ b/app-vim/ferret/ferret-1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	rm -rvf test.rb doc/.gitignore || die
+	# See bug 612282.
+	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/ferret/ferret-2.0.ebuild b/app-vim/ferret/ferret-2.0.ebuild
new file mode 100644
index 000000000000..d6d32cacfbdb
--- /dev/null
+++ b/app-vim/ferret/ferret-2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	rm -rv test.rb doc/.gitignore || die
+	# See bug 612282.
+	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/ferret/ferret-3.0.ebuild b/app-vim/ferret/ferret-3.0.ebuild
new file mode 100644
index 000000000000..d6d32cacfbdb
--- /dev/null
+++ b/app-vim/ferret/ferret-3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	rm -rv test.rb doc/.gitignore || die
+	# See bug 612282.
+	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/ferret/metadata.xml b/app-vim/ferret/metadata.xml
new file mode 100644
index 000000000000..23f63c1306ae
--- /dev/null
+++ b/app-vim/ferret/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wincent/ferret</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/fluxbox-syntax/Manifest b/app-vim/fluxbox-syntax/Manifest
new file mode 100644
index 000000000000..7bad7299da83
--- /dev/null
+++ b/app-vim/fluxbox-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST fluxbox-syntax-1.5.tar.bz2 1376 SHA256 bd59dbbd4d3a9ccf426ecf1af6e470daf45f97832d901a5cde55a82dcdf8cfaf SHA512 0567af6fe0994ea228ac56c3a26485ba5cce7762e3d70d6dced978e56017f6769072c83ae68125de3e03190562a7a10102bef038c02ae148cf70cc0c5951b8df WHIRLPOOL 346e70a9bf402780e61f1b7c942db7e56cdec35209801954041591903df7dac3aee43419b9e89901385e70e22db9a013104c6046ac69bc1c69fdc32fee4a0740
+EBUILD fluxbox-syntax-1.5.ebuild 955 SHA256 960c4703467f2f9b981ab758b1fb46eb7e2b0020bb0049d66ef18b6fc5b5be44 SHA512 6b78e4ec23718fea58e454cec459d23923ecc74b438c61c5bc92c744e1cf0e44c6d83828edbad177fff589c6acbd3d954030d21ef7b0631d1b9614db9b082997 WHIRLPOOL 00a7d37d414bd29f404e854a1f1d3ae047cd5c7d0a146f42aa816249c5ac99c095bb297d57afb67a66951ccf8b7e1e6718b7132a30fa62f44f4b5a0f2f3ecd06
+MISC ChangeLog 2443 SHA256 a623b0835fa133d10396207da6f5c24a3c6904f278f7d7fc2b0acc74eb40d909 SHA512 9f35e32f04e18e397e8e579dcab39c2a4a81c182bd89be235ea25ab7be8c372b64ee0e47ce4c96dcf05e76d5e897ec106a32c60bdb76de724c833c059862eff8 WHIRLPOOL 5e9ee960dcb621fb439cca7adad35b511db4e60b2b3b3dc1ded211ba19c54e815233009736387a613ba650ac0dadab805437f45ab62731cbf10fc4eb65cc8f57
+MISC ChangeLog-2015 2915 SHA256 99dc9ddf3309a6d214867bbcd9e12fc3cf00a29a06cca799cce2643ee30ffb09 SHA512 61aa64f4ca9eb88951f4c171e5f4439da944b53974dfe81e08932ccc95bb7ce87defc873e33c214ad604d6eb62f02e9b04695801bfdcd54f58348311460d41b7 WHIRLPOOL 1fd4805f91e35ea26cdff71fbb1413a24f909fbc3c46cfe08d93184fb220df510021e4705c9d2e4d9217ccb959d22ac8bb5d1d52480263c8dd09ac54ea8f4198
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild
new file mode 100644
index 000000000000..9e895013fbf2
--- /dev/null
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: fluxbox files syntax and indent"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=679"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND="${RDEPEND} >=app-vim/genindent-1.0"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting and indent settings for fluxbox
+menus and similar files. Upstream don't provide us with an ftdetect file,
+but a simple one has been created for you by this ebuild. You can manually
+set the filetype using :set filetype=fluxbox if necessary."
+
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# no ftdetect file provided. lame...
+	mkdir ftdetect
+	echo "au BufNewFile,BufRead /*/*fluxbox/*menu set filetype=fluxbox" \
+		> ftdetect/fluxbox.vim
+}
diff --git a/app-vim/fluxbox-syntax/metadata.xml b/app-vim/fluxbox-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/fluxbox-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/foldutil/Manifest b/app-vim/foldutil/Manifest
new file mode 100644
index 000000000000..62deecd8461d
--- /dev/null
+++ b/app-vim/foldutil/Manifest
@@ -0,0 +1,5 @@
+DIST foldutil-3.0.tar.bz2 7323 SHA256 a0e0382da2ebec1d551d9e6df08e5891188003efb189b706b9dab073996189e4 SHA512 a38561c4530333f5a56596b2fe19a2892f58b4fd35229536c054578b199e9b6b19c18d255aa1b078d51ac4f610d4ca49b205d1929e8be51299bee527058b3452 WHIRLPOOL ea5e82bca7aa6b6616f94390050bb6256ea2d6ad096456bf2c91574830e93ec62b624242484db66156dda4ff298a0c050c86b2173d0d704e8c471ca937b4630c
+EBUILD foldutil-3.0-r1.ebuild 547 SHA256 1b03dc7639609f695873a072ff04da60770956a7611a4b54c2a17a8b5ac277c3 SHA512 d122a2a89680172166adec7526b2f17c101333781d4394014b12eede391a56133011c4339dfeee86a93dc332351f43d2840071eb672ec34e99f9793ed7430eca WHIRLPOOL f2739186ba3a173df213c4e7fb8829f587850a445b2b518abaf0c58c0caa0f99a2df4b3842823c38b9e616ba499422a8dca4da24b91ab883e491fe87b8d7a7d6
+MISC ChangeLog 2930 SHA256 33c9290360324a19c4ee031d993a07435caeee4ccdbf3dc60464713e64cd515d SHA512 7697f8ff58e4dca4c073d7342d6385fd4ae7164a11802221934d870b1835c9d3e21b12f823f7f00d6566166bef60ef3982cebdfb458ea7f71875c8a721f03676 WHIRLPOOL a5c7cc04b20d16c91662d99b97212b7d7740cad42d1eab44815dada3f95ad4f71e71a8ce2a7698e91d8b3c165e7b9f300e62f0939691df94e81e29477bd621a5
+MISC ChangeLog-2015 2710 SHA256 ff1b01e5eb2c063bec27eec60a373f7aa55e525d878aa087d8767ab3dc308428 SHA512 94909aebf5e279e3526435160f9c07b85fa3763593393af134cb96b4b799f21eeceb53a120f3246d18358487faaff26d64b0aa46ee5c7d34784ba216e482497b WHIRLPOOL b72881281dd53be285e5a12c979e08fe81f1db508dce5b2fba0b43840952933c26c34214358a4a4e130d477086bd040e37660a82381fd6e9bfede0adaafadce7
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/foldutil/foldutil-3.0-r1.ebuild b/app-vim/foldutil/foldutil-3.0-r1.ebuild
new file mode 100644
index 000000000000..953cbc3f0d0d
--- /dev/null
+++ b/app-vim/foldutil/foldutil-3.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: fold creation utility"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=158"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=app-vim/genutils-2.0"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a number of commands for working with folds:
+\    :FoldNonMatching [pattern] [context]
+\    :FoldShowLines   {lines} [context]
+\    :FoldEndFolding"
diff --git a/app-vim/foldutil/metadata.xml b/app-vim/foldutil/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/foldutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
new file mode 100644
index 000000000000..0567fe9aafa7
--- /dev/null
+++ b/app-vim/fugitive/Manifest
@@ -0,0 +1,6 @@
+DIST fugitive-2.2.tar.gz 30651 SHA256 8417dac31c1d444547ac6ae5c016ccafa1f7a061495c2190820d81c8a6244cd0 SHA512 763fc352e495dae6346fdedee5e3993a11fe402dbad0e9ee4b002b6b416404c46b56a061b3d9e663174b371d2d62e62e22f5a2cf8767fb6aee28b236c77d9d41 WHIRLPOOL 3df739ad9bd1ea6562275065fbab973554f4aae2c01c80fffe5d6b2b1a8c4e71ade4ad9c23abc615ab4bdba4b3b83382ec229924bb39acbac934a22568cd1b8c
+EBUILD fugitive-2.2.ebuild 622 SHA256 69450bbc073b450730bda19799761a0ac583e23a9e7deaa5a2ca4896b8e8cb30 SHA512 6853dda72a463010abf304eeed07e68735c2a3da95cb4fe5fca29519b19fd7264ab6f6c3bda1ee607fe5b1c0305e2f4a7497bbf347afe3ea623630067caaf2e7 WHIRLPOOL 2ba1798ca7dcd6335c8ca373d8e2fd99d133cda3ba154dfc2bc4c8a82f5758e3137e41c95db43c65ff02da410f410418be79c409010398a2e176178b23ba6e5d
+EBUILD fugitive-9999.ebuild 622 SHA256 69450bbc073b450730bda19799761a0ac583e23a9e7deaa5a2ca4896b8e8cb30 SHA512 6853dda72a463010abf304eeed07e68735c2a3da95cb4fe5fca29519b19fd7264ab6f6c3bda1ee607fe5b1c0305e2f4a7497bbf347afe3ea623630067caaf2e7 WHIRLPOOL 2ba1798ca7dcd6335c8ca373d8e2fd99d133cda3ba154dfc2bc4c8a82f5758e3137e41c95db43c65ff02da410f410418be79c409010398a2e176178b23ba6e5d
+MISC ChangeLog 2867 SHA256 f95649287c39813a7ee5544371148964220e497a55114fe5958d62b8a03f90b0 SHA512 4de2d3e180e585cdbaa271f8c73d4c666ed0a4d60e2db5f7d933bf9404ca13646775f02b5eb2fa30dbdbda34a5ebac3de38b4a29d5358000b1fa3097bff92b73 WHIRLPOOL fd0090c6316c762a43ddfd686bc31829da85d2104db8a54b3e97b6d20dc5f04e17e94ec7b2efee2efeeec21201966ed59b3d784576372e4d1a2f0d7b0e6e6936
+MISC ChangeLog-2015 1864 SHA256 2aa93e67a0d325283a75316114c04b9f43e93181a83e2b4044bb1f556bbb6e3e SHA512 5a9f7a0a3c10e0af55cf6a94628a24f85a7f043c08a1f98a8f1c0bead4bbf14ce46660a214a278a54d36f48d26c37d290cc8c48a9a8041cbfac6a2141f89a7b9 WHIRLPOOL 9e1c917d2383920c6a9d07fd71866b2ce40a8daf1ca2c7bf3e38cf0e7c3050d3edab2f0815227d1abf4e187e454b03f07e888fbf1526cc48a7dc06499a5c62c8
+MISC metadata.xml 342 SHA256 74413c4c8815375620bba9f2ee00e3d6b6b070c4d8d8a9c8bf1032bb52f61a2b SHA512 4ad3c706ea17ef2ab4e6852c6251cec3b8b5b37b687cd3ed87061adbfb791b8786bb5faa4550a73c707a0013ad8981aeda930eba8d74221cc7ca33d110ceb842 WHIRLPOOL 1b4df42ab5c89568e4f0e00a5ab6acfcd69f015ea04ba3a1bf418afe179c49c3c1fe41a648a4f8fb5893bb51e88643b464f0b2231344d71c48281d61ea9636f3
diff --git a/app-vim/fugitive/fugitive-2.2.ebuild b/app-vim/fugitive/fugitive-2.2.ebuild
new file mode 100644
index 000000000000..71ee67fe65df
--- /dev/null
+++ b/app-vim/fugitive/fugitive-2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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"
+fi
+
+DESCRIPTION="vim plugin: a git wrapper for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-9999.ebuild b/app-vim/fugitive/fugitive-9999.ebuild
new file mode 100644
index 000000000000..71ee67fe65df
--- /dev/null
+++ b/app-vim/fugitive/fugitive-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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"
+fi
+
+DESCRIPTION="vim plugin: a git wrapper for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/metadata.xml b/app-vim/fugitive/metadata.xml
new file mode 100644
index 000000000000..84e14fd03b22
--- /dev/null
+++ b/app-vim/fugitive/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tpope/vim-fugitive</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/fuzzyfinder/Manifest b/app-vim/fuzzyfinder/Manifest
new file mode 100644
index 000000000000..f126b98c66ee
--- /dev/null
+++ b/app-vim/fuzzyfinder/Manifest
@@ -0,0 +1,5 @@
+DIST fuzzyfinder-4.2.2.zip 66965 SHA256 9082353b27537512c4cfc59015f2def0c60785df287b74c83724444025d00b77 SHA512 8a4124ec876bd605fe64c9146afdd591b95d045238fbc0160547942d3c247129cd3a6ad05f23e668b0cd8f5a574192c03bcd3c9406f61625f78c4e32b35bbca3 WHIRLPOOL a5c9811315eec523d928ac32d1be9e7d319550225f1ab286341c07f1d0b83625967dd62d6de657e179d17d75d1b96c56119874d9f368e282597172f2aa62f2e8
+EBUILD fuzzyfinder-4.2.2.ebuild 490 SHA256 ca4c8c65b3db18edb935d1ff2a71b49f928e4ec1e1eca029fbd01a407c0e34eb SHA512 e76d28f881121970f51dae7bf99a3a060d6949c80e44f5000f3b205b5945fdc85c4d7290ac37b0f296bf92d1a38ca2427af6c15cb984e3259da0f735d8cbd88b WHIRLPOOL aa8fa990b98bf6cb01cb109de0be4f235f2c9c179bf0dedea3fdf50455fa7dfe038b134d2516dd6187006f4f38c64f9e062ace02c736924f92f8b46fc9353ef9
+MISC ChangeLog 2526 SHA256 0bffcd76c502f5c7548b72e4fcfd80f7a01e7e0438ac6ba76868b513a6f7084a SHA512 c51ab5d0d7b4d7ba298b69c91644b83ba415b53a7f6cfe6c240a0513b402cad0b75a4dc43fb3991288296f5bf9756e860494b5e67869269b9aab339faf247c3f WHIRLPOOL 6bc8911809b9c0709e180f7e33a7bc607895d58275fbd2eb4c91245070c219081c2f82617abed750104de817e8ec5b5eabf67219efea7ee1c0bb24c680bf3ca0
+MISC ChangeLog-2015 633 SHA256 8215ff5ab13b127a01f4b2b1b14217dca120e64e9152282f5f7c8a4787e341db SHA512 c82651bb58e83c47021bcd27863640222356b073efecb13a25eb21f871010e679067209ab0e9a25e0c662df17edb3e6374472641bb68b7b26bfbd6a4004c3f8f WHIRLPOOL 02f543a59e7b1be387f365942614fcb273c78a34124191ee17154d408f67b3912e501006f9a0cf45d552924be8a2d4c45cbab9b0461656b5829ec27ecdecf7b5
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild b/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
new file mode 100644
index 000000000000..3c1e79f68332
--- /dev/null
+++ b/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: buffer/file/command/tag/etc explorer with fuzzy matching"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1984"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=13961 -> ${P}.zip"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="fuf"
+
+DEPEND="app-arch/unzip"
+RDEPEND="app-vim/l9"
+
+S="${WORKDIR}"
diff --git a/app-vim/fuzzyfinder/metadata.xml b/app-vim/fuzzyfinder/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/fuzzyfinder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/genindent/Manifest b/app-vim/genindent/Manifest
new file mode 100644
index 000000000000..92b7654ce95b
--- /dev/null
+++ b/app-vim/genindent/Manifest
@@ -0,0 +1,5 @@
+DIST genindent-1.1.tar.bz2 1248 SHA256 7b64e9943756898bd57f7e0321bf33c462c52754187eb181188e47ac53f123c6 SHA512 aa90cfc988b08708bb25352b66196191e6cc322f2072a771cf768a0e2ace2e4e193e2e34dc0556266bd84c49055ec1d4183f1aec3d89fffc29f5ded88c26a2af WHIRLPOOL a9875c000d310c7d925a19ee7fca69cb522602b55a62795a8f17401e9ece72f8c9e220ad5abc5eca991339b3a6a7ee15864d4b856890e3aef6487507b174fa46
+EBUILD genindent-1.1-r1.ebuild 509 SHA256 5d7632fcd3adf6b4a940f6b77406fb56ac50cd7a3c497677b90e9ed4bc8b27ee SHA512 847972fef6273969e4a8e6466139c89ab19278e046ccbb67e4f5ca927bb7c4c6ace9886d0b183ec5cff9acbaf2aa4c1fa5b32ea98a3f3509ed1809bbaab309b7 WHIRLPOOL 5ffe292f004d6ac5c5b318e9d02f771084153c6ca928441f44ff3b61c4d63ef915af7204820161e8e4c9103b730f9eabd71d15cef3ba9bd410b64d5150bcadf8
+MISC ChangeLog 2869 SHA256 2c4ad9d6a089d5e5c8a0e4de69ea09d08663c1938e17d726b1d487439e6a5028 SHA512 ca0842d45cd8e5d05595da5e81d05e59f119b4121ac0196211d19deff15221104321a6514fc7d89bc4c726c1fb766e9b4e71c8ce6ef44cfa6233d604e1b418e5 WHIRLPOOL 8f2d3208af44491af0187bd9c58348d3772a3c1f75b68b9fb294a6dec99d89ee1a75d18efd7a4ce71a42a9c684c9c409038216fbd90b389b5538420b8f7c36fb
+MISC ChangeLog-2015 3168 SHA256 76091475bf9b786485289bdef695cde6b9655a24a33632fb6ba3092ebdbe228f SHA512 2e379f5b4558e7fca6205e0d6b8cfa4739e9abe62684c71e6057ba642b79814a762f1199f98a5d2a97b077f3d504e8194db3d911529e047cbba4bcad4b34d980 WHIRLPOOL 7b11a8b6dcf666b89e316664254bd91f9fadd8055429f527aeb646719a79cf82851999f4573c8db69e0846be64c9c5b9f51e8d0e83fa1da1e4bf7c15e56b8e4a
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/genindent/genindent-1.1-r1.ebuild b/app-vim/genindent/genindent-1.1-r1.ebuild
new file mode 100644
index 000000000000..0044e6ce14ae
--- /dev/null
+++ b/app-vim/genindent/genindent-1.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for simplifying indent files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=678"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/genindent/metadata.xml b/app-vim/genindent/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/genindent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
new file mode 100644
index 000000000000..47fdd0995f73
--- /dev/null
+++ b/app-vim/gentoo-syntax/Manifest
@@ -0,0 +1,8 @@
+DIST gentoo-syntax-20160530.tar.gz 18950 SHA256 819495c10e594b2fef1fdcd80afa24ee437fe20b94ad9e7eb9e91f0a5be31919 SHA512 38881c5f16499eb053eb7a5514f6324b2a161f1392a044db0bbaf0cb71a0f17e1edebd4a685ff856a78525fbcb8c6267daa2503cfbc6f94d841cf3f6a25045bd WHIRLPOOL 41018200b7f79eec005f55e80d3f8b1eec1f33acdbf1a8bce03b282a27cf63bb08a4959e0fcd74ecc9972322bbf4b0b89755dbde35cedc87ee9a228d07519a33
+DIST gentoo-syntax-20170225.tar.gz 18939 SHA256 f9305c689f8eeb492fc2a7f9e9c90b6af1663e2f16dcf0b95d22e6395a6bb8e2 SHA512 2c01577910eccd413b85c094dbd12bf8445e2f560be1fffc4a4c3130b32587f9c298d8442b5cf12bd7d2950ab8c9e5b95a72f2f41c42c6dc939ffa2c26fd71d5 WHIRLPOOL 7350ddf65ebc9c64fd83997d2e7d9ce329fa434a150ee69b35d54adfd2097319c6492508a0d1d0938453f7ae5068d422448564ad292cb43fc45afb97097efdc7
+EBUILD gentoo-syntax-20160530.ebuild 1847 SHA256 693a68dd3d9b40d57a7bb3a7ea1ab77467e99488cc92509d80b05f95839181e9 SHA512 bdaa924cf1b710e067539ed8ba1c39b43736f2f0bef813366c2894392e76a9724d09edc615412c62aafa364826fba9e3087caae6bf1c382e8c9ec6f4f13039aa WHIRLPOOL da803745c783b57b19f158d738afd9661b291260686b78a00984596638856dc722d6918aa3e34e74a82e053733f49d97305b6cdd94f505bcc5f134828b03897d
+EBUILD gentoo-syntax-20170225.ebuild 1863 SHA256 3c2d33f8036ff160532414bccfd7a5a2c9e2ef777471d213951673f8edce07e1 SHA512 e5178f85e526f5410eff419f776ba8e55f340cccb292330cc48cc37c846cbb1847fff673dbc4662663a8c10488b66780213ce34eb34c4d001934bf89ff3f6e6a WHIRLPOOL 1834a4a8375c2325de3fd9520e0f50f848f9a39b58f2f5cab25cbd07df9f38b8d31f2fcf6ece58d8c119478f3d14686f31fc4da63be1657a1fbed53664e02be5
+EBUILD gentoo-syntax-99999999.ebuild 1860 SHA256 4d39f8486248946734d161581a45f445b1778b8343010fbc6f3f43b30626c96f SHA512 b5db61773f98d50a4c4ab64ee72d50ac98d39de249fec9c3c063a763e58bdf47e0a4f31b71b3dee3ead53cc847b6a0301232e75e440f1115205e2900809e4365 WHIRLPOOL d36a78091ae3f3745ae87c584172e874023f5c33f050223c6b76a50ff7f453d926decf022d37e7a1d7d22e2ec74d6629aaab8b53063a4e142a2e3811f2a25b0a
+MISC ChangeLog 4043 SHA256 6d4da7467c253f0203e022ee7ae1aaebc0e6eb0ed71b6ea38dd3d382031cc62f SHA512 7594ac88fd9a7f2d6113df18b6551648f9e275db22c399c7b46b24a44748de25b5df1ac10c870f8f7c892cf94dc5193636f5d026a2128ab64a89aac65a590e13 WHIRLPOOL b640221fc4543211ee21b6db4f69733b1073b06dff7e4764bd5572e0fc5bf8dbbafb10adb27c818b8cc2405395a8c71e7702607ff659eaaff2c693d168ea376a
+MISC ChangeLog-2015 24716 SHA256 72e7e4698a1bf43330557a097d50bf03e2745a9b15456c566dd1729ddca8692c SHA512 31fdd45e6cab03f1cdb084b3f91b4559da61e446b4d9d2164fffd783fd397adf4a57916d5e0ff7001e1dcc3edc04134835939e8ce1472e06db25b3dbc31a1cb3 WHIRLPOOL 7d6f9ae480b3e656f2aebd2778bb73ecb4f7cedacc6e88c3901a22379bb57794162675cfe21428a2730805497be1252b8120778f7daeee39bea1554f2930a76e
+MISC metadata.xml 446 SHA256 cc5455726253294dbd8c54b5f6f136235f68215d7ca0d5ce9120f6acd566b7cc SHA512 2dc59075bad043ed183529af7484ab54e718774c275ce38e3b96af6b0461b8cf8d704dbcf37cb4aa7fb9dce2db3eb62075ff984ad7ac11fedf3f0bd2a582635c WHIRLPOOL e0b47d774255f3a322819bf507b2212bfac270b654dc4c93cbdc3df50f334a2348075265601b22f01103cda8345962318b03abb0a540680c6a632cb4f978692b
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
new file mode 100644
index 000000000000..88e778acb9e3
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 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/gentoo/gentoo-syntax.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+LICENSE="vim"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	if use ignore-glep31 ; then
+		for f in ftplugin/*.vim ; do
+			ebegin "Removing UTF-8 rules from ${f} ..."
+			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+				|| die "waah! bad sed voodoo. need more goats."
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use ignore-glep31 1>/dev/null ; then
+			ewarn "You have chosen to disable the rules which ensure GLEP 31"
+			ewarn "compliance. When editing ebuilds, please make sure you get"
+			ewarn "the character set correct."
+		else
+			elog "Note for developers and anyone else who edits ebuilds:"
+			elog "    This release of gentoo-syntax now contains filetype rules to set"
+			elog "    fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
+			elog "    If you find this feature breaks things, please submit a bug and"
+			elog "    assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
+			elog "    flag to remove these rules."
+		fi
+	fi
+}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
new file mode 100644
index 000000000000..310a359bcce1
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 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/gentoo/gentoo-syntax.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+LICENSE="vim"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	if use ignore-glep31 ; then
+		for f in ftplugin/*.vim ; do
+			ebegin "Removing UTF-8 rules from ${f} ..."
+			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+				|| die "waah! bad sed voodoo. need more goats."
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use ignore-glep31 1>/dev/null ; then
+			ewarn "You have chosen to disable the rules which ensure GLEP 31"
+			ewarn "compliance. When editing ebuilds, please make sure you get"
+			ewarn "the character set correct."
+		else
+			elog "Note for developers and anyone else who edits ebuilds:"
+			elog "    This release of gentoo-syntax now contains filetype rules to set"
+			elog "    fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
+			elog "    If you find this feature breaks things, please submit a bug and"
+			elog "    assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
+			elog "    flag to remove these rules."
+		fi
+	fi
+}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
new file mode 100644
index 000000000000..ec3e1171dfe0
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 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/gentoo/gentoo-syntax.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+LICENSE="vim"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	if use ignore-glep31 ; then
+		for f in ftplugin/*.vim ; do
+			ebegin "Removing UTF-8 rules from ${f} ..."
+			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+				|| die "waah! bad sed voodoo. need more goats."
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use ignore-glep31 1>/dev/null ; then
+			ewarn "You have chosen to disable the rules which ensure GLEP 31"
+			ewarn "compliance. When editing ebuilds, please make sure you get"
+			ewarn "the character set correct."
+		else
+			elog "Note for developers and anyone else who edits ebuilds:"
+			elog "    This release of gentoo-syntax now contains filetype rules to set"
+			elog "    fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
+			elog "    If you find this feature breaks things, please submit a bug and"
+			elog "    assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
+			elog "    flag to remove these rules."
+		fi
+	fi
+}
diff --git a/app-vim/gentoo-syntax/metadata.xml b/app-vim/gentoo-syntax/metadata.xml
new file mode 100644
index 000000000000..374f1cd98d23
--- /dev/null
+++ b/app-vim/gentoo-syntax/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <use>
+    <flag name="ignore-glep31">Remove GLEP 31 (UTF-8 file encodings) settings</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">gentoo/gentoo-syntax</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/genutils/Manifest b/app-vim/genutils/Manifest
new file mode 100644
index 000000000000..744b0c6d6f86
--- /dev/null
+++ b/app-vim/genutils/Manifest
@@ -0,0 +1,5 @@
+DIST genutils-2.5.zip 30510 SHA256 d51aafcb8ca0e0b4010ad1c68c1627429a332b0089ac045b607a060389962f2a SHA512 80a751038f629d58ce962a6be7d806cf2b7c35ad28f9d90e58cad32e1e462083629f2069ac23281683db026510d7e3d96d6883027d424fae3de63352b80fc5db WHIRLPOOL e0dc4ec2177fd24cd5d989cf0031e530dd999c39a7964dd5fb4c4004e7e38bb1ee90e55dbcc91250329f6a37492f28e47d3aadd107eee10712dfad65ccca3226
+EBUILD genutils-2.5.ebuild 565 SHA256 1f338c41e1d7baade0ae20b493c0c66348d2f3f505f3e74568b3d70610fc1504 SHA512 c3dbf21b42c85b3f25bb74c41ffcbf3f55ff11c59ad848b1f68ff537033f6bb5e60cc6ab7c3c26ed84db37d4b1709263fa0627f51886084f328e9d18df3e5400 WHIRLPOOL d38195854c0145a4bfee74e777ec8e45b2617065931db4dbf18e336c2b9d6ccc3b604999087bd09d22cf2e34f6af8df3156ee6e1d5cb3791b79fbe60fee26675
+MISC ChangeLog 2508 SHA256 3924a11d3ec6d258a6ede62358abd949e5ac1359859466c1f785a9dc8a2f1cc8 SHA512 f35a5b19ea548285ae15515c102c083478c19e5f2b3e8c1ef466b94b9539e3ad639456b864d06d0141d36c0371c2b3f18aa10045fa1abe6bbc310e06b2d0929b WHIRLPOOL e9e1173235e2a74c25c1f6ff5312d0e9f985a85ae7bf29e0bb7cdba0f8a142a6634ba03df4e6183f98e4edc1c3b7ae416df000b663768a7cfcd600842fd7ba9e
+MISC ChangeLog-2015 3265 SHA256 0cece294816e8a60e8a77411eccc63ef3a5037f4803cb684a523952ab74f7274 SHA512 9679bb03cd868a645f4204861ac2c41de683a9cb322debf01c9ac4bbfe774d75ecadaff09c0c136057b9da3edfc08e49461310f53a4f144aee3ca9b87f42c1d4 WHIRLPOOL bc425a2d7c34c2f70f473616b48c655ba5da41f7f489b997d3bce83c763d1aad52e5b732980bb1284d60696c54485be8cda5fd3013eae45d3838738a9412d2a4
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/genutils/genutils-2.5.ebuild b/app-vim/genutils/genutils-2.5.ebuild
new file mode 100644
index 000000000000..b263733bfdce
--- /dev/null
+++ b/app-vim/genutils/genutils-2.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library with various useful functions"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=197"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
+LICENSE="GPL-3"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
diff --git a/app-vim/genutils/metadata.xml b/app-vim/genutils/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/genutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/gist/Manifest b/app-vim/gist/Manifest
new file mode 100644
index 000000000000..774bf0c140bc
--- /dev/null
+++ b/app-vim/gist/Manifest
@@ -0,0 +1,5 @@
+DIST gist-7.3.tar.gz 18170 SHA256 17ff0413b6c222ed240b64259e32ac0020d764934b9cae31e679675207eb661f SHA512 dbd3f638a365c8ee419140d9a934dd2c80fed181910137f61cec3c2d8d61300c21cabc9fdf85d83caa185cf78edb92990e04d49d937cd3fc546b6ae889e5cbb8 WHIRLPOOL 98b2570547059de65b53f5cf8770851c15e505f6f893050cf3083f34ba9c4b0dcca2df8ebf718e42dc35f64f957f5109aefc3c7f484742c0e4fcdfa18fadeb9c
+EBUILD gist-7.3.ebuild 640 SHA256 8646743e8c80af43dca73e07b35d7761f7375ef0956d8f61b4a2fd2ae3114f6c SHA512 3258719152a1ee8c5ce9533555f957ed7487e1410df435e918e4cb1512e2b6177209b9d7d3b93fd5552cdbe25654dcad1515f68df586a15a0191cfb7ab5a1a4e WHIRLPOOL 3b3aab7a965f6c02efbeef4dea677e6b2f3a3bbff974f98d3f7bd94634d4aceeb88a2aaf0fe5fd4fcceacf5cf2b145a826319f6aa3e0cbdacf7c16f2c3c2ca01
+MISC ChangeLog 3566 SHA256 6e159ea968c709573b185a492365e3cd263c8dc3a5d5058617c72ff77cf18cac SHA512 80cab25ae7d2a6bd78ce2c11e24ea9f200b58640d714e197257a7d4e9cf413151a07a85d91559ce721d3a39e8c65635b231cf50aa8fa2bf04a1f80762ba37d90 WHIRLPOOL 0b6a108a6c0717cd674ea39516a4572bb491ead0b89c6e042127983343b74a1b45ee9c9137da8865e6b78ec5fc60a06ac8a8aae2fff18e7c1c8ac2720f712609
+MISC ChangeLog-2015 1525 SHA256 042aa765292c539380ac937b788c7a20fc880098c8f905f5b1c9030400f06979 SHA512 fa1c64fdc1e67da6fc716e366b6888f65046da23e981387b026b4a486cee9fc3f2d6a85ce916f9bbf0c7352906fc36d382afff332a1f320c2eb970099362bdf7 WHIRLPOOL 461d985c386486343b57ed8d25d7fcd10da030169fa1c16899f928755948c3268e8d74bc477779b0b0a2cfb631e6b9084e5d8c667a4d92f3c17580606db3917a
+MISC metadata.xml 328 SHA256 561881f36a3b12f0996dd2102662149413327f10da3152da455121b3b3556353 SHA512 c7ecce29dc9fd9a7eaa2ebf61fbb0a191e3309ca87b4473d4aab058ee585287e7f7fbcaee931dda26807ff66fdb7a2b449edf9caf97ac616fcd283f34f24d710 WHIRLPOOL 6aa92d23e62c45c7adbcfab39e18839e97aca06f9eec560812117ad1c3eb4a5e6d208a8e3563844a13438203ff3298760df3f0ad62b7a7c7aa415a1bfcbdfbe1
diff --git a/app-vim/gist/gist-7.3.ebuild b/app-vim/gist/gist-7.3.ebuild
new file mode 100644
index 000000000000..9bfc10349b4b
--- /dev/null
+++ b/app-vim/gist/gist-7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN=gist-vim
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: interact with gists (gist.github.com)"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim"
+SRC_URI="https://github.com/mattn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~x64-macos"
+
+RDEPEND="
+	app-vim/webapi
+	net-misc/curl
+	dev-vcs/git
+"
+
+VIM_PLUGIN_HELPFILES="Gist.vim"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	rm README.md gist.vim* Makefile || die
+}
diff --git a/app-vim/gist/metadata.xml b/app-vim/gist/metadata.xml
new file mode 100644
index 000000000000..fe9c0bc2d0a3
--- /dev/null
+++ b/app-vim/gist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mattn/gist-vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/git-patch-tags/Manifest b/app-vim/git-patch-tags/Manifest
new file mode 100644
index 000000000000..f4e717aba330
--- /dev/null
+++ b/app-vim/git-patch-tags/Manifest
@@ -0,0 +1,5 @@
+DIST git-patch-tags-0.2.tar.bz2 1508 SHA256 e32808f8e978872c868c3f8fcbf1dc1cad23095279c8fd7ae4a2b017e96e19cb SHA512 63ab541ec77ea70d79ea4e4b441c2f84cb45e0b130c1a57f4f3f1522fd9d7a4a90d137c243ca20733424602d0e75f5079b98b6ce7d39b6d2df185690020dee48 WHIRLPOOL 379cdb0bcb7d7b1a52111a3be42b1b1c1c5209008a3262ecd12c6c754988a715bf93f4971b4432ce8b3b6d57bfe966fbaaaa327c9b126bfe13bf4d44c7a49835
+EBUILD git-patch-tags-0.2.ebuild 355 SHA256 075d93094bbd4b3a3e512497e56425d6197e57593e2c2061173f73665c1e6520 SHA512 ef7125183c67b5cc1bd80c1a9d191f2e798ad5baeb3d8a19dd8571d391965cb705cec3297f61e840b6cde128ee6d113050442fc8b1a7d71f9ea141f60ceeadb4 WHIRLPOOL 0ba54f3f7e3f3af0eb8cf058ae89f78b3a350b88f9af480d3aa0c7fa098dcc5a3e1213c07e89c3a7d5ceb5a48fdd31c16ffecdd6321012194d6958b0afcf30fa
+MISC ChangeLog 2443 SHA256 b3f18ddd3f76521c8cdc6e562b7e8a3d939e30b0a378f3014143d1c2e69aeb94 SHA512 58a5bc584d358bea574fd1581074f6702cb46856b8f99d4dcb359ecfd35f4d677070dd05653e7fe8e504375515afea779835040b0dd3cefb3fcbb0ff864145da WHIRLPOOL a69c420dee10518d6aa659334b34b4a4985937188b620b712b32f69357ef1b4e7b120879a192931c1f04fc195591396edd081784db546e3070e4a650fede8bbb
+MISC ChangeLog-2015 368 SHA256 b7b091df36fc6efddb439acc6d23679aed8d291f5ffdac8ca255d43a28b221b0 SHA512 4ab2593b9934f14252ba9b18d7c71e5728c46136e92bc73103cc568c10f8fcecc4a06a6e3f4934cc5416280c87142fdf0f2e09141be8986a289aef91ad6c4f25 WHIRLPOOL c6f2d20d5e8f297324eed4e500ba7ba9958805eb40df249fed9d0a3fc38aef6d9e823c9d8cd41d66447b7e636b92cd87ffeab9651379d04ea0bd40454d248cc9
+MISC metadata.xml 245 SHA256 a8b1695a5ced5d18651f2c27eb007b4eaf4af0a421f0cbc21e2be1d9282d9e62 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2 WHIRLPOOL 5bd04d29b34b35ffc355cf4fa5048b94bea046b3bcd327674a05c25d5ad3f8a131a1ba4c06e0f897be0037df160acdb82303be1c89057e7ed3586d0bd493a47b
diff --git a/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild b/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
new file mode 100644
index 000000000000..0f8d3a0f1ec8
--- /dev/null
+++ b/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: add git patch tags as used in linux kernel development"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3632"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/git-patch-tags/metadata.xml b/app-vim/git-patch-tags/metadata.xml
new file mode 100644
index 000000000000..f1abc6411341
--- /dev/null
+++ b/app-vim/git-patch-tags/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/gitgutter/Manifest b/app-vim/gitgutter/Manifest
new file mode 100644
index 000000000000..801de0820c94
--- /dev/null
+++ b/app-vim/gitgutter/Manifest
@@ -0,0 +1,6 @@
+DIST gitgutter-20170222.tar.bz2 41819 SHA256 10ff5c0c4fc7c4fca857b98df92f0e94efb43c79b1077aaf7e7c54ea59e08e29 SHA512 970a956a839c2eaa05b699e8507b239d36ad623c40d3d05d9ce82320ec93ae733de2d40619898c5ff43074e2c8f95611b94879424767fac4f2b1fe2747611f4e WHIRLPOOL f201c0edbdf0978f0b48f2caed305343424bd2d97951902a0df9ce6f6c499ae3f0e506dc917a230db5f42c34022b170bb54baa682a2e75805af724b919d1f35c
+EBUILD gitgutter-20170222.ebuild 576 SHA256 0918a039d251f714a1230b40c53fd5cc9aa542268f8fc86433ffb72b1aec4e60 SHA512 f6b6f1fc620034b9e573fc826984ec8c520a32d656ffbbbb7657fd363d20245586c28e33066d711a8e46979da0b944df530e24b89a3a5bd5e57f2904c7300691 WHIRLPOOL ef0880ad18ef43f5aeb64cad7ee18e31dfa014743a55e4730c87d0789d37ae24e0b9fcfcd7110393c83f2574698f7506c3f5e1223ba630ecbe6f1ae74da1d1a7
+EBUILD gitgutter-99999999.ebuild 578 SHA256 a4d3fadedffbbff122bdd1a0bfc8331a4fb0953083b54542cc9908b359b9cfd7 SHA512 98e7672a0422c0d556ca38c747d7b5f7b4c0c6c284a4d0e4d719d8c0ad8952acdee72a91ff15c3689b09e900d7fab1b65b47cf4742341014a7d45f5c9585037a WHIRLPOOL 0b6743cbffe8a2968fefb097f7f64f72bf734b74b84b7cdfa73498eba50d643b0ec67f8e9560a49f3f1b2b7538e4cb1c3a3e9daa39a178bc9e87f10de951414f
+MISC ChangeLog 3479 SHA256 076e7977ae19ca15cc0dfacb730f826d908456d0a0653c8885960ecc4d447411 SHA512 bebfe3f3d3a2a509c3257e1cb1e75bae6c1cc32f54444626b8fca82981a0b2995957483bb790974eee7a40a68f165fcd6dcbb79cc57f93f62e7958dbd0bc361f WHIRLPOOL 52fffd40cbe2a348a655dc8bc438c07c46e3af60adadcb846ada97b06aab87765cc34791218e2d8bac63d5720c46f34d60c5d237c8b5dbb477e7a39bf865b904
+MISC ChangeLog-2015 647 SHA256 2e0c1dc118819fddacfe63be4edfd2db03cc2342c7ded1bb48c495cac3eee7fb SHA512 0e441574b6a3bf70bc5579d625b8f76c2978ade6a69a339f873ef7380d43069dbfb2b8e6c3c5fe404cfa7ab47b3c1d25c37af08e363a30da343cbd694a70e9ea WHIRLPOOL 63f462db32896da9a12da37c7794d2c9b20e37c05fbfa2cf5c276bcb23d69ff19af6e903d0a83fab9088a02157d1d08342c2501167c360a836848a960c93a0ce
+MISC metadata.xml 346 SHA256 85bd6053bcee2bb66209f52a7c19f252ae77f4eeef5a51736ae9dc967d5461e5 SHA512 4ada20b8f4f308445854b0e0ab229271a603e38370675691790dce0303ca4c2a7f00b247363b0f13bcebe78397fd3ebbbd157403260664171b548b8964da7a0a WHIRLPOOL 36394eb9446dcd9a1026f90b6b80e5c7b8e315fcb273ef3a1c3a9fcdc0abe922a38564a9bd639275818d0fefd350870ee5dd927ae7fb505c34b1c5b86adb461b
diff --git a/app-vim/gitgutter/gitgutter-20170222.ebuild b/app-vim/gitgutter/gitgutter-20170222.ebuild
new file mode 100644
index 000000000000..0a08a4ac7e70
--- /dev/null
+++ b/app-vim/gitgutter/gitgutter-20170222.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 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/airblade/vim-gitgutter.git"
+	inherit git-r3
+else
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
+HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+	default
+	rm LICENCE README* screenshot.png || die
+	rm -rf test || die
+}
diff --git a/app-vim/gitgutter/gitgutter-99999999.ebuild b/app-vim/gitgutter/gitgutter-99999999.ebuild
new file mode 100644
index 000000000000..de382720b670
--- /dev/null
+++ b/app-vim/gitgutter/gitgutter-99999999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 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/airblade/vim-gitgutter.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
+HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+	default
+	rm LICENCE README* screenshot.png || die
+	rm -rf test || die
+}
diff --git a/app-vim/gitgutter/metadata.xml b/app-vim/gitgutter/metadata.xml
new file mode 100644
index 000000000000..8a1caee90de1
--- /dev/null
+++ b/app-vim/gitgutter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">airblade/vim-gitgutter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/gitlog/Manifest b/app-vim/gitlog/Manifest
new file mode 100644
index 000000000000..d06b9b100f89
--- /dev/null
+++ b/app-vim/gitlog/Manifest
@@ -0,0 +1,7 @@
+DIST gitlog-5.1.0.tar.gz 29684 SHA256 7305176d205635479a4373349ae4e3115e4f9f8f20d2ce7c8ea74da6d3c058b1 SHA512 1c2bd363ce5341fcdaa80955af350084903da7e7cac1e20583d05f8812ef11e562137e2ef3bd198f787a6cc1e322f7d942135341c27186a7c987cd9d631a0eeb WHIRLPOOL 577d8b598b44216beaa2bf95e43f313f0fb88981cae8701b39fb99dc54d2ce874818cdee8cf725f4bb059317283ffe6ffeca521e5aa5e42fd5eba9d8d4eaaf81
+DIST gitlog-6.0.0.tar.gz 33956 SHA256 ff64dfc23278e45d8d5ae9a92f4785675db8caff1fbe303ec598f54b3d93304a SHA512 17016057df69b22e72548d00bd8c253ace864f0551890f64e6b9a91c1411b1e0a479d6c04028583edf9f9c366418b50b758f60d197fe0a62a75c7799b68a4069 WHIRLPOOL 15598129669f02afb5b1be24490733b0856132392d1fbd84f64774d64c9473a5adf8a202b836a665912ca331b453009d5e3b798b470c9b4363d7e1d50d32bbb5
+EBUILD gitlog-5.1.0.ebuild 499 SHA256 e97ced50657406c9a6da1f45c4ca31cdfc80eccd73e25513853e5a702f5162b4 SHA512 99f5de2279eb2004045af925ce6f6e53b46819f413ceb48f60ab96900a359db9e63f23770f8e9f9e63c82eaffaf3aedbf24b66fec40ed3f8f3793b30c1a77b00 WHIRLPOOL c777840f1842e1867af17cdfde82b022a2f1ee1eedb32adaa78cc01d8e46da140494541e92ed40f281ac2cf7f5952eb5d98e355ef6d27384d3f4f091f1b98a8e
+EBUILD gitlog-6.0.0.ebuild 620 SHA256 6636e9e5139bd66810ad352f252ce016c526ddabedf3394f88ac75516fd52308 SHA512 dcc80bfb97357f367187a7edb0bb5aa849e8c0f4fd6b138a1ec2df0e4bc4fd9c445040b5334ef5e0cb5856b8a0565a13be83c09e0a7d02aea71e022e77007d59 WHIRLPOOL 07b7eb2a406f153a61e2a17487ff7e9b32ba844924802aad3137fcae69a9d6af38050a6802d3891e9335f9e254ecca6dc6a7a457f395718bedc2fad96eb6bc20
+EBUILD gitlog-9999.ebuild 620 SHA256 6636e9e5139bd66810ad352f252ce016c526ddabedf3394f88ac75516fd52308 SHA512 dcc80bfb97357f367187a7edb0bb5aa849e8c0f4fd6b138a1ec2df0e4bc4fd9c445040b5334ef5e0cb5856b8a0565a13be83c09e0a7d02aea71e022e77007d59 WHIRLPOOL 07b7eb2a406f153a61e2a17487ff7e9b32ba844924802aad3137fcae69a9d6af38050a6802d3891e9335f9e254ecca6dc6a7a457f395718bedc2fad96eb6bc20
+MISC ChangeLog 403 SHA256 793efad94de75b8b988691d93f203087fb03dec33bf07f411257dc7ef03ab78e SHA512 825d33b33052a1a69e3080d1564b7d80b8d25cfef608f6dc02cea75edbb3e772e313fdc3600fdeef9100a9096cbd4c29569cc20895915ecbe4f8d63fc480ad4b WHIRLPOOL 9def031c3dafd2be525706861983ef3658eb3d95dd745bff1de9438e59a80a224d88326aa56e6773ccad0a4b7c86d0b0ff5e398495cd2d0026a084197c64feca
+MISC metadata.xml 342 SHA256 683e5b8e238da7f109b6f89cd4075c2419b4fedef2b4be59a8babacc34612c4c SHA512 419f19aff509708c460c7848a5e90c03a19c47c986ae6d5d07be0abb3a387a8045f89b98139d2ac0ac5abb16b9b8cd315fe3001a8808a2c1e4ee497449e23a60 WHIRLPOOL a606b7f8fb3c6d546c1ae0b0c40c8a874abb03a82660dace11b141aa3cfdc95705ac8f995be666646b8edcff8ec3a330c961fdcda0f8a0ea9fcd383bff1c9803
diff --git a/app-vim/gitlog/gitlog-5.1.0.ebuild b/app-vim/gitlog/gitlog-5.1.0.ebuild
new file mode 100644
index 000000000000..f0591aa22ce0
--- /dev/null
+++ b/app-vim/gitlog/gitlog-5.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Artistic"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/vim${PN}-version_${PV}
diff --git a/app-vim/gitlog/gitlog-6.0.0.ebuild b/app-vim/gitlog/gitlog-6.0.0.ebuild
new file mode 100644
index 000000000000..df4052666bdb
--- /dev/null
+++ b/app-vim/gitlog/gitlog-6.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 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/PAntoine/vimgitlog.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/vim${PN}-version_${PV}
+fi
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+LICENSE="Artistic"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitlog/gitlog-9999.ebuild b/app-vim/gitlog/gitlog-9999.ebuild
new file mode 100644
index 000000000000..df4052666bdb
--- /dev/null
+++ b/app-vim/gitlog/gitlog-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 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/PAntoine/vimgitlog.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/vim${PN}-version_${PV}
+fi
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+LICENSE="Artistic"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitlog/metadata.xml b/app-vim/gitlog/metadata.xml
new file mode 100644
index 000000000000..94f21fcb2826
--- /dev/null
+++ b/app-vim/gitlog/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">PAntoine/vimgitlog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/gitolite-syntax/Manifest b/app-vim/gitolite-syntax/Manifest
new file mode 100644
index 000000000000..ba07658a66a6
--- /dev/null
+++ b/app-vim/gitolite-syntax/Manifest
@@ -0,0 +1,7 @@
+DIST gitolite-syntax-20111225.tar.bz2 1833 SHA256 abf8ded395260f5ac11ff0ad2bdcdfe1303ed81676c1bd03dac0d4b1282200ba SHA512 28cac71111f9d41c46e6f9f68a22760512a03650b5f1f2d77ef40e002c22c024a288ede2d6e898320d4616066409d5f8343688681169c136505235b784d3dda5 WHIRLPOOL 48fa3c5f7ca23857b6e3a011d728f05625179bb0b4704fcdbeffec64eaf4a226373c44f64e78794b04bed511aa319e5e164af8bba605c2512f4e9c3815fbfb97
+DIST gitolite-syntax-20130306.tar.gz 2975 SHA256 cda7372e9fea34815ae7dc75db5593bc9b33c74bcc04e34a9544d9dac264ed31 SHA512 c064d06162bdb0b71d9c0638db073bba9b0577a1529eaac1a673b812fc08478e5b351954279d9d68947f0c4e3fe29ee5667741e6d229461d1ad1c7b2f535a49d WHIRLPOOL 0ffcc34ada63e7f5668e693e1cb85549024b05bbef2fcae8aaa381dfb22a0446bb9f24f0918e08af816b3c3db838903c1a9ab6b0e8483d8d2ea03ca7b706b189
+EBUILD gitolite-syntax-20111225.ebuild 439 SHA256 370dc8606b88d24488c86657dbbc003c1ebf3e070f66cb3ba1593e55c0b7cc56 SHA512 001e6eec3844b4a72508fcdeb8ed092759ab6bda57791c4cd3b46fd02b6ad74f006d90cae8f7c28d9db8b72b7df529969ed23e55a15fb307031ce8415a2a63ff WHIRLPOOL 0ed99227ad7cb3c5b532b1ffe0aebfd3386504c70af5ccf79ea5c02fb0ad4f8ca00b1a2de7fe2e1134fd01f3929100d0198955612d54bdebfd872e1215ba3a81
+EBUILD gitolite-syntax-20130306.ebuild 602 SHA256 11f02dc20f430e9eb9f9dde707008ac119ac7266a027e2d77ee5638302b3f396 SHA512 a1dcac2deb62bfda91c6e827f4d093c34c45910de7c4008f509670e6c33cbb9c6fc45e74ef17b04e116b8ee91f840122283bb969238afa827fc2a53c09e5d2d1 WHIRLPOOL 9219350293c076eaa98314b735f302c80d9829353a0dff1fbe4b8b3759177723b6bd65ee0f83c62c330ed0886e7cc601d9605b93c06516203fae0b79a41cd46d
+MISC ChangeLog 2532 SHA256 e0fda97ea8220f199b7aa34e9e6550bd958c67aa27a855ec89ca483642bc8cef SHA512 b4421d08f8e6884146b269011528b2a2fadb3c3c67cb070108daa92e2adc576551d4b83dbb2f6ed1bf7bf24309613bb2770a84cae5ed2c53f526fc1c0daeb124 WHIRLPOOL 8c580f3c61122787ba19888b9a59272785f0a1e69acd2bda76b14ad0450f30cc9d8cb38e793e0ad4869a83537966b4c2e2cdafb66a6bf8c16b8748613221f034
+MISC ChangeLog-2015 1673 SHA256 13b4680ad6ecb5d4e395439db4d4fcf0c83c688ecb91fa26293502ecefa57ccf SHA512 85f9cb14b242f8ddf5a3f6ea6f056d07a673e5b63691413a222dadd994c99f496952f2e2b6045203542e828bebe73525e2e1e513b003595827b81c3dfc6af07f WHIRLPOOL b5c998e37afd43079294230fb3971c1fc548b71c329425c4014d277d6214dd588e540ff499e89197a16a199bbf5dab15104bc3e9f48dcfb11d1d19342bf69628
+MISC metadata.xml 461 SHA256 acf43533d577c7a05947ae45e98fb30cf4eedec16432350ad153655718bb3ff0 SHA512 73a788e77f42a5cd329e8341b399d4f4bac29f08a4e0c4dfecb4d50b67c022b2b5c37b0462aba5fd33ba064c697b5485681ef083e5051180ad5d73489f982fab WHIRLPOOL b71784b998674f0f11e4428b49c0e68d88440bca22ccbf55f7e6a5d660456f758d53ca33d9d1f2edc7979234965158bc1ed4bf61a24824dc905083225a6a0bfa
diff --git a/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild b/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild
new file mode 100644
index 000000000000..0c1871883a09
--- /dev/null
+++ b/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: gitolite syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2900"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+VIM_PLUGIN_HELPTEXT="Vim Syntax highlight for gitolite configuration file gitolite.conf"
diff --git a/app-vim/gitolite-syntax/gitolite-syntax-20130306.ebuild b/app-vim/gitolite-syntax/gitolite-syntax-20130306.ebuild
new file mode 100644
index 000000000000..0935015636db
--- /dev/null
+++ b/app-vim/gitolite-syntax/gitolite-syntax-20130306.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: gitolite syntax highlighting"
+HOMEPAGE="https://github.com/tmatilai/gitolite.vim"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+GIT_COMMITSH=990634e95f209ffca96970da1c117c0f67697d89
+SRC_URI="https://github.com/tmatilai/gitolite.vim/archive/${GIT_COMMITSH}.tar.gz -> ${P}.tar.gz"
+VIM_PLUGIN_HELPTEXT="Vim Syntax highlight for gitolite configuration file gitolite.conf"
+
+S=$WORKDIR/gitolite.vim-$GIT_COMMITSH
+
+src_compile() {
+	:
+}
diff --git a/app-vim/gitolite-syntax/metadata.xml b/app-vim/gitolite-syntax/metadata.xml
new file mode 100644
index 000000000000..a47dde9086f9
--- /dev/null
+++ b/app-vim/gitolite-syntax/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>idl0r@gentoo.org</email>
+    <name>Christian Ruppert</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tmatilai/gitolite.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/gitv/Manifest b/app-vim/gitv/Manifest
new file mode 100644
index 000000000000..9fe7e0b68c20
--- /dev/null
+++ b/app-vim/gitv/Manifest
@@ -0,0 +1,8 @@
+DIST gitv-1.3.1.tar.gz 553719 SHA256 ad65999e64d1924a6c540efe7a3adebb949cf30be2dcb23a3ce41175ed21170c SHA512 e6a6773dcac18fdc36c891bd592d4dcb2eb20af6253df5886582fd223e040fb8296dc606d4fb25abd7a14f9dc1a712fe0e354821e234c8f54b1b5914af55dcbc WHIRLPOOL a200640371fce5a2af8be014b08a578a8e555a8b1a1ac1db138fe0f08cf8ffe4e36e24080043b61448f4653b0dc5d2df26ae56ec937219bb69b7159bb6e825d6
+DIST gitv-1.3.tar.gz 21319 SHA256 6533196f9f2688846c7f4035ab1af82713f5e0e4aaf5c18335fa5007e0ad6555 SHA512 1a13d98ae9dd3e50a559d98881b6b0a8150186573e8f9fcdd9bd5cfdba1a679ea1c02b57f7d7be712dbfb5ec1bffbc4c0e8e1330cd64acf095c88400c499bfaf WHIRLPOOL 7c99b3e697c1e92ae829ad75a85ff2c777014420ed986a93d9d23a7df96af082d0c8c8a35949b1075fcbf8a754c203dd3055e787df075352f9d0fcafce199257
+EBUILD gitv-1.3.1.ebuild 682 SHA256 cdcaddcfb92e97d46e1a388bf695a1fbd6249d9a47968c95808d6e57c83fc355 SHA512 6dac563def9f199a5dbe20070ea2656fab379fbd5fbdfdc7b3bab667b082950220ae39c8028b74374a24192a3f16002a2fbf3212158fe86c71627d1f9d97d52d WHIRLPOOL 737b2d510286cded74558a5b1918a4f9454b7798a8efdf688c243ac20df520034696b7d68f1614b2fd510fc2c643d6882bce53d192b5f09cf24be405fc3ecdec
+EBUILD gitv-1.3.ebuild 437 SHA256 bd38b7d43bc03448a3caaa6b707392b5e48bc1bb4ecfc9ccb09f18456e7085fa SHA512 74b772f3b36f12e0e610171c63fcc04dcefa10564fb86c496739076387af3f65a0ba2f811720234b39e7905d27959935326619c01c83a5dc47e4f496631567c2 WHIRLPOOL 0739fc886b279a0684d6c056b3381a8594c01e1de16245fca754b374a679f49cc355d510bb9b9f7eea7960e82e26fb4cf8517965afe8a2df8bb1be9a2ba2d73c
+EBUILD gitv-9999.ebuild 682 SHA256 cdcaddcfb92e97d46e1a388bf695a1fbd6249d9a47968c95808d6e57c83fc355 SHA512 6dac563def9f199a5dbe20070ea2656fab379fbd5fbdfdc7b3bab667b082950220ae39c8028b74374a24192a3f16002a2fbf3212158fe86c71627d1f9d97d52d WHIRLPOOL 737b2d510286cded74558a5b1918a4f9454b7798a8efdf688c243ac20df520034696b7d68f1614b2fd510fc2c643d6882bce53d192b5f09cf24be405fc3ecdec
+MISC ChangeLog 2664 SHA256 139a57823df298c56d3465e5c817991d3d031b706e7f7a390586bf8d19aafd30 SHA512 9e8a27d4648522762c40f6b603fe737aa1961a8dcc04fae5407f046f4f39bc2a8f22f5fd76f5666e4ce1266087903cddaad34e03789fc44cbed53aa58de6e608 WHIRLPOOL 1c0979054f9505de9d2adb31a162d9409547169392971ad6106f4d82a93bcc8f28bed785b5859794b3df87a68f335ca2780c33142b46c0016909c49a465bc5c5
+MISC ChangeLog-2015 1699 SHA256 8e9ad861c92d1dd5d4992b5dc4c10eb8190cde6c75eec889bed5c43ad9509182 SHA512 2720b94b41815a1aef6e56359edc00a81ff1ba6be6b8f04106e015dc940173a15f70899444a52b26b6950c998cdb1c160e385c89aaab7d455c0b3c212c3bf3c8 WHIRLPOOL 406a6a14b6c0e919eb4684034e831a6f38641bf380255d89ccb1a6e26bcfad9b73118a68bc3be7885972a50f075019f4535d4d840c365fec19b5e65fb0c4f5ec
+MISC metadata.xml 339 SHA256 711f1df16191ebe9df28a6bb09104be750b5560ba8c8d2be1af8a268443808f7 SHA512 ca3cb18c58b214701105d230d86f6499c1df741d0631483991465daa0680e3c3a8c2adb9440d828b98cf73fb598bcf33b4eb31ade16fe7faf31210663742344e WHIRLPOOL ac731345757645a18ef173b65e52843fb292d7485145b3d3e5ac928037d2bf0646f735e6bc5637f2d08f17c0dbf97e0dfe63ac6a75a7af83cc0b77aaa4151fbb
diff --git a/app-vim/gitv/gitv-1.3.1.ebuild b/app-vim/gitv/gitv-1.3.1.ebuild
new file mode 100644
index 000000000000..a772cbef62f2
--- /dev/null
+++ b/app-vim/gitv/gitv-1.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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/gregsexton/gitv.git"
+else
+	SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="vim plugin: gitk for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="gitv"
+
+RDEPEND="dev-vcs/git
+	app-vim/fugitive"
+
+src_prepare() {
+	rm -f doc/tags addon-info.json roadmap.md || die
+	rm -r img || die
+	default
+}
diff --git a/app-vim/gitv/gitv-1.3.ebuild b/app-vim/gitv/gitv-1.3.ebuild
new file mode 100644
index 000000000000..243f24d52892
--- /dev/null
+++ b/app-vim/gitv/gitv-1.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: gitk for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3574"
+SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86 ~ppc-macos"
+
+VIM_PLUGIN_HELPFILES="gitv"
+
+RDEPEND="dev-vcs/git
+	app-vim/fugitive"
diff --git a/app-vim/gitv/gitv-9999.ebuild b/app-vim/gitv/gitv-9999.ebuild
new file mode 100644
index 000000000000..a772cbef62f2
--- /dev/null
+++ b/app-vim/gitv/gitv-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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/gregsexton/gitv.git"
+else
+	SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="vim plugin: gitk for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="gitv"
+
+RDEPEND="dev-vcs/git
+	app-vim/fugitive"
+
+src_prepare() {
+	rm -f doc/tags addon-info.json roadmap.md || die
+	rm -r img || die
+	default
+}
diff --git a/app-vim/gitv/metadata.xml b/app-vim/gitv/metadata.xml
new file mode 100644
index 000000000000..2bc2f53e2dc1
--- /dev/null
+++ b/app-vim/gitv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">gregsexton/gitv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/gnupg/Manifest b/app-vim/gnupg/Manifest
new file mode 100644
index 000000000000..24408d1ca6b1
--- /dev/null
+++ b/app-vim/gnupg/Manifest
@@ -0,0 +1,5 @@
+DIST gnupg-2.6.tar.bz2 12074 SHA256 0c35d9e7026da11e236759b4b6895b7a5e56dce1849a433cc03ac11aa246eeed SHA512 1b7307954aad751006286edebb80767951b9bd9a8eff4c4a57fa6030cb442ceca12730a82c76a2181e1da19cc4cc8be21ccd4f8a21817aedf42785d8ff4b61ac WHIRLPOOL fff1d6bf8d5c54490e76a2dda3600fcab6db1eb3cc15f7baec2e8697f24e43d162c17a92d7e949a1b1148efeae2e40c6c38e3c08bacd2397bd1d86d6cda00e0e
+EBUILD gnupg-2.6.ebuild 770 SHA256 616fe22145e4303ec4f59bd1a2812a753a04deba2c181cb73d0dc1d1a1927623 SHA512 c9856be7cfc7ecfc4769c4a153103334aa258d21673987f27f316ed2c21a3894ea547fee0db50fff2dacb210b015ccbc711a91c397e26c229813f0bce5241790 WHIRLPOOL ffa35e43d09e98e0de3d17332411692fb01f0a8842025d4e9ee095491aeffbc88fb425d19ea319afa4c38c42b4e718892a5a38fc74dc1e7e3b8582a43317aeb9
+MISC ChangeLog 2830 SHA256 344ad0b101b00592ccbcec9ce184fd5b556964407c6db478a3af08bbc6d771f7 SHA512 6477ac0eb63c616758a325e77d77ab64f5ec8b06e4b5dbd84ff5f8e8ecdc1463124f8b20cae0823a351624ecc565dbba0a77844539403ca2c4665dc78bf57ff1 WHIRLPOOL 99f59b23c562887dfd26708d9cbf4b0a993efc8624fd27697cd6a0c6d5affdff27c3a95258be83cd52557e7a2ec4a810005e48be17c611513f73e6cc4725a2bf
+MISC ChangeLog-2015 1134 SHA256 f3e770a480bb603c8bbe7bf61ceb9f04932666c2d98c6d15357509f12d2bf89f SHA512 556c2cdcbe0e5ebeb6a69d5cd051c74f116512b0189cfb82d74737a86452adc8bc24bdfb1882a326d69bb637b0e19a25674a17adbe23b5bbdfd8e1b18a39896a WHIRLPOOL 2240fa7e6f4682c94777912596ffda055f9641e75b1dbea652a6433696b3ad1e7e0404bc86d74ba7d90e6b908ddd8776795f6e354a8464d29015b9cb371aaf85
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/gnupg/gnupg-2.6.ebuild b/app-vim/gnupg/gnupg-2.6.ebuild
new file mode 100644
index 000000000000..9729d06a6e81
--- /dev/null
+++ b/app-vim/gnupg/gnupg-2.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="transparent editing of gpg encrypted files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3645"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm x86"
+
+RDEPEND="app-crypt/gnupg"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+
+	# There's good documentation included with the script, but it's not
+	# in a helpfile. Since there's rather too much information to include
+	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+	mkdir doc || die
+	sed -e '/" Section: Plugin header.\+$/,9999d' -e 's/^" \?//' \
+		-e 's/\(Name:\s\+\)\([^.]\+\)\.vim/\1*\2.txt*/' \
+		plugin/${PN}.vim \
+		> doc/${PN}.txt || die
+}
diff --git a/app-vim/gnupg/metadata.xml b/app-vim/gnupg/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/gnupg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/greputils/Manifest b/app-vim/greputils/Manifest
new file mode 100644
index 000000000000..0b5010088486
--- /dev/null
+++ b/app-vim/greputils/Manifest
@@ -0,0 +1,5 @@
+DIST greputils-2.8.tar.bz2 11886 SHA256 9238d08d4a95355ce87b78d2da58af1fe95190ec7c5c08330612ad02f00f82f2 SHA512 07a7b22a900860b982bb0596232892ad056472fa48447131ba56083caef00318886719f379c9f9296fc00fd54575ab16aae71b3d1adf2af5d05a11a45a2bd7f9 WHIRLPOOL 5a7369deb0c6e751ed9a967b79bc45cdcb772eb959dd5034acc26685ff86f2cfe04bf11775390d35f6945b000ab5a7d2c5468b63c6589002890c04b3b3a7fa85
+EBUILD greputils-2.8-r1.ebuild 479 SHA256 9c9cd57a53815676868b0d24a88efbf64db6467be9ac80a807ad2b1cd023619d SHA512 46f3e17fd138f3902a60267d0a69602171835b7ceeb67afd7999728c06ac65c6e68263a52205727ff37ddf60fb7bc59e172e497d0f5f22ac3a8916ab22360a53 WHIRLPOOL 468095581d3c6e3914bd893276fae9468e2e6c2820658e7215d998275968f0f619a6ba9affe14cfa7ca1592e57f6b53a4ccf957a3937ca48485478a72325a1ec
+MISC ChangeLog 3061 SHA256 30f38921cfcdc82a1932e00fba09211d092350313a151d6ee264c44a1bc3600b SHA512 cefddac74adb23b3294a02bf346af2c9f081947dc1aa2bbcced48a8cb3216f60d71fc4725bcec0c438f2452df1ba573cdf358e1509ba33dd2c8c708dfca13e80 WHIRLPOOL dce591e2130c052308f89829781ec951fbe4df05ff95f179defe5a4e4a9f02016d48dc82227d1529745be38cb1defa602b9580268131faf6bfbf80b4c4bf931a
+MISC ChangeLog-2015 2179 SHA256 7a8596d4b9eb73c1470e02e73f7dbe4d111ec00a91e036135185779499c3b3ef SHA512 359e6531853145d19e3a57bf416e5c3b58d5d45ad8dbf8a618c4a26a51ef3ea62b4162bf233050ca3da675e372b817811db4101408ee2a28c0482c812e754d44 WHIRLPOOL f10d611d54edf840272ab4c3369184e9b9e4a86c17e7f7394b6655cddf5e1463bdfec8a11bd66cd6c3b6200ec9f13fe97e78df0f5f646b43025ace6de54408e4
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/greputils/greputils-2.8-r1.ebuild b/app-vim/greputils/greputils-2.8-r1.ebuild
new file mode 100644
index 000000000000..08131ea52566
--- /dev/null
+++ b/app-vim/greputils/greputils-2.8-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface with grep, find and id-utils"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1062"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPURI="${HOMEPAGE}"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	>=app-vim/genutils-1.18
+	>=app-vim/multvals-3.6.1
+	>=app-vim/cmdalias-1.0"
diff --git a/app-vim/greputils/metadata.xml b/app-vim/greputils/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/greputils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/gtk-syntax/Manifest b/app-vim/gtk-syntax/Manifest
new file mode 100644
index 000000000000..a32d378a9d3e
--- /dev/null
+++ b/app-vim/gtk-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST gtk-syntax-20130716.tar.bz2 234878 SHA256 c7ba136d0e93c13611ee1245186941c7bd2dea7641d33ae3a9d2994469e33c15 SHA512 a90bdf84765ebaf10946b974c7720ebb9366f7ae5e360c8254ffd54bf9eacf1d0e35cf2061ef42727ffd7df3b4d78bb9e5f3ab7392180c435f8eef06c81ff5da WHIRLPOOL 74eae8225313a5e01237ecd58790b5b77b668d93c0e260acf25c1f240c7274dde16352e5377bb72f871e3fb83f37210a104fb5a2cf4ef30aaafa5d708d73e296
+EBUILD gtk-syntax-20130716.ebuild 465 SHA256 6d7fd65410e608651505ea0e8162f9fa117b81f8666be7c0acd071dd04b34d49 SHA512 9ab81b8c230dc4888cf6fda9e412c9cdc7d02cca16095246d48090dcea489048d055dd8a2b8d8e1c1f09ab755e3018d4bdaefdce8fbf7cf160bfcbdd72eb837d WHIRLPOOL 5b07189a501b8e3eb0bb764352d157fe1ef89a1a49b59a26008c8f445136db3403c9fad59a38457651abe346baec7411bf2b418f7655527ecfffbc608ee4527e
+MISC ChangeLog 2703 SHA256 975806c3b4d061740ec1f448406b9116e83a0e0ee98cfa4d50c2431f99873e24 SHA512 93ce0d315d55e4a0781109263d63d8ad3564bd7d7e86b86199cfa6740a2177ea38ebb319138d096f7fd144e2a678a9ea44ac6729772d0e9fea34b0aa316e007b WHIRLPOOL d4a0c1d7ef70e0774bc99fd1b19b052f5eb4de5043fbe86ed2f6cb8a9d76995d46cfe3035928f117bc24fe3bcba3c5d6125dce0dc9477fd60f05cde57470dd1a
+MISC ChangeLog-2015 8953 SHA256 590687d8adeee44a0001a02b26bc7519f1d38c68ec199767e9c5885aac06781c SHA512 85a4b62b29d97af05b905f4dbf65931d155b58982f7fa1aaf1c437f946aceac0f72cafc07660bed86f7926f3fe7943ba0d0b2467d8686ca5d693b90086aab46a WHIRLPOOL 606f8f36baf7c67a8ad240f19bffde764985b7ede19f84488ffcd8305bdb2da56e36dae1d84fdb3c557d5a46f742d0dfe1ec8309efd015632cd4d0f8284eb036
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
new file mode 100644
index 000000000000..7a23163b982d
--- /dev/null
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1000"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
diff --git a/app-vim/gtk-syntax/metadata.xml b/app-vim/gtk-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/gtk-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
new file mode 100644
index 000000000000..1f0d34d467f0
--- /dev/null
+++ b/app-vim/gundo/Manifest
@@ -0,0 +1,7 @@
+DIST gundo-2.6.1.tar.gz 153125 SHA256 6cacba104238169af6e9e2863cf500922a59cb6cb49885b36381a7f5d108be77 SHA512 c8b9b20ff8ef24bd94b0adc18b2cf912cbd0a07c5a70df11be39fbe69d81306027b73d9a60c9127c658c913602a819774c7b1202a8db704677da59cb9916532b WHIRLPOOL a29477209922ec6e0602f26cab96dac4c76d4f0fa4cd86df3f8f01af8d3022a57eced609423dbda73f82e01718cdd6e7bf8b2bc8c5ef2cbe465edf5401ed2152
+DIST gundo-2.6.2.tar.bz2 144107 SHA256 d03d9d96b4f65cee184438679a5d686bc0cc628b292ace02d29132af146b0982 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4 WHIRLPOOL 3bdb7555e37374efcf684c163b937ac71f98d8c73b5f8c3f05f540dd372c937d62e94676b3b260d422277ec5d75a91aae522a88cfc88bb76d83e92309558ad19
+EBUILD gundo-2.6.1.ebuild 719 SHA256 62226900e9d520832fa70510874126b8329311757061cf600650cc13473e6924 SHA512 637fef965a372b43d41ae6b027682512c3c70d2ccfcfc7125ae70ae859c7a8d830b5df5f0ec51e3949817179f9b2b8663e52f69be571255fa3862f8748e3d5c2 WHIRLPOOL b5a787f218c74a579718af2299efebbccde7df11b11f4a836d0d9072fe1ae5b160edf6c80b8c2bb355be9a70de67dc47efcb2b76bad9d033abc84d43b961620d
+EBUILD gundo-2.6.2.ebuild 728 SHA256 95e34eafa9c27a41028892120101725ef1c785a34e1d1cb424ceec3675f9a0e8 SHA512 028e89fc1572ff43baf89abd1768c667ea9a81098785cefa2397c12577494afcbbfcd7194f05baed2bbefcf637bf3a7ca3fde26797b6a32bdd00d8a745e4fd31 WHIRLPOOL 646cbba36ac54c666a402aa08fc3ef48a6ae62aa6fa49861f2072b3657016b9d153394b9e6c63010fcdc7f39b57b90cc9cdeccd2bd70260d197f46ff2375faeb
+MISC ChangeLog 3308 SHA256 3af9e24a637231e67a8a07016accad4fe50f2bbb03134ae513af36edd5fb8c46 SHA512 e076d3bc4c59067e923c5dd613a7dddeb889200b40c765c0a42975a7513d889022b681cc451ded8519aed44acb3e5238b12b11d47f2a9c37529f6e45d5db60bd WHIRLPOOL 2a372d183924b93751f0d31dfae09752991eac7d324a48f7d8a7e8c4d75b214f34f6dcd84ed3bbbdc914cd36d85dfcf4f6e0e464bca142197354cde8f2c05920
+MISC ChangeLog-2015 1837 SHA256 79eaac93c18d50abff760ef9c9ce11c3aed3ca379cf35f57850cb0b44ef8e631 SHA512 aaa9a9fb22e71996829d4bdea01af7e5307415788ecbcdf6fb972fd438469785e44d6208c330945900841530c47e1ac9d53d3ad1db8ea211e6cabada90ab5ffc WHIRLPOOL 5eb10108fffb597823287408cb1de800589dd62c23796254679365b5351514c7b1c2b22f8dc8e29c3c2c1fb135d201079810b1720d3c0b74dd6389233d2cea81
+MISC metadata.xml 337 SHA256 ec4d57d36b5cfdc1a446d97cc7fc088ff601674e323dd280224b46e5589bfc40 SHA512 14459476fa97a611646909941de602646af184e1de555dfff407e71b8fa935c23b5f863b58432be84c31378badabecf8893eafd454d06f8c57759a3bb8035854 WHIRLPOOL 7febcb6985926e4640428bf2bc3c5b1063e90e5627e219d1a240a00dcc9b3bb768ab0bdb44c10163f41934891aa1364f536f3a2a55fdfd51383cdcbaaa01231c
diff --git a/app-vim/gundo/gundo-2.6.1.ebuild b/app-vim/gundo/gundo-2.6.1.ebuild
new file mode 100644
index 000000000000..86515acdeb8d
--- /dev/null
+++ b/app-vim/gundo/gundo-2.6.1.ebuild
@@ -0,0 +1,31 @@
+# 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
new file mode 100644
index 000000000000..28f68459e8e2
--- /dev/null
+++ b/app-vim/gundo/gundo-2.6.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: visualize your vim undo tree"
+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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	${PYTHON_DEPS}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	rm -r .gitignore .hg* package.sh README* site tests || die
+	default
+}
diff --git a/app-vim/gundo/metadata.xml b/app-vim/gundo/metadata.xml
new file mode 100644
index 000000000000..a6020bdaec7e
--- /dev/null
+++ b/app-vim/gundo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sjl/gundo.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/help-extra-syntax/Manifest b/app-vim/help-extra-syntax/Manifest
new file mode 100644
index 000000000000..1e34a0c06a99
--- /dev/null
+++ b/app-vim/help-extra-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST help-extra-syntax-20050106.tar.bz2 633 SHA256 4c0a1068ce31bf344195b9664d199ac87d8595cdc8b50738cf8130058996e2a2 SHA512 84fde638941bc0b63b599ae0ae46dc151796409652bd99520df102b54e60497df23ee62b61d8ee2c7532029cf0183702345dffe743420dadee3e5ae6c4a2ef44 WHIRLPOOL ad36ba8a9162120ff131c675ef8292f28e4a625394451fda0fae6d85e49c1f7f97fdf50b3789e315bfaaf44633674c40c95e1241d57f0f3f38cbdfca7adaf7ae
+EBUILD help-extra-syntax-20050106-r1.ebuild 633 SHA256 fe07e05b5732ec99815c87b70c014fd7ecb6668b33cc828d1a6dc3f5033a5018 SHA512 f374762f9fb2038a3541f95cb69115f7b93bc5cd00996ae1124fe493b2cb016c0f7a68b4a21b6c318d504e31611098734baf54834d5d501e44e1f19404ba63e6 WHIRLPOOL 0dba72d1f5106f6fd3924f3016e41a730e2b93eca8d89dd96f353041e3df9262ae04386bec4ce2b2b6ae248e3de6049fbd94636510c3da2bdf41d3557531f3c9
+MISC ChangeLog 2468 SHA256 669d4fe960229b35e8e4b4280aac445c2a4073d7d4fefc94383ce6f337ad2d12 SHA512 09f931a2d78bd7d839a529cb4b0e8999e95da98feca23397e4c098357fa190d31f4ab8145d45c47228e06c2ec25bec0f9442707bfa9cd78d8c54f9e702ef6b3e WHIRLPOOL a43afa85cca43fc8a95f4add609be060c09878abec637d29d4f5c5e1614f33c6c828910d1df00dc1d28ec584a5c891a03b582606abc5c5bc875d8ef90034887c
+MISC ChangeLog-2015 2081 SHA256 0ac4ec96c1def9d075edd5dc5a06935453153cc55c5ad89984910594dc86aa3e SHA512 e17e04b7e21c01d13fcdfbca53b1aa2a6210b69e18e2239698f17ee5fb8eb6a3b4a6dd6e21098f97e34922c534f450e0b82ffab31403a606ff79b571fb6bd20b WHIRLPOOL 43c092568365d7700faf9cac2baa9ba64af16e308a22795348a4ab9a46f13c700ba65bac47a636497707454cee861792ed8656e3fc03fe85d4edfa1080de92d9
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/help-extra-syntax/help-extra-syntax-20050106-r1.ebuild b/app-vim/help-extra-syntax/help-extra-syntax-20050106-r1.ebuild
new file mode 100644
index 000000000000..e14b0812f6dd
--- /dev/null
+++ b/app-vim/help-extra-syntax/help-extra-syntax-20050106-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: extra syntax highlighting for help files"
+HOMEPAGE="http://mysite.verizon.net/astronaut/vim/"
+LICENSE="public-domain"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides additional syntax highlighting for help files."
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# use hi def link, bug #101797 / bug #101804
+	sed -i -e 's,^hi link,hi def link,' \
+		"after/syntax/help.vim.d/extra-help-syntax.vim" || die "sed failed"
+}
diff --git a/app-vim/help-extra-syntax/metadata.xml b/app-vim/help-extra-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/help-extra-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/html5/Manifest b/app-vim/html5/Manifest
new file mode 100644
index 000000000000..8b435dbc3008
--- /dev/null
+++ b/app-vim/html5/Manifest
@@ -0,0 +1,4 @@
+DIST html5-0.27.zip 30471 SHA256 56491f0ef69712267f39e85aa8686fdfd927f2473f36fba7467524abb3406b52 SHA512 94cc7ea1a082d232b85ca4b0887240a550f3a0381bebae5b8e06237257453f05f954e5e61a3d52437a9f27edfa05cb82e382a5796a7f02aedace2f226ab3f322 WHIRLPOOL f2dda6480ff52253771671e6834b2f938699cd5de01ddf08beeadb2129b0248041ee258bef0ae7d902cb28d23c758917c53a2dcd3dd0501232908559636066c5
+EBUILD html5-0.27.ebuild 478 SHA256 b5cc8f77c1775ee2d377d912d2d914c01601b89dd41d112e50aaa7590d89ed33 SHA512 d721ad5a3bc7d77581ee7cd9631d5ed22254f77afdef0b7a7636ad059093a7747716bdc355be5a56a79a213aa7eb88451f35e713f41a6b2c342e2c831dea80fc WHIRLPOOL 7e3cb6f70bb405ab6543fc0d836f61656755b2b329ce74f782636994b7a851da756fe49a75fb362526e5e75e6d26722463e5aeb0a95cb170d3579f72a3457a99
+MISC ChangeLog 532 SHA256 6debd12607ab8e7229a9541d96069f91e2a56f63d1eb1c45d550d6df5662787f SHA512 ef441d8e44d0ecdae720c3c124c060777635097e5f0992367cc52da1e9e8ca978d6b201e1b62502dd68660ac45a39eaf70291c2ebda6d637c26c9567a52303b2 WHIRLPOOL 6dab255ba8f9f9de08a061f070aa3714eb8fff41aae3ae485964d004276ca3b6252692a3a1a59d5d78749a8059cdadc93fb2147f7e623a258a943120c396a8a0
+MISC metadata.xml 425 SHA256 c97b75b38f9cc6aeca212e14a6b465d6c6c556955d65b9a51d279adc92078027 SHA512 479faa9e818287fb3bf7142f5d0bc61cc04fbf3d48b67072d2c03245c482fb07cb63f89b73498f9049c11d4dc72a97fe8c4096915da9e73cdc245cbac99ab7a9 WHIRLPOOL 3d3bfd784642e3ff3896a166c931cd82815a7609fbe0bb13d6c87508db8c34bd99253367052b9f01cacba8aa07f92e69b1ace467db139d5de0a0f4da8ecd8f44
diff --git a/app-vim/html5/html5-0.27.ebuild b/app-vim/html5/html5-0.27.ebuild
new file mode 100644
index 000000000000..55a9c26d55e3
--- /dev/null
+++ b/app-vim/html5/html5-0.27.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: HTML5/SVG omnicomplete function, indent and syntax for Vim"
+HOMEPAGE="https://github.com/othree/html5.vim"
+SRC_URI="https://github.com/othree/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+src_compile() { :; }
diff --git a/app-vim/html5/metadata.xml b/app-vim/html5/metadata.xml
new file mode 100644
index 000000000000..3222f677d0df
--- /dev/null
+++ b/app-vim/html5/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">othree/html5.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/increment/Manifest b/app-vim/increment/Manifest
new file mode 100644
index 000000000000..849dd57d13a7
--- /dev/null
+++ b/app-vim/increment/Manifest
@@ -0,0 +1,5 @@
+DIST increment-1.1.tar.bz2 3058 SHA256 b8fc54ce0d8f3dd562849bc5f33814a0dad8896eb21af77d9e6e6493fe9a9d0f SHA512 eae4fd492c02e83556646df35c57a50c07a09ea3c9cca0c8d8e15b8a49b621007e3952c23dc997d99d22dd8352852d98332180aa299ecdd4e53ffdafdc6b7a30 WHIRLPOOL 5880d563bdf0f1facfd8bdf13d767f63e372096a3a4b587403ad7a55845d1a596cd2ef988eb91643fc1e7f25e2f33e80a89255fbf5312fa05a442e621ac75cad
+EBUILD increment-1.1-r1.ebuild 378 SHA256 cc14772d68a62e0738f3b9432f60740b4b3d40ce84e75672360878756b170c30 SHA512 4d4b7e7c514e3bfb779d3d35ac3fbc0c39f10f316c7273498037ecbce61381c392d4caaecf62c1c482ba7414260f844b70c106e5f96274708422898ee57f427e WHIRLPOOL 260bcf7cff1e34cbe2bbc5a3a7502d75d3d06ef498d3b9bcab28fe7cff47e83fa08987b7fe7e95f1b49bd3df64e8d9f3c14f0777b4e0dd4fcf8bdcbdac4e9a16
+MISC ChangeLog 2809 SHA256 c3e3b346cd253618e5da985fd697c893d1b40850cfb08599947348ee03f814c4 SHA512 6a96eecd5183dd8eca03d26342210bb880e7692f713aecc2c5f2fc604042663e1a75577f5905d042db1948abe5232e891fa117963c0b00ee33f31e111f4e1dbf WHIRLPOOL 9478fad60fc069edd7e69d281ff58987ec0d108694b4e7d2bb51507ab02ef392789e34dc40de20d61331759ffd9669f670aa9cf039b383f416135cd53db63814
+MISC ChangeLog-2015 1703 SHA256 1f0ce942764548fa30bbe00b1d8a6d80a44404a49746707e710e01628da555eb SHA512 c7e53e0e80e2a7f8202b8bb16b4880eacfa6fb59d4bc2efe412031568345f9df0f52e275a7c40e87dbb9b15f511dec4ffd7f39e5adb10e41daa1af9813d78292 WHIRLPOOL 1562e36db3118ed9ff0f118836b814bddfdb6f12be42ad57656c03ed9ea179b722b8a20d8598ab1c9f2080460757296798aed755a4ce9f687b1f55f88c059359
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/increment/increment-1.1-r1.ebuild b/app-vim/increment/increment-1.1-r1.ebuild
new file mode 100644
index 000000000000..25c0c7e7989c
--- /dev/null
+++ b/app-vim/increment/increment-1.1-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easily create sequences of incremented values"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=842"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="increment.txt"
diff --git a/app-vim/increment/metadata.xml b/app-vim/increment/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/increment/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/indentpython/Manifest b/app-vim/indentpython/Manifest
new file mode 100644
index 000000000000..793a2fff8bc0
--- /dev/null
+++ b/app-vim/indentpython/Manifest
@@ -0,0 +1,4 @@
+DIST indentpython-0.3.zip 2682 SHA256 0e6e16f80e21d173d6f9b87efcb7d2027026d8e7125156a01a9367f7a9489baf SHA512 d358579357d5197dc035816b02557b8e84d5f0c85fb6433d171b9880e211dee75ef6f5fd7a37651677591c6c31a570c39094d6bbd5052a29ef344ec18b0e13c5 WHIRLPOOL 976555635d61360b55deb975c78ccf079eb17bf66595babf6c307f0f7eb0e5c68fd9a26abd85d7d5181942524388ef3dfe7795767cba19e2097ec77c7859c5b8
+EBUILD indentpython-0.3.ebuild 449 SHA256 1c791480548e4eda3c74d1e7febb7e885bed3e04c3eabf671073b48e2aff2528 SHA512 c378174dacf9d514a2eaa3cc6b5714a9c29e58c30daca71c92f4287a1c6026732cc06b5c1613c520c79267d7a69c106c520ca2f84b06ce5d92953ee580490f39 WHIRLPOOL 527b2ad8f6d246193c98f578591b1d0d7ec0f14a9f47d5417d5f8e0d3db5b97624b715deeb7f21233f3b2c64cda0dc842ce5fd3537532652f005873747e13486
+MISC ChangeLog 707 SHA256 c712fb81b15c5ce881155d62fc3a437b241aaaee443c33c17e5e15329eeff453 SHA512 c7847b0a5e305664c1d832eb80d61a69db9868ce7553782390e1de519d1510950920eaa0b8f23ac3285238a795b7154c7e0c665473159f763ed00ff8ba15ac4b WHIRLPOOL 6aaff442dcaf2f478beb8d44238590e1134e24107cc4db6b6d5b731c535080482f34b362cb9c1e9fecdac7f3470b73ef36aa39e82c0317ecc001d38515439829
+MISC metadata.xml 437 SHA256 2f765b8adea76eb180142f1dffa06213d46fc588137db07c86ae94df2ce3a231 SHA512 a6dc546a8b543e5e568f0dace43860187d1ea909b614ade44ecf3eb6cc03507b77fd4f62da85284c191b7007376ac31ca9933171983df84b5da04bfdb8424ac7 WHIRLPOOL 5780c63147d55c18952d6cd8c5248f0ce6bda1f51067902507bf2e901a01328dc02c6eb5a2485af67b5fa529d864b7ff81a4945068ff7016951d7c7edc0ee7c3
diff --git a/app-vim/indentpython/indentpython-0.3.ebuild b/app-vim/indentpython/indentpython-0.3.ebuild
new file mode 100644
index 000000000000..ec5e9935e3cd
--- /dev/null
+++ b/app-vim/indentpython/indentpython-0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Indent Python code according to PEP8"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=974"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
+LICENSE="vim.org"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
diff --git a/app-vim/indentpython/metadata.xml b/app-vim/indentpython/metadata.xml
new file mode 100644
index 000000000000..a4ec1d420f91
--- /dev/null
+++ b/app-vim/indentpython/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vim-scripts/indentpython.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/info/Manifest b/app-vim/info/Manifest
new file mode 100644
index 000000000000..0c9d7a389430
--- /dev/null
+++ b/app-vim/info/Manifest
@@ -0,0 +1,5 @@
+DIST info-1.7.tar.bz2 3958 SHA256 c7fe167853d12464c13b5e67d40a2e3a4126c9ca766ce05b45348c94cea06850 SHA512 8d1d00b844a7485544fe02e17a3938a08b25be8cea7cf9f5e139be5b1f1f1b37abed8d717e149154d7bb87028f4d7e94b1ded844a6f83e8e645da2a214eaa81e WHIRLPOOL c4c09479b4698c082ae94d30c27f7123de81b866355c7790fabf025362c80bcd79cdea908d4e3c8ff31bc13c328bac7152f0d49756bea5ed5efe24ffc6265302
+EBUILD info-1.7-r2.ebuild 635 SHA256 38effbb70387572bca956e0ffdae60afca85778f9c702ef9a187fbabfcd22be7 SHA512 07caaae100964922f67f01892fef1ca37247b5b6b9cd40928b5fbccd6690cce487ef03ec3fbd06ab072bc18fd617cf70d7352408f37bad8af0900892aa78c7b9 WHIRLPOOL 97de64d6b14be6a39dad040517bc080dcd3cb831d98462fe2b7aedbd3d6efe8b9dc55eb475f7e3ef543e60047279c46f282452202996bdec814d3e3c2bea8adf
+MISC ChangeLog 2911 SHA256 99a1d3c3eed65625a4a50f24c5810b182b238ebabee430db05e17123ee5bdcf9 SHA512 e5e51cf298fbf20d5e2d15697bd1416d35d6047af03f260ab99a2cf4490d4c64b552b2d48b544e808368305d0d90639088f6a201b10cb61ecb31ba5ed7f6ea9d WHIRLPOOL 4a40fcaa6bf51462efd3549e7ce80985483e9b6fbf351427f8e454f5a47f24dd93368f046f71f71b8fdd6c837f7db377c7cfe000f932e3680ef0a11653a95935
+MISC ChangeLog-2015 1749 SHA256 29bebe680ef6068e2011d87a39afb5038190b06ac1217f7685d4b1bbb5d2d758 SHA512 031854b2ee56e6a476cadb770e1c13fce9c6d024af00d6a038352f473634b9c2b92477c0b8c11edf2886ba264d14b068240b073a4c7feb9fa9554a1992923692 WHIRLPOOL e942e5389e0e5585b0497160703e31ff8219df7294b6d745d82f9e3c54f7e0e41282885c259a3ac1cca1ef48884c370e5e1f4e09cdfdbce32b9f314701f51995
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/info/info-1.7-r2.ebuild b/app-vim/info/info-1.7-r2.ebuild
new file mode 100644
index 000000000000..fdc870f23c28
--- /dev/null
+++ b/app-vim/info/info-1.7-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: GNU info documentation browser"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=21"
+LICENSE="BSD"
+KEYWORDS="x86 alpha sparc ia64 ppc s390 amd64"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT="This plugin adds the :Info command."
+
+src_prepare() {
+	default
+
+	# The 'h' key is a bad choice for help.  'H' would have been a
+	# much better choice.  I sent this suggestion to the maintainer,
+	# but no reply.
+	sed -i 's/\(noremap <buffer> \)h/\1H/' plugin/info.vim || die 'sed failed'
+}
diff --git a/app-vim/info/metadata.xml b/app-vim/info/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/info/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/json/Manifest b/app-vim/json/Manifest
new file mode 100644
index 000000000000..b6fcc582ce86
--- /dev/null
+++ b/app-vim/json/Manifest
@@ -0,0 +1,5 @@
+DIST json-20150511.tar.bz2 8620 SHA256 9975f164569224a242c17392f94ad7b7e4768f56b0f7cd44979ca9319ed3b581 SHA512 357ea8ea298c6e2758db75e54334ccdfcd43d3146f032c816756688f35ff163dea99df42b9f1168aaac63e50e6ccedb85ff6f37f234e9faf72c53fb9e05c9b9c WHIRLPOOL a473798595830d8aad2de1190ba0d66abbdd1dfdad2e4dc5271340444e976fd2a24166a70b34e361ce290a0ab3d0b348281419b41bac2aab37c15fb7e44bd720
+EBUILD json-20150511.ebuild 314 SHA256 4dfb2599ab73793995fedeae1d024c7cce0821e9a0e42473c0eee052fc1919ac SHA512 e2250c2af2ed047e2ce1c22e9b46a39c0bbd384f0e6892c3748740f14e685df3086005125bdd02fbdc18f0e38a6cc5a4d04b348b37823b42f662b278c04d006d WHIRLPOOL 15d85d9043c16d3ca86193f81d0467a897029ca4ff22fe2befcb44b79ab606a5f123883348fcd980ade7ea72cfc94230b19fda07017a4e0e816597d7b32f8355
+MISC ChangeLog 2839 SHA256 d7938433672aab92be25d8fc63518b978c17367c7eaaa72d5b1708bc60510663 SHA512 ad01eaaac77e4690152bbbc21582f62c93d7ee9549b5bc9d6dfe810dc6de72a21cc949359d6e508d9058fbbd5e3c2b7f52443840bf53b053398fc16fbbc7f11e WHIRLPOOL ef0d80098bcfa5478c19e03519622dec300d873a6d31130c639c387cf3105bba5dedf921b132f98e6ab5fc9fde2d2a3289194a5764febf016176dbcb2e1c86bc
+MISC ChangeLog-2015 679 SHA256 c570302bf6c3c48585bb794d7789967b071b97140b58892fd6250a96fc2a5ca4 SHA512 bfbf651188d12a5eb2021551ad3b562d7749c7117e0f7dedd90d568c59fd16d24f7dddba5b7eff4a0fe5647b0b3d892a248b8a830c469c94fa4b2a75d8d27d27 WHIRLPOOL 07a0518881e7c326adc535df8516387085b3866ac2bb19aee866f800d280697cae9ded98212a549700edf32f8e956b0e0a294c3d9763344394315731a93a5245
+MISC metadata.xml 337 SHA256 2ea5809620882314f64fb26afc4b43d528e751a313e26a0205116445fb78b80b SHA512 5d1f6814b0a463d6b4a534a4d16b1c28d9a3ebcbd9f351ea03eca3731ee993a355053d271ea2f40cb35ae900a75902b1033866439c786a2427f973d93b90dfdc WHIRLPOOL a99ca84bbdf6faa269d6554afffbfdc96bba6d7ed17498b9a27324c98c29ade720ea44b7d32e96c8ec6ea4338a6d4eff00fb4b935e3ab6e36785ffa999e4e807
diff --git a/app-vim/json/json-20150511.ebuild b/app-vim/json/json-20150511.ebuild
new file mode 100644
index 000000000000..945e149aa0e4
--- /dev/null
+++ b/app-vim/json/json-20150511.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a better JSON for Vim"
+HOMEPAGE="https://github.com/elzr/vim-json/"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+src_prepare() {
+	rm *-test.* license.md || die
+}
diff --git a/app-vim/json/metadata.xml b/app-vim/json/metadata.xml
new file mode 100644
index 000000000000..853019aaa34f
--- /dev/null
+++ b/app-vim/json/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elzr/vim-json</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/l9/Manifest b/app-vim/l9/Manifest
new file mode 100644
index 000000000000..42018d4ecbb5
--- /dev/null
+++ b/app-vim/l9/Manifest
@@ -0,0 +1,5 @@
+DIST l9-1.1.zip 12363 SHA256 aaa47309c6403c3bc2b58c32aff085c2fd756cd24c6fedfdc89acd443b59e761 SHA512 75a593dd5bb7f6f3abcb6a915218755888d259ba950f3bef0f93eac189c5ed65e6646959c662a7ae9ca3a61fc80fc9e449d1590c718dda6544f86875097949d4 WHIRLPOOL dc81e3669b620b7bcef3ad37e97864eb6e0ff6b28b644e68648c5151b5974f2e951560cb44ba2deb0d9dbe81084a9fc2b6ed1aac33961f88ee7ca54b8976ba07
+EBUILD l9-1.1.ebuild 440 SHA256 0e0d97fca89768d89d00066113ec657031ed3142d2c30307107c17cb1ba34907 SHA512 fd7257a08e4b8af8c7c4be172bf415537fed849e9841aaf670e82775123aebdbf5a65664f64ed41208c3a4b86201dd5406c711156ff3b9aa4ee2435a200ea3aa WHIRLPOOL e0ba4826a2963678fff832903edc019c29645bca40d6062ba7b7fdf7097dfcc980eb422bf06b2c1f2e20591ae3c25bd4e2e2bf91ec94d491eaa228f047da7505
+MISC ChangeLog 2484 SHA256 3e4904b909bd268fcdebdd4aba86c54319102d4227c3625f0d283e7eebf23293 SHA512 84ca1dffcb5218013d6386593f685c2214dc0f8e837dc97e909336a5b5d07ebef5f85afdd338770c793e1c1fc80ac785d8904f42950d11e52a34ca5aca106d51 WHIRLPOOL d7604e844228f38ca1a42388d691112d4b9a2bc05f50fe492fe62bf66c7eac5b070387d4f6f432e8523b634773eb079b089393b541eecaadd64861275f640ee8
+MISC ChangeLog-2015 541 SHA256 3c1a87c3ba72a7ded971dbb14196f036dc69a66b5f857f3aba39f661a70cac39 SHA512 d6cede1785b1c8b13df212cc08925e027c92b576becbb052e989dec28c8db993edfcd227aed1933d06c56efc6f67ed0c18702770bf2f07b70547a219df325a10 WHIRLPOOL 6324946984b3f6b921c3c48d81c87151a7a5e2e6600f178b32697e9a4f28db442942126136394ef79ee4a7805fc2f81018d56c49090e538a64ac2e89c9b2dac4
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/l9/l9-1.1.ebuild b/app-vim/l9/l9-1.1.ebuild
new file mode 100644
index 000000000000..e3cc55600081
--- /dev/null
+++ b/app-vim/l9/l9-1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for vim scripts"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3252"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=13948 -> ${P}.zip"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
diff --git a/app-vim/l9/metadata.xml b/app-vim/l9/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/l9/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/languagetool/Manifest b/app-vim/languagetool/Manifest
new file mode 100644
index 000000000000..39cc5f89317b
--- /dev/null
+++ b/app-vim/languagetool/Manifest
@@ -0,0 +1,7 @@
+AUX languagetool-1.29-script.patch 1413 SHA256 0893cc1c3362376db4c7c09e2263682a87bd02361407a17629dbd720558dd2cb SHA512 b4e25e527a8af3ea5fe649bd31aa0ecf0f073a0852f1f155ecf2cbdc58d105ce114db8a12dc56ee086a9076cb15e5bde61e7340e570fff59093ed2f266247564 WHIRLPOOL 6cf5e1f99903a8f5fe0dea7d3d6b0dc02270b036aa3a62b0000993d6531a5f2ac316af3b508b542d5741dea028addcce5a95f6d108a3085c25ccfd37d0cf6535
+DIST languagetool-1.29.tar.bz2 8059 SHA256 92fd4bf94c65828f1c309da5257336a2287c07cae7ab6a4709ae1b79dcbbbcca SHA512 09b5bdc1d3590afe26578f687064a7a62493a11fafca903759dc1e9048cb22a04c6352127b13e4a63acb867d73d943b56fcae7f733350626f05b66a6d1f1626d WHIRLPOOL d5c8d411b465fdad629493e834d154e7e3a25898b20bc009c4ff9977593ab46ca6e0f6f57ae7933da08b9f7283ebc793106a4eb31a17d670050a94f27a2f2af5
+DIST languagetool-1.30.tar.bz2 8089 SHA256 b99b27e06a43e5ea0c1a3d3e02dcef9b8339c55bd725782fd0ea4cd1efc0592d SHA512 c04115752f8a601e85b718ea8d68cbdaa7628d14c252b4bb5bd11449ae2c5558ddee3d0f3a1bc2db84364e127fc211a0c4fe51e4ff9b442ebe99aa4f9d1db935 WHIRLPOOL b65931b68dd4a47f8ba77cfb4e9a08c58686495a6d095cddff7acc51c76969ec60c51f207bee73b5614fddbea95d35152c334df29f6f956d39c57335636a8fe8
+EBUILD languagetool-1.29.ebuild 418 SHA256 971cbb7b5f0856f79e8b5c85bfda57bd2e4f4a705b4578e5831cb8ad01cb5c99 SHA512 d61142c4b3f38863dda68ba06298e18e2f8a1406e1c6dce5586e13357ed4f203d5cb8a7a87f48a600f24d2d6ddd1120b4cad451c46390a5b3c38fe26812decad WHIRLPOOL 5137de115a04a3081300182c66645de5adf731f614e8d87b6695ae721b2e1bbc6ea28c381a02d60475087b28a463e4b5998d076434311a52d980eccdeecbdfed
+EBUILD languagetool-1.30.ebuild 424 SHA256 e5b27ad8a338427e6dbfc04a363842b3cabcd6c5788205f566e8e7bd69611e5b SHA512 288d763f49d74c4e29aef2684d6b02649ec6bc5f42b900df799e788faa00f5dac21932c69304db7110ab393097ab927a801be3c1281154e740a27a3312a25364 WHIRLPOOL d561eb3944b2805619efa015a2e7fc565d0b9c1f91f82b6adda3a5386e2b9ada9d652f27fd96d3f320040be7bfd6582ce0606976dbfb4f0cfd04b3669a5d75c6
+MISC ChangeLog 564 SHA256 497d9e2cfbe958da4c69ee55fa19b76fab39fc3579a56f1a488d7f2abf67f625 SHA512 1130a5a7ddccabfa88044ecab5dc03f7483e3a0c9e2f24641d3cdee70bbc6583dd537dd0e072a69454e44548b930108380680e27844f09016be68b437b389c7f WHIRLPOOL f50d6b33cadc7c8617d1e8b414b7a4966cfea8454d7a09c6e3dcea46e27a0b840d47b49c368e0427deadd820ff25cce35a7eaaf96cebe06ba4532aff731cc216
+MISC metadata.xml 255 SHA256 fa2495381a46939e915222bc4f5e8c1e704f336ca63c064a2a63090c79b0e5ff SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167 WHIRLPOOL 0e543ebc68a9501374d42528b31fc9d94ab416939eefc6cc37dcf033d0ecd85397ec58ab67e02d6a08b2f4c0048891d441a2b217075e4596ffc25d5b12cc8ec8
diff --git a/app-vim/languagetool/files/languagetool-1.29-script.patch b/app-vim/languagetool/files/languagetool-1.29-script.patch
new file mode 100644
index 000000000000..f2737feca8c9
--- /dev/null
+++ b/app-vim/languagetool/files/languagetool-1.29-script.patch
@@ -0,0 +1,38 @@
+Use launcher script instead of directly running from the jar file.
+
+--- languagetool-1.29/plugin/LanguageTool.vim
++++ languagetool-1.29/plugin/LanguageTool.vim
+@@ -162,23 +162,6 @@
+       endif
+     endif
+   endif
+-
+-  let s:languagetool_jar = exists("g:languagetool_jar")
+-  \ ? g:languagetool_jar
+-  \ : $HOME . '/languagetool/languagetool-commandline.jar'
+-
+-  if !filereadable(s:languagetool_jar)
+-    " Hmmm, can't find the jar file.  Try again with expand() in case user
+-    " set it up as: let g:languagetool_jar = '$HOME/languagetool-commandline.jar'
+-    let l:languagetool_jar = expand(s:languagetool_jar)
+-    if !filereadable(expand(l:languagetool_jar))
+-      echomsg "LanguageTool cannot be found at: " . s:languagetool_jar
+-      echomsg "You need to install LanguageTool and/or set up g:languagetool_jar"
+-      echomsg "to indicate the location of the languagetool-commandline.jar file."
+-      return -1
+-    endif
+-    let s:languagetool_jar = l:languagetool_jar
+-  endif
+   return 0
+ endfunction
+ 
+@@ -242,8 +225,7 @@
+   let l:range = a:line1 . ',' . a:line2
+   silent exe l:range . 'w!' . l:tmpfilename
+ 
+-  let l:languagetool_cmd = 'java'
+-  \ . ' -jar '  . s:languagetool_jar
++  let l:languagetool_cmd = 'languagetool'
+   \ . ' -c '    . s:languagetool_encoding
+   \ . (empty(s:languagetool_disable_rules) ? '' : ' -d '.s:languagetool_disable_rules)
+   \ . ' -l '    . s:languagetool_lang
diff --git a/app-vim/languagetool/languagetool-1.29.ebuild b/app-vim/languagetool/languagetool-1.29.ebuild
new file mode 100644
index 000000000000..b02abf5fdebe
--- /dev/null
+++ b/app-vim/languagetool/languagetool-1.29.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+MY_PN=LanguageTool
+DESCRIPTION="grammar checker for various languages"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3223"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${MY_PN}"
+
+RDEPEND="app-text/languagetool"
+
+PATCHES=( "${FILESDIR}"/${P}-script.patch )
diff --git a/app-vim/languagetool/languagetool-1.30.ebuild b/app-vim/languagetool/languagetool-1.30.ebuild
new file mode 100644
index 000000000000..ee2e5b4a7705
--- /dev/null
+++ b/app-vim/languagetool/languagetool-1.30.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+MY_PN=LanguageTool
+DESCRIPTION="grammar checker for various languages"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3223"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${MY_PN}"
+
+RDEPEND="app-text/languagetool"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.29-script.patch )
diff --git a/app-vim/languagetool/metadata.xml b/app-vim/languagetool/metadata.xml
new file mode 100644
index 000000000000..84f8f1cf6bcb
--- /dev/null
+++ b/app-vim/languagetool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-vim/lightline/Manifest b/app-vim/lightline/Manifest
new file mode 100644
index 000000000000..bf4767befa34
--- /dev/null
+++ b/app-vim/lightline/Manifest
@@ -0,0 +1,3 @@
+EBUILD lightline-9999.ebuild 547 SHA256 d4c50a3f477d8c069252004e3cb0011a4497cc1b429dc53389cc85bf8ad3722d SHA512 66111e246aa0b2ca377e8d327c73ac039d6b54c1b35002d2fc53835c7fd8d4d0d581d2e5d76f911f116da48cca19ecbc7d2a0adaea24e45d6fe225c4723aba01 WHIRLPOOL bebf6c7088e71491eeb428195a8fec8db20624b938878f1c3261fbd6428baa9099698c39a69e21d1efe747c8e741a9ac138a6ef0f59cd1f4dfeb760c138f8cd7
+MISC ChangeLog 397 SHA256 7cfaca201b48b535c25b69e2c9f589383b52ccb57c8e5623bc7f638e32abbaaf SHA512 8560b9b9fffedefb36c2e61f329851a19c3c1728dcb91aa89489b5457a909eb3a768b5a293a30ef50b06923053bc6890400eda502c61974345996fb8b36dff79 WHIRLPOOL 7648d9f4cecd324de8cca2dbbb0f0820a76bb921d73d16637b97a0ae2810deaa52276729ca92ed88ba47679d93691fffe853890301c746dabbb56a05ec5d5d13
+MISC metadata.xml 430 SHA256 93c08172d95dfa3aa5d3ceba70d7213e015c6e5d4e085e5286fd82e5dc8310ea SHA512 b6fcb4818bfab07af559ff67912a956bffa0908ce29a91913088b86b7bea38e023ca1d407cacb30e48598e6d5fb5b851b72196eab5fbe7aa78362b976da535d9 WHIRLPOOL 88abf56518a20501ce3b47c7a5fe416c01b54f3be2953cac10429ff410247e19063c2a5a81430fc7488446601770753880df8929811a540ccbad2536e4c55201
diff --git a/app-vim/lightline/lightline-9999.ebuild b/app-vim/lightline/lightline-9999.ebuild
new file mode 100644
index 000000000000..0aa89f109984
--- /dev/null
+++ b/app-vim/lightline/lightline-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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/itchyny/lightline.vim/"
+else
+	SRC_URI="https://github.com/itchyny/${PN}.vim/archive/master.zip -> ${P}.zip"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: A light and configurable statusline/tabline"
+HOMEPAGE="https://github.com/itchyny/lightline.vim/"
+LICENSE="vim.org"
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_compile() { :; }
diff --git a/app-vim/lightline/metadata.xml b/app-vim/lightline/metadata.xml
new file mode 100644
index 000000000000..3e87edaa71f7
--- /dev/null
+++ b/app-vim/lightline/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">itchyny/lightline.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/locateopen/Manifest b/app-vim/locateopen/Manifest
new file mode 100644
index 000000000000..c034557c5e77
--- /dev/null
+++ b/app-vim/locateopen/Manifest
@@ -0,0 +1,5 @@
+DIST locateopen-1.3.tar.bz2 1925 SHA256 0db60ec03324034248d5bd1b2233965e2d337b74c60f472120699cd47f60d57d SHA512 93d1f89eef3b877830a01a0fa609855108e3415836128d27f3b66fa6e3c57614a81e0cbcc984e39e0353883b7d8fec86c73f77a4c3f10a1cb8183b8be21a6dbe WHIRLPOOL 1513d5c8a6a96bd4e38163dd48eb3da0b18c079e53970c0184bd879fec21b3a7be9dc6a0e903c0f9ec97f46c2294923ccdd2ddad2ba07bea8807fb1562891c07
+EBUILD locateopen-1.3-r1.ebuild 788 SHA256 fcc4b7d44b4515694b34425dbd5302c1fb7ac5b138bf5735271fbcc16de3af9d SHA512 8f809e118b4196c2f48eaea8bfd871100e78fc2cf17886339cf9b62301604a4751b69330efcb7e134b64d4c8fba4b24e33e13859a8152528cb5f57372a668f51 WHIRLPOOL d2a9bead383b1aca2ead6c3a1d9b41b499ad83b5eeb427436153d43e21bd2d5502a4c76165270d37a1217bc22f1d894443eb3c73c3704f79cbd4387430837c2e
+MISC ChangeLog 2948 SHA256 b0d5300ae985039548516d5a578ec0b258292766b3148722c79bb6496cb7b673 SHA512 d22821d9320f5a6d992f1941b7bb4bc32dbc1f9ffe2502acb8ae98624b6f096cf74152642d0a18baeba2cedb3037fded671b3d12ae8247074fd1a8054c0a889f WHIRLPOOL 6d9c05b2fcc3f4ffa5e5c61059ae0f0bd9f507568242abe19aca5bf75537abfc760d668f1f17904c7a69abf00c7b9fe991f5c4399300ec632fd37c204686401d
+MISC ChangeLog-2015 3642 SHA256 f413e28cfc926919782954687b9d6d3dd247b1481589e3bf7e9b31c6680765eb SHA512 48a8eca7215f0bb3172239f07ab2f5948b5f4fb895ec623dd21abe6315a97d7caf93b9c7279e3f6a9b0cf668126313ca575b2048ae40e64361077b74e6a3d71d WHIRLPOOL 1321f2a0ee593432fd9e864dd349a7be823b9c43b6306c1872eaa3b1232557147e7c7b8c8f14b601248e705cc7939efbabd98c257b8ea61b78b40d2c067991ad
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/locateopen/locateopen-1.3-r1.ebuild b/app-vim/locateopen/locateopen-1.3-r1.ebuild
new file mode 100644
index 000000000000..cbc60e662756
--- /dev/null
+++ b/app-vim/locateopen/locateopen-1.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: open a file without supplying a path"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=858"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	${RDEPEND}
+	sys-apps/mlocate"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides commands that hook vim into mlocate:
+\    :LocateEdit   filename
+\    :LocateSplit  filename
+\    :LocateSource filename
+\    :LocateRead   filename
+To configure:
+\    :let g:locateopen_ignorecase = 1    \" enable ignore case mode
+\    :let g:locateopen_smartcase = 0     \" disable smart case mode
+\    :let g:locateopen_alwaysprompt = 1  \" show menu for one match"
diff --git a/app-vim/locateopen/metadata.xml b/app-vim/locateopen/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/locateopen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/lustyexplorer/Manifest b/app-vim/lustyexplorer/Manifest
new file mode 100644
index 000000000000..a1dd498c2bd6
--- /dev/null
+++ b/app-vim/lustyexplorer/Manifest
@@ -0,0 +1,7 @@
+DIST lustyexplorer-4.1.tar.bz2 17098 SHA256 7030fa17b5f51afda72184382eb9a211dd5de16d4c5541d0a1b6a8e588e39f38 SHA512 2f9af8c40f93333a4a734722a6ac6532fc05719165d730ac10bb0b3096a769a7a5fc2bb02fe0f457563b9ada69474265b1de6d5b3e2d9ca30503a704be496a86 WHIRLPOOL b558dd70212ad3dec6b49f7a80fecf3b24bff39ad983e527fe217f61c1a47f292ded8155856e751b0726d3815e8e7950371686a173a89b87e94426cb48884183
+DIST lustyexplorer-4.3.tar.bz2 17373 SHA256 acfd2e16778e653d75ff6d5823d799f27de1a7af2045eb09788798659b1024a0 SHA512 24ffa1fe5c1698dfa6093c7cfed2f08540ce130258df5e8ec135356ecea4c1f607f11e643ab859f551e63ecbbf6fc8a615a9514e1d4798b752cc97146c29c661 WHIRLPOOL ab55b1450c2cfb1ef434fa51f9959691b4ffaf3414dae1f0ba43a4eba720054886414bce3bd9136334b79c932f10529dce9c7cb9dadf6fc08f523394530f029c
+EBUILD lustyexplorer-4.1.ebuild 840 SHA256 ea78e66e3b2057788c457d14cd302a0ce4db27c2a8ddf6a4ae610c439639c71a SHA512 7d0d188de896ad6be8e1f985c96dae0bb147c82500c3a7d7e839e2411adf4c9939723da829bc14dff30839a066980950b448c18945a577b4cb2e6aa4670e3a0f WHIRLPOOL 10d00afa0a68f618de7b2f80ec3d91ac1b7910fd7b81d1d309f641e2ae6f95b26e8f5beea323bfa9bea12dbad0cc406e31f1334d7f7acd4c3d862ac2a5863dfd
+EBUILD lustyexplorer-4.3.ebuild 840 SHA256 ea78e66e3b2057788c457d14cd302a0ce4db27c2a8ddf6a4ae610c439639c71a SHA512 7d0d188de896ad6be8e1f985c96dae0bb147c82500c3a7d7e839e2411adf4c9939723da829bc14dff30839a066980950b448c18945a577b4cb2e6aa4670e3a0f WHIRLPOOL 10d00afa0a68f618de7b2f80ec3d91ac1b7910fd7b81d1d309f641e2ae6f95b26e8f5beea323bfa9bea12dbad0cc406e31f1334d7f7acd4c3d862ac2a5863dfd
+MISC ChangeLog 2500 SHA256 24966ad37be1f72d7731f87d69cfe2df28355318a840e044f91148b968b54863 SHA512 0cf4bed995b8be05b1de227ecacf9010694d35d4242fbb2e3910086b3216c2262316301dbd918fba34271167f8421e5af9022a851ab2be5f438b685179508c91 WHIRLPOOL ee156ea6abee1eeab8104bd7fc3f14b5d54b8303296d893c2d9479c4e39c619da1087e7af967f47600fb7d7e1bd508f7664ae5d182b48988b205fe0d4178e4d0
+MISC ChangeLog-2015 614 SHA256 f8e344c701f36f9d653c995f9a6f6fd5112642f558d83d1e36725f7428461adb SHA512 3bc6ad0ec6c8a5587d66daa91ef521c6ae6b5079b762986bfeed59ce2790261891a840cf0afffd7b9be76c7fe93748fc31e9fe42cd932568241920292bd7571f WHIRLPOOL 628f6f3eccf49675270e024e88668e6ddada67ff01622cb15125f62133cb6bd6c2e1b19a664703e60816c3d9b689f37d94498101c11605ff961ac6e138ab0479
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild b/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
new file mode 100644
index 000000000000..563cf2c9e83d
--- /dev/null
+++ b/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
+LICENSE="bufexplorer.vim"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="lusty-explorer.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+src_prepare() {
+	# There's good documentation included with the script, but it's not
+	# in a helpfile. Since there's rather too much information to include
+	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+	mkdir "${S}"/doc
+	sed -e '0,/"$/d' -e '/" GetLatest.\+$/,9999d' -e 's/^" \?//' \
+		-e "s/\(Name Of File: \)\([^.]\+\)\.vim/\1*\2.txt*/" \
+		plugin/lusty-explorer.vim > doc/lusty-explorer.txt
+}
diff --git a/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild b/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
new file mode 100644
index 000000000000..563cf2c9e83d
--- /dev/null
+++ b/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
+LICENSE="bufexplorer.vim"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="lusty-explorer.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+src_prepare() {
+	# There's good documentation included with the script, but it's not
+	# in a helpfile. Since there's rather too much information to include
+	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+	mkdir "${S}"/doc
+	sed -e '0,/"$/d' -e '/" GetLatest.\+$/,9999d' -e 's/^" \?//' \
+		-e "s/\(Name Of File: \)\([^.]\+\)\.vim/\1*\2.txt*/" \
+		plugin/lusty-explorer.vim > doc/lusty-explorer.txt
+}
diff --git a/app-vim/lustyexplorer/metadata.xml b/app-vim/lustyexplorer/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/lustyexplorer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/matrix/Manifest b/app-vim/matrix/Manifest
new file mode 100644
index 000000000000..9452d9640647
--- /dev/null
+++ b/app-vim/matrix/Manifest
@@ -0,0 +1,5 @@
+DIST matrix-1.10.tar.bz2 3365 SHA256 8561e69ce31934e6770ed6af71106330e668847d8cd04db0e51fea26ccac9c66 SHA512 9c268ced7b0a7e3117c88bfe005236f1fc61cfd74fa10d46318b739fe61a97f7bd856d125d69cf599a79efb8fb181d8876641cda65ae5dc80e4c650e7430fa85 WHIRLPOOL fd37835d9dd57e82e0eae9e409456e4c959907d259b1edcfa45cec10d96f296068a606d04bc0a89497f84204a9694510bde9d4cd7ba3cb989b01491332e1f22d
+EBUILD matrix-1.10-r1.ebuild 430 SHA256 ce3802141d34e20eb2b24b2cd221dcb294ddfc47643db26ee7eaaa5eaab2face SHA512 c7f0dea64717581feb89950b10f10a9958d3857d20e9d4731620fdc4c33cbd3c1cd183024a38f3623612fc320de3529af819ab8c4c883d18e53d2e11a246f942 WHIRLPOOL 9b83384e34ee5531ec60d7ec66ceb73e9284196ce0aafa9fcb8964db5fb5b08550f0ea57e7a9f0aa8019f85e80b5cfe0179a58128d3d11e16e46345e08c02b40
+MISC ChangeLog 3101 SHA256 1de35ee970a6e4054b7a44582738cda1d95900ba06c2d1057605715c86efb3b2 SHA512 5976eb571d74bdd834864a2ebf362fdee75166c6a09ec0534e4c6d1e0f6ecf7cf3a132f58a225260d772eda3cc7f0c5e93968a0dde1057037ef9405c81c4e29c WHIRLPOOL 4cc9d280046c224aa06484a2e2a6178fbf3f6a6c2ab7d55b93bf1aa3c4afdfcadb7fc4d0b931fc397ba8f00d351c585964171017dc09b65f06defac355ba92cb
+MISC ChangeLog-2015 2537 SHA256 be04439fe5b3be40e8320d4961aee2614ac189902cff2ae0373bba1035883797 SHA512 355803376415c4bef2393c8c8ed3a82afaf53bb0ff3968ae1d842aad1af0df878a0b4915ae6fe06e04abfd372c50677a8941b247a465ffd22e6b2c5633d2988e WHIRLPOOL 4b7e127fcd77a0c596c0c61c83fb39a1eb3c27520723f8f0cc8a2564cef2bfaa24f78dd53874ea5b1d3aebf89f6dafbf336c080c572e816f69a4004991916ecb
+MISC metadata.xml 401 SHA256 f641f238cc7b65b63345e4e6acdcf27711ec630a7b5affb30ccd2527cfc63d1b SHA512 62867793f995b355e1dbb336bb5e2f2622ed6ee9467dead5b813c29c5667e4e1888c6c3ce09a2896acf31e95f0a849bce49529c959a4a209a871497fa8a9b614 WHIRLPOOL e9b8ed7e19d62dc232bcd751cea783f496d9d6ecd77cf96db508294f0c14d7f6f0b57ba0f9ca9fc61d641360cf36f2e25cd4a7ab34e1295bd42b754eca2933ad
diff --git a/app-vim/matrix/matrix-1.10-r1.ebuild b/app-vim/matrix/matrix-1.10-r1.ebuild
new file mode 100644
index 000000000000..bdcbef0f2021
--- /dev/null
+++ b/app-vim/matrix/matrix-1.10-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Screensaver inspired by the Matrix"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1189"
+
+LICENSE="vim.org"
+KEYWORDS="amd64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides the :Matrix command. To exit the screensaver,
+press a key."
diff --git a/app-vim/matrix/metadata.xml b/app-vim/matrix/metadata.xml
new file mode 100644
index 000000000000..185b552dd34c
--- /dev/null
+++ b/app-vim/matrix/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		A Vim plugin which displays a screensaver based upon the falling green
+		symbols seen in the Matrix.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
new file mode 100644
index 000000000000..8c7404083f9a
--- /dev/null
+++ b/app-vim/merginal/Manifest
@@ -0,0 +1,5 @@
+DIST merginal-2.0.2.tar.gz 15048 SHA256 e1f5030dfc30cf7c2c98f9193529c385c86def213ea2bc36c3feb5feea789a59 SHA512 fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721 WHIRLPOOL 5101f0040f608370296fc57ab5b61be281c5190f9957dfbeb553714fa983434d22e8b866a60457a633e8ff89a4a49f4629bc20d47d310669708464065b966c9e
+EBUILD merginal-2.0.2.ebuild 606 SHA256 1b25c78c97afb4c33d8ac73c27d4547969fea46aff96e522c05a38da272dfe80 SHA512 a6ce247cb63895e38bc8ae65256ebe9e0d40e2e6bfbb2a49aeba81cb5b2b34ebf16441294caccd46cee24dfb9d969dcb7dd03b7471ca956694000aa74c8ad00c WHIRLPOOL a2b102e2e89265884f23ff6d7335c01e0e6ea91fe82beef51dc7c77ec8a42ea8ac4662dfe6dda5c87e0a348c413dee61917ef09af58524d18dd156a4562f6613
+EBUILD merginal-9999.ebuild 725 SHA256 2b9da031324a8c8a787ffba51f75edb4d2c437bf68a8db0236f1b088ba62f14f SHA512 07723127315f34c04686248fcd3f4cc6598f055fb014d0b8aa7954fa45c439f694274a9daf531821fbfa58c2ec641e49d257a0cc6a49de94d8d57643c5de0363 WHIRLPOOL 04a1f22564fec2aa3c72848228688ed4a4301fc40c90d307f4b875d96985d8a944d43e05f6a9001ce4c7a09d41e1a6d188d09fa356d24eb98452fac74575cd4b
+MISC ChangeLog 1013 SHA256 68c6ad3109ac0cac53c4c2d7abf4e018e8d7827344e8bc1910bff252d02510b0 SHA512 71635bac6454ee0f8bf8be28d9d4a2ef513c7883993cc863026c0fabeae60335b9ad4282f47781d5bf1214fe237e234f3c52c14eca4907a77d838ffa5688148c WHIRLPOOL 73103ce5d9e51a6e084fda72ba574196613090731233e97add26616182b5bf75a02f7e22217b70610ec5ef2e2ff211906f53c08d878abaaa7afc2bc54be6592a
+MISC metadata.xml 345 SHA256 64293a95b48d1d9c7468ff16713a596deca735a98e781aa8aaca93a706cb6fbb SHA512 c86f966d8b95d7ae380395af45af1046b3102e4c921f5a4102b4d421c707659b4e5aee25765b8af1e815cb5274963bdcae482cc4700d3196259e62ecaf6919ce WHIRLPOOL a3528486823d2993f156eafd1b3702c6eca615211a88c6f71193f94b9719f9be39811ff4adf87a69507379d3026aee0f01c0f69291ff2bb14769891cf45e2063
diff --git a/app-vim/merginal/merginal-2.0.2.ebuild b/app-vim/merginal/merginal-2.0.2.ebuild
new file mode 100644
index 000000000000..a6860bda0a0b
--- /dev/null
+++ b/app-vim/merginal/merginal-2.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 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="http://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-9999.ebuild b/app-vim/merginal/merginal-9999.ebuild
new file mode 100644
index 000000000000..642e1deb87ae
--- /dev/null
+++ b/app-vim/merginal/merginal-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 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}
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/idanarye/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
+LICENSE="vim"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+	rm README.md || die
+	default
+}
diff --git a/app-vim/merginal/metadata.xml b/app-vim/merginal/metadata.xml
new file mode 100644
index 000000000000..bd94d1ea0754
--- /dev/null
+++ b/app-vim/merginal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">idanarye/vim-merginal</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/metadata.xml b/app-vim/metadata.xml
new file mode 100644
index 000000000000..df7f60378d9b
--- /dev/null
+++ b/app-vim/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-vim category contains plugins, syntax file and spelling
+		packages for the Vim text editor.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-vim enthält Plugins und
+		Syntax-Pakete für den Vim Texteditor.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-vim contiene extensiones y paquetes
+		de syntaxis para el editor de texto Vim.
+	</longdescription>
+	<longdescription lang="nl">
+		De app-vim categorie bevat plugins en syntax-bestanden
+		voor de vim text editor.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-vim chứa các plugin và các gói syntax cho
+		trình soạn thảo văn bản Vim.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-vim contiene estensioni e pacchetti di sintassi
+		per l'editor di testo Vim.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-vim contém plugins e pacotes de sintaxe e grafia
+		para o editor de texto Vim.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-vim zawiera rozszerzenia, schematy podświetlania składni
+		oraz dodatki służące do sprawdzania pisowni dla edytora tekstu Vim.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-vim/minibufexpl/Manifest b/app-vim/minibufexpl/Manifest
new file mode 100644
index 000000000000..784f5d2694a5
--- /dev/null
+++ b/app-vim/minibufexpl/Manifest
@@ -0,0 +1,5 @@
+DIST minibufexpl-6.5.2.tar.gz 32119 SHA256 9638336d41a3550bb82c5b911ac23178d1df72438c3f140450fbd3d4a7f2d148 SHA512 325fb58b025392c5484574c4988ec95eb7374a10b67a4abe28857a0ae8d768316ef4d477b51bf442ffc1bcfb5f68dfd0c924731291b155192731055fed3569d1 WHIRLPOOL 66bfc0fe5787f45cec84c75479d648a62a02cb1e3922e77c4c844f889a3388732bec8775fdd5636de83af91ade33cba8e22f8e5f77961d32c004d819f0c8e0b7
+EBUILD minibufexpl-6.5.2.ebuild 556 SHA256 e2f6123c9978c5c0c1c437283fec070c6eb4c06efc2afd6bbddbe2c70d3a6ddf SHA512 d2e2392d480e3f29f25dfd2e32d4ae0748005ccaa67e625145ec0129cbfd238befe475dcbf65df961f55bfcc3fd96db52e6a3c63ae2cb7eb932781dce24cf314 WHIRLPOOL 799f54f09dce060fb0084a3aa409ccafaa51fb4ec5f4878886f358cf308c18e287cf3da08fe93c15f5241ebdf841dea93a729b98356d7330754fa9f5d6d2a1ff
+MISC ChangeLog 2774 SHA256 bee4f9e286b7d6401f2241812e5e8ba25bc575490d7b63f42c691878eefd3309 SHA512 2c46f6f901f24950e354f10fbd0b8fd5e87c61f6c740a473306bb153df78a93bd643ad7720f4800e3181cd789247027df4beaa733c76a75df9053ff738e09c40 WHIRLPOOL 00a2a1f9a777583a96f877456f4900a2578678b27a374c0c832138d6a2a07a6ea405cfd16a0782fd789c0376beb318f10c058730ba646f0cb6c06e8dacbf93d5
+MISC ChangeLog-2015 5303 SHA256 7b5c62f7a05597ac42ab54b1af130c4c95d067fa2feb1b78183c854056b53c0e SHA512 09b796a1556acb4b146e39e941ba2fb5392c3fbcd85be24439b0e85682e4323f3aebf25453b312fa3e974c73baaf9e57b268c8ccab22be9590a83c6209df6be3 WHIRLPOOL 361c4a502134ae6f16b5536080046857d5b8412f7d76a09f36052af8c82be958b7c3e4e64ea871b82f1d5503c54de663da6f2c3072ed79bee2731185ae2ec024
+MISC metadata.xml 348 SHA256 df1a5767f6b6b23a938e97bff91d2adcffe987e6d1119675c5dd71f511a629f5 SHA512 9e05112037982ea5d6cf6b3b63fc0782221cf2ebc9e779baabe56f3463c2bb436fd7d0de4f5afac67ec59d12913feb9671d640fd78689efb16eb8aacc87beefb WHIRLPOOL 6ef5783a37aaa4dbf97a7eed8182d85d8753d901a31032be7f39e58c3203930bb2b6664ba178e6ee442180243326194e57f6d2367eb65f9cc99ebfef90f7487f
diff --git a/app-vim/minibufexpl/metadata.xml b/app-vim/minibufexpl/metadata.xml
new file mode 100644
index 000000000000..d75188e58923
--- /dev/null
+++ b/app-vim/minibufexpl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fholgado/minibufexpl.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/minibufexpl/minibufexpl-6.5.2.ebuild b/app-vim/minibufexpl/minibufexpl-6.5.2.ebuild
new file mode 100644
index 000000000000..ae8944a0310d
--- /dev/null
+++ b/app-vim/minibufexpl/minibufexpl-6.5.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="${PN}.vim"
+DESCRIPTION="vim plugin: easily switch between buffers"
+HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
+SRC_URI="https://github.com/fholgado/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="bufexplorer.vim"
+KEYWORDS="amd64 ~mips ppc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	default
+
+	# discard unwanted files
+	rm .gitignore README.md || die
+}
diff --git a/app-vim/multiplesearch/Manifest b/app-vim/multiplesearch/Manifest
new file mode 100644
index 000000000000..add35392a930
--- /dev/null
+++ b/app-vim/multiplesearch/Manifest
@@ -0,0 +1,5 @@
+DIST multiplesearch-1.3.zip 6500 SHA256 4de3a1793c9169eb085179011a7358b09291b18ab6302f5151d2547b38963313 SHA512 015e5744c0b0c496ca9263c901f29d66ea8edb75de6d39eb5b4956d977b1714611fda199be730fd77f6a9c0ceb0fe0cd74744ba3853b747f33bcdc8af92e7235 WHIRLPOOL 91fc7962bf9da68815fc458959f44defa52a62e2a06204868b1ddaee842bf21d2f285463e0e698a61184ca3a000c805e719c005aa23ae64c11ab4f2bd1d9117f
+EBUILD multiplesearch-1.3.ebuild 487 SHA256 30e8dd6fff6a2865503f3589092ef8797819daf3b3025bbf52187a5458d081df SHA512 d8bd57e5c61545f34401986c6050ac4e0768fb05cf8b02afb8c39625ddd30461c973238d555b5898b6d815c367a9bce537766d3281de7c6448c045ce89a05f78 WHIRLPOOL 2cef647657e0bda60d9a1a36b5e6eff0417fdd4b5590f22b8c655900361ccea077c7cbd84206d24ad1e36b797dd65ae56bce6d805e888b2c90301d127ba9760b
+MISC ChangeLog 2532 SHA256 7991c09919d6cba297dbf9434effe3bad063edfc32332095e73f7386451431e1 SHA512 5bf633c5f060ff431d888b0c745b93adb872df8a5c9f7cc4e59502e5023a6d8648b6d4dea92596e876d3e3edd45707767d62d4ea59b05c9a06f1d04849eea47f WHIRLPOOL 7220ee1f9f747b95502a49e007293f284156162c91f9da04b169d404a30421d7f131d8173210c458cad1dc1e288cb5d7f7403ea9f6e24611a6b24b5822c7d07f
+MISC ChangeLog-2015 2598 SHA256 5b913d844d1e8bfa888cde669048cf61c747cadce24b73921f4abd68e6e17374 SHA512 546458f1f16be38e3e71383fb2c8daee2587ab5b9bb5e86d85bfc1044ff2fa3c705ffb17187c30dd2fa966de916054f7394de84519ad9074ee608fc57e3441bb WHIRLPOOL be92cb8e80e837dee49097e30996ca4666f5fdd6fedb6bd2224b9415f76c11022a666a414d07ef3ddd08835f42c9f1fc8fa73f851cfd1497132fb929b340850c
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/multiplesearch/metadata.xml b/app-vim/multiplesearch/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/multiplesearch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/multiplesearch/multiplesearch-1.3.ebuild b/app-vim/multiplesearch/multiplesearch-1.3.ebuild
new file mode 100644
index 000000000000..c497fda29fc4
--- /dev/null
+++ b/app-vim/multiplesearch/multiplesearch-1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: allows multiple highlighted searches"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=479"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=9276 -> ${P}.zip"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="MultipleSearch.txt"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
diff --git a/app-vim/multvals/Manifest b/app-vim/multvals/Manifest
new file mode 100644
index 000000000000..589519bc2739
--- /dev/null
+++ b/app-vim/multvals/Manifest
@@ -0,0 +1,5 @@
+DIST multvals-3.10.tar.bz2 12299 SHA256 d7ad86cf8f0d80f0751fbc6b4a65a6cfcd496117a5ce73e62fd8cf436026a8d1 SHA512 6003b7fd2c16ae7b6ee400482aead44a5b7867d9e010d689b1b25452f78f4a84335a257eef56deba241fae8967e57b877132693b1ded1b4b01c0248da472152f WHIRLPOOL 71fbaf964091cdb2058c4069ea646a1b65f4361130722d1e0424bef2dbae9f3287f183515a8fba80981a5dd7acb94930dded95dea03195c1fe0aa0f41e92db5c
+EBUILD multvals-3.10-r1.ebuild 446 SHA256 c66d81ce48ca717f638927bf28143746976a79c53b5ace1efae3b85bde499a93 SHA512 5aee147503af3117fa35e7f3c1b6793d911a29348a64f1fc926338920f91e428beae9c5173cdfdce00a949d49833af38fc74d1ae034b68cb37b39a5503e5268c WHIRLPOOL 572f0c0fa0d7a783c49c4114a8008c2465c8ae6fb244d9d53bd4cd21acf214aee93e2db33fd6a04a289b47b9d300eb4f5e30af1688bf99924a85b129c7e63500
+MISC ChangeLog 2722 SHA256 586389ceb414b0b5602157c696778831376eca654d4fbeabda675fe9e118b7f9 SHA512 bd038adbde2276c390cae451fb9d69bdae50a12573840177e41fdfd14275b51569fb6923e60f27f6a33d8c0b7d7b86e1ea16eaedf18f1195bffb5d4063b90112 WHIRLPOOL eaf85fe9db8bfcefe1a8d22e00cf59e02f07f336de00ed850ae62fd299aaf64d1a273148d6d8c79777d6def7519f2ef6800dd5fd06ca70453b536f32b6c42307
+MISC ChangeLog-2015 1705 SHA256 54184adaa5f3da9e8c2242645f1698a28a983a6f0c1908d140eb15b5de72f0a0 SHA512 79f2b31efdf634b83dc9a4b1645443731bd4b90b08566fcd2ae93146ca0d23fa2748cb841e2a78127c88c3afaeda960751c644060a1b21ba64d4ef92bbad3647 WHIRLPOOL a1649d5e58a8479cad621a456a16bee0e462ecc9b1d44a23eb8f49577f0678c646cfec52375f1e822f522a91313ecb6598110085bebe27a5687a47aaa7e14c46
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/multvals/metadata.xml b/app-vim/multvals/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/multvals/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/multvals/multvals-3.10-r1.ebuild b/app-vim/multvals/multvals-3.10-r1.ebuild
new file mode 100644
index 000000000000..b4070481b61e
--- /dev/null
+++ b/app-vim/multvals/multvals-3.10-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for helping with arrays"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=171"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/nagios-syntax/Manifest b/app-vim/nagios-syntax/Manifest
new file mode 100644
index 000000000000..47b260bde507
--- /dev/null
+++ b/app-vim/nagios-syntax/Manifest
@@ -0,0 +1,7 @@
+DIST nagios-syntax-1.8.tar.gz 1737 SHA256 83976725d00e3d346456a1d53755552622f1c01b501a266064919071a8b1fb31 SHA512 53a17c521a66a42f0082e6a963059ff96ed5f899e2be4c50ab68cbf237d1ca6bec8476b798b4a99563a8fdd6dc6ef632de19399b5aad12bad586f0cf0161f76f WHIRLPOOL 99f376c40dfa0a09915a986d305be629bb259c834a38cdc25e8276d5de92dfb75e62ecf8d913994488ab14cb16cf232f21826047589cc9bb0024efcc5d414807
+DIST nagios-syntax-20050105.tar.bz2 1721 SHA256 76ddf01aefe98d124a8c120c39060c6f374e8333cdd644d075f4e445ecfc3399 SHA512 4bfca41c7aac4580511bf651db67c0dc16fcdcb09137ba27ce5472be9e3695db0ac254dca370b0f3576ab58959cd0ca5235833e45b1186c6f6721ca3d5793c6b WHIRLPOOL b5727573851e7d43a8bd84830e58c8c0cee65316a24ad5fee7d8f2d1890cb5b2f66ea40e738b7182e5800e2710260a0f32b9a22dd8b365807361f1e7cfe98148
+EBUILD nagios-syntax-1.8.ebuild 562 SHA256 61fa8abea01398022fdbb689ac74f4392176d7d48682e0928e2a48a3548eb1b8 SHA512 bb18109c3d2f0af840f74ad2b7d53d58a0145fc6cc730f3b01d06f9f5bd31b0f15b4d22a03a8509bd6415247d463d6202342d358be8b81f8d705978b2f04ab05 WHIRLPOOL e24de5bdf8bafabd236e11ca566ca9757cf31e842bbf941e29f94a816cd1c5541334d2c2ccd88850250cb01f70149e44d4c8ff712832d0cbfefd2b57192e399c
+EBUILD nagios-syntax-20050105.ebuild 488 SHA256 e6422b7e81921974ec9e8d49988f2af2ec4976237dc9dd35b69ef1a7b3adeb31 SHA512 c72ec5d5a2199b06ea41439e06b12652e01ffde1959fdaef3e44a15ae6a3570adc77e13a20476af8c7c3c8ad87130589a9e413655af0859778d6bad1ab216861 WHIRLPOOL 5628a631c9ea66a79578830fe278204bcf60c40549217c1744c741ab092ff800931091d0f3509e019bc6954feee12880de054de30811575bf5642a2254f48e70
+MISC ChangeLog 2450 SHA256 91f3f86f8a8bf26ba64039c72af6bf6bc03e298c65f00d3a9ae82c5211689768 SHA512 2f197a351f84a06535761161cd759658a40027cda94b9221730163041126e9228901bc48e5c0f3f668db1b3054d1399d07ebbf07198d151b829007f090f5af7d WHIRLPOOL bce81ca312f63cbff188dd4835eb6d6afcfe738fd662888434eae0e5573efb6e6739d9323c69a9f912b7dc9bb2c51dfc7647c9eef3b2f5f3cbd8bf03f35c4aae
+MISC ChangeLog-2015 1753 SHA256 099a5a31fb58a557b59bcc81c10678accc10c8555c1271eeb60623c34446c8af SHA512 44f4d0e660a4953425852b8ecf5c223b38ecfb2980c81171bbea81db6565805c93454ce74255685a479f810e2e06036ad4726dc3eccb28c92ec4265741b6f673 WHIRLPOOL 8cb3d825663f5c2ace585b63c4bde9536572d336255f85ffe79061b3e952869c879498e3dd18888e6362650913381e93cea19931142a8031ffbe4396f890c523
+MISC metadata.xml 452 SHA256 d53982a4d72af65f702e5ab958c36805584326a53c11dafd9689c6a62fd5ed34 SHA512 9cab1433b109d4ee6a223b5da40a276e330cb97ea4a48a570e399ebf939de36623f052bd222c0f957cf3c7ddddd7c380d2b5a711867be32de059006d48d85b9b WHIRLPOOL 3899b74c702b8667dec92a7d2095474e82c7bcf09c68798d37aab46dc19580a374fe5fc44e7fdd120123fc929db3dfac6dac960d9bc713e567ad67ef2e330b83
diff --git a/app-vim/nagios-syntax/metadata.xml b/app-vim/nagios-syntax/metadata.xml
new file mode 100644
index 000000000000..c9bbb2b6e814
--- /dev/null
+++ b/app-vim/nagios-syntax/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package provides Vim syntax highlighting for Nagios configuration
+		files, and automatic filetype detection for these files based upon
+		filename.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
new file mode 100644
index 000000000000..d8cbec98c140
--- /dev/null
+++ b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Nagios configuration files syntax"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2261"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Nagios configuration
+files. Detection is by filename (/etc/nagios/)."
diff --git a/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild b/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild
new file mode 100644
index 000000000000..8b221a14b087
--- /dev/null
+++ b/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Nagios configuration files syntax"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2261"
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Nagios configuration
+files. Detection is by filename (/etc/nagios/)."
diff --git a/app-vim/neocomplcache/Manifest b/app-vim/neocomplcache/Manifest
new file mode 100644
index 000000000000..0aeb27f21e99
--- /dev/null
+++ b/app-vim/neocomplcache/Manifest
@@ -0,0 +1,6 @@
+DIST neocomplcache-7.1.tar.bz2 73724 SHA256 82286c44115e3181749259402876e17f742a40d3f1cd47f0f1cce6d2c1432cbb SHA512 1ed17243722055a08bfda6b3e5524870d55377dd5998cbc5677f673974eebf5ee4019975e6b66c12c8ce5ff804d5c1512e69b7f53f56c1bb6f87638025a3210b WHIRLPOOL fc9345818579a300be55333a14e9003300050075d929e95aba7503980524fa9c77f7e4f7c946a456cfd9bd012f4dc8ce5d647d40f479980384eb09a84212ecc0
+EBUILD neocomplcache-7.1-r1.ebuild 414 SHA256 11d877a95a5e79dfe579a3799e61b8ddb759158aa1608aba531f24b3cd748cdc SHA512 68c1940406ff21a772fc305ce9b356247032c8c7bdfb92313b049eacd206c42f0f8a6ac9c9d0a80ae9f6bb3f4b3bfa818646b6fa86469aebee9e7d4ab3ac0b9d WHIRLPOOL 6d99c0b121bc7dba36746f37b78a200913b15cfe63dd31adaf0ad09d12c565b3265e47bb1c44e24e5c14fcd3aadd712d9a045eea188bd4d30a7da3802a43a82d
+EBUILD neocomplcache-7.1.ebuild 335 SHA256 d5ccde3e6006f2fad6e325cb804d65e79eff0d400a72a800f6c96ba899cd4cdc SHA512 2c715a8cf0f4a57198d22e0be61829f724d784ab947e03d84f0e605093e3f79117dd0c16d80a989c5cccca72d01196ff4afa74d7ac16d9df7f2e3d101422b695 WHIRLPOOL 652acf112de9f598e8ae1dd1016ed7c68ca61cb0a6d04efad8d47f7a7e2c0ccbb6bf5d5a7fc40df1f1fbf394f1d2cb4808dee90830f368f0f98a97a52121447b
+MISC ChangeLog 3149 SHA256 2aab5cc0550808bc44b27e5770ca2084e4d6298b961352ceb4db26268d872d46 SHA512 9308d0255f74b1e381f2b3491e9f2bd6f130045ee8f93233cb4fdf1850b404a85f6b7533122128b1e2420c2361953a65603b2ae5a225487e83368a1622a69f73 WHIRLPOOL 16c1506fc71e239be602337e4b4725816a40c6e7c24bb247e4b7416394ab02e2452f58518c7592085c65d5cc2b667422f530af32a649320149e457b9855b9105
+MISC ChangeLog-2015 962 SHA256 7e74f45871227bb9f1607899937cd82ad3179951262a03d158ca9867d661eeda SHA512 b3658d0bd2ab33e24aaf54eecd3382298403ed2a4d150205cb73fd6f5cf9c8fa4066e2503f93cc23fdcb366915689a4963126f3c90b520765b3d9531eb500bff WHIRLPOOL 22cd098636d77e886d7018a2cabbe65943e06f9f3b742a801eb621cda460a4bff6ae3962fdd88b57ee63cd105ef4467d15699ab7b796d0aad20ac81da3946ab5
+MISC metadata.xml 349 SHA256 ef7fd6fb02c6c7898d96fddd7e6298755c5e9beccaa214895fbd5f171b87ec79 SHA512 2fbc0b0ecbd013d0c7dbc2e4cfe560d46beecb157052c05635c25d9ebb836a4969879b121a07c429699d454350ddb2aaa97cdcc0e9a5e36d52eea2964df392be WHIRLPOOL 1fb9288939ba8c45cee2428604554f1a3a437ec26b9a0c9315aa782369a43f4d1dfc6b405f81dcdf804bfb6ee2b0a09fea49d1fec3f23f1aeecb32787785ac97
diff --git a/app-vim/neocomplcache/metadata.xml b/app-vim/neocomplcache/metadata.xml
new file mode 100644
index 000000000000..077f19f1d9ba
--- /dev/null
+++ b/app-vim/neocomplcache/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vim-scripts/neocomplcache</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild b/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild
new file mode 100644
index 000000000000..ae2a54cd75d8
--- /dev/null
+++ b/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ultimate auto completion system"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2620"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+
+	mv autoload/vital.vim "autoload/${PN}vital.vim" || die
+}
diff --git a/app-vim/neocomplcache/neocomplcache-7.1.ebuild b/app-vim/neocomplcache/neocomplcache-7.1.ebuild
new file mode 100644
index 000000000000..127f58a1c2c1
--- /dev/null
+++ b/app-vim/neocomplcache/neocomplcache-7.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ultimate auto completion system"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2620"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/nerdcommenter/Manifest b/app-vim/nerdcommenter/Manifest
new file mode 100644
index 000000000000..34d7bc0db2e6
--- /dev/null
+++ b/app-vim/nerdcommenter/Manifest
@@ -0,0 +1,6 @@
+DIST nerdcommenter-2.5.0.tar.gz 36834 SHA256 c6611cd24cf7c9c9aee49f14f6060495c39d29e69030d5dbdc1525d6ba2b6ac7 SHA512 8616f56d90dfe2fece0a82b888700c4c762c75b7d1cd30e32a3294d1fe7b65d506a13cfead534ae0f11a2384593d246a723e9a0042421691a5d6fb44969e7ead WHIRLPOOL 88e1b2fd26e1598c411e482cb4e0969a33829d361031efa280ee896ed45f2892aa6198333cd802f8a24bdd75dd1840e3e5e69731b4f3fac37dd11cd2c47a6bc0
+EBUILD nerdcommenter-2.5.0.ebuild 699 SHA256 537a5374f1016c79ee884f3d07d19e3b51e6e15326fdbf7a0a5f585248f86873 SHA512 a43f10dd49bc6053e5e19ffd42b6e950014163c547589815c87febe8cded36de01090d7c18020e7089c23f665b21576138550dd81092fe2ad9d0a630806c26d7 WHIRLPOOL 0e1f3aad79087c62845f12ba4d9d026455425ba7ed1d36a3c24b56a077b7767a0c02ee1ff939f2fc1c8f6b32687b132b54bae475444011d90b1947a2c5c209ea
+EBUILD nerdcommenter-9999.ebuild 701 SHA256 d39dc34893502ee75a0e9345e8c27713754b58ea4489e3fd9005c9865bbd8e70 SHA512 e40856f26fece304c3c0075d084bd04fbc896e455b7996bdafbf4c02012d487a753b0ae771c7cbf1d1f5e1eba0b50b7e17cce5f15cbcf432520b1ce8b9ff19d2 WHIRLPOOL d6cdde82e99724ff9adc9466043296aa5132ab05c9dd59ab97517dc057e31af77c6653ae6ae5967322ad7e2f3da76ceceb6337692c4203652798bab984617017
+MISC ChangeLog 3284 SHA256 061c1b766dbbdbf817a0724dc59159bfb8511981a8ca987259926935ae1227be SHA512 3cdfbe8c056a911b0f8ee88469ca5beb640a45d7ff3add1675daa6441446c8e3e75d4f57738e0390e69432d9e7833b56d38b161a58ef9483b445f7f2c555f75a WHIRLPOOL 463f8819d9870062934e463fc70f9e932cbd332f3ae048cdba7f840a653b72540da45600ac0f0586dad1886d47523c41a44e40784bd97615622abc8dc53f0b78
+MISC ChangeLog-2015 2033 SHA256 4e01e44cb29b6886ecc4acd345443d3c9b1ae11605e6fb6fbb5ff0c427b3b898 SHA512 4c2f16f641d319b26864a2c7e0cd71145230289efc05a321ff3a0f90b7f1ed16f53ade0dd758d0ca04bf4db541d4a755ccf3e650ae7640a7cb571ffe602ac0d0 WHIRLPOOL d28c1c315ffeffed386fb55f2dd66c8b1bfbdf73d6246c545ec4bc21ea384152b8f9bb0c033693cfcfe540ddb50d88800efa833da90a452c3b5fdc81f170e5e9
+MISC metadata.xml 338 SHA256 3f8e81798e4ef5ae5fb7f23983c22b911b7c9651e19adcc83c8d3fd1890744e3 SHA512 fd7585ceac792841d94bd11039d0f2367ecbb2a5d297213b6679aecd22a3f64d64f627421e3447ae6f01035bfb1ab7208b5d0c53a9d402085c9c5bf48b43eedc WHIRLPOOL 2ec2f89ba0126ebd52953f42cc5c6d9eaaeac49327fae555d2e79c66cb8f4b42883ac78dc2220bdacba66e362f194f74bac4ce60aa5fb04ce72121e903ff1e38
diff --git a/app-vim/nerdcommenter/metadata.xml b/app-vim/nerdcommenter/metadata.xml
new file mode 100644
index 000000000000..d44387bc0e20
--- /dev/null
+++ b/app-vim/nerdcommenter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">scrooloose/nerdcommenter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/nerdcommenter/nerdcommenter-2.5.0.ebuild b/app-vim/nerdcommenter/nerdcommenter-2.5.0.ebuild
new file mode 100644
index 000000000000..5d0f89e4459a
--- /dev/null
+++ b/app-vim/nerdcommenter/nerdcommenter-2.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 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 http://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/nerdcommenter/nerdcommenter-9999.ebuild b/app-vim/nerdcommenter/nerdcommenter-9999.ebuild
new file mode 100644
index 000000000000..5d3f9f95e5f9
--- /dev/null
+++ b/app-vim/nerdcommenter/nerdcommenter-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 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 http://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/nerdtree-tabs/Manifest b/app-vim/nerdtree-tabs/Manifest
new file mode 100644
index 000000000000..b29efdc016e0
--- /dev/null
+++ b/app-vim/nerdtree-tabs/Manifest
@@ -0,0 +1,4 @@
+DIST nerdtree-tabs-1.4.7.tar.gz 11135 SHA256 010cb1115f8bd3ea82a231dc480a51f70d215234e4661c0fca403e2e6b92cbb2 SHA512 f11172f0f64628752c7b523c7f65864a35b57ac83c966dd765402489c52b78c6a86bca65b99f788f2abf0b3d489e188dcfc9e75b342818dacbae221930aa6449 WHIRLPOOL 4bbee97f516a38d982b633c87f5a8b588543a16f3b29fa8a0389c5db4a3cf6ce5fd7ecf03d0bc95791fd604917838773fb3d68f6c9cc60159017c24cf0c8fd21
+EBUILD nerdtree-tabs-1.4.7.ebuild 505 SHA256 3a8a038a25d2e7672a81a366d242a0b423d6aa90f007297ef7a2c7fada1dfcf0 SHA512 31fb9e6a514fd90aedec1784c655584618b52ddfcdb4beba3bc4cad7450fdcbdcae56c522217b4388970653914fd2cb2dc4eed5feb4ea9ca494f4a4ca3317953 WHIRLPOOL 9bfd287eee734788fe2f461a849096704b251f991219f25fdf764af60e5799a85f0ba28d5606ff361e77e1054858242e07d72ebfeb9da0e30970b8a4a5905bcb
+MISC ChangeLog 648 SHA256 f3f27571416a4c41bd9e7b672bf70f24c59503b04bde26c72b3053518361e274 SHA512 9cb71d85cad4e42d1d6738a0635aa0135a7ed1071b32c1a6a9b9d6ac4e14f02eb83ec0ec9ba943597847c448938181e8bc914276aa08b3a339a2fb8532febb38 WHIRLPOOL 3c08967f0dcb231b1c68a133e3c214ab7f772969189d8a43f486da059ff0470b0b3b37ef8a2e985a6a24eaa5a9c4e57471431c5120259ca4d7fe6338bf9c38d1
+MISC metadata.xml 432 SHA256 0f9658021973469ef29640a767ce92a1ca33ea237c17ce9ba240c32e4d09ef87 SHA512 52c60fed04ea58d04749f4c9c645b252b83b4b8ddd0b6b813329b2be250e78a2f7a55c71a737288cd1f832922da54f5ea7eb5ac0bc3b3350494f7ada6e480b39 WHIRLPOOL 7cb339203b84d515411e1cc8da160526b68b568269f0612509f8389e36da75bdc668813b2b24d8f60237626393e8177b715485f471220d31351607d2cbe94ef3
diff --git a/app-vim/nerdtree-tabs/metadata.xml b/app-vim/nerdtree-tabs/metadata.xml
new file mode 100644
index 000000000000..345b182b51ca
--- /dev/null
+++ b/app-vim/nerdtree-tabs/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jistr/vim-nerdtree-tabs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7.ebuild b/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7.ebuild
new file mode 100644
index 000000000000..85793d95a23d
--- /dev/null
+++ b/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: NERDTree and tabs in vim"
+HOMEPAGE="https://github.com/jistr/vim-nerdtree-tabs"
+SRC_URI="https://github.com/jistr/vim-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-vim/nerdtree"
+
+S="${WORKDIR}/vim-${P}"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+	default
+	rm LICENSE README.md || die
+}
diff --git a/app-vim/nerdtree/Manifest b/app-vim/nerdtree/Manifest
new file mode 100644
index 000000000000..d08bfcb6a3b9
--- /dev/null
+++ b/app-vim/nerdtree/Manifest
@@ -0,0 +1,6 @@
+DIST nerdtree-5.0.0.tar.gz 56162 SHA256 64ee6c672261aa5a6baafe45cfadf3affabe0b329166c75f10b84d68eaae5a3a SHA512 7de6e7978604e89e2c03cadf74ff4a57545ff73a643039fdfe76f277e773374b5b5f9bbd5d8f3307df4af867f88fc687f9bb5e28ff9e90d11fecdef8bdb83d1a WHIRLPOOL d1e6458500a52cd0b5afe277c1395c28acd6988b55357ace2fd6b3d2db6add489029bf8c244a21cb6d971f80b53090d74a02d30edf3eca0754f17736a88ab604
+EBUILD nerdtree-5.0.0.ebuild 522 SHA256 b8194ab61c2af3cc720bba073a1abd16f9134a46469912b2ffe2f51f807750f7 SHA512 cc20a2fbacc7677fce00167fe57312250b0b7dcaef6ce4a188c81d88d7486efee644881193e8505a8b4c50a8a958a88e6fe591b68b842d0235374368d3be2915 WHIRLPOOL 6a55e85a3cdd7c52bc08c4eb6c537b441f2f6033b9c37196730909183b84a0dcbae332b99a086440c27146ce1bb70b00eea5fa0ba92b95f51fe1d20c3c39689a
+EBUILD nerdtree-9999.ebuild 667 SHA256 4cdeb6491a25acb22c98b3f3b9e06f7d636775264e92e1beeec7e2f72ebd945a SHA512 4e93736aeeef6f91ce602f730f6eb4ba56e77b987580607cc71eaeed685ce54ca718d64bede1abeb35c006dd286dca05dc443c27b9d3b65814c0e401a6784392 WHIRLPOOL 93a4c32d9d0a7e18cceb26a88d7f9e3c19dab74da1ba7e974c36b8a774d853622c10ebe349a6416a7adede1dd1f219cf051c8d242fba664cc90786cb3b71f43c
+MISC ChangeLog 2877 SHA256 37e7af4907b3b871578cc0e3540334228b208336df896f89d2f21f7821dbc131 SHA512 6055c9c296a64f088ac065e75f4b719af4c2e03e2ffef8358d8496047990a080556c307da98f42da453be808aada2de2ac99b5ac70bc6f60d070bbcac06322d3 WHIRLPOOL 0df00326eeb7fa6ffcaa4e90877e8d4a5e0554de14c0b2cd76ebde857158f61e02822cb3be7b1c710b4977a5e824660c10c0708cfe3f31461f7d4492b31914e1
+MISC ChangeLog-2015 956 SHA256 f956aaca8e148f3dc9118ea19de9ae65efe9759d486c01b5db7702fb1b1c29b3 SHA512 c9b618853d300b95d0f5408cbd79ef5270d157afcc231c85e41206830fa006d39125fe3304dde9c42002c7fbf57e77d3615c5f25e1155f4e6e0c749f8f73dd39 WHIRLPOOL 2801c7c3cf573d75e4ec54821adf5147dbfa174fcdaa625fa3d055c989d2c4166abb9aa87c03c0af3a860d19668d3db900c4536db436ffa93ac19a2e791d15d7
+MISC metadata.xml 333 SHA256 895b506b4450d15c014f1f8b9a4fb61e99a021c6b7b38d045c75da503eb0f8d2 SHA512 703134609bdd4d7ed256d4c6e3f045fec2ad056d0348af8e97bf6513c5e63139ce0084e8ebca8fe56c925d5ad7fb7146256f932094ee21846a0f8915f0dc5dea WHIRLPOOL 596267a430e0a64a434eeb7bb3178265ca86c8d8249951d8e66ee17ac0302e08944ec5d5dbb11abda6753f8f16cf08050d41895ef247af5cd82bd718c1b84d71
diff --git a/app-vim/nerdtree/metadata.xml b/app-vim/nerdtree/metadata.xml
new file mode 100644
index 000000000000..4167319572b2
--- /dev/null
+++ b/app-vim/nerdtree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">scrooloose/nerdtree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/nerdtree/nerdtree-5.0.0.ebuild b/app-vim/nerdtree/nerdtree-5.0.0.ebuild
new file mode 100644
index 000000000000..c97d4f0cf061
--- /dev/null
+++ b/app-vim/nerdtree/nerdtree-5.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
+SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="WTFPL-2"
+KEYWORDS="amd64 x86 ~x64-macos"
+
+VIM_PLUGIN_HELPFILES="NERD_tree"
+
+src_prepare() {
+	rm LICENCE || die
+}
diff --git a/app-vim/nerdtree/nerdtree-9999.ebuild b/app-vim/nerdtree/nerdtree-9999.ebuild
new file mode 100644
index 000000000000..54290f4ae099
--- /dev/null
+++ b/app-vim/nerdtree/nerdtree-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 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/nerdtree.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
+LICENSE="WTFPL-2"
+
+VIM_PLUGIN_HELPFILES="NERD_tree"
+
+src_prepare() {
+	rm LICENCE screenshot.png || die
+	default
+}
diff --git a/app-vim/nginx-syntax/Manifest b/app-vim/nginx-syntax/Manifest
new file mode 100644
index 000000000000..0d2e30bc7f63
--- /dev/null
+++ b/app-vim/nginx-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST nginx-syntax-0.3.3.tar.bz2 5675 SHA256 1b729f6fb034750568fd7407192ba6787c998fad5c86ccd2d254a8392d4d583c SHA512 0142c9b825b9f9c262145c0d202651f020e5b3f3f3548ecbdd713cf66c5f7098b974e7d16eedfa9d722c2efdfbd9732097bf8b293a610a64c21571ec66a5886d WHIRLPOOL d32a86d52632127e0ce520bca3ccebc80e95aabe9cb3c2c673a41b306937e85165e8eed7b1a8b5cfff9da8396eb6f248c40a500bde68de8f88b2cb8e8dd77ebc
+EBUILD nginx-syntax-0.3.3.ebuild 354 SHA256 7ae99ad761515439136ce5249ddf3e1eb413999e3080bdc8c022d92974cbafb0 SHA512 614d05953ce2b24c92892f396ccc4a7504c23db68e5224bf69b75dcf2f225b180afd2a4a6d235f7d8df1e55fd23d391f57b23570de07e2012c89c13c36f6667a WHIRLPOOL c1ea5c9096e0919f3a9c7f229d9557cf1d15eb00ad544d9ffc1eb0a37d6fc0661d1cfc34a2c6293d91dd4f138b1fea322a61826f6d152a0341078dc3ea33436f
+MISC ChangeLog 3228 SHA256 859ab7f423f6d16636ced24d1d53b1e549a9dd139a2020bc1db195fd83395027 SHA512 8307a094aeaf2b16b733253ba0e5224346cfa819cff805e2a590c6e543ee191bd42b0be568ab5a1a7a47519bdc24f6026bf6ea4e893f6f8cd2532bf082787291 WHIRLPOOL c6035368b311e854762a67d0cd4b73e7c9f93ea1226e6f47da4ec22d793bbf5ddbb89fcbde400d3a8fd5e91e38d414da268c17abdc387f00c3311e1e5613026a
+MISC ChangeLog-2015 2016 SHA256 338a8f391d618343531fd8e6b7dd9432d0b2ee1f73ecfcb5e449e92d57655780 SHA512 0555979537ea0236bbb27dc9d04fa1f64a19ced50601b163d5508d6c895120940a4e6b091f247c7c60a4b268129ba2e2f9f5b01f068d00c27b830d6a09183193 WHIRLPOOL 1f237e630653dcbea070249ea0ff641969f949f07e0a3c288c8ac80f1613f0fd1ca1e1d8fc37b591e34f521b4064c8c42486a43783d1684a3d970a9dee665e57
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/nginx-syntax/metadata.xml b/app-vim/nginx-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/nginx-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
new file mode 100644
index 000000000000..49d15e20d603
--- /dev/null
+++ b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Nginx configuration files syntax"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1886"
+LICENSE="vim"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
diff --git a/app-vim/notes/Manifest b/app-vim/notes/Manifest
new file mode 100644
index 000000000000..add9fc1cb6ce
--- /dev/null
+++ b/app-vim/notes/Manifest
@@ -0,0 +1,5 @@
+DIST notes-0.33.4.tar.gz 239372 SHA256 2a118a484beac2cf6254efe81e6a0d5c1513e027f476df7be93e330ab957034e SHA512 7f2147e786582e69760c6d76d7144bc1fd0f8934ce6574184e16f463f5ca9c21e9e0fc87f88b56922b8195b26be7b0f99435cef773ccbc360077cf568b98b98a WHIRLPOOL f23428663a8b8ea8b5f817728f81165c7046fb4f9157cd37bc1603cb4f876b125d272d4df9333988c2f84ff70e6a753167d6e12b034629da387f143adbaffd05
+EBUILD notes-0.33.4.ebuild 688 SHA256 9902301ab79cd4b7eb99282a6e1ec8134c538d0840694b22ee037e304c0fc30a SHA512 e643ca31ca9124cc94db3727999fe66189233c2ce3985d66b036fa9493e839da7e053b3deba489be3aecf42371f8825126f79463d414fb418d1cd1c0f54640bb WHIRLPOOL 4c936da963e8c408bdf90e733738ad1567d3430063155d5413b023912acb10ec778f0cc3e44d0d2b7a06168a7f9dae1bdd89f6f783b90d46b3de189d767c8b15
+MISC ChangeLog 3187 SHA256 1033b479193242fd23cdfe63445583da6fc718b8c2276bf349c6b3b21b7462ed SHA512 df595918db0e35a0bb2183ff6279471f58af833f5c773dcaf16bacd4c0da73b8aace71d2bb1cec0c0a2135d2ecc4f6b05787fa30745b26ed8555428981bfbfdb WHIRLPOOL 32167fcde2184d262a99b5b2ca94ea38927e07875ce1f2a94d11c25a9b2c8ea71fb6d0049edd5e2ed2bc815b7bb2f8340b870e1f683fa9c6b97a1ebf3c1f4fb3
+MISC ChangeLog-2015 3386 SHA256 09f6b86adb2e96379729b6a58f9857c12e151820c15a60059f292818d53d87e2 SHA512 884623f1999d53fe036379a7b908a81036d6367323a5a766181d16d5eba6bc73808320334a9544fa8194107f3149ece09f490f5d762a684832ce08a25901c564 WHIRLPOOL d562c7bc94c5cf1c46cee90f97ed5d66b6f5a3cbf0f90ea43b63d513f5c968cf077804a02a90c36d545645ab1a09cb749c063b11c8e7b3936ce20e3bdb583931
+MISC metadata.xml 339 SHA256 23ad891d2ad832be80efe215609b41dbbe7d214cbe5d3e8032c126b1655f223c SHA512 ebc2c6981c7bb2ad9c8281e69d29203e5700bd5b930ee17feb16e5f1f581eb164971bcfc5584eb639404d70e2f13a3b8c51f4514759798ecc47ee8ec4776bbd1 WHIRLPOOL 9064ab1d4d528e9bd493a2a4e33f1a1f5a7d3146312ce707d98e8f73733645f6f68f7a59b5759b74f3a12c65d70b035906204b9d3f064e4a3e1447ae8032b729
diff --git a/app-vim/notes/metadata.xml b/app-vim/notes/metadata.xml
new file mode 100644
index 000000000000..2e0c837525af
--- /dev/null
+++ b/app-vim/notes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">xolox/vim-notes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/notes/notes-0.33.4.ebuild b/app-vim/notes/notes-0.33.4.ebuild
new file mode 100644
index 000000000000..9006ecc51f8c
--- /dev/null
+++ b/app-vim/notes/notes-0.33.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: easy note taking in vim"
+HOMEPAGE="http://peterodding.com/code/vim/notes/"
+SRC_URI="https://github.com/xolox/vim-notes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-vim/vim-misc-1.17.6"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/vim-${P}
+
+src_prepare() {
+	# remove unnecessary files
+	rm addon-info.json INSTALL.md README.md || die
+
+	python_fix_shebang .
+}
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
new file mode 100644
index 000000000000..c348effa9c76
--- /dev/null
+++ b/app-vim/ntp-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST ntp-syntax-20031001.tar.bz2 1636 SHA256 a448fd162591e87c8f36f49e136d151df5f20f2fcf36156d545d54c94842e9f5 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8 WHIRLPOOL da7228b3e92182ee76f2352b56cd007405535d424ac8a346f271ba4f0b19e8ab284e454ddfdfbc16393a30084cee0a4aef55b822fb637332f3193e3da70c58b8
+EBUILD ntp-syntax-20031001-r1.ebuild 446 SHA256 ace9cdbba9ad2e7be6a999d39844e366ad4b6897eb5df7febc9ec8e764af21c5 SHA512 bb5714f0b0ce98cc02b0bf8de5c4a83e2916fec20f79f5ca4358e9f98d1b327cd65ec2219722d1748e58afe8cf8016353e5ea412d6c6c3d18fb5922f206567d9 WHIRLPOOL c1bd712f1c05baf7cc927ac893d337e9124d92394abc49bf14e2b7f5da3285d38706cc623eae6b9178c85b9623a8fd9772bc25705fbb45eb9a453533d33b0aa7
+MISC ChangeLog 2618 SHA256 c0c35484cbb146ff075c52db02d1b4113d6af39a5fa033113db7b13ce9d4fe11 SHA512 5ed9801928ff499f83ccd45571f77279b1ca1f797923564adca8aa5b7d23644ad6fc135148c5ce88a5ead4f3d77f311789c5ca691c4c6991da8f976332bc6383 WHIRLPOOL 5be36dae86b3beb43b76a4c2725dd910ca2d09baa7c2ee1142290af787a0d43a45c0ec8385edbec4ea719c4b7b8936a09938c5c0411d1202550459431d0b8e99
+MISC ChangeLog-2015 2064 SHA256 d06daaa44f681672880313a57930a5bc35199ff0968ad66b58b4d868a20b21ca SHA512 f99ab1cbfe0ba9b3e4269bff4e39fc065cf640481034c1aa1affbb6625d0d5b5170a0a80865b4bd15a8fca6a13b07f6498b3ac7c50aed0b0605da5b1daa9f0e6 WHIRLPOOL 377d672494b63a999cc10b7a894ca15f7b537ca659b511e23ed82d9ee7170ed7c34f74cf6d7593eb6d0e4acae358f1db5a05db9bed35d2fff98d1860e4018990
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/ntp-syntax/metadata.xml b/app-vim/ntp-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ntp-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
new file mode 100644
index 000000000000..5cc7e21c7c28
--- /dev/null
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=778"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/app-vim/omnicppcomplete/Manifest b/app-vim/omnicppcomplete/Manifest
new file mode 100644
index 000000000000..f1193cd2babb
--- /dev/null
+++ b/app-vim/omnicppcomplete/Manifest
@@ -0,0 +1,5 @@
+DIST omnicppcomplete-0.41.zip 38331 SHA256 7f0f3e870674458548bf219cba70ae11a5a7076399ca3fc2380982b61fb9d2da SHA512 565703f0e21f818308dbfbfaaec981eb522621568dee5b021bb8fe243da464b1d7defa45dc1cc2ac3370b3b3c67fb39dcb0dd7a1535a4dfe2ad81218f4ac71f3 WHIRLPOOL 7c59b3f14d0727c9e157b26e82957b603dbdf324fcf8c98da50bf684a0c474f5c24ef1ca430a5802aa83d2e3e6b11cd66b8c6d54c0627e0dfeb6eaf73267ea19
+EBUILD omnicppcomplete-0.41.ebuild 530 SHA256 c25d215612f90230f214f9cb7f450313c05fce294689fab74661755087e37d60 SHA512 05f341d2a6458bf5ca2c46a40b2bc43cf4163510b9b48ddbd778cd70db42795f76b4f1ef8dc248dd221c1ebecf3b3135c0d8cfc82da5c7c6e2cfa3557c260b25 WHIRLPOOL e591296f4d8689a52839c474612ce92c30c35397d9b1112300f382b32e85ad6223c1492c4f2aa1ba2fff5c2e626509c1ae084503c942886a41cb546ec0c5d1b8
+MISC ChangeLog 2448 SHA256 2925ed2e876b46d7bf3d02e15ed070eeb84c1ac1f08bd80767ba5cc4c5dd043f SHA512 a10f1fffabd6b7c59e1e2bbc551744a42b1c5c66f374b12789c68fe4586f88babd62277282cc77b029252bef0a9e16b964d4bebf6db3d49239e53d833a8bb026 WHIRLPOOL 9c651d8961a68ac2eac4347e56aad2e33517b37d9edb7b2a53edf37611a5ae1ccc90d310e3a9d957d96ff9067edbc50bea7823fdfa2baf6cba84e3c966da08b4
+MISC ChangeLog-2015 893 SHA256 8023b0aad3ed408f24832d2592c59a41df14a24851a264a5c673de844123b615 SHA512 cfe6b0f4c044c8e56ba3e4c8fd5d1448fd2c3014e2e2d38827a264ea5192f26ea6068b874bce07542dfc777bee4aa8ce9594d05be9c738fb8c3d02fd8bd824af WHIRLPOOL 13e1675d4c20fe13d04844d5a2a6fb0d458e2ba76e3ddc90a362af6dc667281f8cf3c980956f13b0065deeef5997974f466c4a30fa0060cddd7676999b9d27e5
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/omnicppcomplete/metadata.xml b/app-vim/omnicppcomplete/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/omnicppcomplete/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild b/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild
new file mode 100644
index 000000000000..c87e6be5a063
--- /dev/null
+++ b/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+VIM_PLUGIN_VIM_VERSION="7.0"
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++ omni-completion with ctags database"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1520"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=7722 -> ${P}.zip"
+
+LICENSE="vim.org"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-util/ctags-5.7"
+
+S="${WORKDIR}"
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/pam-syntax/Manifest b/app-vim/pam-syntax/Manifest
new file mode 100644
index 000000000000..7cc29548187b
--- /dev/null
+++ b/app-vim/pam-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST pam-syntax-20060424.tar.bz2 2803 SHA256 9b2ca802c54906aa6b9c67b678520970e7ea5277577a76cdc021a206d121db28 SHA512 750028c153111ffdc9472b333375ad8d6312262fb1c8c7ac8563207d11e36ab885bb6ef341a39d59f5e980b69110c35166fa6eeca3a6093b0328ee2c58cf09e0 WHIRLPOOL 5ad1ec68e4a56476b2ea201fe8c1dbcca4a99e9867f25d5ab49c36bf5db9f982647ac00fb6be46a2daf6b579f4890de4dfbfc976a43f06576094272d51798244
+EBUILD pam-syntax-20060424.ebuild 490 SHA256 cc7781b1742350b511312d277847474363a36e9bcc60fb9f38754e11b81cad23 SHA512 e7cb9aeb9f24f3884ef6ffafc93c1a15010fcdee56ea2d86d9539d59da53717fee0e66af9031d6ef2a4e9ddc73d245b1ce2c936719cab4e20387a71d4268c00c WHIRLPOOL f918c88dc7c12dc8425b7892a7f704b3e82c70a86ba567d0f1f9aba2841e4b94e97e33124c5a1781ae025d7d54096a92b32641439abf11c0f974edf6fdf7c312
+MISC ChangeLog 2631 SHA256 4232a18b7f64c60ecad58875daf2b803c328ad67c6977345b60f462604412724 SHA512 3069c44b6a7ea0c6553de748480dc5bf7268b39fd8c03bd62bf7e88886fea7e6c7a8df04cf65452fd5d62b698b3d16ad617d17f8aea2b60f0c921608bfd13a25 WHIRLPOOL ac6fdde33fcc9232ca02be9bada3e85b60b457f86f4aa832a01865daba9555eb356ad367b3d8e331790a19809fa6dd8038cf43442b1826874e196ea9685bb1e1
+MISC ChangeLog-2015 3073 SHA256 b7311037a2b29fd21de911b8532862cfbbc4e45e11949d8740b2a0825cbab874 SHA512 ae66e805d63c5871a505cdcbbed79e9eb9241ca009ab246609dad057a8a207c77f8d5a04cdc8c624ead288209f5138ef0b6c89b56ebfd655fc13706e96b54d6d WHIRLPOOL 9ce3a35afe2f51fd19c32f641d0a4332245bccb704a84115887251e3b5a65a7809666b9cc0b82171d0a3cc3e2662ef8c60637691abb33f1c665a964a67252622
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/pam-syntax/metadata.xml b/app-vim/pam-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/pam-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/pam-syntax/pam-syntax-20060424.ebuild b/app-vim/pam-syntax/pam-syntax-20060424.ebuild
new file mode 100644
index 000000000000..cb4a2d655ad1
--- /dev/null
+++ b/app-vim/pam-syntax/pam-syntax-20060424.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PAM configuration syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=735"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for PAM configuration files."
diff --git a/app-vim/pathogen/Manifest b/app-vim/pathogen/Manifest
new file mode 100644
index 000000000000..33327900c10a
--- /dev/null
+++ b/app-vim/pathogen/Manifest
@@ -0,0 +1,5 @@
+DIST pathogen-2.4.tar.gz 6458 SHA256 2551a0f4ac3681cba97c265af088460c2977fba9c5152afb4ce1b56fdf3195a8 SHA512 54da8755991e5c52c5a9258c92ce5731434a15873df44d12e9491ed9bff1f9ebfe2a1c1b94a9ea3615b38aa1833d511bb03c65e85955d96373b6bffceae89fbe WHIRLPOOL 95f54f2cb1747fc92aefca54a7497155db05e89c7dd7249717fce6de34838e7a4ab57aadf46ef8eece668ae7156d4c4b5d481b7fd3dc16b248652b57334fe4b3
+EBUILD pathogen-2.4.ebuild 443 SHA256 0c6ad7aab4cee6f1a32e525fe80ca13122cf295512fd39adb39a0b18751294b9 SHA512 4172785d0bbceb0e43a8618c4bf862db5779b19b7c42f0ec85dba736043422d609929e83aea0315f710f2a92a26062331e85fdd7d0cf26f810bc429fa4c5bb70 WHIRLPOOL e51c2e0d6b499802a48b12bbc384f0a245e345c245b5ee054ba2480f9492b96df5feb4956969b0ffdf9162b7182a421e7adae565f7a9feb32763d15538075441
+MISC ChangeLog 2855 SHA256 96f2370b9217d7ba2c2b9a4ec34066e92e5754f64144de4e882cea2488243e72 SHA512 a8f258256d7f44cb1b5d320b741586ebd7f225071fb136757d273eeea11ae07cab16c73022564105218d47537b799e9043750c023c42de539dce9a82a03fe310 WHIRLPOOL 7dc629d15baec869d7884e9b8b825da080c1aae3e228f51c80a9dd92e03b40797126addbae66a69698d656714adc1b35c4197a9822808d172d68835b1c8b415e
+MISC ChangeLog-2015 1031 SHA256 0dff6e1c1b6f57513579eaa7f275a2f18d0a98800b44c34be7106a3601789ca8 SHA512 a904f12f3a47ab5a74d1d2b55e05d15e28271547e70dc3305c6882721e3525aac2431d02d025e912b1146c9a85b259553d84b2943a87e2c395c32f00ef52a4cb WHIRLPOOL 3c72821b2e5c6c51561a1e9db4350ffbdc35535f7a45be6bccb4468f93383e74850de06e466441dd84e1d68ca259e59df3d89f968bc660a972c0db4521f8e8a2
+MISC metadata.xml 342 SHA256 1e35a53bcb78170c9f2d50ad3f912be01bc3acf05306d14dfa9c53dd8567ce07 SHA512 c4839875a6c09fbc05ba0f94aa1a5b9f81c4f22c9972ac96113c48266a3a7b0f0417c8198b9df181eb0c7374960d8e49f241cc75a4efff598a821914f5560425 WHIRLPOOL 13969ac07807a54630c0bbd69e193dc63508bc167a61dbb3c023a9adf3e5cc9c23992fde33201040297b28864e5696a94e633992862251953d7c1aa8b9066e2b
diff --git a/app-vim/pathogen/metadata.xml b/app-vim/pathogen/metadata.xml
new file mode 100644
index 000000000000..e3b8e4389c73
--- /dev/null
+++ b/app-vim/pathogen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tpope/vim-pathogen</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/pathogen/pathogen-2.4.ebuild b/app-vim/pathogen/pathogen-2.4.ebuild
new file mode 100644
index 000000000000..b3e2872fcac7
--- /dev/null
+++ b/app-vim/pathogen/pathogen-2.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: manage your runtimepath"
+HOMEPAGE="https://github.com/tpope/vim-pathogen/ http://www.vim.org/scripts/script.php?script_id=2332"
+SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86 ~x64-macos"
+
+S=${WORKDIR}/vim-${P}
diff --git a/app-vim/pdv/Manifest b/app-vim/pdv/Manifest
new file mode 100644
index 000000000000..d21b9f500b26
--- /dev/null
+++ b/app-vim/pdv/Manifest
@@ -0,0 +1,5 @@
+DIST pdv-1.0.1.tar.bz2 4473 SHA256 b21dde083be56ec98bc049eb47cc51763b803278579ef054a74cb9211cea387b SHA512 4d7cff977b690d6bf54885aeeff201033b3445aa118c4cf57ebde9cd71ea6e0e548d6c3419e7344aecfe4ca54de01f306406fe3d2aadc7d05d010093792b679c WHIRLPOOL 724c054c9111900518aaad122589b26d1173cdacbe406c2571bd83b078f28f0421fc3175971db17c6118233d16dc9b8b49588d75b065d87f8f166ad19374a6fa
+EBUILD pdv-1.0.1-r1.ebuild 537 SHA256 b985055c7d0efcf6bae2884c68f0711bd9a7420e33230f8f688ebea82db4ad1c SHA512 494714abe42a5b74d4b40e52627ed58a072f73655819a6ee63d89c57b8230672a6a3177d81b70ccd36ddfce1c5ea65b13c4c29f29cb1e0d67538bce9bc7e0d3d WHIRLPOOL 9aa3af4a21dc89fada5aac88a397561b7dfca6600257e4843bd8e3f5cfd85a4630d3bef8090e9e2dd02ebe8446d5f19138d5cbfb5866ecb2e40c3911abf74549
+MISC ChangeLog 2695 SHA256 0070449d9d9fbc8816a289adc9de338df389622279c1a06f13ae62ee80f8061c SHA512 595750875da6245f16f761f77ba02a71689a4539927d963868ded570f2587689e69f0ce790caa71e7948d09aa91426e1f7d483b83c8f92f30110441c2911fcba WHIRLPOOL e24ea67ab4d4eebec00446f205bc1d7469fbfe7c0d2819e2008820e4922b04cb4d69581c55dbae58f6e3ed6bc036f4cc0563bdcb8941a560a7a16d4a6a17661a
+MISC ChangeLog-2015 428 SHA256 f56234bbe9eac8e4379fc7c043ffb2752b882e5216f302a7780e8eeb86721ce2 SHA512 bec89528746f71b15415852c02b3951bf141531f18a033841e4758b641fb99dfe525fa500de2628696631e187ab61b871c6cf935896c43f15315461b8d878e52 WHIRLPOOL ab2606a096bcfaf0a636ff6c88b5401ac0540178c266d9e85bfb8c1a5fa6f2f12f81b13557bc995402bd1748c330121fc760e15d899d882b1191b343d4c77672
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/pdv/metadata.xml b/app-vim/pdv/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/pdv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/pdv/pdv-1.0.1-r1.ebuild b/app-vim/pdv/pdv-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..34b911d0aa17
--- /dev/null
+++ b/app-vim/pdv/pdv-1.0.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PDV (phpDocumentor for Vim)"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1355"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT="To use this plugin, you should map the PhpDoc() function
+to something. For example, add the following to your ~/.vimrc:
+
+imap <C-o> ^[:set paste<CR>:exe PhpDoc()<CR>:set nopaste<CR>i
+
+For more info, see:
+${HOMEPAGE}"
diff --git a/app-vim/perl-support/Manifest b/app-vim/perl-support/Manifest
new file mode 100644
index 000000000000..370a30c9724a
--- /dev/null
+++ b/app-vim/perl-support/Manifest
@@ -0,0 +1,5 @@
+DIST perl-support-5.3.2.tar.bz2 178598 SHA256 b192d1d12eb06bb7b3067ad89f091afd87d3b36b15995eb907c688f0c9f464d6 SHA512 1eff321b0c5184b58737e79de379fbe431b32fbe5a140914b950d024ee9b512393b46cf4e45cafe50289ee9f9d4747984534efeade399882a17237a1a1ca1161 WHIRLPOOL 945634b4d5f6344efb91826f51dc3415f7b9c63018424a6054da5bcddec9519c3b686acf5bd2399031c44bc5ccfd7f5a302592a5668e6489a7c250db2bed77c8
+EBUILD perl-support-5.3.2.ebuild 680 SHA256 4cc4f4f3c9a0a159b627e75c500b1fe7761052fa997921fd26bd9a30369d2062 SHA512 f1ad2bfd7dbeabbde9442bb88c5c1931437dc9db93d9cb75e4bd08ade45d02837fe62bb5c2d67395fa6cd05f5829aebdb06f61aec9f6f1af8b1cec94c1eb565b WHIRLPOOL 150c8542101d39e7639c1ded2bf1327677b922620a2d9990ceaacc35255eee273be25232c4f127632a0c44c58fee5fed27e9573e18252c201421b85e0170c40c
+MISC ChangeLog 4212 SHA256 b38e69962619e1ae98abfc164d29e73e9e3b24850684dea4f4510d3ea4736c66 SHA512 94db91df07310078dbe9ecf703f5f0b6a0d947b17f57aecaa0500fc33bc0a06c9a4c6a77b89a45b9814a0d1c9f320e4d5f764db02da89e858cd16cd464244e14 WHIRLPOOL ade68b51946849ace2d2dfcb737f86d68216c9e26204db09a8cbe550259d8ea603e1b4b46f5a402fa74c8885168be9a77dedbdab61a747886aa64d9b8a4bfe00
+MISC ChangeLog-2015 6258 SHA256 f14480e3cd18da6dcaac26aed5ef0daf205b8c7acce5ac6a8c2f5e7df128a164 SHA512 7dffbd829e4db3e5335d9782419c01fe518a18ac57b63ed4175de30291305477850b7dadcc76357e72ded6f0c519be0b1f81bd633601e1c3d05c31bb60a53668 WHIRLPOOL ecda723a205947a7f95f1943911c608f356368a78c5e218223aca514529d4336204cb3290ff972af5285d41b960a8d12e0a15d8c5cb375f62a890870105c7c2c
+MISC metadata.xml 342 SHA256 2811afab6719e5cbaf701ca81996fbe4037248184aefab448239f50e1fab9caf SHA512 9d55373f4445d1bf4f3dd7db2c3b7973321fc2f461254d21f9968bea94ff8a8511129232fe4a30d3aacd723209d70566cb3ae1594efe0f28873f3bcee7b009f1 WHIRLPOOL 7217b61bc31cc64767a9033481a7a5b23ae48340836e4ca9b021af52178d849afe8ad606a4e7497746cdf6f42ae8e2b1f1815696f7f758f446547cc718335196
diff --git a/app-vim/perl-support/metadata.xml b/app-vim/perl-support/metadata.xml
new file mode 100644
index 000000000000..c450d9618260
--- /dev/null
+++ b/app-vim/perl-support/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/perl-support.vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/perl-support/perl-support-5.3.2.ebuild b/app-vim/perl-support/perl-support-5.3.2.ebuild
new file mode 100644
index 000000000000..a5cfb0273bf2
--- /dev/null
+++ b/app-vim/perl-support/perl-support-5.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556"
+LICENSE="GPL-2 GPL-2+"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+VIM_PLUGIN_HELPFILES="perlsupport.txt"
+
+RDEPEND="
+	dev-perl/Perl-Tags
+	dev-perl/Perl-Critic"
+
+src_prepare() {
+	# Don't set tabstop and shiftwidth
+	sed -i '/=4/s/^/"/' ftplugin/perl.vim || die
+}
+
+src_install() {
+	dodoc ${PN}/doc/{ChangeLog,perl-hot-keys.pdf}
+	rm -r ${PN}/doc/ || die
+
+	vim-plugin_src_install
+}
diff --git a/app-vim/perlomni/Manifest b/app-vim/perlomni/Manifest
new file mode 100644
index 000000000000..061307830909
--- /dev/null
+++ b/app-vim/perlomni/Manifest
@@ -0,0 +1,4 @@
+DIST perlomni-2.5.zip 26871 SHA256 b13f8ed41ecdfa779875c48ac2df1241272ac03cef53271054dc6e9c0b011288 SHA512 aeb4bb6efef859145a942271ac4e08c99af3aed45024ca2d5affe2e72c356fa4e8f9cef78ff8a1796426ec9d2339ea2b83f07b224a1b4b98598aec5f6f45b0d7 WHIRLPOOL a8f62ff6c7a0535d0177bea205206505ad3d578c50a2ce8880fa2cfb32ba3e8fa6f750908ec846ac0a7b2af546c34043676c8747b11504487e178f93ecbc4089
+EBUILD perlomni-2.5.ebuild 656 SHA256 5c71c2d69d8dd15e9b6aae6f02e736154f533bba6ee44d0fef0d672f4c001efd SHA512 675a2db99220e16c04eda42c852949a9ce39d1f9f1a7043942a1ba888d80a97d4c1e6f7097b405e980c5474e472cfed6726c1c6d9a6ba8720b1b623ff9307413 WHIRLPOOL 0110c2089b9ec4803cdf3bde08c70efb4d07a05ae19c685804093582e1666430555d04a310848b245afbab0b06747e971601f4194ab516118272f45a1717511b
+MISC ChangeLog 596 SHA256 270783dd2f268ca3c77ee7b31b611f7993fd5a6b30338ee73d6b97124e809eb5 SHA512 93bcdacb2bf4ef6b811cec1ffb45295b3a203e1539be684395cce4bd4b739eb09b07a6edea3ed495768f6fb78e4d66dc4ccc18243cdbae673eca2b7bfbba1bdb WHIRLPOOL 3660ed480ed2ca87131f891bc50050e5143bb3ffa22fc441160ab0b0fab3432bf6d17d3d4444521b02b7fa79a1eacb9795d1fd10423b84095b37b554532ca4a0
+MISC metadata.xml 425 SHA256 5c038d9036619e2f85341e307d3820fcc7ae71a38269ed94aa50458c08932706 SHA512 8ad19bbe8fd10660518b2b20d8c94307a0322031615bfbed081b24c977bc8d999fd3a5878698be85d41d4090c1dbf632887ef9ab99fbfb068596b17c5be78c2b WHIRLPOOL baef8a80dab9b0e72a31fbf038cbd09f5d6d6f7478a972e6050678fe1878b078bb18ce2b0f4e2ca418985ff339210d9d59d038b2dce4420a813c7ae688edf24f
diff --git a/app-vim/perlomni/metadata.xml b/app-vim/perlomni/metadata.xml
new file mode 100644
index 000000000000..6dfc1d1aaf2a
--- /dev/null
+++ b/app-vim/perlomni/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">c9s/perlomni.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/perlomni/perlomni-2.5.ebuild b/app-vim/perlomni/perlomni-2.5.ebuild
new file mode 100644
index 000000000000..8ec957c7ec19
--- /dev/null
+++ b/app-vim/perlomni/perlomni-2.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a vim plugin with Perl omni completion functions"
+HOMEPAGE="https://github.com/c9s/perlomni.vim"
+SRC_URI="https://github.com/c9s/${PN}.vim/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="vim.org"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="
+	app-arch/unzip
+	dev-lang/perl"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+src_prepare() {
+	default
+	local CLEANUP=(
+		Makefile
+		config.mk
+		README.mkd
+		README.mkd.old
+		win32-install.bat
+		TODO
+	)
+	rm -v "${CLEANUP[@]}" || die
+}
+
+src_compile() { :; }
diff --git a/app-vim/pgn-syntax/Manifest b/app-vim/pgn-syntax/Manifest
new file mode 100644
index 000000000000..d7bb3be04d7a
--- /dev/null
+++ b/app-vim/pgn-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST pgn-syntax-1.0.tar.bz2 675 SHA256 a382c41d292ceede8ceef201e76ec71e440e3ed90b84248ce4401d59a36b3159 SHA512 8754881ac77d84359609fc55a00fa91f4dbad6e66778c7d9418fb7ed401c8fc063c1bb84d2574368827db0ecdbcd20c6f9e25808a691021f8d0b3afdb3360c5f WHIRLPOOL bfe3f5915ec1b7fa3a4b52a14d07ca0c018b09ee1352a046607c84c8061d98fa33c067b29b9592c6f857618142edc5d45c2e2a42e744b18c2bcd6f96df426933
+EBUILD pgn-syntax-1.0.ebuild 434 SHA256 28d67b04938279eaed36ce1cfb7b050a7d48d3f1a86ef54a72afb8dc843b6570 SHA512 83e4e24ad5307b0ea78fa4e2d32799a1a18e350ae731d3bd1677e441684ba4d9f1f35103f32c19351424ea21a1aa527cce774f4782d2034e6eca99a40d3adf02 WHIRLPOOL e600be2f8116d4188ee4eab48c62fe4392e1c4832b5c63df8ed3d784cb2dc0f0984e479641974b307de91ba0365a76931c272089dd3ed705fb8204a7247d6365
+MISC ChangeLog 2431 SHA256 a7de4c5894ce2fdfc89eed820407c7a4095f1c556d5bb984278e801f00db0a08 SHA512 82ba98504237855f4c0ff39d7c0697716ee74baf95271957c7a989681b9dd32e6f3770905ef47057180a7e1df6df7e0291ccf235220c140c3dd0bd11d231651d WHIRLPOOL 67812ca655016743d959a70a774edcbe8ad237ff607c4fe11a27460a6ba04afc1469673e03dcbd95c47499ad10954019b936bd9c35629c0ebb5f55d1c5699dbc
+MISC ChangeLog-2015 1304 SHA256 c0befb966ff87776e21e49df99ada28558da07d11f85584ec7d59d7827b7638e SHA512 6b0108c472fcdea2b2878f8104a73714f06e84f4b380e60e89077517d63310719bd013551751dcea6d0f62d65b7ac0c4a6de7987863df1577268da1321b94021 WHIRLPOOL ba35b0f7610d237c5424a7621838b9e95bbd4347a506fe9b4824a927bfd6e9f1ee3830ffd3e523b248be912ab275138a6b86361bddade6f0a3a482ac82911d11
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/pgn-syntax/metadata.xml b/app-vim/pgn-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/pgn-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/pgn-syntax/pgn-syntax-1.0.ebuild b/app-vim/pgn-syntax/pgn-syntax-1.0.ebuild
new file mode 100644
index 000000000000..7233b39bbb26
--- /dev/null
+++ b/app-vim/pgn-syntax/pgn-syntax-1.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PGN (chess Portable Game Notation) syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=677"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for PGN files."
diff --git a/app-vim/phpdocs/Manifest b/app-vim/phpdocs/Manifest
new file mode 100644
index 000000000000..dcecff447417
--- /dev/null
+++ b/app-vim/phpdocs/Manifest
@@ -0,0 +1,5 @@
+DIST phpdocs-0.26.tar.bz2 3772 SHA256 c511a2e52eab9eae34594b91d369b87876c6d3ce5b53bd2fe49e02dc0c0178b1 SHA512 625717ce5e8cfe8ee6fb76611df28838f6bdf54905af138dccf6e2870c29c36f6c618872d81990833c06d30ab3f010445d2d31fb4173eb8b245113f8b5c87bcc WHIRLPOOL 84363c3041985fc7ec483e0b5ec611a79daab7633e655afbd001f2370d0dae94668106d4a2823089253e719b74e14826a93c0ed3e87a47007e30627c355114da
+EBUILD phpdocs-0.26-r1.ebuild 503 SHA256 6b7ff8af2b353e8272496d1134ceb91f9298cab3e38734d4a0b0826734aa2c56 SHA512 ec217114e3a32371ce7f940825bbba6835237510fd08780772e645e5daadd6c6a11ceaecca2084c9af01b4e0f83e695b545c208c1b407dd31068affc60387197 WHIRLPOOL b2c677b7f0f2b79cc6687c02cd20a55eaf7120d7bd8995f9ffcdde59ce0c1c4a628a8cd37d5836cf58796e3756567cf9a5facafe2b0f812b8875daf637c5c606
+MISC ChangeLog 2424 SHA256 b06db9823f0c0f0823bbb895913b97cc1b0eb441cce6fbad34de0a18e7434e3e SHA512 1760cd757cbf4a5a07f86724a888b8303501f4632e8e209f3f6e2872c63948854f930df9a180745f55e8f1776fcf3a5e63c93df1d07ffa9333da961b28c42e5a WHIRLPOOL 4449418088e3c7f973dbfa5c9ab5b074c96a486284e35a6a067f1465025803037d35b2d2e97908876460f40dcdc7082cbd8113798cd8f9d278b5c99cdb170a32
+MISC ChangeLog-2015 1952 SHA256 39ef83515f81e536a3f33d35951e9505a1d6f463ace364fddb78b629280a8a26 SHA512 d3e2e920c780b7702e49c691c1a303b1c99814f998ad6794fc2a4742ad6c137f8fc2a814ae67b0a03d923cfa4df410a92bc33d9b476ce59b082b9246f588d181 WHIRLPOOL 0c843e1c9be824efd906219818dbc9c439acf5d5fdfb8967f38cf7b9df8602d32245f2db6c766d8061c24f5a07a4df17ad83db9b108c97b80656e6105b5d8b18
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/phpdocs/metadata.xml b/app-vim/phpdocs/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/phpdocs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/phpdocs/phpdocs-0.26-r1.ebuild b/app-vim/phpdocs/phpdocs-0.26-r1.ebuild
new file mode 100644
index 000000000000..4f344a1b3ed6
--- /dev/null
+++ b/app-vim/phpdocs/phpdocs-0.26-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PHPDoc Support in VIM"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=520"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=520"
+
+src_prepare() {
+	default
+	sed -i 's/\r$//' "${S}"/plugin/phpdoc.vim || die "sed failed"
+}
diff --git a/app-vim/project/Manifest b/app-vim/project/Manifest
new file mode 100644
index 000000000000..832e8fd4a2de
--- /dev/null
+++ b/app-vim/project/Manifest
@@ -0,0 +1,5 @@
+DIST project-1.4.1.tar.gz 20705 SHA256 6e0c60cb2782d8232182124b0b617fdb6f1e1fcf0259273ce717940976d0b097 SHA512 315d76a375dda2ba6e5523b80e83b6e53590a31713eb8da4ee976e0698a35eb0419ce88bb2eb3b1793e272a9f23ada1b29c7e8f1460cb36f5b57204cbbb54852 WHIRLPOOL d2c7e9b33d8487ac366b5f0adbc16c9fb9df19faee8e60af08480c4e66bbd0a11a544da40a4ea012a4b2540d698697898ca6565ae3c2360e933afd62ac2f06be
+EBUILD project-1.4.1.ebuild 460 SHA256 a6bc026c7006a731cf56902fc8266f3e07edc137d21bd77cb310b61c1c5ee75f SHA512 851b5ff2470fa7f131542d22a53f34c2d7d6508dfcc26523625ad3ea0839f8229eb5be8eb968878cdc215a7f728ec02f3664b205564dace28ba8a6c02e91ba90 WHIRLPOOL c6d44147ff533ecf380c2f15a54ed54fc8fb8ad4e7761bb6eb25cd187c934356118d4559ff783c31fa8c0844be7aeadfac2cccb4fc61e6eb1c826f8fe573fcb7
+MISC ChangeLog 2510 SHA256 3252843b3f16235cac187fb2f9f1d913ce1658fac1c7fc9eb97654baa663984a SHA512 5cf924ec72767eb4e111b373507853d65c11cd6be26ab4e8423392427c94b540ac91c1957e5aa2d24b9993e0118cbde5542cd6a9c78219df1864f5de5989bc91 WHIRLPOOL 16bd340fef5fd12ea3a0e44f59f17d80bee662fe3e1c9d630f3276501537b0be90a0a7f524f7200caa1c628d731cd878866d2bd83f9a33ff74154a648bf73aee
+MISC ChangeLog-2015 665 SHA256 e5c372304051ec5578fac54d0d310de1c36eb8cab9288c4e4997cec2c91e8ddd SHA512 8f03e55fee3beb01c20eb48a30a8750e0c3f73b404d4d391644416cbce90ad0d50944a243367cdb6bc32e1b5900f46120ca34a616cb7027b23c16a8113b94eeb WHIRLPOOL 5b379bace59a1412f4a3cd25d7408da248140ac7371c5ddae1e0f9722c11dfca312df811286c536071e55262c9372398ab85e18e2bd8d838571aa345e108b477
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/project/metadata.xml b/app-vim/project/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/project/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/project/project-1.4.1.ebuild b/app-vim/project/project-1.4.1.ebuild
new file mode 100644
index 000000000000..eb704caa8f72
--- /dev/null
+++ b/app-vim/project/project-1.4.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Managing multiple projects with multiple sources like an IDE"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=69"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=6273 -> ${P}.tar.gz"
+
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S=${WORKDIR}
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/puppet-syntax/Manifest b/app-vim/puppet-syntax/Manifest
new file mode 100644
index 000000000000..7eac0409c5b6
--- /dev/null
+++ b/app-vim/puppet-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST puppet-syntax-3.0.1.tar.gz 3548 SHA256 2a9ca4172b2c0d58c4a74bfa579ef44a6760a02d687e42dd5313c9770305a9f4 SHA512 fb96360e784da578d2ab77a021befe874644cf964c1ca2d8b34b316296872a67679606ad0dfd4ab90027b7d259900af20d831d5e3359d76649e0c6f43546938b WHIRLPOOL 8b9d76f3c1d6929b1ec4e5b32e01244f94af3591d5df51ac2bd24fe151193679c97cb1dbfd9bd6ccc8c8602436dd47051bf0e59cac4ec6c643a1330ef27094ce
+EBUILD puppet-syntax-3.0.1.ebuild 558 SHA256 8d49d1dbb6c9ed01d6594a141201d3ab2393882a5e35f3e870d7f1071adf4503 SHA512 4fe127ba436c49e32ac7379127984c527e7ba3ed8a44d0f2888373938dd4b721e313174c442e7a5d07d5c7da1ca0d85169895fd0f248ffbd4d75b6b22c640cc0 WHIRLPOOL 35f23fa48089009532f056603178d7cfd87882c1bacf695ddcedcc782c24ca086d425d83dcf62740e528c3a33ce754f567b36e0fcdcd920d2263942ae126a61a
+MISC ChangeLog 2474 SHA256 d2205327c0c27ecb1861e354ec9b94b8322e06b82c16e8a15596ee42c8ec71c0 SHA512 ba24361f703fe99b522063c1490bdaa25d84fff199d555c676d3de67b0f6187f5dcdb224bf7019381bb5f1a074040988c2380280ec5127576eaff6173b40f3b1 WHIRLPOOL ad0d9efcabb01826c1d4f64aba58ec63a65e6f64ace39b637edb9a29f546959a9613d30dcfb33dd6051b89afdedd960e41265ab694e69a495c5be80e972f39f9
+MISC ChangeLog-2015 1134 SHA256 7a707dd7caa4152ecd4e658944f99bfff3fabd971c1b3462b4ce456faa96c1af SHA512 46fe489f0978fd2b25e5ce11401c421d49e316f0534f107ff840a61c76c5776d6bc4a0210c27bab8bcdffb5c86542a8334e1384fe0129949abb66235d2b4d953 WHIRLPOOL 38b26df736224d06346007640c7490139be944455e1b55ec389ae4bbdfab9b85b03241dcb3e030463534023c826ed1ef79c1f8d124a475c679e88016a6ce3501
+MISC metadata.xml 363 SHA256 761cfde8a22d6fe68ceb2c0f565c0a6a39503a7a2368ef3559507e92bfea63cf SHA512 cf7d45285491a9c11a9bff7354c6bd726eb0e359114a447321642056d199f117921b3bd15d9a427c5b7af2371c0e10ecffa634cf824df2b59997aca9ce6ff3e6 WHIRLPOOL 2cb97c0c2a1d4b153c3c0da5a0e0bf83608c771fef45bfa3c66f17450b78c783622d17be29a73718afc9e97adc1a83ff1668aae4a3cc8148515e7ba4d53cbd03
diff --git a/app-vim/puppet-syntax/metadata.xml b/app-vim/puppet-syntax/metadata.xml
new file mode 100644
index 000000000000..f1f6747112d6
--- /dev/null
+++ b/app-vim/puppet-syntax/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sysadmin@gentoo.org</email>
+	<name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild b/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
new file mode 100644
index 000000000000..17c83d9b6be0
--- /dev/null
+++ b/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Puppet configuration files syntax"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="https://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.gz"
+LICENSE="Apache-2.0 GPL-2"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Puppet configuration
+files."
+
+DEPEND="!<app-admin/puppet-3.0.1"
+RDEPEND=${DEPEND}
diff --git a/app-vim/pushpop/Manifest b/app-vim/pushpop/Manifest
new file mode 100644
index 000000000000..fd0a7eacaa1c
--- /dev/null
+++ b/app-vim/pushpop/Manifest
@@ -0,0 +1,5 @@
+DIST pushpop-4.0.tar.bz2 7486 SHA256 3b7993ca955f8940e4b4de18cf9fd82ed004250488afe7b57a1ee754053a9bf2 SHA512 84f61908ab25ea6028c0f77d935286ffe3b8905400e455e1d123ca6e53cca2422e066adfcd8e75d2ad1d63d7e01524fea286a2eeeda3dd0968076be6a4229684 WHIRLPOOL d08caaf9a71602d663739f6dea4d37433dbe575c9ad01bce975dc2432911e5936a1c763babd81e6de632eae19f77650e1e6619fa9de9fc36b0cab8caf6db208a
+EBUILD pushpop-4.0-r1.ebuild 514 SHA256 9fdaa29068fb821b0a60c1d139bc6cb280c33cc07a563ba0eef94e28244df231 SHA512 92dd1925171320037184b8c303cc0e7e14ba7ce4f8b35d75b45eb7ca8339143e28fda582c649ce351737f94e06f611c5f4e0a29b434fa48d3c10b5da9812fd9c WHIRLPOOL 7c7f2389e0e7f13bec4091495a0d0b8858f8a8e2efeb367a9f31318cc79eea0e02ea70abc34738c1bfec71a03e2b2fac37986a59f4ad279cd85fdb70a1f01c5f
+MISC ChangeLog 2923 SHA256 244491b8c4d26e218a82940f54e3b0ba863fe31e23ed962f6d5d88358f5e47a6 SHA512 fc41859ceed5eae3f3af701fa5f47eb5e33e604c32611f063901f3595c6942fecc9cf6f8dc4943881a5affa1675c57186dadaae46cf3acbbf5370df3c22bd639 WHIRLPOOL d444b4d6dc426a14b1474e1bd5448fd98d7f6843e5ba146c5b07811d271ccd578c00a5ce47521eea956e286ba38a924ef49a82b2b22d47b409a72c4a9261bc5e
+MISC ChangeLog-2015 1678 SHA256 2a050250ba11dec39baf9a9db699ce31d68ccd073f93ee7406efd6344a54609b SHA512 63931659937de5af5be819c0fcf0573e68886b645839bc0ea3ac8ad5aef39bfb0d21ed99dda8d6fabe010cacd4f8cb038a07434c4cf46999637b5789e31c31c8 WHIRLPOOL 0cb5fb668af5711dfdab3a98bda3cfbee6aec7803549a919fafa64523d1b2bb02241269b3d33ebcaeeed3eb21a5b0fd1cb58b18f220be1047712a9aa84dbd9f3
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/pushpop/metadata.xml b/app-vim/pushpop/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/pushpop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/pushpop/pushpop-4.0-r1.ebuild b/app-vim/pushpop/pushpop-4.0-r1.ebuild
new file mode 100644
index 000000000000..f5e838e8dc21
--- /dev/null
+++ b/app-vim/pushpop/pushpop-4.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: pushd / popd from the vim commandline"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=129"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	>=app-vim/genutils-1.1
+	>=app-vim/cmdalias-1.0"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides :Pushd and :Popd commands which emulate bash's pushd
+and popd functions."
diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest
new file mode 100644
index 000000000000..c716acfe34c4
--- /dev/null
+++ b/app-vim/pyclewn/Manifest
@@ -0,0 +1,7 @@
+DIST pyclewn-2.0.1.tar.gz 124914 SHA256 15549d7375299c286abc3da9cb0942cc834f354715aa5464f8c68c104cc67621 SHA512 996acbedbb7922109925f188efba4c71e83f1823c029f92dc00bb21449f024232ef55df0c74a9fd4bfa7229523ed9ad4301aa9dbb8a3c20424082fc6939f63db WHIRLPOOL e92bab273982783f61c0bdfe464673be26225c02ce8ba14a0d7e1d9088167f3c48cc07247b83e36b5d98bdc6e314f76c828d3de1068b5ca4633149bc8aa0be8d
+DIST pyclewn-2.1.tar.gz 129697 SHA256 4e6dccb6afa07e34202cc8cba4fc63a53d432b2dbc3f1a08c1945bbdd2a2a855 SHA512 346b98a9e37957a5bf97b8901247f56fa8e38bddac38727867773cf4e78e555d6a85848c4c400d1faf1159ba61122cfd4931c95a67e3b2abdfaae7996beb4f1b WHIRLPOOL ecf35c8e7ef0e60f4297dc3375d31023f26aea645ec95193c5c4ec808f4d8c973524405d14c15317ceb03a5974ab079ee545ecc987d2ed99f4681dc39133df3a
+EBUILD pyclewn-2.0.1.ebuild 1057 SHA256 7b41f3bc7790230bfc07f6593c3b7b4fb2db2009df1f97ccf7452e3d2f36e8f4 SHA512 729fe02cffcd975dc3735c5c003bfb8db1d5b1044ff395afb776de09efc0c2dac828cb74600acec811a5e311fa27f096641c03cea19f6bd2d92c2e107f1c271e WHIRLPOOL c7b069a9c878875aaffa9e72158a0d93f7e9e7c2e8f66dc8030214c818b96f98576263a29951181c747e582e571108ef21917da1e0867fa3044140cfb461f099
+EBUILD pyclewn-2.1-r1.ebuild 1026 SHA256 6c8621d3ceb3ca5dc5addb2574f8133ce28bdf802b11f322934875ae3ab64934 SHA512 1204f2b6553182b95c7603ea75a7a73ad79322290ea4573edd5962d730f77f34694603a28d34f171516452925ee36741a071103e6d98a226cab40ae3a81956c6 WHIRLPOOL 0b2a4a1c8fb0202213629555c636e43239bee7be636cae3e4cb9f6f2ef123d91d90bcd3b4cb0d7d6fcb2b90bad037bcc708fdd40b5a74fef0c6a88613e0cf95b
+MISC ChangeLog 3306 SHA256 1d37cbacde1c48a3bcd56c7a5cba3b83a29786b7297ad9b9d4dec7b13f9dea48 SHA512 ceeb179cd7314706101a8fe3becf4b7aa7379cdbd4c1400861f763f0501730aa2ee56fd3e3c005a66c3c2476f481fad6a4a0a53871659fce90ae7a4c97e46623 WHIRLPOOL bc81fbd6110f84ed38eab89596e4485d47b051107bc24750884f0da8f7a84fe242f42fce927e25cdae8a5c6a26c58318f650c1f6dc09b825ceaf07c1ae758903
+MISC ChangeLog-2015 606 SHA256 52fedd35f1cd942011a8925cd73bb61139027b1e569714ebc8faa7ecca79b53b SHA512 6785813e8c29c83377d6c0b205a5c7e895ce36619657c03c5a5c7ba654d9b3e99947e0ef8afbbb48c764298794605a14f94fbf94c4e5c66a3688b24ecbdbe20e WHIRLPOOL 3bc505abeb4929593fa423d332df20990827fa124c792c1f91b73b788bdc48beebf4c8f602dbd96027d7840096b28795e1b60e5557a17b032e96d5b2ed076663
+MISC metadata.xml 499 SHA256 7626d17bf92bdc42aed225181eadb6e80bd1b7079f9ed4df0115f04dbf54696d SHA512 30b127677f0d5a9afce208e5cbb00c9b98f6d7e771ef273155f9acad764da789e71249289104e8006420cf5ff62075bb7572527150f9b339e0e51cb219c76a81 WHIRLPOOL 098440722a0e6c5d7f8aa7c8026cfdf019e191c931e481fb13122051282d65352a25dbff91bbdb5ea0c97a5a7423d7f4c99b5fc43aeb55630f3543a88e065235
diff --git a/app-vim/pyclewn/metadata.xml b/app-vim/pyclewn/metadata.xml
new file mode 100644
index 000000000000..a93aab33c5ba
--- /dev/null
+++ b/app-vim/pyclewn/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyclewn</remote-id>
+    <remote-id type="sourceforge">pyclewn</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/pyclewn/pyclewn-2.0.1.ebuild b/app-vim/pyclewn/pyclewn-2.0.1.ebuild
new file mode 100644
index 000000000000..cd2bed6c6c96
--- /dev/null
+++ b/app-vim/pyclewn/pyclewn-2.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+inherit eutils vim-plugin distutils-r1
+
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+DESCRIPTION="Pyclewn allows using vim as a front end to a debugger (pdb or gdb)"
+HOMEPAGE="http://pyclewn.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="|| (
+	>=app-editors/vim-7.3[${PYTHON_USEDEP}]
+	>=app-editors/gvim-7.3[netbeans,${PYTHON_USEDEP}]
+)"
+DEPEND="${CDEPEND}
+	app-arch/vimball
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep \
+		'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
+"
+
+SLOT="0"
+
+#Completely broken (runs vim), disable for now
+#python_test() {
+#	esetup.py test
+#}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	vimball -x -C "${ED}"/usr/share/vim/vimfiles lib/clewn/runtime/${P}.vmb || die "Extracting vimball failed"
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	optfeature "C/C++ debugging" sys-devel/gdb
+	optfeature "Python debugging" dev-python/pdb-clone
+}
diff --git a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
new file mode 100644
index 000000000000..f21226086046
--- /dev/null
+++ b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit eutils vim-plugin distutils-r1
+
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+DESCRIPTION="Pyclewn allows using vim as a front end to a debugger (pdb or gdb)"
+HOMEPAGE="http://pyclewn.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="|| (
+	>=app-editors/vim-7.3
+	>=app-editors/gvim-7.3[netbeans]
+)"
+DEPEND="${CDEPEND}
+	app-arch/vimball
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep \
+		'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
+"
+
+SLOT="0"
+
+#Completely broken (runs vim), disable for now
+#python_test() {
+#	esetup.py test
+#}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	vimball -x -C "${ED}"/usr/share/vim/vimfiles lib/clewn/runtime/${P}.vmb || die "Extracting vimball failed"
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	optfeature "C/C++ debugging" sys-devel/gdb
+	optfeature "Python debugging" dev-python/pdb-clone
+}
diff --git a/app-vim/pydiction/Manifest b/app-vim/pydiction/Manifest
new file mode 100644
index 000000000000..69b883146d85
--- /dev/null
+++ b/app-vim/pydiction/Manifest
@@ -0,0 +1,6 @@
+DIST pydiction-1.2.3.zip 475441 SHA256 fa5ca8fcd67bd5f7ff7d000e3e0e7d6565d5c298f1d9cf7d0424afad12b8c283 SHA512 91da1d8a9be89095072724d77bdcaa342fbd5479f5027d7ed7bb2d4a382c7385b2b7fae91c1cd94605232b34a96370a86096e3c32db0d106cbcda2a82f409922 WHIRLPOOL ffc9051eee429263b6037e09f16145704b5f7b209830ac1280cc10e56519ae3149532226bce38e12e8cdd5668ff8c67c80996129946afb9ffa075ffab2b16eae
+EBUILD pydiction-1.2.3-r1.ebuild 701 SHA256 e0a1002fe4d8f4247d202351b6b73405dba71156f6806c82a12c43b243ebba90 SHA512 60c6cab108c87042e3b01e3a2329429cba70f883d97bf7217e7e5b07c7553745c07bb74d7e250b736af21a99e831b70b0610a8cda6fdff0f100f85d6b13e2856 WHIRLPOOL dd831e1a6ff27cf1c1bc85bb35345ccad9fc417eb48305e9c30d2ccc6d5f25bbf948a0b96f736bab2ea1970cc61da0aee06406cbf16c3126193e6b776b9bd5f4
+EBUILD pydiction-1.2.3-r2.ebuild 949 SHA256 6416ebdda41ab156375dd82049981beb1f1af070feaf67f0f223743e72495d04 SHA512 2e155ba8b1d8920cd7c643b082fb8629c9d11e5199645a5b041d8579c85da01d0f618bec512b81b8249518a45b0754c3fac20a3ffd020e90adcf47baeb7ea9b9 WHIRLPOOL 563c143db86c679b58c707045a6a39def1f2247311c484798e6e12479fd1e80cc4564eee50de73b44fd5ec4ffc90ab201f49555e33e623c466b17ecc960fd331
+EBUILD pydiction-1.2.3.ebuild 598 SHA256 15dab39157711830a041bfd1378d2b3f2081f0f0490379fe9335fa130dac091c SHA512 11d845c3d011daab5bcc676581a347974731166f689e7c2e41f6a0fe680f865079c2275d14632c3cbd901b187bb1ee3a829a07ceec77f32332f66ec74ca6d5e6 WHIRLPOOL 0874314218fb8921e8a584683f94b58c0b6b680abf75bf1ce662fbd6cf632de4912c1963d839191ce1805c4f37dfc6b7e2ddb281e1e1ecbd7fbe1af820896dbc
+MISC ChangeLog 1140 SHA256 8444e8052d1e6612053ec885a7be3fcf5b7d941b38629b140f703093d761dba6 SHA512 cd7b1b47bb9a26068c26d502379b885e4a792b5b4ab384cb40e6d4c1c696b9ab2495182d3ee8754a3f7951a12b0a5bbe3a65a2c9bbb9df50ba64428173bf8dea WHIRLPOOL 4acff04aef2e1b1ba15960cda85817757c8cfde52a9e32317ed5c7e8cc9397f42d016c9ef845108842975d55f303389307e73826aafc14bd7071a8043fe7e394
+MISC metadata.xml 361 SHA256 62956fe353128ba3070b7c2fbb041962cfdf1757c7e0b23ad8acff1312385aad SHA512 f205ce2b8f61bcc7d966345b9928efccdc2adb4ce6a36166c774134bd8959a3757a3a9a556aaa2d6c6f7b71b945be84e41903a58e66f844c4258326a66b2b667 WHIRLPOOL 5e3743e257d98ced096c2f5c1ff413a6d5fc8be9fc73362adcf6a5da38de5f28f841e5a9639818988770f5012dc8fc87cbade6b58f86fb5f30eb48b92bf33ee0
diff --git a/app-vim/pydiction/metadata.xml b/app-vim/pydiction/metadata.xml
new file mode 100644
index 000000000000..8fafbfec1948
--- /dev/null
+++ b/app-vim/pydiction/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/pydiction/pydiction-1.2.3-r1.ebuild b/app-vim/pydiction/pydiction-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..0e9e20b9d9ba
--- /dev/null
+++ b/app-vim/pydiction/pydiction-1.2.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-r1
+
+DESCRIPTION="vim plugin: tab-complete your Python code"
+HOMEPAGE="https://rkulla.github.io/pydiction/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/${PN}-master"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	local pyfiles=( complete-dict pydiction.py )
+	doins "${pyfiles[@]}"
+	rm -v "${pyfiles[@]}" || die
+	vim-plugin_src_install
+}
diff --git a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
new file mode 100644
index 000000000000..b01441526404
--- /dev/null
+++ b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-r1
+
+DESCRIPTION="vim plugin: tab-complete your Python code"
+HOMEPAGE="https://rkulla.github.io/pydiction/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/${PN}-master"
+
+src_install() {
+	# Rename pydiction script.
+	mv "${PN}.py" "${PN}" || die
+
+	# We're going to remove those files in a second 
+	# otherwise they're installed by Portage.
+	local pyfiles=( complete-dict "${PN}" )
+	insinto "/usr/share/${P}"
+	doins complete-dict
+
+	# pydiction is treated a singular script that lives on its own.
+	python_foreach_impl python_doscript "${PN}"
+	rm -v "${pyfiles[@]}" || die
+
+	vim-plugin_src_install
+}
diff --git a/app-vim/pydiction/pydiction-1.2.3.ebuild b/app-vim/pydiction/pydiction-1.2.3.ebuild
new file mode 100644
index 000000000000..c4fae8228716
--- /dev/null
+++ b/app-vim/pydiction/pydiction-1.2.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Tab-complete your Python code"
+HOMEPAGE="https://rkulla.github.io/pydiction/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+LICENSE="vim"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/python:*"
+
+S="${WORKDIR}/${PN}-master"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	local pyfiles=( complete-dict pydiction.py )
+	doins "${pyfiles[@]}"
+	rm -v "${pyfiles[@]}" || die
+	vim-plugin_src_install
+}
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
new file mode 100644
index 000000000000..7d6b9ba000b8
--- /dev/null
+++ b/app-vim/pydoc/Manifest
@@ -0,0 +1,5 @@
+DIST pydoc-2.0.tar.gz 2795 SHA256 3d55f46aeccc76b1f0c21fef7e859158929710f7255719eba996f532cb0ce0f9 SHA512 bea2e0dcb82090803b45e0cbccf5ad610a39f22d04c099e5e946e2b3707c9cbd69b85e3f1024a73760d1ff81a0199aeeb3bab20546307676953156eff7185214 WHIRLPOOL 7a0337a68ba7075c08c379e9bc138b1130cf4c7b56e529f11da98e5689a64a4d84afb155f1e8306a229725c1e61a619a94371f722c6ad7adae30dc9040aba7a3
+EBUILD pydoc-2.0-r1.ebuild 636 SHA256 f87cbb2c59e0f47b5efea0a1f085f8e07c779279c526f64308e38444f3f2e4e6 SHA512 26caaae3822c8a958bfcad05981652f1a6204e6a9c0256a4a977792f5b05fd27a4950750a0c973af80b70876c0db0ac0caf733d1b5430b24c2e36dff50c700e9 WHIRLPOOL dd04984d67b334f50733205f657c26da22b60fa5a487e8583c0ba003ae7fe0b5e9daec4e6e6c9ab58cfdf797004e2c03a1203aff700795787535d6fdbc55444d
+EBUILD pydoc-2.0.ebuild 542 SHA256 28a8a460ff03470b4d227ec821decb362dfeacb5674c232d839b4c83986faa6d SHA512 5f4866a1c36908510e02f9da44183db21c0a3c8824049d3e2cb1dcca9fddd69c05b117f5ef0710af3133535fe13549499414bbbc6554fe5a3d798903affcec98 WHIRLPOOL 7b5e49a031dfc93d10b029930f5a9f18fa69bb55ddcb77d212bcd355046e0a4e8e357d7f30c72edf7ecdbbc705d52beff3b62be5e87621cd266e7f11a952f8ba
+MISC ChangeLog 570 SHA256 b2f195079eafba306422b12c6eb903e50a4d9571607878735c120bb6fccbeec8 SHA512 7aa64aea9cecd489a28904b78998ad471a466e1aef2b955c8dadfff54c4150261ef094ddd82d8fe80bce66838144a92c8e926676565f2e562882608c6e5db3e5 WHIRLPOOL d5dae54fc62bceb4255fa16dc4ad0d2ece0acfd3f5efd83f963c6edf33ed280747a1b1d662cb503160246cf817b3f83002e2e5dc0eb64416d4b2f319fc2a98bd
+MISC metadata.xml 424 SHA256 25b4b474c67fb633cc2e943bb98af2b4eba25fdff26a9b5c7bf2872c43d24e31 SHA512 b64ab21cb93c8d24a87fc0434baac17c21ef9a4a23d4d2622d6c733a043d84aab2c3cb00acc41edd9c61e8599cfcfddeb50025ea0135f9f10c0f5ee243f61dab WHIRLPOOL 9b232a1a86b18b751353d2f4d25815a2df10fe1af36ba042a944129be6c3274d76a9e56f399c683011129a4ee02ff5fba9070842c1d1e414f2050b28257da994
diff --git a/app-vim/pydoc/metadata.xml b/app-vim/pydoc/metadata.xml
new file mode 100644
index 000000000000..2b82c379a010
--- /dev/null
+++ b/app-vim/pydoc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fs111/pydoc.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/pydoc/pydoc-2.0-r1.ebuild b/app-vim/pydoc/pydoc-2.0-r1.ebuild
new file mode 100644
index 000000000000..7114a955e20b
--- /dev/null
+++ b/app-vim/pydoc/pydoc-2.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: integrates python documentation view and search tool"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim"
+SRC_URI="https://github.com/fs111/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
+
+src_unpack() {
+	default
+	mv * "${P}" || die
+}
diff --git a/app-vim/pydoc/pydoc-2.0.ebuild b/app-vim/pydoc/pydoc-2.0.ebuild
new file mode 100644
index 000000000000..ad9661d62975
--- /dev/null
+++ b/app-vim/pydoc/pydoc-2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: integrates python documentation view and search tool"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim"
+SRC_URI="https://github.com/fs111/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/python:*"
+
+src_unpack() {
+	default
+	mv * "${P}" || die
+}
diff --git a/app-vim/pytest/Manifest b/app-vim/pytest/Manifest
new file mode 100644
index 000000000000..eb987b6cf28c
--- /dev/null
+++ b/app-vim/pytest/Manifest
@@ -0,0 +1,4 @@
+DIST pytest-1.1.4.tar.gz 10550 SHA256 2e4096f6339c729b6812fd789e9baa7c9ac8dda2358a1b00cbd6fe3c431d4b55 SHA512 94240b763c332e5cd46169af86c6e775993a8ec48e5ad4138cda1dcc5798e2f40f61c484a04a91f9d7a351f3f583c72e56254bda9af8843b2a99aa451d1a8930 WHIRLPOOL 26bf7954aad6d70366e3d8df170759c8b81a64670eaea0e02b2a381aaa0e90ab6688ea3fff5f3e1ae878a3cb161928d39e34f4c1312252b85985e8a3ea534c5e
+EBUILD pytest-1.1.4.ebuild 496 SHA256 b3c48f099a11ba0c372fca7aac8419a4d59c5d5bd2e63e02e42b4bbf29ed0e14 SHA512 dfeb155de7aaffecc5f76210993cfbc89064ec33d2e35f00d3dcde77a13aaeb0902d6c7e61604e8026ab13d22fa33689605bc75ab345c46c5e5b62f2723e828c WHIRLPOOL 4bdbb132b2b7d4383d7fb2193702ead6de21c4b05c8fe08a6c417935bfd70afe7865ebe89712a9c625b086699f369f5cb082249a5f656c1770b6dfd950199f9c
+MISC ChangeLog 373 SHA256 41fc02bcd6cf709b79b72f9f5d96f4af4782d6f4aa43b284b4a170df1d5d852e SHA512 fda67cc568b8e3d3e6de9fc97783062fab99d5ab7bb0ac563f159f4a15961d5f7e2756b0af3e1fb5e75814c402a0473f95a7bb6967d3f2fd5cfa9a51b1c1dd06 WHIRLPOOL 53224f7d31b6d0eae440f6dc01310e73aa5ac211bf932531ea1bd66dc76c0e6e9717924b46812316ebfbc4cbf75df517ac47861a806fc2705b8261e4963c204c
+MISC metadata.xml 340 SHA256 b5f94f381f43622fe0bdd5583e273d70cf00bed9c1e54cf07b1441804f206e87 SHA512 5b3eb98fdc674b48cdf126bc027b5c9c09145e9020fb2b54788452e1329e64890fe78628dcf7098266b1ea72db038520959233e1ef89ce479eeab259ac31650c WHIRLPOOL b1e003b8e2358b4b83544ed9a533e72336f7f24523bb0643c8a870de2de2cfe1047e0d1355db9aad9d04da2bca13bcd4972c12da6a77ff13987216d85b511b9e
diff --git a/app-vim/pytest/metadata.xml b/app-vim/pytest/metadata.xml
new file mode 100644
index 000000000000..6c8987e6f46f
--- /dev/null
+++ b/app-vim/pytest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-vim/pytest/pytest-1.1.4.ebuild b/app-vim/pytest/pytest-1.1.4.ebuild
new file mode 100644
index 000000000000..7cf349302109
--- /dev/null
+++ b/app-vim/pytest/pytest-1.1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: run tests with py.test from within vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3424"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=18178 -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-python/pytest"
+
+S="${WORKDIR}/${PN}.vim"
diff --git a/app-vim/python-mode/Manifest b/app-vim/python-mode/Manifest
new file mode 100644
index 000000000000..cc72fa28b9f6
--- /dev/null
+++ b/app-vim/python-mode/Manifest
@@ -0,0 +1,10 @@
+AUX python-mode-0.6.18-dont-add-cwd-to-syspath.patch 496 SHA256 6179613855dc9e394f94d8e675f39277ad1e9e78e6388f09f44ee4ed44e4cbba SHA512 3008c54ec29aa0c6f9a96874bf970ddf6264b26090df55336a493ac4d69f52a8e2cb938323c064c158dc6fa7f8b94f5ae1d4761fc4b093c14bb7664e9a196696 WHIRLPOOL 58d6b5daf47bb3e69b55c6d8b57e44fb70fa0b630ee984240b2078686bd9683e3f341bc0b2ff19a2d96e7ac0034253cd9b364fc6dfc6820f147d3a6cfe307333
+DIST python-mode-0.6.18.tar.gz 386846 SHA256 d46ff14b7ee639b698d1b0ae0e7ca0dcfa95a315ffb25e523ae720461f399c1d SHA512 0e3159a055304443c8b15590c424ac0f4a4303e343882ff91f01f5b959274931dea83969ab1dcd19ce95894c7da5be60699d51b852dc73165a99a271feec4e64 WHIRLPOOL 1a6114999c1b832335268dd7dd3e9ebfd48ce9e35cdc7058e4a1011d3ac0aeb36df85ab52599460e449c0ee645303aca17a8ecb44533a5d137a9b904c426b1da
+DIST python-mode-0.9.0.tar.gz 671985 SHA256 5a6c9ea3cd8e094318cc2acbbbf1f81e37b41a67d00eedcb1a6968f8524c8e5e SHA512 03aef010a95241abf9605ca334d95a2c0b917c61aea23f794e574acd56ba5d958032975d17d1af40a5edccd90f0172783a26fc301d799fd619bfd263da685161 WHIRLPOOL 1d8f9a3a74cc6ba4ab45267dfa8366e78e313a6b8a38f66a1b7c70e0e226b1f79b5b8a162cd841666ddbf663dbbd7a9df847d2b428b80a03ecb39126d375f1d5
+EBUILD python-mode-0.6.18-r3.ebuild 1553 SHA256 f0a0768090fa94d38ccd8bf2933c8166d7512744abbff3903f9e7b9f2bb641c5 SHA512 0aef727c7ad80dc374be31f65dfed787cf9934b80e0b91a03f686062cdb222156b9db3c332e2d01dfb6d2e9f0b33a54ede023f20addda8cc1b24c7bc980bc20a WHIRLPOOL 9a3640900de05b09279547c51efed7004e658ec520c46115493914eb4beaf043024582a2373f5f088fd48bc3d2987d8074fe8b9505584a5f453f5b6d1d8bf58d
+EBUILD python-mode-0.6.18-r4.ebuild 1861 SHA256 3851c13a597b4acf4d51653e2544840d7e8986959e28d26278d760610aef77fa SHA512 dbaadb05f7ad3642719f69af0c84faabf9e94dc49a04be4c7ba7d7d1e18a9a973390e5b0b087e062b406abb91a4dde11c1e15f27ad10de593af6ab13c5123852 WHIRLPOOL e67ea16297b355e9902f0289ea88a7da3a89764d7e2bdf5404e021f619171077eeb30501608c90b7ff4f714e783c3264995ce3943615558d053e033529344a84
+EBUILD python-mode-0.9.0-r1.ebuild 1193 SHA256 1608e92ad6b9853ab129da3767f26fb2ad96493e3379cd3e61bb53ff082c475c SHA512 9406bdcf3000fd01f803a69dbe8a93c6dbad675b85e5996e173095d25c936cb496587c7e9b9c81c8327f11f090984b2609869d1e2d4a2e974a4aa87fccac0683 WHIRLPOOL b100dfa196ed7261d8c91fff8b7e6f28a1ed89341a55fe0746be6530276414abdc8ca6bf3ab2cd03a923388db6f56ad5c9f2fc4080688471362522332d7fa0f2
+EBUILD python-mode-0.9.0.ebuild 989 SHA256 7bb4c5f4e2cacbc18be374a056d10c3b44c0281469fa2a7e55e922bebf23f224 SHA512 58260c9aa2b577a3f1267d7d7f0b9fc967d3c98a1211ebc12cc62a2ae17b6e74d91902cb74e7662f60f1df58b8e13677b5075b14486b32fcf77423c1000a5b01 WHIRLPOOL 9e0528c92e3f2a44d2f331715a1cfd823dbcc853388ffd8d6a33717efbcb3a3f838486a0ba56f7b1db5fc3f919bfc4be5c603a6efdcd75808d2449fbb455a46e
+MISC ChangeLog 2862 SHA256 b7b8439882fc35e319a678108580c86618e0f65fadca92c765f8860dabef96dd SHA512 cbb37a327a7fd4d340c0e5aec3c4f1c7e2352a21223a99113961347aa44fc90d5af764ad17de3c5752d9c1067e38ff805f7924a95a704fac9da70ae0b307ce54 WHIRLPOOL efe8559e10b1bb197d6acbf9fe9d209d822bbd7e1b047b3526eedc364721fe182b34457fc5025598e5ba6a7c7f5f33174ed1723cf3be8217f16d0479e9d40fff
+MISC ChangeLog-2015 2449 SHA256 2886b480ef0d086972f3e82d17fd7aa7d2229a7df7030031650d749d5b023a43 SHA512 82db96e9b597cadd88a8c62b3d44bc32eb887c9dfea695bb760e91483645ada37004179f97fcdcf9f74335623851ec9e4aa2d6777c8ce4ad9d9aff77733ea9af WHIRLPOOL 2004975a8b4dac5625b6986d399c3379675030c85bc6d337236c1c67197f7b66b188908a32616c0061b4e10250eff3cc36e598bcfb63056dbbee0798768c64e6
+MISC metadata.xml 590 SHA256 a1961c5663e707473cf03867bbabf500f5bc8b6c86bfcd7b843f01fd3add16b3 SHA512 b6fbd9c3f197ca6b1df05584448514c12f78eefa1a7f80fa74c0a46ab3e6fdce1b3824fdff22060cf056fce1463ee4af62b7988c7a5025942e7ed072ad9f2d99 WHIRLPOOL f0cdf34b6a1ff36bb42c2a43bd71896ee393601afbd5cb77bbfc67e27711daf08f752739847e5939e570002d07f4c5222e74a476053e03cd15396f58ab72bcf1
diff --git a/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch b/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch
new file mode 100644
index 000000000000..fb92614233bd
--- /dev/null
+++ b/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch
@@ -0,0 +1,15 @@
+https://github.com/klen/python-mode/issues/162
+--- a/ftplugin/python/init-pymode.vim
++++ b/ftplugin/python/init-pymode.vim
+@@ -46,10 +46,9 @@ if !pymode#Default('g:pymode_path', 1) || g:pymode_path
+ python << EOF
+ import sys, vim, os
+ 
+-curpath = vim.eval("getcwd()")
+ libpath = os.path.join(vim.eval("expand('<sfile>:p:h:h:h')"), 'pylibs')
+ 
+-sys.path = [libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
++sys.path = [libpath] + vim.eval("g:pymode_paths") + sys.path
+ EOF
+ 
+ endif " }}}
diff --git a/app-vim/python-mode/metadata.xml b/app-vim/python-mode/metadata.xml
new file mode 100644
index 000000000000..40d7427cf17f
--- /dev/null
+++ b/app-vim/python-mode/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription>
+		Python-mode is a vim plugin that allows you to use the pylint, rope,
+		pydoc, pyflakes, pep8, mccabe libraries in vim to provide features like
+		python code looking for bugs, refactoring and some other useful
+		things.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">klen/python-mode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/python-mode/python-mode-0.6.18-r3.ebuild b/app-vim/python-mode/python-mode-0.6.18-r3.ebuild
new file mode 100644
index 000000000000..b261bed53428
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.6.18-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+inherit vim-plugin eutils
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-python/astng
+	dev-python/autopep8
+	dev-python/pyflakes
+	dev-python/pylint
+	dev-python/rope
+	dev-python/ropemode
+	"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dont-add-cwd-to-syspath.patch
+
+	# debundling fun
+	rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
+	#rm -rf pylibs/{rope,ropemode}  #475686
+	sed -e 's/from .pep8/from pep8/g' \
+		-e 's/from .pyflakes/from pyflakes/g' \
+		-i pylibs/pylama/utils.py || die
+	# there's still pylint left, I failed to debundle it :/
+
+	mv pylint.ini "${T}" || die
+	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+		-i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+	vim-plugin_src_install
+	insinto usr/share/${PN}
+	doins "${T}"/pylint.ini
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+	einfo "If you use custom pylintrc make sure you append the contents of"
+	einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
+	einfo "to it. Otherwise PyLint command will not work properly."
+}
diff --git a/app-vim/python-mode/python-mode-0.6.18-r4.ebuild b/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
new file mode 100644
index 000000000000..e8f195d59fa6
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	dev-python/astng[${PYTHON_USEDEP}]
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/rope[${PYTHON_USEDEP}]
+	dev-python/ropemode[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-dont-add-cwd-to-syspath.patch
+	eapply_user
+
+	# debundling fun
+	rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
+	#rm -rf pylibs/{rope,ropemode}  #475686
+	sed -e 's/from .pep8/from pep8/g' \
+		-e 's/from .pyflakes/from pyflakes/g' \
+		-i pylibs/pylama/utils.py || die
+	# there's still pylint left, I failed to debundle it :/
+
+	mv pylint.ini "${T}" || die
+	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+		-i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+	vim-plugin_src_install
+	insinto usr/share/${PN}
+	doins "${T}"/pylint.ini
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+	einfo "If you use custom pylintrc make sure you append the contents of"
+	einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
+	einfo "to it. Otherwise PyLint command will not work properly."
+}
diff --git a/app-vim/python-mode/python-mode-0.9.0-r1.ebuild b/app-vim/python-mode/python-mode-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..b17c1530666c
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.9.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/rope[${PYTHON_USEDEP}]
+	dev-python/astng[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	dev-python/ropemode[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+		-i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+	vim-plugin_src_install
+	insinto "usr/share/${PN}"
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+}
diff --git a/app-vim/python-mode/python-mode-0.9.0.ebuild b/app-vim/python-mode/python-mode-0.9.0.ebuild
new file mode 100644
index 000000000000..1992f3c0658f
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+inherit vim-plugin eutils
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/rope
+	dev-python/astng
+	dev-python/pylint
+	dev-python/pyflakes
+	dev-python/autopep8
+	dev-python/ropemode"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+		-i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+	vim-plugin_src_install
+	insinto usr/share/${PN}
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+}
diff --git a/app-vim/rails/Manifest b/app-vim/rails/Manifest
new file mode 100644
index 000000000000..f0d53a7b876c
--- /dev/null
+++ b/app-vim/rails/Manifest
@@ -0,0 +1,7 @@
+DIST rails-5.1.tar.gz 57639 SHA256 d7de2f81f41b2895cebd4568bd66c76934453b81a075ec439f22dc79bd7e036d SHA512 15aac8a66c84c939ad7628480ebae8008644a09c4901d1c20c09945232f39ccff236f4d0926dc4f902b9373bda30dc6740d76f7f580e5e74892cb16749ad5a11 WHIRLPOOL 1326312f9ed11e65494698c38c987115689844985eaa67110771b2ac234f9aeaafa2534210bbf77061d958926c287dc3962caa39c5a4b3935cecf8390846deb9
+DIST rails-5.2.tar.gz 60940 SHA256 b9dda94631dbb5f2c7b2e5bbf404d10f171c3b36754b2c8a0feeacef5633150d SHA512 0a704545b864eed46513747ab3a9f0d3537e3d6a5d01cb1cf628131f79b4b72f90e567df26364e3344adef423ccf96586367a97d0e7d4a8be9c72f54e842a810 WHIRLPOOL bb382e017667e0dbab671b03295a5934171f0ce5a115751e3a0f8366d7c0fa0bff3b3834fe41b9467ad0d5498228d91c6cfdbd73ca22890cfd588b166502ca18
+EBUILD rails-5.1.ebuild 559 SHA256 16af087eacb9c1921ada4e4bd9525280ca7c932624c4570d85a937bec7706ef5 SHA512 2bc01572ae563aeab6616988c6cce10c1efb0afbd2af9f7b6117bfed86679d7d5ba47286958d8e364a95762e385eab24693db90584a82435225975220a7cad3b WHIRLPOOL 32b03cc1b7020822517eb52bde71717c235dcb934a54d5511de7ee45c249c9d9191d16c37c4f541aeae05866f86b53785d7e704ed65d4772ff0755727ea638b7
+EBUILD rails-5.2.ebuild 559 SHA256 16af087eacb9c1921ada4e4bd9525280ca7c932624c4570d85a937bec7706ef5 SHA512 2bc01572ae563aeab6616988c6cce10c1efb0afbd2af9f7b6117bfed86679d7d5ba47286958d8e364a95762e385eab24693db90584a82435225975220a7cad3b WHIRLPOOL 32b03cc1b7020822517eb52bde71717c235dcb934a54d5511de7ee45c249c9d9191d16c37c4f541aeae05866f86b53785d7e704ed65d4772ff0755727ea638b7
+MISC ChangeLog 2780 SHA256 a5dd84f3fc00b094245d0f38832efac2a1b0eb4d0323e4aeedfd5fb166bcf7a4 SHA512 f7c74a9bbc1f9a39c58c7dbad119274e0c1c29c63ab64ab6c6c0f10f29e5235854ca2b2762ed03a05e7304299807f91330394fc39b8e3a247d98a426fab7f6b1 WHIRLPOOL 701d31e5f15ee33e164fdeb7919f0514ee10f2eb66f491d9bcd7cfd051a4e180c29e6464313182f5c23b8ad8d8206de444aca5c5e38a2ffbca90a361481b7eee
+MISC ChangeLog-2015 782 SHA256 6836e481616ecef7655f2e961bf1f74a299ebbf059614337adff49e1733d55aa SHA512 14939aa94adc1c0bd3e2477715efe4bd9b528454d2f61cbb89a2b3c6447fe8dc0c27e2c69958945333cf26e3542b4e40fb3854c1871faf6301febd297186e443 WHIRLPOOL 61bd3a0b61efcf8feb66998686a13dd16c3ee1099a28039af7aaed67e012083d83558ebfcdf6a989cda51595850254970516004c5f039d589d38d5b6f0aa48ef
+MISC metadata.xml 339 SHA256 7fbb18f5bbd18b78d2624673feb08e3c8ace758989a3adfe54916b0e1fe2edb8 SHA512 6c08bc15b40f53439632423b8139d2b10cb3a3e2d237e973efb08ab95e2ab306557cea32eb11fd31aceb4d03b2392f981595d181a9c2815801bbc6938be9903c WHIRLPOOL 8d267ac705510a598945a25d4c0093168d78d745163ebe45d3e1004db10ab8fc143608ad70a3ab6cb68dcf3a836f719217614445d400dd273639326fe56ffbbd
diff --git a/app-vim/rails/metadata.xml b/app-vim/rails/metadata.xml
new file mode 100644
index 000000000000..2294b568b512
--- /dev/null
+++ b/app-vim/rails/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tpope/vim-rails</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/rails/rails-5.1.ebuild b/app-vim/rails/rails-5.1.ebuild
new file mode 100644
index 000000000000..8ccec2791abc
--- /dev/null
+++ b/app-vim/rails/rails-5.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="vim-rails"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: aids developing Ruby on Rails applications"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
+SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm *.markdown || die
+}
diff --git a/app-vim/rails/rails-5.2.ebuild b/app-vim/rails/rails-5.2.ebuild
new file mode 100644
index 000000000000..8ccec2791abc
--- /dev/null
+++ b/app-vim/rails/rails-5.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="vim-rails"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: aids developing Ruby on Rails applications"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
+SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm *.markdown || die
+}
diff --git a/app-vim/rainbow_parentheses/Manifest b/app-vim/rainbow_parentheses/Manifest
new file mode 100644
index 000000000000..3caea3ecaddf
--- /dev/null
+++ b/app-vim/rainbow_parentheses/Manifest
@@ -0,0 +1,4 @@
+DIST rainbow_parentheses-1.0.zip 2827 SHA256 e0be4686a6a8f095be57f5f9ae7d9d43fd0390fe11bf983e95de8b83ef94114c SHA512 326310058a7dd25fbd47105334cc1a6a059d40842afe48164922b7869af344dc230a5f3b329c13d5d0ae9779814507defa8d0ff56b951556e8f2bd685313e569 WHIRLPOOL 2b8878875e2a0996a5a85124ce43064786a8cef4cb2ca69c2db3e74dcc590f2ad8d2b87249848244f0d79cca5bcfe0b730b0e4430b39edf23ff14ea9d81a9d02
+EBUILD rainbow_parentheses-1.0.ebuild 465 SHA256 a5530d93127574ff1532888c37a067ea7ed943a9e904d7718d1430995fd191d0 SHA512 26bd9fb6ed5a1ad321d80c87077b757d88c9a00ad8f053e634f603fe7352dd70ed8b26067d60cac8f49c96f459b8cc471fc2f68eae6171612095b79102668d5b WHIRLPOOL 340fd31f0e471a5e351cfb702d16bb7201cb9dd4f40e327bc60edbb11397e4982dad2604e553b15cb5086de2b910599b6b917fd9a987798c22663f6f861194e3
+MISC ChangeLog 771 SHA256 cb8d23e51a5f39aea1ed86640d0decfe7eb96f3e2eea63b617da96361de416bc SHA512 790962a223eb69c2616bef94153d73bdc8c641c71eb218047a4ac82da1d28b770831b83d620db65c5639f620433c1425bc87ddaac5fd2e1426a631f402ae2942 WHIRLPOOL 1e8487101947d748e931a07c331abe27407061c315e78fd49fa96e42bdf84603ab72e1525316fc33e59d6b01984b82eb72f0d0b5c6e083c6ce892a9fc0b12333
+MISC metadata.xml 454 SHA256 c1a558c038a6cc05b4e604c325b8044f86b43d751593ee3e5a670a617ebe389f SHA512 a4b31f36a2f9097b165e424cafdeb772ece04ecbfc5b7813e17ae13eb5ee4a15f1e180fa20ac722087ba2968385c766ff76be1599dd584a01d804604c732dd63 WHIRLPOOL e9c46550fbedf3b5a1d38eb8fd5673589390e765f67e5227d938b8a44533ec3792cbe083714fd6bcaa4551a50544e8e93a11f0067f3c4274d8b4434a8fd95b9d
diff --git a/app-vim/rainbow_parentheses/metadata.xml b/app-vim/rainbow_parentheses/metadata.xml
new file mode 100644
index 000000000000..d73a957169b3
--- /dev/null
+++ b/app-vim/rainbow_parentheses/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kien/rainbow_parentheses.vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
new file mode 100644
index 000000000000..c9f0a4f2d4cd
--- /dev/null
+++ b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Colour parentheses to differentiate nest levels"
+HOMEPAGE="https://github.com/kien/rainbow_parentheses.vim"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}.vim-master"
diff --git a/app-vim/recover/Manifest b/app-vim/recover/Manifest
new file mode 100644
index 000000000000..f09c3454af57
--- /dev/null
+++ b/app-vim/recover/Manifest
@@ -0,0 +1,5 @@
+DIST recover-0.18.tar.bz2 8137 SHA256 9fcd1d440ef0709b4c9719c758d67ba349970b08027b16341290170a4b27cde4 SHA512 fe31626bd9bfacf299536f4943b65d61262da8bfec9c83b085e67a52833d8fe8c5ecc81fade50c451cfe2889e0cfa938401635a2c9471ebd31191fc1c7beeb71 WHIRLPOOL e1d159a1c182f514a625c9dceadb6ecba6f2a9b9b9f335654cdc53ef4758bb9922a46a441ac8079590d1ba1196548c5a275f31d8ff580510616c5d93e9160f35
+EBUILD recover-0.18.ebuild 371 SHA256 a0df64f9f7459240fbfa532090086b1fc6aa1b30258a8c6e030b93f3640513a0 SHA512 d27885c8cc7992743ebf53a78d7829370848e01e20b1f199ebab4f5f119918cd1d0fc8f115d051c3e3cd4f5c21242ea9002670c7000670682a837881b99e8921 WHIRLPOOL 4e007f19135ca89bfd7009325fd255f5d7dc6c8648825c73cdbd193dde328df832d60c6d9e9d10878ee9c984f352ddf2e819b5443b0dd5cd6003e750c7ffddeb
+MISC ChangeLog 2558 SHA256 fc07a53a6169c1b100c4d348e5bf4157516602be20fbcce70f03d8fdedaa419a SHA512 6f2528b17560440bbbf0cebfe103b6ddf091bb08fb103be68dcc8b65d445d841379baa9ea1dfe8eaaddb08d5509e1301f92e6b66e649320efb2d2721d5f8e1ca WHIRLPOOL 418274c81612a0e1baec9b5555c1104f6b1f034cdcfa0522d5626ce1397ea1b6d0ba406044a0e6ae98f5d3f7f453d94fb5547849e4c725cfa44535f8651d6a69
+MISC ChangeLog-2015 440 SHA256 446f59cfa265bc0829dbe51ce428239ec50218e722041d2962ec69382962c6f1 SHA512 e7a405865e3bebab89429b3eeea7be62baf77312e5f097a1a7141597cff28c5c90837902b06508039f1119505bf7f3ed967842460e6258d1182b0da9cf9f437d WHIRLPOOL 8ab0afd1f84e21a38a9e782e090779e1ad06bf5152cc94b90d5c7c7afa9961be0732c3bd4fc37b4bc1ad0797379be675e926f2c8fc9137133cdb6b9a844ccca0
+MISC metadata.xml 344 SHA256 0c162cd55c9d3d7a5380a07bc940ee1b2426449696b432048835b12dd38f129c SHA512 7295a8980ce4a1e57fafa002cb40fed1af649626ee9bf544332c4689fa0ecc9af4c5d8f60dc52edebe1e9929ee635d2b0342d4482caa981fa4b12e1a4160c7c8 WHIRLPOOL 8a747c468762a10ced8266c7d085965ffadfc60ec21abc979bdfe4741814044954856a9f30acc865bb10a74f935d2062bc23d36f4a054efe27e6e0fd6546ffa9
diff --git a/app-vim/recover/metadata.xml b/app-vim/recover/metadata.xml
new file mode 100644
index 000000000000..2a6d61b908b9
--- /dev/null
+++ b/app-vim/recover/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">chrisbra/Recover.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/recover/recover-0.18.ebuild b/app-vim/recover/recover-0.18.ebuild
new file mode 100644
index 000000000000..38cfca9c21eb
--- /dev/null
+++ b/app-vim/recover/recover-0.18.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: show differences for recovered files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/reload/Manifest b/app-vim/reload/Manifest
new file mode 100644
index 000000000000..6ff15823e02e
--- /dev/null
+++ b/app-vim/reload/Manifest
@@ -0,0 +1,5 @@
+DIST reload-0.6.17.tar.gz 7028 SHA256 4a51350effee39a13296111e5156559aa4031046ed03102ed8c4a9a9579df3f3 SHA512 639ffcea9bf94b0a8346850078f59ff332ff6180b042d2c22662d5c637307969644607ca3f19e2648a1ef9a019788ef1f83be52b627ca6784e16d1b7bddc39cd WHIRLPOOL b55a7dfa9da13ccc9c0159a43d3048ae2eed717b0f0944e6dd70aed8783ed6bcbfe8b625998c8672fc15e6313d41f3e7a24910c25bfbec41da7be6cc392d313a
+EBUILD reload-0.6.17.ebuild 508 SHA256 b4cba40b7c5e6ffee8f71cc396707890af214967ccb55abb6b569ecdb168995e SHA512 fa6ca4568cd17547e9e7a3a506911e4cad913ab9008e5b9c0d230a47e46a9ed375ce405d99fa80a25592e9913dbff601679a4aae9b25ad324eded6f7d6833e40 WHIRLPOOL 883aa945a8804aa2e9effb99d82f64f73a219e34a7f742363ae61c647aad40f78ea1469932dc463ab0aee68eb292132cf36b6c98063868bc8b2f59840461e3e5
+MISC ChangeLog 2425 SHA256 b76a35d47548415d80d0999cd1dd82329a38d24cca9b86480888889a43fb9030 SHA512 be1dc15e5ab3ce3e2944bb6e52c8758312208cfb3054faddb27727316aa3b795c9b6f76d13bb54e81467dd1c0ddd22ac058f8f0dbf2b0576541e3b82f0709b7a WHIRLPOOL 3ad8537575a4dc24d773439cb37bcbf590b051df18189628fcea957848e1c6fa211a8a2e55fcfb02b8426c2900ecf3c713c9f83ab0617efadef5ebeacb52f423
+MISC ChangeLog-2015 1134 SHA256 f7becff73f010c36ed3df313453bdc30b7e1bf13b439b786090f487a95314802 SHA512 bb130e18ecdecc53e995c6fef98ca2f42c04b86d125f52fa1f9446776c54ee5ca9abc34b3a525fd79e5073ad83c66c16335725451a2e705e2cb5fcf19c76d79d WHIRLPOOL 720a564511e08a696c6d2c366fbaeca02a3ae4067e54a468987b0a1a231bddc0add0b1161c4e96b5964b4f83b0da4a0bab3fd055eb50d8dbd1338d5934415a1c
+MISC metadata.xml 340 SHA256 5fbf512bda36f7e1a7072591ea3e5d4da479b5c242cf5afefada9da5bfa2ae23 SHA512 25a88a091f9cb2756f5e28361ec31f79997114271499c3522f47ddd2a86d8dc9bba42e533e004a040b7598dc380ef84480966a1d3641e333f423a810223bc1ec WHIRLPOOL 0496b582dc9a1b762126dd45231148f5976d681f8ba978c8c605bf87b0720ee6a321d2c75547c238321e37b575ca2c552bd1fca614d8a90fc8e711f3948c14b0
diff --git a/app-vim/reload/metadata.xml b/app-vim/reload/metadata.xml
new file mode 100644
index 000000000000..e94902a72acb
--- /dev/null
+++ b/app-vim/reload/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">xolox/vim-reload</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/reload/reload-0.6.17.ebuild b/app-vim/reload/reload-0.6.17.ebuild
new file mode 100644
index 000000000000..b55fba2bf075
--- /dev/null
+++ b/app-vim/reload/reload-0.6.17.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatic reloading of vim scripts"
+HOMEPAGE="http://peterodding.com/code/vim/reload/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=app-vim/vim-misc-1.8.5"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/vim-${P}
+
+src_prepare() {
+	rm addon-info.json *.md || die
+}
diff --git a/app-vim/repeat/Manifest b/app-vim/repeat/Manifest
new file mode 100644
index 000000000000..4d6082d4f9b3
--- /dev/null
+++ b/app-vim/repeat/Manifest
@@ -0,0 +1,5 @@
+DIST repeat-1.1.tar.gz 2621 SHA256 1e7f98140d126622352e85483ce33f41ab44ca64fd0fea7bc501d2ac5e643c98 SHA512 9df73c7049f38a93da5e6bd36dc0fe833ec23394540de1b6929159910ec9f18af2a76211af612bc8f3c92d9c7f2faacd72a65d7d593584689ac6a7068df60bf9 WHIRLPOOL 5a0c03aadab21f2da125d4fcac6eb6fee8941334ab3f6f839e4db9a5b4651533beafa520a7f6c08b27d82f90ad1e28195240fa379b2eeee4f22ae979da814388
+EBUILD repeat-1.1.ebuild 528 SHA256 a376086d0e58a4f83d03668f1440d91a4a6e02c4d7b321de12bed6c5e83ee3a6 SHA512 6bb3c6c90fa9435e4711fdf07eeba33833f29147fd5f3c3efc1b7dae78d66299ac00b3a7ccd672e512296200ecd062495ce04c5c65deb1d860dd334b3d11e9a7 WHIRLPOOL 4acecbec8e4064f794092f4227e8c5710a3fd772c86e41282c963b6707e98c94448065aff5feb8d531cea0949f0f13d6a308513e54529ef5d68a956a506d15f3
+MISC ChangeLog 2419 SHA256 e1dabab44c6edababba1bdddc62153ad75c362b8b9e1fd25344cf63659aae294 SHA512 bf1ec625bbeb452f2f7d059d53a993a1d99208f91260e1eaf51999bd3767c69ce4705873c2db3ac0ebcb7e416aca538425b05a852984c3f4c6bd3ba50c291c51 WHIRLPOOL 2f27e30b2333c2b6fa9678b80fe7da64833eeded3b011fb61f0e13e94a8a34f621e349f2e6be46aa8de8314b46f3d419bf6c0c98752acbaa4e677b8bb8c4eb72
+MISC ChangeLog-2015 698 SHA256 1215664ee4244c218abb829c4481adee0597e524b4433821d06ee856fe7cf41c SHA512 b3b3369c2c481af31bdb847fa726674335caa1fcaeaf00eebf307f1f472274d5604ba2aa1f0180167c14549f7a8884e9c87b5b7927b3ba798cd8b2c3bcb2ae10 WHIRLPOOL c0be93cdd7fd503d45d4ea53f853fbd9f702ddcdbe3c70616f0c75bd8e9111b2706115d71ab945c1caf54fb1ab098f4dcc29b2d4e404087c8f03d800cc4defd4
+MISC metadata.xml 340 SHA256 1f6d09d646ca89f40e18fbcf687e879e3773f5d6e2953bc0e99d537d0e942a8d SHA512 126d76f034905a45118eaf05237228af870c065ed967ead33818101d13dad96cfa6ccdccbb4e394e69fe5d698bce0ffbbd4c03315a11866c9b56f5189dbfb6fd WHIRLPOOL 177c343a17107173eaca9c0ff9383d1d18effc782bc2cc663f6521d664a1b9e8979d8770bacadd7218e794f352405b1b0bc1ea3718ec9bbd811a439a0e62f61b
diff --git a/app-vim/repeat/metadata.xml b/app-vim/repeat/metadata.xml
new file mode 100644
index 000000000000..c61e73016706
--- /dev/null
+++ b/app-vim/repeat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tpope/vim-repeat</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/repeat/repeat-1.1.ebuild b/app-vim/repeat/repeat-1.1.ebuild
new file mode 100644
index 000000000000..be184379eb33
--- /dev/null
+++ b/app-vim/repeat/repeat-1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="vim-repeat"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: use the repeat command \".\" with plugin maps"
+HOMEPAGE="https://github.com/tpope/vim-repeat/ http://www.vim.org/scripts/script.php?script_id=2136"
+SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm *.markdown || die
+}
diff --git a/app-vim/ri-browser/Manifest b/app-vim/ri-browser/Manifest
new file mode 100644
index 000000000000..8d33dc0ebef5
--- /dev/null
+++ b/app-vim/ri-browser/Manifest
@@ -0,0 +1,5 @@
+DIST ri-browser-1.2.tar.bz2 6499 SHA256 0e33657502bd072135ff53fbc433561d412d771eeda5cfb0693ee5d62209f13c SHA512 98ce57ee9368d22c26b7c9e4a609add45296ed0af1b6a2ca0929344ab7cfb92b6640bf61ecf77b16831236594be54449fac38a2d62520676a55737abee24e305 WHIRLPOOL 030578c53789c08209c1bebc5f2ddf83d50af17e79510c622533154d8d5ba38deb23df4d4171b5e260f8db70828cc948ef8337e01339b869720fa9d8c16fe883
+EBUILD ri-browser-1.2.ebuild 425 SHA256 0ebdcec638025b94fe98b50b0f258381174678ec8d74fdcb50169531436507b4 SHA512 0d99196896f688bd68c9b8e85dac7515198c5641a3f7b0b626c105d092b02dcce5c84f137f4d066dd941e9f8afdc4d9451ab8c2b1a8ade155139cce3c10e4ded WHIRLPOOL 1a2def0fabe8dbb833e93177d3380d661493c959eb351f1b463eaa61031912a1de5d1adc196eb7e942d2530bead0a6f97412f278e15b6c611f5b0f73653c3584
+MISC ChangeLog 2824 SHA256 a2e45fe41cb7b3104ad48bff8cd989f6404d448e5d26db96e2e44053263a35c8 SHA512 6a3778ecf383e152b84439f32e923489a3743293e8cf7368a01671340c6905ebc5e802d68a49d8941c701aac7ec6a363481b36a9ef9c10f4312efbb7f880070f WHIRLPOOL a70c163fdfda66491d3b0ebd3097f0bf3f686581b44b9646950ff91669d1c63a770e4fe0418ac0469e9c36a044e173b139cf8180b7934189dbe8c8b4c646daa4
+MISC ChangeLog-2015 864 SHA256 1dd4f0c550840692b48ab8f390593dc89230e11bb97990a2327599f556c08a75 SHA512 14cd3bfac3f77fb3c0b0b267123ddebf7a97152ef6dd07934d673ca23b164a9e67e4426ff103ae32a842347d1508699da040a809c7039f7f9514bf3029f8cf82 WHIRLPOOL d97a1a90b930ea9a61fe1821d421277dc0de002b6d9053cb521c5bb05bfee92996c005b8f14748bafb0a78207dd3f456797f92bfad69c16a2002c49c08a38c4e
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/ri-browser/metadata.xml b/app-vim/ri-browser/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ri-browser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/ri-browser/ri-browser-1.2.ebuild b/app-vim/ri-browser/ri-browser-1.2.ebuild
new file mode 100644
index 000000000000..e7aff9419ffd
--- /dev/null
+++ b/app-vim/ri-browser/ri-browser-1.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface for browsing ri/ruby documentation"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=494"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc"
+IUSE=""
+
+RDEPEND="dev-lang/ruby"
+
+VIM_PLUGIN_HELPFILES="ri.txt"
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/rust-vim/Manifest b/app-vim/rust-vim/Manifest
new file mode 100644
index 000000000000..b495f84c063a
--- /dev/null
+++ b/app-vim/rust-vim/Manifest
@@ -0,0 +1,6 @@
+DIST rust-vim-1_pre20160829.tar.gz 23801 SHA256 43234612d8a5ecdb6c4e988dcf14dc15b0c7c9b473591024b12cbeb09eb187e5 SHA512 bfd9290f03f3fb0ffccbc1d78f9e37c5d3ca57379f0b505e84b445105bd5a011f623f402d35407a634eaef4db9ad3fea68517057aa4d84e99206bc99067daa3d WHIRLPOOL b004a6d2fd63833d658ba2dcf38bfd2dc8e39fcac75b6dddae56a47a8b288908a9e613d12d75e0380e6443bfff38c49204c829be0a2502bce28b64fd68014a89
+DIST rust-vim-1_pre20161204.tar.gz 23759 SHA256 113442bc6fc3b9411a64ce5192a05c51438e3adac8a70ff699c2b0d7e82e8f48 SHA512 2b0ef5ae8df7ab244bfb97e04116a6f25c210d3736c7f78324c41fa44ec92562615d466bfb45de7a9239a2675c2212dfb88e951d3054e68633803a162512cba3 WHIRLPOOL d106a54f18e9a29a1602b9f362d5ed86316c6fb1cfdef38d448b37aa824a5f275583c2a2d97fbb79d38834b2d156750c7a4b4fa73215dcc052a617f2e588685b
+EBUILD rust-vim-1_pre20160829.ebuild 436 SHA256 70c432c2b79b0a06b24fc6720b1618edfd67a30bf24a65e7c6499d6e45279fc9 SHA512 84fd5b6812889e6da86c1258781b1a384babbc41f781bc681e32c93ae1bcbb441bb577c3954ef0cd42075831d6003ad0abfef0b70c568d76289a9455f9ba3834 WHIRLPOOL ad4ab8138a4f7b68c07889e7c0f6675fab2f72bdfa15ef26981b58df91000c940dcabafc574685a1b6e005c710bc51835aab0770c6bb6fd0e66b664067942d45
+EBUILD rust-vim-1_pre20161204.ebuild 436 SHA256 0b45fe2261601776fdd8439236534016cef4653e869eb5b93fbad45652824294 SHA512 85b8f8fff03a921b3a08c26a0ae820d6a08638030567bd37b7fbe4126d0bf2cabe4110b1317e41372aaee2bd55ca20e5f7bf8ff1c94e624c5f9d84210265e6d8 WHIRLPOOL 372453e77be8c5f5673be81a69d523b6af1cee2d051eaa2255286e0c9feb11148f5b5ab0e23c7e7f4a02d540c6b56e1663cca5caa6dcc01fbae2772e37902e60
+MISC ChangeLog 1175 SHA256 f695d396cee103fb2197e3e1b8b2ef0060343c3002e2955b9577a2b810558d71 SHA512 15abeef2ddc5e6f38113f8cb6ec0a9e0739298bb5f1aa0340181e55854e8f1195d8e77f30f3c0df141e92151992c13aa6721b7ed60b7a67a5fd0d7367b4909ef WHIRLPOOL c2ed4d35fdffe910a63b53a83420af0361d3f0c9c217dc49431b068037485014587d2bf175da7514ae08e2317ca521bf40189968e099a93b97119bc402edc3e3
+MISC metadata.xml 466 SHA256 639ae84ecd8dd6d63b3eac4c2e3ab7de847108a0b0c9376b27e5c25e2ae63a46 SHA512 c5f50d3f28ebd55380e26b349a3410eff3aef28f37a42174c018fb49e37aaafa17021d73fc02503c8ee7482536a8b18ee8b75e4eeaf6ea1d1dfa58530e283307 WHIRLPOOL 1c6d0fe86185b7c9365199be16f564cac2afeba14a1593f6df6e2981aeb0a3d6fb5e44555a5f50569835f13970f6c52f9c94d07239c5e5593fecbceada706111
diff --git a/app-vim/rust-vim/metadata.xml b/app-vim/rust-vim/metadata.xml
new file mode 100644
index 000000000000..170cf0d86713
--- /dev/null
+++ b/app-vim/rust-vim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hilobakho@gmail.com</email>
+		<name>Mykyta Holubakha</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rust-lang/rust.vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/rust-vim/rust-vim-1_pre20160829.ebuild b/app-vim/rust-vim/rust-vim-1_pre20160829.ebuild
new file mode 100644
index 000000000000..dd71f623c568
--- /dev/null
+++ b/app-vim/rust-vim/rust-vim-1_pre20160829.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+MY_PN="${PN/-/.}"
+REF="fc11d02fee330df7b30c83a80f09dd0c60ab43ce"
+
+DESCRIPTION="Vim configuration for Rust"
+HOMEPAGE="http://www.rust-lang.org/"
+SRC_URI="https://github.com/rust-lang/${MY_PN}/tarball/${REF} -> ${P}.tar.gz"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/rust-vim/rust-vim-1_pre20161204.ebuild b/app-vim/rust-vim/rust-vim-1_pre20161204.ebuild
new file mode 100644
index 000000000000..ca93837d63dc
--- /dev/null
+++ b/app-vim/rust-vim/rust-vim-1_pre20161204.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+MY_PN="${PN/-/.}"
+REF="eed97e75117faaf210cb6103cf39a797fe21bfbe"
+
+DESCRIPTION="Vim configuration for Rust"
+HOMEPAGE="http://www.rust-lang.org/"
+SRC_URI="https://github.com/rust-lang/${MY_PN}/tarball/${REF} -> ${P}.tar.gz"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/salt-vim/Manifest b/app-vim/salt-vim/Manifest
new file mode 100644
index 000000000000..072f45cce94e
--- /dev/null
+++ b/app-vim/salt-vim/Manifest
@@ -0,0 +1,4 @@
+DIST salt-vim-20151119.tar.gz 4009 SHA256 7ac88028007779a69355a946ffe7d8f93725bbb56b334e9cd601104cfc527646 SHA512 4267263836c986c33d19739afc8ff710234f3519b3f2ed5f4ddd1a929691e02563dd87a0d722d098a2038610b3b0d5021d00497b25cc00bd6ec6b6fcfedb9105 WHIRLPOOL db55f271b0268b3309be97a3d0047427534670d25b94fe26a9168de255563d4955eaf7d8659f09193a57940b587e06683756f57a005b77afe3bc9f83ca53028c
+EBUILD salt-vim-20151119.ebuild 561 SHA256 008f41071ccd4fd6a84352e8c5ddf16b61cfa1aa704472704ce24a870aaed885 SHA512 502822db571a73106316d59012f877b75d794d6c692c8779c7448c851ef03459f317f01bcd5dbeaa9ffe567f04aa2d1ec0576831bc215393ac1f642e2ca3e68f WHIRLPOOL 75c1279eb4e50b110b3d50f1b84bc3a0967b11597dc29ac39362537cb9bab1504f1db3c6717070f21c48108e0960699be3c646bbaac7a23e35da5fd20d3cbf37
+MISC ChangeLog 1388 SHA256 447fa1ceb464ea5997204c325539c2c85c814daa1b06a831d4dad99402cee5da SHA512 37697ca9337078ea0f45275f51d8ea8a5acefb819de1b1343af3c9835a95813d5d191fc460273bb4ebfdbfd7ceafccf5b3f68a2588a6bd637a2619641ddb4b54 WHIRLPOOL 4a9d399750e940465658f41dbe4054a9b5ba84265a99e0fb9ac3d836c1a8fad033276f31d021955463b0042c20eed630c6c8180b1f0f2434dab6b4c6699bca1f
+MISC metadata.xml 442 SHA256 76857d1bd3fe377cd29304a1c461db3cdb783c0b89dc8fa7e9b11c3e0189d0b4 SHA512 070c99868fe3b9929748607fd0fb8d93860cce5eacbc84603c1dae349552908f9b18b61cf3814cb3042289aedc8e41c36c86ce4cdd18c9755fac2b11fb7dd880 WHIRLPOOL ad863783c27337ebb0682eafc00ef2e545105d1732cfd60c3a24c7e9fb8ee8dd1be764a941340c8d58947110bf928545a34f4793ef8a8923875adcdf8fcb1ac2
diff --git a/app-vim/salt-vim/metadata.xml b/app-vim/salt-vim/metadata.xml
new file mode 100644
index 000000000000..3ba57bdb5a2e
--- /dev/null
+++ b/app-vim/salt-vim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">saltstack/salt-vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/salt-vim/salt-vim-20151119.ebuild b/app-vim/salt-vim/salt-vim-20151119.ebuild
new file mode 100644
index 000000000000..b3685d8b5efd
--- /dev/null
+++ b/app-vim/salt-vim/salt-vim-20151119.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+SALT_VIM_HASH="5b15d379fbcbb84f82c6a345abc08cea9d374be9"
+
+DESCRIPTION="Vim files for working on Salt files"
+HOMEPAGE="https://github.com/saltstack/salt-vim"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${SALT_VIM_HASH}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="!<=app-admin/salt-2015.5.6
+	!~app-admin/salt-2015.8.0
+	!~app-admin/salt-2015.8.1"
+
+S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}"
diff --git a/app-vim/scala-syntax/Manifest b/app-vim/scala-syntax/Manifest
new file mode 100644
index 000000000000..dbffa5bbbc7a
--- /dev/null
+++ b/app-vim/scala-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST scala-syntax-1.0.tar.gz 3622 SHA256 5df41b4183b1b4eb021e914d762a4d7156a8491df28c106f5cbdafaed1391a46 SHA512 b9d4b5f5b0077fdf1c4cfa4ea88e7262c45119d53451bd744490c79a0f5c2890d0f13f0bf58598114899ce6e0cb918fa2933f0194e1e60d9283749ad584347b2 WHIRLPOOL d49421810a2fbccc2cd3fd7de6247c7f482813f8415010005ce75d7cf03b74686bec169c5d94e4dc754c02bac041304c3a7b935e53387a1ef8e63a0de31ecd08
+EBUILD scala-syntax-1.0.ebuild 374 SHA256 0f9cd862c5960e6f246de852b9989e5b9800f4a902561084c82f5cae69edd2d6 SHA512 4adf71a94f944228f9a32d65733807f05f592153757a14ddb9224490db521d89696101b08a87ab2aeca398a7e88edaa2da25cabecf24b1652bacda911566efd7 WHIRLPOOL 04a8d09fa0ad7e495430cb00748293747b223b17f5495b700d16c1a2b966928f95b60454804b93d4248b8ace5e226797afca553981aea9ce662f5b7d8470a7ca
+MISC ChangeLog 2213 SHA256 b214bb33c404b874b28464ddc8b8d8f6856590768196559299f7325ecff650ce SHA512 e32cb9458bf823f556fadb6c8e8100c700d110afedbee102e019bdc23b98508d02a7c3150f9957175518c51698162e4076f943024d158b406af03fb3c11b5a70 WHIRLPOOL 0a7e61cf5ee2d6596d02eb06255805cdc068560e85baf386107ba95f849780e132617e07f50627de19094d72fe2a3f26daa11c55b67741aa7ddfd0dcd8360157
+MISC ChangeLog-2015 498 SHA256 ca2c036d8370246b51d364b39f364e1625daf149cd24f444de7f2279fb4621ad SHA512 d55552ceb2fdbfa138411001966f0d35bbbf365c899ccec2d0dcf76b866f52a6ab4f7ab002065e9e50b455ab7fa7bc88c6810a60145352ef31974f3358d95ca2 WHIRLPOOL 6ac138a18faee3c6dac2b79b683401d700b5e0732e1d447cdd8dc9b884c040ba862269a71177fdefc20310b3708a2e35435b8a5b24a75b7aae10fa639a955028
+MISC metadata.xml 220 SHA256 998ce4afb847c8594ee92e054f8a06ae3de375d38b2e400eebab911ebbad60a8 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc WHIRLPOOL 23c78e4c05afc8a04239236928ca26e539b0a969f44389b90a34fef3f4a57f18d9db2838d3df439c482cd4b89ce8b959dde5e83500c44ebd2af453629ef79a3d
diff --git a/app-vim/scala-syntax/metadata.xml b/app-vim/scala-syntax/metadata.xml
new file mode 100644
index 000000000000..294c350c6960
--- /dev/null
+++ b/app-vim/scala-syntax/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/scala-syntax/scala-syntax-1.0.ebuild b/app-vim/scala-syntax/scala-syntax-1.0.ebuild
new file mode 100644
index 000000000000..dc6ef25b22ec
--- /dev/null
+++ b/app-vim/scala-syntax/scala-syntax-1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Scala syntax highlighting, filetype and indent settings"
+HOMEPAGE="http://www.scala-lang.org/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/app-vim/screen/Manifest b/app-vim/screen/Manifest
new file mode 100644
index 000000000000..77225b559fa5
--- /dev/null
+++ b/app-vim/screen/Manifest
@@ -0,0 +1,5 @@
+DIST screen-1.5.tar.gz 16395 SHA256 5024d5288240d0a9261ab436dd831bec51e4c03e2a486d7deb2bd761ab854521 SHA512 eef9fbe327b1ef16cb5d5ffb851b04c6d4c8f1b8ef215ae9a0f05c91eaa39538bb470fc1ecd2cbb7697ec23a4fdce2515b97818b47050cbfc4fe7da199648549 WHIRLPOOL 23c7afb8a4258cd58c95774c80b36f4f4bc3b6edaee536db4b8d152cbc75e8bdc9bf8ae5554e1c47bf7e6b8a4a1df41054b59de3abb4572597d282ba3183427b
+EBUILD screen-1.5.ebuild 562 SHA256 398677c2ad9d0b40dca5112b0322564bd6e0a6a9c49647c36c84f8594e72e6da SHA512 f271900e2d293d416c5c868fbdbd90052616b2b866d8c87d837dc5c54c2c0b7658d9d39891ee986a46112a76eeb9147bdfe30cd9afbe0df6ada5425a47de52d4 WHIRLPOOL 0f707c051791e6ef06dd0e4f2c7b0d1d989492aaf36f50ce7638e0989f0b6778d4cf10878e276cac13258dcaf02f279f894687fb148cc17d3471aba52ac72b79
+MISC ChangeLog 2830 SHA256 94d42888d9470db389a3d8e976af201a8ed7c9ae32ea64364cf5f6b4fa108e0a SHA512 d74aa1697de00426171bc291a0187bb186113f0becff2155538164ab7212c2dba8556fccb1a7f881360139938cb4d36e244ccddd74ebe3f6c73e5557ff642970 WHIRLPOOL 4e7c8f6aab1301b6fddd7b2622b6180f8e2f1a38278f577aa46c8dd17b564f79491b4973f6457952c9606f42d1c78bbfcf83ba44f09e3d94e6db98a78fbb3550
+MISC ChangeLog-2015 679 SHA256 4f615ed23e0be408752b122c2e708dcf02432d0667fece3194212798aa8517a3 SHA512 77eaee4a805b3817495bd6be5f3a1e30f9558c465a36d2d4c86e6f118d912a036ab3fa3da92cfa66d7004474f79f10a44b11e5ef2dd0acff47c45620329e50b1 WHIRLPOOL d0bcfe0594e0c0bd0d893c08c936f68953f99e97592deb3403841a29caa287b4df687f26c005b1fefd9a5a94e0bde6954368548edccf5ff51af65efbc3e156ac
+MISC metadata.xml 363 SHA256 8b42c5223b5e3358f8906bd44a898171ef403570675c33a204efbcf745d09dc6 SHA512 0396f42997f43d9feeddfcf10787c98722380b77986b193c4216764391fda7ff901b2616202f607ac1182a92b44dca9097b07a79f7980929350d970cb6154a7d WHIRLPOOL 3faf3784f15cc2453dc58987c07ef150d9ff158700c01a267f4eb6489eeddecb0ab16f03626cdbd53918483b842d1eeb6349aca1853ebdab083295412717aa2d
diff --git a/app-vim/screen/metadata.xml b/app-vim/screen/metadata.xml
new file mode 100644
index 000000000000..fedfc9aeeb89
--- /dev/null
+++ b/app-vim/screen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vim-scripts/Screen-vim---gnu-screentmux</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/screen/screen-1.5.ebuild b/app-vim/screen/screen-1.5.ebuild
new file mode 100644
index 000000000000..91c7caf1216a
--- /dev/null
+++ b/app-vim/screen/screen-1.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin vcs-snapshot
+
+MY_PN="Screen-vim---gnu-screentmux"
+DESCRIPTION="vim plugin: simulate a split shell with screen or tmux"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2711"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="screen.txt"
+
+RDEPEND="|| ( app-misc/screen app-misc/tmux )"
+
+src_prepare() {
+	rm README || die
+}
diff --git a/app-vim/searchcomplete/Manifest b/app-vim/searchcomplete/Manifest
new file mode 100644
index 000000000000..79b2084ee65d
--- /dev/null
+++ b/app-vim/searchcomplete/Manifest
@@ -0,0 +1,5 @@
+DIST searchcomplete-1.1.tar.bz2 1204 SHA256 2096ed1e550c24d18288bcf30c52f6bc421015c567b8170e1a50a11881503ed5 SHA512 8c30b446c330665d303935f07566aa0b3ac8bbb89a3068d5da40209f3a4d17dc3371245dd7bef567030b1a33653f9c481cd1165ee200b0c73723da5f5aea2043 WHIRLPOOL 49f24b83d550172fd641c06bdb40e82b43873e3a1bf081489fdccc1376f65e88edff69409af2676cb7d2ea91c4e08e8be82d0789d2e05e25e3fd59555c7bafe4
+EBUILD searchcomplete-1.1-r1.ebuild 392 SHA256 53288f14e7f998341d01a386ccb6da5873029c511bd2a836e9d98d576c1596d3 SHA512 4dfeccfcc8187dc6e70b5fa5c11ce29681b8f94ec964b250077d04bfe856fbc41b9120cb25dbe6c472ee1d54465baed819fa619f0af94bf7509b36d996cd5f6a WHIRLPOOL 5707abe2c97ce0c24852bf9fdb8d201e57f7a8c70da1f66f7a88bb8c8936874327083ba4bdca1523fa76c9dbecfd33193e370b6d30a0a0f249f9aa15a08095b3
+MISC ChangeLog 2908 SHA256 da77baaf3a24ceb57dcf073618c35044df8fcee4ce06c8e1f3a4b0b34a0420be SHA512 efcd8de8652591d496eecb6f06e2094c27266e4431d4e3a70979da3ae28b6716bf8302768029778bf0361d745b1e9b3e91b2444268bd0afbbe6dcef0452e1a51 WHIRLPOOL 36ea243c51d9e05dd13d5e3f89cf7c213b9b12044e7621de2a97021b33669d2fbd58f4cdcbacf14138e1e7a9f569d6d6a9191a3a0d84378d5d1d6ef21f80f18c
+MISC ChangeLog-2015 1305 SHA256 94758f3a52253fe28997dc9414c83ecede9ef47f71ab4ed752b602b26af06836 SHA512 cd54b71f944441d4c226f238c4c43a82049a715bca84763006cc9a2b3015d7cf38aabd384c3407273229cf0e42ed6bf20e49fcc7c7672de19c154f233392b66a WHIRLPOOL 5de32aa8bf2fcd07568be881d945b5faee66ac0aaf76d64e8e24033416a9d8535b4e5895f7b175ee40d2bb3c828c6171bb425a2bc29dc8eabaf5aa6d83aa79d9
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/searchcomplete/metadata.xml b/app-vim/searchcomplete/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/searchcomplete/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild b/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
new file mode 100644
index 000000000000..c6be88ee3e9a
--- /dev/null
+++ b/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: tab completion in searches"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=474"
+LICENSE="GPL-2"
+KEYWORDS="alpha sparc x86 ia64 ppc amd64"
+IUSE=""
+
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=474"
diff --git a/app-vim/securemodelines/Manifest b/app-vim/securemodelines/Manifest
new file mode 100644
index 000000000000..e7d2e17c7b0a
--- /dev/null
+++ b/app-vim/securemodelines/Manifest
@@ -0,0 +1,5 @@
+DIST securemodelines-20140926.tar.bz2 1562 SHA256 57912489453596a3fceaffd8cc59c15cbf5f0b861a48add77e9c3f8649bb7947 SHA512 15a948781751998d832f445e7c3ad936e5c034fcc9936d977c5cf05215dd541a235fc066f7e774b151fac2afb2b0a59665d13f6f981cc59d4e1135f06f6cdc35 WHIRLPOOL e731692ef7c8bb25f3fb1bb936b94c140e57223f5904d3de685440bf1bba9b1ae0fc8bf2ca57cf2e732edb85233b4d15bf97bbbac550c02c621f62f4db007cc7
+EBUILD securemodelines-20140926.ebuild 526 SHA256 004102b8bd796b4ce957ff45c0690533f314c3a5d6924756dd33ba772d7b7512 SHA512 3933237c8661e98075bd6a71ffc1ab2d935299e83c6545a1b48960d0d2ca23f49365735e2d10332a168ce2786fbd1acbcea898b26fb9118d7cf8db917925216d WHIRLPOOL f076cbf07c62486e85ca8169f1dadab360c6d2f6bbaba29133f2231827699be4616419e55301b113271268d82054f78e8e007dd0880a46b604a15df1df3f8195
+MISC ChangeLog 2456 SHA256 4b36fb22efd52b0496cc2b62af46e25aa2190070c987befa16774674b075cf24 SHA512 beba20e7682ac3fd64c995af47909d82bf6b130be4ce3883598111e7c4217dc19c050ad98dfffb624e4678810b9f22f39ba41d305ef871b85cc60c4f2bc6aff6 WHIRLPOOL f9c6fda21f2f6bdad2e3238897f38bfc79a265828eaf5789669d62cef7135989b114865ebd788ea5207ef1c1775249fadc8f37f81732fd2a6c0845a438287aef
+MISC ChangeLog-2015 3240 SHA256 1ed9871b052f72469761cce29021e084009624ee9b3072af9908fae6de4eb13e SHA512 7ab7ded231e4941a2a98c6498e08b209e63c4160c64eed796f758c4e30b72728220ef00ded0b4a2f0a393a53a67c442c8892c271adfd802fc548d3844b768cca WHIRLPOOL 3f35f50fa6b52ade7afd592ca4b0e2614322e06b2be9138903c5044765c1439d63e31f6b94ef3ce1d40452577707f627422900e1eae356c4b2772440072494c4
+MISC metadata.xml 621 SHA256 a1dd4de3c7e3d71d2c079d07e6619e1602ad5498b4ce5472f7780daecf07a98a SHA512 ca9e3cce0633bacbb643201bc746e9c6397e9803c6b6c717c1a6e8fd2582e85e61f9fe7c8ea3ea575de6150ded96a0d26ce0fb6ac973884c37c19ce28ded9204 WHIRLPOOL 3768affa1ed22f92be2ab52aebe075afe0eba760385f6934df63a5450712056918843fd91f954a14ad575ffa63b1c88868688d21821654315110d0dc749764cb
diff --git a/app-vim/securemodelines/metadata.xml b/app-vim/securemodelines/metadata.xml
new file mode 100644
index 000000000000..419ac8208807
--- /dev/null
+++ b/app-vim/securemodelines/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim's internal modeline support allows all sorts of annoying and
+		potentially insecure options to be set. This script implements a much
+		more heavily restricted modeline parser that permits only user-specified
+		options to be set.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">ciaranm/securemodelines</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/securemodelines/securemodelines-20140926.ebuild b/app-vim/securemodelines/securemodelines-20140926.ebuild
new file mode 100644
index 000000000000..dc217ecf0e85
--- /dev/null
+++ b/app-vim/securemodelines/securemodelines-20140926.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: secure, user-configurable modeline support"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines"
+LICENSE="vim"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd"
+
+VIM_PLUGIN_HELPTEXT="Make sure that you disable vim's builtin modeline support if you have
+enabled it in your .vimrc."
diff --git a/app-vim/selinux-syntax/Manifest b/app-vim/selinux-syntax/Manifest
new file mode 100644
index 000000000000..3f17164dbab9
--- /dev/null
+++ b/app-vim/selinux-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST selinux-syntax-20041225.tar.bz2 1411 SHA256 5d2cab687bb48a479b22fc4dfd2576f2d5f55f4d5ed1b9c380e5c004a232ef41 SHA512 ff048bc00a7774a8ab265bcaae4e5f7c2a3de48027ebfa4e8cf23611089fa33bbec90edda83b1341df618706d99c6b4fb52111abdc48b68e9924cde0ac1fe4d5 WHIRLPOOL b7d0556cc4abbe740d72656e65af8d2afe8988e8b54f3e5b085e7e5c9ea71fe5cd954004f80ca4130b852210ad9bf25c26d40af3d45c4d62f5cae36a071fe019
+EBUILD selinux-syntax-20041225.ebuild 439 SHA256 b8bdadd2620faa86ee91367429fd865f874fb79114878e8510da10459812bab7 SHA512 1927f416bbc886e0ad90423f0f46a0b016ea6b7077f3a63840b02e58c85fb7641b5e20ececa87e9163bcc9adf5d7efc9feaae7b7c2f0f7aebf31bc494c2213a1 WHIRLPOOL a77218b8197c74aa57ecc154a258a34d6ab7e19180cded550dddeeff5b1477c6da1741f334b1e6ee73dddcb54768b31af7659e3afe63a447bd9cdd3873bc6c82
+MISC ChangeLog 2453 SHA256 77b93c1204b73898188fe31ef93b3a3bc67fe4923c04380590ac6d61e3c0d428 SHA512 217a964f71a48622dd4cf6748d1a04c91ef29bb0b7fcf08b89c0303cffde5ab66430012123e6285f4b98e1498eb8be32dda304d17157b665950a4f9a8e571289 WHIRLPOOL df258c95360ce4827c74969b07efe9add0e734da82299858dc72297320b9af17459737b78138d90a03db3e0dc2d5d6636c2e1e8651e8288ed6bfd48fce489a7c
+MISC ChangeLog-2015 2259 SHA256 56768e6430e920bda7f588435593e643e9095045ce48cb2dccec206f56ecdcd4 SHA512 b1bb3307405c3e1bdb2830c3e94d05a6c3eeaaa9fd18d82436b25ea0a585320cf895449d827fceffd8fa50edec36d235153af52ae357c2a0bb44f97f2e7bdc48 WHIRLPOOL 5a2aedd8dfcbd5a08dd1ff68ae7d70030f21d82b8e6a17017637d7f7cf6d7f176cf91ef594246dea41d9ed48f993c2d6fae6e0274676b5e6a4cca4a76a2ce70f
+MISC metadata.xml 360 SHA256 55b3696033517fe3399a85331cc06695073a7184816d974a55d010745e127037 SHA512 6d2aa6636d95c12b37ff47e212b8bb61df9fdc7484627a0111a34cc50363d13128e79f1f20f43059e5c92c09727584762dd80695f791a0cc040561521f777834 WHIRLPOOL 0e617089c8337690b6978db12d472d5309cf29f87a13ea4757154b3969adeb69fd5df14baae90241008cddc0e6570574ebffb8b596e1fb917cba2668a1708cf7
diff --git a/app-vim/selinux-syntax/metadata.xml b/app-vim/selinux-syntax/metadata.xml
new file mode 100644
index 000000000000..bf7daabc0193
--- /dev/null
+++ b/app-vim/selinux-syntax/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild b/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild
new file mode 100644
index 000000000000..1bcf764c5248
--- /dev/null
+++ b/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: SELinux type enforcement policy syntax"
+HOMEPAGE="http://www.cip.ifi.lmu.de/~bleher/selinux/"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for SELinux type enforcement
+policy (*.te) files."
diff --git a/app-vim/session/Manifest b/app-vim/session/Manifest
new file mode 100644
index 000000000000..518816821318
--- /dev/null
+++ b/app-vim/session/Manifest
@@ -0,0 +1,5 @@
+DIST session-2.13.1.tar.gz 79688 SHA256 827dc571b22d8f6bce4da6a939950164a915894781444920cda07dd5113df29c SHA512 44a7ca107da6710f70705646b4ace26a92abfd56802dc38e22e620f4155c3752d4c880b0055089d85d52b54e34a5c7b47bfc4c39721bd3569ec335c4d3a91efe WHIRLPOOL 17affbf3a603902b5c27eaf510ffa06103a68aa77bda47a6261f510843e8757fd7bffe7f123d311c5d5c946d90d6cec0f10b352fb7b160b2063b06085a5c0ebe
+EBUILD session-2.13.1.ebuild 546 SHA256 84fb1faa6bd6bf2a31c6b6c390e3329ef40448f29653400a6484aeb810760e61 SHA512 88853782788b608dcc2550de424401ff9c08f12ca5cc008fbc9c70a588ca395fda4912e74a08071a63f2f670a2b51320dc111a21369c1e169a161180d5b784cc WHIRLPOOL 85a9a85746f9c5068c15845bc8d81e65120a13a8140a18ec5ba893418263f084d88245f5ab1e5fd7df3a8c056b52b182089779bbdf5e936462ce63addf338b21
+MISC ChangeLog 3384 SHA256 f16930c8c0d42fcc519419237aa4cd853fe3cf718a7da7bcf109b36ec9d1f710 SHA512 fb54b4b70958bc610a9d0073f64399aff094c87e1d2474fe2a8d52e61ad53f01be630daec4557ee04c1c203b2dc106de7178d02324b34445fd3586a41fe43281 WHIRLPOOL 8795de392060a0499050364e9d0097ce2963930444251ba3e7f7ff9edada47e683e79ca2445209611b74ff932be193289d9474141758860399c0618cd398f583
+MISC ChangeLog-2015 2739 SHA256 07d2728fef2c701099ee17568dc25b5fef3ff5c239ab9d4b09674a15fb1ee3dd SHA512 cd4851338b1eb79b8b976c22e9f41ed864925dac1b13dba76b6c9aedec5aa8bdd81fbed8a472ecc06e39e854c05dfb589f3ffa8fdbaa7385df6140e57dcab04c WHIRLPOOL 580a6f05261a0a55e2587e53db2a1878c735bc4d532a9305ea8a99a38c22399ba05c73be3e188c6a77c26f8d8999ae3d4a9775a818d63ebea6048eb12db40bf7
+MISC metadata.xml 341 SHA256 2ad2e0b8a5a4493d73501dbcf5529a21663c45e8ac341430aee265e4d995c1e6 SHA512 0b53b76b4e8c3639b707c5d5b4ed05fd3577f3f37d243b5554ecda6b52e608ffd4a1b724184eda3da4584493f3b55870763100c627c5dc58af434f85927f6961 WHIRLPOOL 8c4f605856009741ff2e61518cc554142e3ff08688dd8e81b615c2eb5a28055f459ee48b51a324eedd6ca3d4978255f38a9086bdee5b783309a477f2ce3f50a1
diff --git a/app-vim/session/metadata.xml b/app-vim/session/metadata.xml
new file mode 100644
index 000000000000..ca843562ba5c
--- /dev/null
+++ b/app-vim/session/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">xolox/vim-session</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/session/session-2.13.1.ebuild b/app-vim/session/session-2.13.1.ebuild
new file mode 100644
index 000000000000..8af04e2940db
--- /dev/null
+++ b/app-vim/session/session-2.13.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: extended session management for vim"
+HOMEPAGE="http://peterodding.com/code/vim/session/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND=">=app-vim/vim-misc-1.17.6"
+
+S=${WORKDIR}/vim-${P}
+
+src_prepare() {
+	default
+
+	# remove unneeded files
+	rm addon-info.json *.md || die
+}
diff --git a/app-vim/showmarks/Manifest b/app-vim/showmarks/Manifest
new file mode 100644
index 000000000000..3e1cff509780
--- /dev/null
+++ b/app-vim/showmarks/Manifest
@@ -0,0 +1,5 @@
+DIST showmarks-2.2.tar.bz2 8195 SHA256 7c25f98e14796595400bfb76fe7433eaea00c204e04fce7b339714ba560e5d49 SHA512 0121070d8b8c51b3b31c1d052b368fac304ee38e413881e67e2b9336b1edcae6af165c592d592f42c502834856d2c097b575571286574ba83a51d4fc9964b7a3 WHIRLPOOL af6a6e069f5eee9eac32da0606995b23f76d9dee65577fe8b2d3e92699674c31b7a57e890715ce2038fed0631cf5451a64f913256d6f91e40189aa1f2af1bd67
+EBUILD showmarks-2.2-r1.ebuild 836 SHA256 d44c67b6697708f476b43d1ca723b8824ac7da30b3e4c8d3f2a8e3aac85c3e30 SHA512 56add26f8740282060a840e1ede135a0e461fac58eea856fbc650ee7aa4d1c3ce5e2f591f9e13dc4911fa93193949b4073718a02e7b930f647632a808a548156 WHIRLPOOL 54680ac4c12288ce197a6347d90ebb7f6922d387ef4c44a55f1227c47994bfd5ab3f382ad0855463a986c3f0c6bf833b5cf63af368c7b4543e221ad42406f4e6
+MISC ChangeLog 2921 SHA256 7931181dde89d6df312e6bd3ae846bf67bac84e105e9b0850b6db3bc8fadeb2d SHA512 65f699b1c86fa62731fc57297afa3657741af7b0f73b80fc9a1b2abe7c05ae4f96ba7b417151ef563d24cd2a19d142d57502d426fea8256db66ce759f62539a1 WHIRLPOOL 7008ed6b815fe2d52fed7d4c4aaab1b534fe9a8a2d6b3020eafc104208f073a182af32048126f00f8267d7bbc8b85cc5dc7564d22786691e8be76200e2a5badc
+MISC ChangeLog-2015 2466 SHA256 2e0279b2d95dd35e8882af5ccf69bb7a564ae92ff3c38ba77d2b3f98db01921b SHA512 6268fcb064ad128e65f9baddfba5a581e4f7affe2144ef301960948e9806bd9d8eb6371b22c87a1d8ca3492c8d98d9dfc8bbe7917e7875cfc03df39484cc94b4 WHIRLPOOL af793971ad557b7797013387576c479f721217dde424a4c0d432640295ab5587e254c846e8af6e45e79e008bf747d9b0982920fcf04b62ea4a4d381c79f4a931
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/showmarks/metadata.xml b/app-vim/showmarks/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/showmarks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/showmarks/showmarks-2.2-r1.ebuild b/app-vim/showmarks/showmarks-2.2-r1.ebuild
new file mode 100644
index 000000000000..58f2af5d082b
--- /dev/null
+++ b/app-vim/showmarks/showmarks-2.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: show location marks visually"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=152"
+
+LICENSE="public-domain"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="showmarks.txt"
+
+src_prepare() {
+	default
+
+	mkdir "${S}"/doc || die "can't make doc dir"
+
+	# This plugin uses an 'automatic HelpExtractor' variant. This causes
+	# problems for us during the unmerge. Fortunately, sed can fix this
+	# for us.
+	sed -e '1,/^" HelpExtractorDoc:$/d' \
+		"${S}"/plugin/showmarks.vim > "${S}"/doc/showmarks.txt \
+		|| die "help extraction failed"
+	sed -i -e '/^" HelpExtractor:$/,$d' "${S}"/plugin/showmarks.vim \
+		|| die "help extract remove failed"
+}
diff --git a/app-vim/sleuth/Manifest b/app-vim/sleuth/Manifest
new file mode 100644
index 000000000000..08cb26ab32ad
--- /dev/null
+++ b/app-vim/sleuth/Manifest
@@ -0,0 +1,7 @@
+DIST sleuth-1.0.tar.bz2 1839 SHA256 8b5dd0c7254766a4a873abf0b8c8998eb9f57c2526164672426a3ba1f547ea40 SHA512 19fb158a28bfa02e7364208f11911d0afcda77f4a35a410202b0342130e48b99b52db56aa687b2484ba0ac9595970ae040c349e7a0fd350f07c40b6b58d43a13 WHIRLPOOL 9d7df8812ba68af3f735e45e7af64d260b34a05d4c43e31ed7bad7ad037bf9e9682a9547330b1a1bc599e727f86b26c165ce442143ea33ec7ef40008d3b1ee60
+DIST sleuth-1.1.tar.bz2 1972 SHA256 4ada9eef22debb07a5e01575f06a992faa8f0a6456e1dc66a2aa44be8d433788 SHA512 76a2bbb651452cb7a2336cebed5f7e8ff79e995bc7ba11d36089f7e58f607df031306bf38fd161e7af728aa6699b37fa8c2c322b8a8cfa7889dfaa3e96d400c9 WHIRLPOOL 58bee1be4f549277215ab84b8f41c03d1e840c2c0fb8fb3213a188b96c8605881efab0f3bd5618d9336390cf19e9310341c0d83639cab1a35da795fead6307a9
+EBUILD sleuth-1.0.ebuild 372 SHA256 e442d5598f955ce091d72605bbe8e7c3d60621b21fb5b6fb92c45f6b918e1a94 SHA512 11caf0c1a741a4fe8634c9810ef76f7db3bda4191864e1045635968ed61c8d653b3c428461f710e4d61b8413da023a398d03c123be8b1b3762cf02f2b5b2487e WHIRLPOOL 2e1f8545d17fdb6ecd16e7381050ad6cc4ab6d8f791a6c6a2aa3dd85d3f13b7fd7e1de6914bcd02e831e7df815992cb2557a6a617366ea1dca5aaa94aaa15f4d
+EBUILD sleuth-1.1.ebuild 362 SHA256 75567ef5aee580cfc3e213e66499f856fcb4093a90a9c4b05bca3413910e41d4 SHA512 b394057db26213a02a3ee22d86e1107813343afcbf623b47c5ce9a6780d43996804a57297e3fc9cb5bab157b2a550393bb8476c0e440be28b2c8cce205897cf3 WHIRLPOOL c11c33441be2843c242399c5aaf910be1920b6bd1cdfcf9b71afa13a9a4f429c917f242a3fabe2e0766c6d13269c2ba66d9485d60c1564d9f8095e923256b2f3
+MISC ChangeLog 2593 SHA256 fd3760e5e47fdd3d08d6be888e52a0f1644b485c50741f85f477746f8cfa5670 SHA512 9efd2b1b6bf2dca5093d8e76ab16578fd9e0146092db9485823c665887b799f863f045b4678755204a59457c9ec96ee6de599efb03b3fd49a04d18a519465b3b WHIRLPOOL ca1a6e0d5a810297df4288f4e819c36e0d4c246fc02561699b33e9cdab96889fc44936367dac7089dc22a2b801f50b0f0fa59bc70d8fc7a000809a5c6d25c351
+MISC ChangeLog-2015 547 SHA256 9edf7bf9915d10fca01b12fe3006be484688f9de0b3bea95b4b4683b8e3992ce SHA512 2ecb707f1f7b49e6b5c1739b48bcdc93b67a328d9501f7735c8e01e1e86b95b931a73909bdbb4a42388c83206d3eb1a9c0637a83c7893290f55dea48250d0096 WHIRLPOOL fe11a751bfe4d6b8ec6c30a323642fe2f2a04757f7af78eb23c2ff3e1c86f660e80ab8772ffd2f5690102c863aa50e9bf656e73dc6efb9b9ebfaec3de599125d
+MISC metadata.xml 340 SHA256 71e829b91f140998e301e6ca74e917fcc4fb7fcaac07a76424114f8e11495529 SHA512 53ef8e8ee6f87ce5bb69f75ac07f0b59bb4e699a6ba6ef8cef6191d3cc887fcf18efa84a92d2403c925cfd8276245c4087298077b3a379f1017effe19dba488e WHIRLPOOL de0b17a692fb38d379c75ab9ad76f8ba408f8e9885629364dc2b66abf7f51a79780cf6287613bfc6e68109e69b3af11befe220c505034ccdbf9ab36cc9622538
diff --git a/app-vim/sleuth/metadata.xml b/app-vim/sleuth/metadata.xml
new file mode 100644
index 000000000000..675d6cf8ebc9
--- /dev/null
+++ b/app-vim/sleuth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tpope/vim-sleuth</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/sleuth/sleuth-1.0.ebuild b/app-vim/sleuth/sleuth-1.0.ebuild
new file mode 100644
index 000000000000..92063a0ff051
--- /dev/null
+++ b/app-vim/sleuth/sleuth-1.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: heuristically set buffer options"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/sleuth/sleuth-1.1.ebuild b/app-vim/sleuth/sleuth-1.1.ebuild
new file mode 100644
index 000000000000..ced2fffe99bd
--- /dev/null
+++ b/app-vim/sleuth/sleuth-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: heuristically set buffer options"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/slimv/Manifest b/app-vim/slimv/Manifest
new file mode 100644
index 000000000000..3d8eb5992978
--- /dev/null
+++ b/app-vim/slimv/Manifest
@@ -0,0 +1,5 @@
+DIST slimv-0.9.12.tar.bz2 614025 SHA256 ee7785027191fc74041d874e3a390cdd4044dc9dcd85392671016601b77161b1 SHA512 7ccf617780c5d6b8d25738546cb9df6986b4409748a5938e8d9112b057d34626a6b8525fb8622db06d0f300d6ec38f7513ef2c0e49df3bcd89614888887ca057 WHIRLPOOL c455c56422714af809efe18a05e2d12542030bf83d90b11656570e0df94f67624398b7a5953e8b5f1892121ccec3b6608a726b25cf261bbcec6691b94f02a740
+EBUILD slimv-0.9.12-r1.ebuild 864 SHA256 a285c72ff710b6ae8d35853618a0ae84263f1fb93b083ddf26e7581c1c7930ef SHA512 2c656b80d4483b47e24da86c17725ce03915a8066e95cfbc62ef93c376116599d09bf032a417d19ae1bf2777352e00e7fbffad5d2c9cf91ca7a4de4d72f6c938 WHIRLPOOL 0aca39514cb24583b26f516c3dc0ee00ceb3b6f13aad87eb61d93e19238f842e6eeff4e23b7ad1f3038e976c90ab4110c598d4ad05219089934d49ff36a5af32
+MISC ChangeLog 3258 SHA256 b436ecdf84f238e2d39157f5a935b42fec88a15a3207d3cc1ed9be6bac798065 SHA512 e790388195ecb6415d98cc91c8534fab32b0f89271637c1eb8511ff6c8ff841ff7b54585693d05b22afdad3cfbe8a243ef41dd430a3476942c2182dccbaa8620 WHIRLPOOL 27400653fb658695f4c507957978060a298c4d3d4dd1840d996b68676fc0723f4986f80e656a3c11fa55db91d9fef2e0b331cd48ca7c0bece742ede176d7280a
+MISC ChangeLog-2015 3785 SHA256 97c24023dcbb446c5962b3a3b9255d7c6b80f5241186e0b17270396135ae8542 SHA512 0c3565faae65bc073d71bf4f7a6222bcec74fc6c565ce347d07c65fc03cd0af2ebfc69baa4bc1e326a04350bdadf6eb38123e80df657fa8fa4d097bdd82c592e WHIRLPOOL ebcc22544bd0f55a28b985d849c0b990da42123043ab4f0c5d330a5a496b0aff2bcbc4470f8729ef6a1b0a7c9f3d6e172ce982206a2bed1d1f3e5e66bd8a4380
+MISC metadata.xml 1220 SHA256 e1e7c129306919d5ca949e5c23aba583cb0c5d96cc55a9519ca6d7159c91334e SHA512 11c6fb3a83ea65ea97e57e70b24d9e011d48fb456bff15ea8b501e0dab767f73c78ae1c63e662423599252dee9969c1983b17fd1505533b3ee26f3afde2a3b29 WHIRLPOOL 47ab5b6560b80a29c9b7b2fe626cf40ae6ecf5bc146ae3a3ef82d86dd15df627c1baefee7e42831c77d95877965606a06dc7a3b75846834a88d48ca31ee7c0ac
diff --git a/app-vim/slimv/metadata.xml b/app-vim/slimv/metadata.xml
new file mode 100644
index 000000000000..0f0e597cc1b6
--- /dev/null
+++ b/app-vim/slimv/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Slimv tries to mimic a subset of SLIME's (Superior Lisp Interaction Mode
+		for Emacs) functionality inside Vim. The script defines functions and
+		keybindings to send s-expressions to a console mode Lisp or Clojure REPL
+		(Read-Eval-Print Loop).
+		
+		Slimv runs its own REPL or connects to a running REPL started by a
+		previous Slimv session, the connection is established when the first
+		Slimv command is executed (e.g. an s-expression is evaluated). The Lisp
+		REPL buffer can also be opened inside Vim as a Vim buffer with syntax
+		highlighting and autoindenting, Lisp commands may be entered in the
+		command line, just as in a regular REPL. The script also has a basic
+		support for Clojure REPL. 
+
+		The script also supports a number of other features provided by SLIME
+		including profiling, paredit mode, and hyperspec lookups.
+	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">kovisoft/slimv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/slimv/slimv-0.9.12-r1.ebuild b/app-vim/slimv/slimv-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..5fe714d6934f
--- /dev/null
+++ b/app-vim/slimv/slimv-0.9.12-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 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="http://www.vim.org/scripts/script.php?script_id=2531"
+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/snipmate/Manifest b/app-vim/snipmate/Manifest
new file mode 100644
index 000000000000..3efdc3e9c1a2
--- /dev/null
+++ b/app-vim/snipmate/Manifest
@@ -0,0 +1,5 @@
+DIST snipmate-0.87.tar.gz 20624 SHA256 4ee93136a378ff3037bd2992f028cb475231d1f589c4c700ebb0e3f9af2cb0de SHA512 36ef13676e0ff8085456883ad09c111158be6051251a15b428a05d3caee678a6c8ab092694fdf876ecdf19b93e04cb8ff67108dda83ab602250f5ae42602e6b9 WHIRLPOOL 82d588d25aef73b73874d1d541b8bf63d5497e54a667bf064237a5fde615f5c5ec15d9d208e8781f0035e5e4d08a234b6d79332ebf3da8b3dbc94fa942bda3dd
+EBUILD snipmate-0.87-r1.ebuild 630 SHA256 21e26fd95d44114840088a36f7d4a9ec9383144ad66f0bb6673a30237f444cba SHA512 6548f4284a67e16cc64a1113a6a1b2de42eb4623868a3806b7e9d3ec43a394582659dcce11527c154ce9ca7ba12b178c80ce6ef37218c7a4eb72ba3f5552a667 WHIRLPOOL 1583158bc2244a5dd0265573aa1737fa92cbc50974b9ae3325429cb59f243eae779e348c5494ea1019746d41b0495acb987ff445d81f36a3005813596d248859
+MISC ChangeLog 3008 SHA256 e28eecd71fe50ed335ab8bf3c86a2a39a325d5c8a04d71c6cf33759dc3d44b4d SHA512 aae40711716ab3ae5c89476098a6a816400ac744d723d08af8fb308ffa8f2ea64dc2236b449d474b7cb9d3e5587b16621a4d7edd7830bc2a40370d584bc3c842 WHIRLPOOL ee517fe55fabdae1b275d67913b04eba70929e5db4230bd6a494856aa828082b7bcaf16dbb4c682e050be9901ace6d1033393fab4486ebd3343b4a05c90ef35d
+MISC ChangeLog-2015 883 SHA256 ae9e17966c22e7890e888827336cf4ea10e068c351ac6973f9a7351a069aea31 SHA512 bf080e0b7c2b7459d9abebcd3da6ef6f5f4edd59c5c920d2cf24087f0ad59f4e010c2cf3b3cd23dcaeabb079b657a48fccd939956fe018378055b5e54acbccd4 WHIRLPOOL 427a5034c36948f3c1dd07d33b94d06f02e6cfce8672ba6df2eb2d2377d63668559ebf357bc9e5fa73cbdb72096b6e9df7469cdab4bea3e7969ebe5a962013ee
+MISC metadata.xml 333 SHA256 d156de6c07aead61e0732b385a35122c0e0e2fd84a899eef5696ebae72fac003 SHA512 e74edb9123ce65fe8ba73a41b21ed68702f7e9e6c902ce5d4b3dca9caee585747720444ab71866c6472a3ef1cf3cbcc12668248d3180ec03184af3d29a2406f3 WHIRLPOOL 597f73d30f224ea88ebfd7a3dd840cfebdc3ef89867fd547022f357e00d660e249f04a0c31b6af569bd56ac03da82da8c0b7d0661bfe79ace39cd7db729576d1
diff --git a/app-vim/snipmate/metadata.xml b/app-vim/snipmate/metadata.xml
new file mode 100644
index 000000000000..e1b691100398
--- /dev/null
+++ b/app-vim/snipmate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">garbas/vim-snipmate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/snipmate/snipmate-0.87-r1.ebuild b/app-vim/snipmate/snipmate-0.87-r1.ebuild
new file mode 100644
index 000000000000..1f8c411b3d58
--- /dev/null
+++ b/app-vim/snipmate/snipmate-0.87-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: TextMate-style snippets"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate"
+SRC_URI="https://github.com/garbas/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	app-vim/vim-addon-mw-utils
+	app-vim/tlib
+"
+
+S=${WORKDIR}/${MY_P}
+
+VIM_PLUGIN_HELPFILES="SnipMate"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	rm addon-info.json || die
+}
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
new file mode 100644
index 000000000000..9bf579b305a1
--- /dev/null
+++ b/app-vim/splice/Manifest
@@ -0,0 +1,7 @@
+DIST splice-1.0.1.tar.bz2 12369 SHA256 30e7d947defb29971d8c750670bbdae6625e2238d4f892e6b5590609d6a6a81a SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede WHIRLPOOL a8e4405f5169857c07b81f0a778757aebd198f4c0e73f4cf239a451dfae64911d5fb164121413799a750646df609fcb864a08393510d012a84383261f6c006ab
+DIST splice-1.1.0.tar.gz 15513 SHA256 5f4b8324b873230124b93462581ca438c517a14076703ec36ec91a561ecb1504 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37 WHIRLPOOL 83807c37e17c204e84fde1d02bc7f9645f259f7f6bc24d05fc9d41f0d2f2a366ea77c46615ae2a92811ee19ef1b7ccbedeb1c23a9bac0a1a413fa03113df306e
+EBUILD splice-1.0.1.ebuild 714 SHA256 8892267f8066010e55208e3d2e7209e3a9b1607a7eec17901d586544fed68f68 SHA512 c9700ac764a36afd97ccec149dd45d8a8236eae470ecb3939b7856be70efdfeea87748c8ecb061eaec0813ccc57c93de06efd3eed28995e7adb5d5ae3e4dcf61 WHIRLPOOL 621cccee96bff4bc7c7308568dd95a93e976382c1bbfdaba63ee70320805c40c9900449a17091063067ff7254655179f40a48a62ef00d6fb4a2881712b5c70ac
+EBUILD splice-1.1.0.ebuild 895 SHA256 020c1ac3c51650acd29b3e3b0f1f4567d3b26f0bd29eb0abbf1cea4434db803d SHA512 69fcde94ee3b9c1d76629c6e067a53fd1d93f5e8d7919b560a98d4a2f0ab380789de4a467617375ca2a0da8e6d50dc5ad3e30f25c1e3e9e184cebbd8f593d4b4 WHIRLPOOL 3cbeb4670d1c9d440bba5b663aa9ae3e13d0179a0126b4288e08e2f2174ce9a0a33ed7e5d9c806a4d40012baeadaa361ff9ae53e9ab69894c9004da5ea4e79d2
+MISC ChangeLog 3320 SHA256 f19798781e3f7ed79896ff631f18d6422aaf8ffe3b6e57773c856b334d350a5e SHA512 1b8f2c5815233eb702ee767e6504360d8f7996fd9fe914b7387d4b7ffbede8dc280e65bdddf445bec286b7623593b4ce2f15a7031589ad74a9af50fa107b7f23 WHIRLPOOL e4f0c74d34bcadfa3c9ecef1097a1cc46d364e2a8e051c2155a94512fad7a579b8ba673d0ceb08081dc7e28e1f0d73fae8dc8ab4de2b52f92f4c55a0f25bbec3
+MISC ChangeLog-2015 870 SHA256 05ba1d8bb90e2884d2f195ea5103d8e7048757d8d99c12d67941c3fb70d7f8ce SHA512 566eb8320d5844e53abf0609c81feab24d8a5f64653f68ba8abdada1ff5b9b4f3869003ecf8c183d2533ec823a02f58be2f30bc73b2cbecf07f9424d265a1930 WHIRLPOOL 5ff6c6b78990edc494fd71573c6000bc0c1eb11dee943e057bc276a8a7e8421d1f74c6c43e0cd157c96e0227777d398ad1cb9d79927ce3160156939fdd4aecb3
+MISC metadata.xml 379 SHA256 640fad4d5b2d76d4e7be2b3da7bdf4b17a2bbf971a0a56d3a7fe6cc8ade0d8d3 SHA512 76d8d1f9dbdd2aa7fa54e8d4dde8a34fa62e69e5e20154545572f3c083df1fddf7e3ed286d1077f63cd4a46bdb7bcf3617700fedd2c77800e1dc4d15ac67e9b0 WHIRLPOOL 74737b38489aaada67f59b11202cde29e2c0c49d7bc4090a87c0a0f86f06f788db8817ab80ee2aa3373a32870652cc18542defb5eb45ee3fdde899d72857ab8b
diff --git a/app-vim/splice/metadata.xml b/app-vim/splice/metadata.xml
new file mode 100644
index 000000000000..d67ea981ad1a
--- /dev/null
+++ b/app-vim/splice/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vim</remote-id>
+		<remote-id type="bitbucket">sjl/splice.vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.0.1.ebuild
new file mode 100644
index 000000000000..60628b4e9474
--- /dev/null
+++ b/app-vim/splice/splice-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# 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: resolve conflicts during three-way merges"
+HOMEPAGE="https://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026"
+
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python]
+		app-editors/gvim[python]
+	)"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	rm LICENSE.markdown || die
+}
+
+src_install() {
+	vim-plugin_src_install
+	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
+}
diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild
new file mode 100644
index 000000000000..f74cf9af1d36
--- /dev/null
+++ b/app-vim/splice/splice-1.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
+HOMEPAGE="https://bitbucket.org/sjl/splice.vim http://vim.sourceforge.net/scripts/script.php?script_id=4026"
+SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm .[a-z]* Makefile LICENSE.markdown package.sh || die
+	rm -r site || die
+}
+
+src_install() {
+	vim-plugin_src_install
+	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
+}
diff --git a/app-vim/sudoedit/Manifest b/app-vim/sudoedit/Manifest
new file mode 100644
index 000000000000..64a693d5137d
--- /dev/null
+++ b/app-vim/sudoedit/Manifest
@@ -0,0 +1,5 @@
+DIST sudoedit-0.21.tar.bz2 12483 SHA256 b877c19aaa4f7440b611eafbca4a903f39c5ab5dc19d90eeb54ae3d1ba520e4c SHA512 60d5fde0ef82c4ccba2b62c75651cb1ed1dfc2a4e2815785dcaf4e515222a4d2bed193cdd8323a742109cb43a4123d27db39776a562b150b93ffdb9beec12d3c WHIRLPOOL f15eb65d7c5f583e6ee7c39c889d14f94aae7157995fa69e124a82b44783a6c947e42df89b5b739b7ed61347c4c9cee8706ec66f8d587c3478ced7f03a841ff3
+EBUILD sudoedit-0.21.ebuild 517 SHA256 1beac8527d01d7e6ce265e40c5f1acc9eba383a2d1ba47969a31500b7b3fa8bb SHA512 d223f70c3dce2bb11aa01509fa3aade48147dd8454423a7c3f6d66c8f915104047aa1ba6e8b097b860cfe8c69dab0e8b7d88b8ec28b5cc44b436bdb7e77b2a37 WHIRLPOOL 03c550cd3ce91c81b9a9ac815e43bfcc1eff0319e8e24234d43402251aad1e29f1ea1cf48555ea243b3d51b820711277e1e6f68b86d140a3a455751594357d55
+MISC ChangeLog 2821 SHA256 eabdb579f952d416f3ef756a85079a0d978c620c8bdf380a0bf1f98b0d60b33f SHA512 27f0ed5165d8f8b6dff0e5ded35424d97640235e1ec1f78c8c29431af86fc10825e07e504757d43607db46c597aaf21d057d01a81adfdc5afc37037546af7b29 WHIRLPOOL 5f1b21564ae2ce59427470316fb7cd43ed70a838a5a5c4600a0a8b35c51caade4a0213fb4c6a132c879d4992c4da4a974578568c1beb9f300d5473b1cd1ebeab
+MISC ChangeLog-2015 563 SHA256 c843f538ca37d798f213b589fc609309016e2c5e08a5c2270b0609f896ba9cf6 SHA512 eebeb9d95b87e0276e3daa4627a456b7adfcde135332ec7793559394932be73d6f10e2a54b0baa1672ae55969b57277bd49220b04af99d5fcb5b4e4a5bd3525a WHIRLPOOL 7769d37af6c8b08bddfd8feea1eb1def196eb3e2690824b481b34b729212c395313c68004838d11a24c964d2c06862ab1dcb3d1ac8af04df20daf7fbc19e7053
+MISC metadata.xml 345 SHA256 ec14cf0e72b6f519b95b0ab8e78291090ee1f3c74bc18b8aac5e4306fad996dd SHA512 d142b12bdcea40b3bdec43b9c1309eea2a6463c552c864e1d71bdc63189288e0a76958a8452d79bcbcc1d9a80da26aa895176ae08c7b52555756ed695afab37e WHIRLPOOL d90193e0976ad2d42cce4e3ee94997255798371511fcdc479663b3ccf37fc91758d6496f5f22a48d78a4fe8dfb2fb880f6de2b32c37bb699eaf161997c023031
diff --git a/app-vim/sudoedit/metadata.xml b/app-vim/sudoedit/metadata.xml
new file mode 100644
index 000000000000..ad1ce6e291f1
--- /dev/null
+++ b/app-vim/sudoedit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">chrisbra/SudoEdit.vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/sudoedit/sudoedit-0.21.ebuild b/app-vim/sudoedit/sudoedit-0.21.ebuild
new file mode 100644
index 000000000000..10390e571456
--- /dev/null
+++ b/app-vim/sudoedit/sudoedit-0.21.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: edit files using sudo or su"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+VIM_PLUGIN_HELPFILES="SudoEdit.txt"
+
+RDEPEND="|| ( app-admin/sudo sys-apps/shadow )"
+
+src_prepare() {
+	# remove unused windows related files
+	rm autoload/{sudo.cmd,SudoEdit.vbs} || die
+}
diff --git a/app-vim/supertab/Manifest b/app-vim/supertab/Manifest
new file mode 100644
index 000000000000..81ac0d97ad30
--- /dev/null
+++ b/app-vim/supertab/Manifest
@@ -0,0 +1,5 @@
+DIST supertab-2.1.tar.gz 16585 SHA256 203d76597f2c183de2d6583de8f3b65423cba3090dda631b51e6eec32301ce1f SHA512 6daec863968be9aaefecb3388a8626f4ebf1c76899e460463fc64a56f15f743d3eae36b03588b5450a2c49b63ecdec8faf3476eda1a07cc48caf731eff77a592 WHIRLPOOL d0928f5a78b03d5e4d06e18fa198665f3fe333f264b55fd80d7c16cc4e01dc1845847308736417bb26688111db3c1ec4cb981c329043d670664ade74171b68b0
+EBUILD supertab-2.1.ebuild 506 SHA256 5802fec64cc5905c3a0c0794c805b053cbd6bb9e30a6ed2ebe4e7160530bd556 SHA512 fe32ea92981ab68e83a97cec68b821f989340a706f2be2cd5cac485f120e6c30b22e8b8223931d48d5298f535320d3782b36b353bcf26442a931005b19cbec75 WHIRLPOOL 56501c915e2f99ae2ffd8347805eed140f0ca3caf196d8b19325e227c7c1a0df95c8c97a6e51605da55626eb9529a9da92879ad3ae46f93412b6b906504ee12c
+MISC ChangeLog 2425 SHA256 58e3c46de221df254f44c33ffc78e05cbf2888cd0802a520f31aa997b97c04a1 SHA512 a3b208a076c71e5db5c2fdaaa2d73389a789db99ef4ec16c2fa6104b328d576e4d9751fc792c6639559499f29d69940c98c12b260e9de55b15150a889b8ab448 WHIRLPOOL 3c2f1dc2b4b80525c87f5226583a2fd343fe3930b821dd60a9bec3b35eb6f135fedc24cb5b829d3a1b8e00f5d3393c0150deea66a616f4c265d3c371186bf41c
+MISC ChangeLog-2015 5259 SHA256 2d652393a95d9e674b67c6711b449529a580b18902a06d06389ae19a8eb57deb SHA512 b53568a2568da04be5d169f547758abc330f29a5d2c7cfb34ea55a67241263ad973116323e0e78ce076caa1902f5932b0953d38f8e60ce7dbfb1f185b0340398 WHIRLPOOL ad2010b36cad648cb741d70e3d96c390e0c149ff42d29237149608394895f8f9244bd13d47782fb3871aaf15419add2b810e150670373d474bbe984741bbe46f
+MISC metadata.xml 341 SHA256 da3eb2dff8ef5df2a02760af87fc6fdcfe6819980c6a6fad9a8723d86842ef0c SHA512 e1c44cd31882c2aeaee01a4112c8ba3c6d57bfba3d1b30ee0d1f9726569d4249528b2ea1c2d7b5beeddca28dbf443e1b9bc788381510a4ff8ce56b2788d17425 WHIRLPOOL 17bc88983d7fa7beb14ed5d0389d32fac82dcf3f0759e792dac9244f206602874be1820dd8ab463c4bdfee262eb464085401ea8bff445751187b449b2a46be69
diff --git a/app-vim/supertab/metadata.xml b/app-vim/supertab/metadata.xml
new file mode 100644
index 000000000000..5865f0ad42ec
--- /dev/null
+++ b/app-vim/supertab/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ervandew/supertab</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/supertab/supertab-2.1.ebuild b/app-vim/supertab/supertab-2.1.ebuild
new file mode 100644
index 000000000000..e08cfd3791d0
--- /dev/null
+++ b/app-vim/supertab/supertab-2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced Tab key functionality"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/"
+SRC_URI="https://github.com/ervandew/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 ~mips ppc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	rm Makefile .gitignore || die
+}
diff --git a/app-vim/surround/Manifest b/app-vim/surround/Manifest
new file mode 100644
index 000000000000..25bd44aaf75d
--- /dev/null
+++ b/app-vim/surround/Manifest
@@ -0,0 +1,5 @@
+DIST surround-2.1.tar.bz2 8441 SHA256 0bc6d088294e608fc0fee92af9aebea933b4e3aff441011786d19a11809b45dc SHA512 2b4283f77dac468ab91cdc941ac2dd5a2b99a35c23d6ffdc1e1c819a04bf45ecb934c5a111898ed45539a02d1f1ce6c702da80685f609944cbec9bdd25a1e22e WHIRLPOOL f21035d8829c4a41c47d339812769ec11337ae4125622058b1795135d0a77b81294385bd9149b410530407961c6f792dc9a83e8d8541f6d8683bf204a60b2dcb
+EBUILD surround-2.1-r1.ebuild 353 SHA256 7e45ee67fb3fa049e2016d4890430626431fc523f227b7c273e6e847c284706b SHA512 669e09edf6298a6ef4dc950c6eecb0f108627013887bc745f0d2941fefcb7a8461232ccc518fbfb1977190c3dd6660695e82faa35dd2a9159620abe1050f090f WHIRLPOOL 2988abf5f8a0d79a92e1b357c2f5370f79a7f3189d5fd8941796f8d425bd6c689e724c2d80b883b79bc4640c1895f542fc2991a19b68e9c0d53f36100b167547
+MISC ChangeLog 2907 SHA256 90140396acdf62c28584965c7dbceac7f6b228ace1330907399b7d867a36e1f9 SHA512 2088a497ab26451844679b5d0ed2e1a9f68370975563f91b70921eb869414a692d67305337ef4b3fcae59f6b215e993462b93124a209f63b899ff1a3804d42f2 WHIRLPOOL c4bfdca2d0f6982d4e25e78bbb7c27b395bb790a35ff46878a6bb04909f668568778a5444b1f86fa00c256fabf4caa2faca45134841a2f1df43980821029bd0c
+MISC ChangeLog-2015 1749 SHA256 2b7b76f383a319b84c5b8899d7a2aa7f785675cf2de6b18c7811222656713137 SHA512 45102956f8e413962391aefdb07da33d10fd2290cad56aeaea654c69c305db1e00cd7bc9a053c05ec7f08ea6c9630059c0d5c46762aa44040cf1c7a54e918758 WHIRLPOOL 6f5c9bc9918c5ba8b0250a6786e171bffb2871d47b1f46b1e92944345293e7eb5f88b86ea08d3c3df016f3366815e128fdfaf132e7f1dadbb67dfca08bb80f87
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/surround/metadata.xml b/app-vim/surround/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/surround/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/surround/surround-2.1-r1.ebuild b/app-vim/surround/surround-2.1-r1.ebuild
new file mode 100644
index 000000000000..6494ee32900c
--- /dev/null
+++ b/app-vim/surround/surround-2.1-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Delete/change/add parentheses/quotes/XML-tags & much more"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1697"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/syntastic/Manifest b/app-vim/syntastic/Manifest
new file mode 100644
index 000000000000..3f9de3485485
--- /dev/null
+++ b/app-vim/syntastic/Manifest
@@ -0,0 +1,6 @@
+DIST syntastic-3.8.0.tar.gz 253425 SHA256 aa46913abdfa35dfbd9f022d084680b375bf43b32b409378f4a697ab576a5673 SHA512 b2f7fb07d457169a397a1ed42141e099cad14ded0b43f54a11060f2952843387396fcc539ffc9aaa1aa137ae62801e346a73c6de6035a0504706c59e40acef5c WHIRLPOOL 3f061793e89e54b1c267b34e5e70ca5edd1fecbc0d042ac4f716a065e66663bc27fd3b62f480bdc8e4084e6e4a145618eec4a1b58ad61426d270c7c9186d8e0c
+EBUILD syntastic-3.8.0.ebuild 967 SHA256 6c4a7826f00580db8becbfb115154d5512a674b0c16c17f5d18ff5cfa7a65aad SHA512 79ad0ea67c78d3e33021a0b1fe047b604e0640efd0d7be04c6db37d6e5b00e5b96ed6ebccbc32ef0c2e5844b5d0482eab43dc27d8182347a63c2e86a757b1df8 WHIRLPOOL 630729ea6a5f433d14be7101dbe5dc309ef5cf5ea716c9ba499aebf2f6130c15acfe69b8ddd759bbdcb0ddd647f7d4cc78f7a60a0c988a55a59d2a283c17c785
+EBUILD syntastic-9999.ebuild 969 SHA256 de0ea1dfb65c1710d5e42f3aa05593d00afde77da9cee69a1d18275d17a63f9a SHA512 c61b7fb349ba29ccd179adcf511d2b7d33cae78901b071ccf3bc3516f6f6a05ff2c5b120eb690b81ec1f8ef06754265fb39b07937c0eab1ac5415284b5b95c38 WHIRLPOOL 8a01c7d3f9553c8251039a2e6e9a2cddc8f274c48c2b30fd651c5ddcf8b6cf82eda899bd2e1da52cf302797bb367d2f510fddaecad1f702869ccd26b6968cdb8
+MISC ChangeLog 3299 SHA256 229e8de9e7a6738ac2c639f487c64e1375812742c4a552154b624e52949a4359 SHA512 e1b78be1c19a886d415c5242d71613c965b5b050774af43d1135626254f902e8723383a9200fc2a567618b24e5bc332fde91a37dc4826c70c2f5c91c83ed30e7 WHIRLPOOL 9076c12c09caae8546613602e548149368074dbebd6637f8a62eb297a0eb3b5bcebcc592bd4a0a2bb3530710b1406ca04a26abceab6ef12de4178cb39c042360
+MISC ChangeLog-2015 2098 SHA256 0822a0025b9991cbb7ccfba39f83a5db38a8b41ade9ec83b0764271540d74fad SHA512 9dc5374983f7ea07a7d0aa267c2396612a0907227e2d459e4f02bf5b266a5ddb8d8969b135383e2f12bf7763e1a6f6bfddcbd999794d845656467ef93a9cb8d7 WHIRLPOOL ae26e93c7b999f2ce032c87914f6ceb5ae30fd3b17d89a62480297a83c312c7f53c8e953409ae01468e34ed6af3723b3387cb79abb11ce0d42f529cd6b9c6fe6
+MISC metadata.xml 344 SHA256 769bf7bd21cf375f5142f14b9188cd296673959eaeb916501de937fc5ca863f9 SHA512 ef01f82c783947320dcb2bdafbcc9545cd2ead7fedb18ccfda335c13d246f980cdd6b31c6e5a2f78f6f75b1ffbc18471a8e8f6c615ba1a75180b362602b6cf85 WHIRLPOOL 0d964a6ee6bd36af7241dff12d540493480c3ee570703e120db2062602fbe5ed4fcfc8da2bc3b46c1ec606d676e32875a6034f186af934cce5a3092b75531a14
diff --git a/app-vim/syntastic/metadata.xml b/app-vim/syntastic/metadata.xml
new file mode 100644
index 000000000000..b2babe02672b
--- /dev/null
+++ b/app-vim/syntastic/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">scrooloose/syntastic</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/syntastic/syntastic-3.8.0.ebuild b/app-vim/syntastic/syntastic-3.8.0.ebuild
new file mode 100644
index 000000000000..36f8e62d1ec5
--- /dev/null
+++ b/app-vim/syntastic/syntastic-3.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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/scrooloose/syntastic.git"
+else
+	SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="vim plugin: syntax checking using external tools"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
+LICENSE="WTFPL-2"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+	default
+	rm -r _assets LICENCE README.markdown || die
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Syntastic has many optional dependencies depending on the type"
+		elog "of syntax checking being performed. Look in the related files in"
+		elog "the syntax_checkers directory to help figure out what programs"
+		elog "different languages need."
+	fi
+}
diff --git a/app-vim/syntastic/syntastic-9999.ebuild b/app-vim/syntastic/syntastic-9999.ebuild
new file mode 100644
index 000000000000..cc6fc347a77a
--- /dev/null
+++ b/app-vim/syntastic/syntastic-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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/scrooloose/syntastic.git"
+else
+	SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: syntax checking using external tools"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
+LICENSE="WTFPL-2"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+	default
+	rm -r _assets LICENCE README.markdown || die
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Syntastic has many optional dependencies depending on the type"
+		elog "of syntax checking being performed. Look in the related files in"
+		elog "the syntax_checkers directory to help figure out what programs"
+		elog "different languages need."
+	fi
+}
diff --git a/app-vim/tagbar/Manifest b/app-vim/tagbar/Manifest
new file mode 100644
index 000000000000..9ab86c9615dc
--- /dev/null
+++ b/app-vim/tagbar/Manifest
@@ -0,0 +1,7 @@
+DIST tagbar-2.6.1.tar.gz 51639 SHA256 c061a7e0a45a166f4558b31e6c47b9fd701f5fa1319527b65a268ea054dea5fb SHA512 eb0f29dc2f08d943e1ac0c0fe97ed72a49b85e22d105815a5557e205532be379d3ce8429c5303b917c005b465a7385161ff2edc96efc0fc312178155c67a7c22 WHIRLPOOL d5f7b0916e1eb0faa9a7887a4249ace5f0b8e369527a89010dabfee55507516050a5e5dd2184ab43c095ff514708bf25ab6d78fea85db8821804bbe908ebbc27
+DIST tagbar-2.7.tar.gz 59027 SHA256 955523fdb9a12aa3de2985e57884a7ec3d5dea2ebeae371a25c2e71ab0af817a SHA512 d964d3055f1679aad86b0756cc444a4857eb29ca22f2bd3567ad6c8d073e75d0c8823109038415f5bd1d269bbf8e36da6f34d70fedee54c10f90535ef79ff3c8 WHIRLPOOL e8534ce2b59ef6cfe6b78c3a21fdcc88be64f5f46662686c3878bad86c42b584ebc1a5570ee74a4686180406322031991bafaa337052f898ff654c4079ae7b15
+EBUILD tagbar-2.6.1.ebuild 499 SHA256 989a3cc00a55c497a946474a5fd5d6b97450e036c305d841ff85df6efdf711d4 SHA512 ae7eda422917ee525190d76beeb0e8829a4e22e3a0580ce7cf19c718bf6f147d790cc79c7e3e2b93be871599073f26b12ebb03f493aa1f8d46c778a8e91562c2 WHIRLPOOL 0ba4e93daa509ed39626a302afd25e950abf0a650174fa36755f79239247b4af0fcc1e5544895c2ef2e9d9532540685e28bc41e605a6d23412a4577e87b6d182
+EBUILD tagbar-2.7.ebuild 548 SHA256 e89b1aef0ddfdd224cd3ff4aad390c78e0f3c1bc14c9da70d8f24b304cf3bd3d SHA512 4ba85c77bf571c2fb238e128caf04264849118d6568473f4bca6ba2785ca7b424b4117ba239697e037089631afadac0f532142ebf85492ab19da22d2d780f20f WHIRLPOOL f03c3cd472c15db68f5c7adb03207b69b87900f78255790d6c3ddaaad785aa684473d885ac2c3756edbc419ce6774146c0a54a27be0c39a6a2c4f342983a81ed
+MISC ChangeLog 2886 SHA256 3df563319c9dd27005f59266e80c823796b5e3f78008b0736b7aba409301d560 SHA512 87e1832c694d2dd885794454e34b394356f4f88117688193eaa28fce3181abadd3681ffefbe870eb3e4c45e0982dbca5d7242c18d377daa29a9a7fc82dfa1ca2 WHIRLPOOL 59287a557f25d48ec4791b70e9314338c5f56dd2368ed4fa5b9c06ebc8690c0bc6ee9598a4cea41bde6ff6bd2b04eb00cdf7fcd7bbb31b487587d95538bf5153
+MISC ChangeLog-2015 1477 SHA256 3b72b93ab12ccdf2cfbd702f016026e1dafe46d688075bed8b72d97de0fe79b7 SHA512 544212d2d3e10f05e9ed8af6e8e6dc940a5fc365ae8d708216c3863820ade217a6c6424deb7e3874e3e8bad2b9550ae4406549fac40b22bed546f383be74b1a4 WHIRLPOOL e2b62dfe0d00db853dbabc9f8d29f4b0d47062c89665ecfb1d277590f8816f98d23451f8b11943f5f66425ce1cbefc3cf17c7889abb583e93b700848a1d3ba2c
+MISC metadata.xml 341 SHA256 726b5bfa0b1a7aefc7c0faf8a692eca2bc009605fc788c03aa0c230e3d3ec53e SHA512 adfd265c7224b9d6f4013721066f15e26baf908c0c89b0357f0a6d92797ee08eecfaa6b3c28d5117b88e258f6a0eb2fbd2704c701a11da6dd6095511a298eefe WHIRLPOOL dfca3a4b973dc95c5d3c5c863dd16d2031df5215256e708f4847b2c2eb8db918e463e4b88d9843cfbdfd82665c59a66147593596231c6cb3dbaab2cd33c315d0
diff --git a/app-vim/tagbar/metadata.xml b/app-vim/tagbar/metadata.xml
new file mode 100644
index 000000000000..f571998c87da
--- /dev/null
+++ b/app-vim/tagbar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">majutsushi/tagbar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/tagbar/tagbar-2.6.1.ebuild b/app-vim/tagbar/tagbar-2.6.1.ebuild
new file mode 100644
index 000000000000..d82891b65ce4
--- /dev/null
+++ b/app-vim/tagbar/tagbar-2.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 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/
+	http://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
new file mode 100644
index 000000000000..560f75868dd2
--- /dev/null
+++ b/app-vim/tagbar/tagbar-2.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display tags of the current file ordered by scope"
+HOMEPAGE="https://majutsushi.github.com/tagbar/
+	http://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"
+
+src_prepare() {
+	rm LICENSE || die
+	default
+}
diff --git a/app-vim/taglist/Manifest b/app-vim/taglist/Manifest
new file mode 100644
index 000000000000..e2b8e66fbf5d
--- /dev/null
+++ b/app-vim/taglist/Manifest
@@ -0,0 +1,6 @@
+AUX taglist-3.4-ebuilds.patch 451 SHA256 7a3319878dd0ef069c7689f47832e37919a969a97df516bc2c35cc76beef1704 SHA512 9fbff7c21e0c3bc73738dbb28ce8a10bf9f5b052d669468940f471988e8e15862b75104db1b0cdd209a679c4d72f58b3c147f5fdaaf8248e5ed0bc18f3615684 WHIRLPOOL 6afff0e8c1762367c6215335009e1e9fe025c99d1731e48a0b171be522d80d6684377d1bcf69d1729b7165d38b3640a14b1699c90f68a7432ac6c804ee691c91
+DIST taglist-4.6.tar.bz2 40344 SHA256 30716a97b4667a862849dee122b843c2522c649e60553e8cbe2277bb93ccb6a3 SHA512 64686f2685cf4f9b09eeb7e1981a1b9d514cce2f6ea4bdf3e3613037d9818556ad6ed95740a84b4d73eba3fa1d5d58a41f15e1bc0a1403c50a810f5a704f3073 WHIRLPOOL 4e7b154e1c693cfee821e55e9b4d8f2b26f1c5dbacce6015757ee4b13586927ba5dca2ab726e23ad090944e55e0cce9676c01c8c21efa9ece967cb24d8bd5acd
+EBUILD taglist-4.6.ebuild 501 SHA256 8926b7faf6ec890466fbbe42d94c633f468c6c07a3dddbdf58e8f5ec493fecd8 SHA512 a292c887ebda9ff2372c54c5755926f3d6a710f2931218ec2d301a5fa8b67ad5625a3f89aaaa1aeb7f759e96bafaa734ce8556d1c7f0d448f22588ce29959218 WHIRLPOOL 9434194a4fa5325a068273d4b682a6b0b0b6f0caf06924b12bb61ad55a7d8782c62e2e8798a115a184d030302882c1a113bef8de870e07e4cc532eadbbc5b726
+MISC ChangeLog 3136 SHA256 f61145bb2bffc6a245fc426071e88dcf7b3a4a821edf426c79537b781596285e SHA512 93ca66763811580a5bc26be96e6a97c6ecd28abf647bb89fc4658d8d8e57bf2393fbde05d3223f26d0037965730bf95bc0cc6ac04227e87c39ad4e15e6cbb678 WHIRLPOOL 5f7f9daa393becc3886e6e79da5329cc4aa4a89585d95bd8327e50544b84c59e30cc9f15bb6b6afdc663daf8afa80990db43cc5bb9a7fd069a1c559cdec83881
+MISC ChangeLog-2015 7935 SHA256 710d1b9c03436602972395a59700436d153e8e0587a58165a8131a633a01690f SHA512 9bbc5c04ccae72c651b33afca8788ca89ef80153d71df59470509da1cc312ba112b350ce322db574a3916a7f266d0b04d6ccf1c4d4e31072cae1d0d8f7cfb433 WHIRLPOOL 80ee55af9dee331850ed69f3a2674a38bc01eaf73ed19d231872f79ff8adceccc6137ac13841e54a784599923ca28cc3a7d299b976e81cff77548505b1f9ca6f
+MISC metadata.xml 330 SHA256 7ef2c7b25a0ef8f6c78e4328cdb01d8f0ec6f971abb2c9f261adda9376b6796a SHA512 0965202e6286e18810375b491ed126f12a309958cb726c259c549c38b1813468e0d17a1d00d01dab882f5ea069cb03aa5c1d4ce09399fb2efefadfe70aaf5dde WHIRLPOOL cd6fec2dfe8e57c84e8e7cccc13f976b83817a2fc8692b7cb50c0fb449a8210ab34396379bd62f3f9f4a5ab311bc583abf49aad76a772906680bc4a02f1dcdf1
diff --git a/app-vim/taglist/files/taglist-3.4-ebuilds.patch b/app-vim/taglist/files/taglist-3.4-ebuilds.patch
new file mode 100644
index 000000000000..8fcc928d4497
--- /dev/null
+++ b/app-vim/taglist/files/taglist-3.4-ebuilds.patch
@@ -0,0 +1,12 @@
+--- taglist-3.4/plugin/taglist.vim.orig	2004-10-02 00:12:58.400215576 +0100
++++ taglist-3.4/plugin/taglist.vim	2004-10-02 00:26:28.535056360 +0100
+@@ -205,6 +205,9 @@
+ let s:tlist_def_cobol_settings = 'cobol;d:data;f:file;g:group;p:paragraph;' .
+                                \ 'P:program;s:section'
+ 
++" ebuilds
++let s:tlist_def_ebuild_settings = 'sh;f:function'
++
+ " eiffel language
+ let s:tlist_def_eiffel_settings = 'eiffel;c:class;f:feature'
+ 
diff --git a/app-vim/taglist/metadata.xml b/app-vim/taglist/metadata.xml
new file mode 100644
index 000000000000..8b75cc7efb06
--- /dev/null
+++ b/app-vim/taglist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vim-taglist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/taglist/taglist-4.6.ebuild b/app-vim/taglist/taglist-4.6.ebuild
new file mode 100644
index 000000000000..b4214d29c76e
--- /dev/null
+++ b/app-vim/taglist/taglist-4.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: ctags-based source code browser"
+HOMEPAGE="http://vim-taglist.sourceforge.net/"
+LICENSE="vim"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-util/ctags"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4-ebuilds.patch
+}
diff --git a/app-vim/tasklist/Manifest b/app-vim/tasklist/Manifest
new file mode 100644
index 000000000000..501c9f9bdf06
--- /dev/null
+++ b/app-vim/tasklist/Manifest
@@ -0,0 +1,4 @@
+DIST tasklist-1.0.1.tar.gz 4066 SHA256 70c676e71d3fe6f98ff99b2ad9df64ed8b7ae2f526dd83f5fe938e521170c603 SHA512 623ec5b147e485abe3e246796a6ed67dd8325ef37708e589c4568897da10ba70076eb5dffd9fb9333fc29d045c316cf382950de13f616873334fc734875600b9 WHIRLPOOL 4d59eaad371860a2a3d8fff861ee663b4fbcb40e80e3f14d29c386d64938b063228b12e13a67869d7f1ef24736c75bb652215add39c749b370f75c8ed74472ba
+EBUILD tasklist-1.0.1.ebuild 447 SHA256 c614876f18ccb7ffdb6f706f8d96fbc0f746ba3e6528c2da6dc8b067fb9d0221 SHA512 530bb7f503cc4e402bc288a0fdc61aaa5fbeac7e7521168679881cbd480cd45b73de5a4de424d92ab87b46455cadd1d143d08eadd02e14af35eba09645f4cd9c WHIRLPOOL c44a3e025960fe24c64437f7ac3c45369a48c0e69394a102ef074e95f96173860c021b98a216ee40c6ecaddea763778a505a90bb1b9d294d138f4d9d9082495f
+MISC ChangeLog 383 SHA256 2d475834ca2f13450b9b57be2888aa16864d1786bd004420059bef3bb1839fd9 SHA512 c59659817125d7f8f9474b6d9bf21547758103e037f1a8727a70b977e9d5f2e9f3ad65a87e58ac923d2658346ebe20374279987333f24938135c904deaa17405 WHIRLPOOL 7548745c036dc7c45e0e15d72a42a0a3bcc4e2056da794c19e210e81ab704658ad16286734be83e3228e6d0d474079c8f3b52b52abb44608340ee769b4cd08bb
+MISC metadata.xml 450 SHA256 95956fff6968c1847aef8ad31800a7ff176229490df3e006cd16eac273b3a96e SHA512 2f047ee53729d6cf9fa63861c3f4246767541fbc16d21df0f6b75bb153a77f0e2b68d67e20a1544944f19ffb00e8363c6a374c9d414c242cf218aaf0f3ce69af WHIRLPOOL af97fbd1b08f50de5d93ca087ebed73b568206332992d4d0cef3e2cfa9843e5281570ca84eb531aa18acf200e2a818a4d5a61fca2f4206bf3914de6b4272b6e2
diff --git a/app-vim/tasklist/metadata.xml b/app-vim/tasklist/metadata.xml
new file mode 100644
index 000000000000..550fea50c1c9
--- /dev/null
+++ b/app-vim/tasklist/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/tasklist.vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/tasklist/tasklist-1.0.1.ebuild b/app-vim/tasklist/tasklist-1.0.1.ebuild
new file mode 100644
index 000000000000..165b0a12dfa9
--- /dev/null
+++ b/app-vim/tasklist/tasklist-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="Highlight FIXME/TODO/CUSTOM keywords in a separate list"
+HOMEPAGE="http://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
+}
diff --git a/app-vim/tcomment/Manifest b/app-vim/tcomment/Manifest
new file mode 100644
index 000000000000..901f63d51032
--- /dev/null
+++ b/app-vim/tcomment/Manifest
@@ -0,0 +1,6 @@
+DIST tcomment-3.08.1.tar.gz 49918 SHA256 4f42ca89bb66110fcd770862a129b225c6b54b3f8e9419dba168002de238ad6d SHA512 609d5eb1e7785fb1af829000ab27ab63ac2bb7550bcd0f91c7c35f0a8c4b879e5348745f57b11d1e24d37920056ca55da8863e15e40d6fe289617d5d898a4177 WHIRLPOOL eb4383350708e78fb6b816aca97e178897f9710a3ff4cba8dfe5c7861b65ed4b86a7532375ebdc9ff0a2635a6493788d3caeac85a079c2674c2980b8cdda3404
+EBUILD tcomment-3.08.1.ebuild 706 SHA256 53388f268b586a52f93dbf55a2592b785c64ebbc46caa24ff55d2db506266424 SHA512 fc1227b08fe6fa09795e34534444e2a6b782f9ff8eb3b93b73cd1a7c5a602929023bef00501f59d5dd0d6d8ff3b2501aa50ad6a79c8cbd9be99c3ee96b738467 WHIRLPOOL 6eb14813ead039d71919690ec79dd643c97402759fdc43856796c059f6f55e62928fba7d631bec1403a98366e1c97af67cfa328fb659e5977336199da2c5d625
+EBUILD tcomment-9999.ebuild 708 SHA256 a87c1049e4d847e515149e6ccee66e0c226a11f5f58a5611c39ff80bdfb018d9 SHA512 45a745cd9a267962989c19cb7a51a44b7371962f293b96b9a1d0084db78fe9b137dac15b14de860f7958053a2d05a32bb54feb9082fa5ad42078a2e9974f0c69 WHIRLPOOL 71e136015332f47640174ea6a8858f1feb2584b399a5477ef409bc21aa8043b19042384a6f2daa7fff602d9d04d189993d051bfa86cb7763937977370702be1d
+MISC ChangeLog 3159 SHA256 591b53dffa5dc4036536b6d4d7676b15b09b2f4490a064271cbb1fa26f5b0528 SHA512 7e34dbedfcd0e690b1f8f114473c8bdda36e435d91c02533da5aaa95df652d4cfb47b3cdc0033236f8829c8a5de1b84f12865b2da1b80831f8f1a1f9a506d128 WHIRLPOOL 42800d2cb9bc338ed5138584750ebb8f9e7eff8b20705bcaa9fc676e40225e17f1c37555b62b84ad0e355cb0b682dcebbcfbd7d683d9c0d014c6b657f4cf1c6b
+MISC ChangeLog-2015 1341 SHA256 a5ca61cf9bb8302de921bac686783fd8288a701041ce4f758971aa80b5fdad03 SHA512 195e138364017cfd2130a157ec166d6cdb0059ee9a44a37bf4ee1db1bfb2e48f9aae098d983ba1b895f1fd28ce03165e1f7a32ff126b323e3349b9579c0b132c WHIRLPOOL cd524c1927dc5d1040b9afbdf8bcf188e256872adffd96a8a6a5564cc7606c74c5d236a1b58f6a6612538aa4ce22429c56378e47f45af1fbb72a033bd7097782
+MISC metadata.xml 343 SHA256 e9eee7f65931fb3a013400c2baf4fb78ec61160aad5b9476baea65364c0ff6ca SHA512 f8b176729889aea616f7ca8e3f0de17519debc53a102e4db499aa2e6a196482a5bc47b235fcaa88249c748ea7a583b2d0b31a5498571fdf3fa7520882e8c6257 WHIRLPOOL de1a410f2416ac290c3827846f0531648fbc8c1de1e4d0f1c441b71726885d2ebc8cb6d77da7845a5d781d8ec2f6bc507d2f4a94c9b04b448088a0aae2fec628
diff --git a/app-vim/tcomment/metadata.xml b/app-vim/tcomment/metadata.xml
new file mode 100644
index 000000000000..9e97359a2544
--- /dev/null
+++ b/app-vim/tcomment/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tomtom/tcomment_vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/tcomment/tcomment-3.08.1.ebuild b/app-vim/tcomment/tcomment-3.08.1.ebuild
new file mode 100644
index 000000000000..3fafd8d493c1
--- /dev/null
+++ b/app-vim/tcomment/tcomment-3.08.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="tcomment_vim"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/tomtom/nerdtree.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="vim plugin: an extensible and universal comment toggler"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
+LICENSE="GPL-3"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm -r README LICENSE.TXT etc spec addon* || die
+}
diff --git a/app-vim/tcomment/tcomment-9999.ebuild b/app-vim/tcomment/tcomment-9999.ebuild
new file mode 100644
index 000000000000..ab0decbf1e3f
--- /dev/null
+++ b/app-vim/tcomment/tcomment-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="tcomment_vim"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/tomtom/nerdtree.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="vim plugin: an extensible and universal comment toggler"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
+LICENSE="GPL-3"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm -r README LICENSE.TXT etc spec addon* || die
+}
diff --git a/app-vim/thlnk/Manifest b/app-vim/thlnk/Manifest
new file mode 100644
index 000000000000..22d0ecb9c994
--- /dev/null
+++ b/app-vim/thlnk/Manifest
@@ -0,0 +1,5 @@
+DIST thlnk-1.2.1.tar.bz2 35428 SHA256 8a9b57d857230d5c6df706e0009acdd04e6b2d75fd6a3470678cecfa55dd4485 SHA512 c3de0452a5a5d068f9c64d7ef1f7e390a3f870546a7ab2daec41d301c19f57d4a0e254fd45de4775455746312f48f3223b6ddbaa80159a0ff56cf707b9cc0945 WHIRLPOOL 69bcaacc7fab3d0e36a5d0debd69afe784086a54c5bcdf7807ebd2a5ad12d7c0fdce03e3036cab8416eda48477e4ba0045da7a48fd3046ca3ee7b88de5ffafb0
+EBUILD thlnk-1.2.1-r1.ebuild 365 SHA256 5e09310577ca2c83f7dbe4a90825912696200d0beaf12118dc3f7b893ee1a5d3 SHA512 2f23746a6d7af4a44bd089f8bd33d5384c2e8c5c92a5141c37905d072eac207fe026be11007bb1632a307c22a090721c0b9616414abfcb377e6e4fbeffb3b3d3 WHIRLPOOL 5d05339875d082366cfe43fc491ca7039e6c65a25f167b67c26b6d078afadcb762ba0ec948603720e50eb0381475861e142b00f9679986d619c100723b6c57d1
+MISC ChangeLog 2921 SHA256 f557c38985c82884a9b465d7c2bdbf1da74163d86f39099d5f6c1d387a3a8629 SHA512 012dc6faa311f42b4212bc78f5965afab181915c6e46e3b1ed9817e05bc9d8736db7e3bbd49b58250a7c8d512f28d7bf6a4dd172914f2cf39c246b06ed642d21 WHIRLPOOL 65b12b39c10292e88e046f38e12704166fe7fdf00bec4b3194daa6727a7e1e5fbfc889b0af5ce783bc51fc6e2fc07b0e60dd91568947b5bc1b660690a42501a8
+MISC ChangeLog-2015 1289 SHA256 f611423fb72d57544375d987a54f81d6c54c068fb2fa1bac963f8e0ca3857c7e SHA512 9fdc9232db7c15f68fa52fa14323f3bdffdfcbc66a2ff0b25b3ebfbe3694b046fc68e320497d5bd0c3fd7ab28eb59620723b9ef472d5e885ec0f05ee9b86fc50 WHIRLPOOL aeefda196be2cc60fd6559aa9e227ac35853de303cc1dc8b93ce646f56fdf1b337dcaf1887197a96d8d40d3162953c92031e99a862970e8c074f882858c7c5b8
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/thlnk/metadata.xml b/app-vim/thlnk/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/thlnk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/thlnk/thlnk-1.2.1-r1.ebuild b/app-vim/thlnk/thlnk-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..f63b21dae08f
--- /dev/null
+++ b/app-vim/thlnk/thlnk-1.2.1-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: linking in plaintext"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=293"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="thlnk thlnk-reference-manual"
diff --git a/app-vim/tlib/Manifest b/app-vim/tlib/Manifest
new file mode 100644
index 000000000000..aea797567331
--- /dev/null
+++ b/app-vim/tlib/Manifest
@@ -0,0 +1,4 @@
+DIST tlib-1.20.tar.gz 111202 SHA256 e2f37beed9a799643d519879418a51ade0f609d1d53230522429735778d5501e SHA512 d8a344483da2a174324dc81472b5d3bdb811e54af22a1599c5567019d33bafdf499845d3efeabf081ecf17dc6965c69640a6a01b208811529e86266ba1871218 WHIRLPOOL 41e85a5685d0636acfb56e0402792cce8b255d3c18cb8b108f53127fd33c8b98c1301067c0675e6689305d455d46f4f8a99d26375bd896fc56d8bb0f910ce53e
+EBUILD tlib-1.20.ebuild 565 SHA256 0f16723bcc996e2250eba167958e67b950ecfbb7ab78bd6e7384848596a56c17 SHA512 742b388738695cd8e188726319015a8eb0ef84c90a46c1aa74d76bb4730ac715dc6dacb78a753320e7b0ee0fec79d3e69c011537f64e02e157c2cbc938fbec29 WHIRLPOOL d7ea1ba6d9cfa560bcb9598c452ce8f833c3181ea996a3b98869a261dfd3de0281a6a66b95db8ea5ccf23867737d952d7bea279a39ab2ff0b47f5d39c1a1d47a
+MISC ChangeLog 420 SHA256 88d192915ab5376d4562a8c5f233825058f0b570017dcf43814f606740a981aa SHA512 8dd8a6e986568bf24e28e90f098c62ae17c9b6e55789f327c52ba28d265a4dc3661c220636df0e441a2410f49f9bb1895c76556fc8afc0aed98c7283dee747fd WHIRLPOOL 2d9bc2103a9cc898b2ee31276485c46b3a320795841408904e4cda015903e3885332a6100f6273a91ca969c9afdff5f362fd7819398c05ee32feeccacd118cd5
+MISC metadata.xml 329 SHA256 977f89046364f6efa117c122ee21b292e2bd351aa23d8d054f92f9742c1e1c5a SHA512 d36d9443ce025d73d277cc67387418ad73458be408932bf200609b6fa133b06b87598377866c89b8f9606674b54540b19c6f63afdc5ca9696225f1976bcdab48 WHIRLPOOL 8e333afb1087889605d4f5b4075db456db045e1e63def4cbbae3633d702c4dd0ba6346bb314b5c45c2253dfc50990de7aba12a64794838d9625dfc5503678c53
diff --git a/app-vim/tlib/metadata.xml b/app-vim/tlib/metadata.xml
new file mode 100644
index 000000000000..5eb011848cb6
--- /dev/null
+++ b/app-vim/tlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tomtom/tlib_vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/tlib/tlib-1.20.ebuild b/app-vim/tlib/tlib-1.20.ebuild
new file mode 100644
index 000000000000..794c046e0418
--- /dev/null
+++ b/app-vim/tlib/tlib-1.20.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=${PN}_vim
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: a library of utility functions"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim"
+SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm -r test samples addon-info.json || die
+}
diff --git a/app-vim/tmpl/Manifest b/app-vim/tmpl/Manifest
new file mode 100644
index 000000000000..0f14cdf438b9
--- /dev/null
+++ b/app-vim/tmpl/Manifest
@@ -0,0 +1,5 @@
+DIST tmpl-0.1.tar.bz2 1165 SHA256 da9cf364dc16d2e16e4aaccdf551e14f2cd113ce690b119ab43a4546825b1b0b SHA512 c50d15be556224544ae99bb1a4ec78fca6d0cc4c1df11c4ef5302ce851b8f92baca04e498774cd1352ca3f1a8789498e7f47bb371828da13a7703a2f654ab51c WHIRLPOOL 15512498a205e3dd6c169d0b61c6789bd925852a31d222bb06316c803875b4e39a6cb4ddd3f0c478e5c333fb1833cba19b33f7867f3de6ce5cfb30db553b4987
+EBUILD tmpl-0.1-r1.ebuild 402 SHA256 761fee4b56766cb627501ad9edb560082bc15cde1eff2b97fdf8fad6c5a9062b SHA512 95ee5f8e94fb391846cc80cbb5b3c71798c1c30fbb999c0134aeabbda7e0d79e5bac252d4592903b4c1919bfa59b9283680119696c53818edd2c8a7bc4330aee WHIRLPOOL a89a3263c07f5848be22d8e04326fc8271e200f8ef1e71a0297b64042d73a474ae47002ed6fa59cf5e68bdd856fb5c75255d725198bc9242bf1dba374645b82f
+MISC ChangeLog 2902 SHA256 552306e9c8f4527207ecd66cf7d0d87410e06e9bf73aec4ef5a86c5322dbddc5 SHA512 3e3cfdb2bfc46eff6a922448b3ba5c0f9ed9a3e21f0191df08e2c63f8e9c02ae4c629733716f851bd56b12f4a68fe301b3f3484f2f8aebb214a4c0c817360bf0 WHIRLPOOL 4cc89e8ba4a9540ce162480b992fa73454d22b9db193059edf023b5a677df436902f49d7ff6650a3efb5e9a4c65cadfd8f18dfa75ab62a60cd49c753c47b9cb3
+MISC ChangeLog-2015 1236 SHA256 6299fe54bfed92c385c20f56e4b825a1cd025df6ac107e9404c5aa3a0201a502 SHA512 9ae761d91cd208219629a0ed756487399bc909cf65ee92ed903198d2ef23ced59f54ec0bf0fb06ebafc86e149ee16d06ff11174bc6cff630330c605bfa8cda69 WHIRLPOOL 690efb2528dfdd43ca23e633f8bde47bd66f721fd7e53e0ff44fb7736d8bfd5953c81bd78db68cce2138ec1173b7898cfb2b48c6a95d7cae4072fc58eafd9af9
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/tmpl/metadata.xml b/app-vim/tmpl/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/tmpl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/tmpl/tmpl-0.1-r1.ebuild b/app-vim/tmpl/tmpl-0.1-r1.ebuild
new file mode 100644
index 000000000000..8eb46f8ee06a
--- /dev/null
+++ b/app-vim/tmpl/tmpl-0.1-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Syntax for Sam Tregar's HTML::Template"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=254"
+LICENSE="vim"
+KEYWORDS="x86 alpha ia64 sparc amd64 ppc"
+IUSE=""
+
+VIM_PLUGIN_HELPURL="http://www.vim.org/scripts/script.php?script_id=254"
diff --git a/app-vim/toggle/Manifest b/app-vim/toggle/Manifest
new file mode 100644
index 000000000000..b65a89dbd095
--- /dev/null
+++ b/app-vim/toggle/Manifest
@@ -0,0 +1,5 @@
+DIST toggle-0.5.tar.bz2 2790 SHA256 ec9c1b8d2bcc9ab477dd6e1b0885c412c1434602c2c9b6a97b4861d3ee27e204 SHA512 bac60e8e09cb3d82ba1569c333174fa58596fcd009181a56feabeeba4590942805a14cf08c3ff3dc7920e8481d14b3bb659bb85ad1c8bd85ca66a5d491dae05c WHIRLPOOL 93fba31126708a0993a89bfde3b880a08fb4a6ae8895bd83654b2e5dbc0fe2164a0992e833b2e955e9178494bafcdc60235b4dfca1d8f56f9c01a0011edf1fa1
+EBUILD toggle-0.5-r1.ebuild 443 SHA256 b14f7d19a5b30866e68ce0a31af3ed0f861af9dab0336dd25f96ce07c4c5fa12 SHA512 c27734cd79dc439df1805170bee2b3b92489b04bd87165fdc0b05ec75f97f71c862ad51a9a57fef59c8e71116009a6d862ae47cb6b9b93dd45dd671448f19777 WHIRLPOOL c772d69ecc4b9249ef81f7da22a36736f2c701a97a8a5b69008f84464ee1dd9fba2a97099902ef7a566855d887c63d5a37d21ed8a650210dad89b38e4f56d222
+MISC ChangeLog 2916 SHA256 2d725170f72fae5bee982417e18596b82b786e2132fb278283243d75d6a4b266 SHA512 f9f5745a0e2fc5486de1fc029c9a3588eea04ed3c57d09b13b9295c8ad314141d44077851815b2a0e67586cc23877dc7fbc6e0dc31fcd116e7a4611bfd6abe49 WHIRLPOOL 5181908aec4a1638157af5efec0e9e659f46160c574c1393ba913e1f03fd44cbab33da9ada1ac13ed98509ca68b50f5c8799650e65b0003a57f6b8c02d1a1034
+MISC ChangeLog-2015 2022 SHA256 9bc7b1c83ac68d2375ac6597ae69431fbd16def21a48214fdcf62d3f8828340a SHA512 2985d42823ef892dced7de4e53893d4eb37e90a99f3f854ea3d52583e17f06053af1268fbb27ae670001c874d51bd5e9d17d84aa89704ee5e39d185b81ad6905 WHIRLPOOL 271548720b9875e2253f0d3275ae3c66fdda8d8f3f23ff16a1c586869a58b361d317cfa97c54fbd26cc0be05547621ad97aded75ca9a1a49dbdd3cb1cb9fe5e4
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/toggle/metadata.xml b/app-vim/toggle/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/toggle/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/toggle/toggle-0.5-r1.ebuild b/app-vim/toggle/toggle-0.5-r1.ebuild
new file mode 100644
index 000000000000..cc6ea38f9ccb
--- /dev/null
+++ b/app-vim/toggle/toggle-0.5-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: quickly toggle boolean-type keywords"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=895"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin will toggle true/false, on/off, yes/no and so on when <C-T>
+is pressed."
diff --git a/app-vim/tt2-syntax/Manifest b/app-vim/tt2-syntax/Manifest
new file mode 100644
index 000000000000..664e188113b3
--- /dev/null
+++ b/app-vim/tt2-syntax/Manifest
@@ -0,0 +1,6 @@
+DIST tt2-syntax-1.13.tar.bz2 2991 SHA256 6b5ed46f6dc66c3a7e0b0a7f0498de83a481ffee5637d8d37c9906ef480306d7 SHA512 0e7f5ca2b5dd53598778bb85a76fbb8be52ce789221342cb5ab51a5084c7d679b8b2f5cee4f8f05db9648a5828471eeba3d0367959f09d280d9c098a9c21e52e WHIRLPOOL c561fdbe410af2b2011e658796fd25471319b9a85228a84cbbf8ff47268cfc38c5578f2d6e899674b0978b5fc1d079cec5c65eabd0b83daa228818c46e3c7606
+EBUILD tt2-syntax-1.13-r1.ebuild 449 SHA256 a77b4a640bc58ff60bf195abb8e6a8524315a763517a9013e83404e217c644fc SHA512 86d65b9f758e7e15d90725aeeb2f2699ea3a3aa87d4f6ed8d86c3d3f0c9b91a18190f147d7fb07226ca8c10f338ac97b3b4950dfc7019cc90035ad4ef0f59a92 WHIRLPOOL 0e1382235b2956e21901ee8ff82e595b8986c974aceb6b6589e382f86de29d72f33dbca176c7c59c84e2377d2dc667f83079bcf0029cb571a788aa633ee1dd36
+EBUILD tt2-syntax-1.13.ebuild 437 SHA256 3cef319beeb3d3022f9f405ad01558128ba194109a6a0d1ec1a312cdf5166fae SHA512 2c1cbc3b190ef2c1eb53a1b583a84971da19ff3ee6adaea7d1d20f7938d15716681211182736008f22209b4226e778279292c3669d604bb884e05ff1ad48e9b0 WHIRLPOOL 83dcfb0060aac445579190a701441f7d79c0d2ad5f1bc2ee8179e89f3bd2c4673ad6ffc413173be2ef577bcc4b5afe6abcfd9a6a0dfd1874fc71611031f174d3
+MISC ChangeLog 3122 SHA256 9782827497a812cf2020900d07bcbcb3b9b1a004f4e76f329f1700d2849be430 SHA512 01d89874246d564ec52010158984e451d077fd56dfc3723ba78c6216aff25b42dc6ac03b9001a86cca62cc6942dafa6b485547f257d788410f97b2034b59d9d3 WHIRLPOOL 92110ff3c0fbace990e081220d75927d82c3dd6b90d9673e0929ba6218f49cd28c9dbd124a602f7abc974d6b04db04aa987b8ccd3fade1ce18f2ad174f07ee91
+MISC ChangeLog-2015 1542 SHA256 27861da26aa5ee3e4d62c65bca0ceae80a06ac8d5f207112813ba0e0a5a8fb95 SHA512 2f5f012442392ca37a08ebeac598da180ef77b34ac8dac38cd18ed4f8d858a78ca6a60595023f40063e0e7ab8bdfcd48d4c383e1760bdf5230393cffa09db921 WHIRLPOOL 6b99cbde0d753eb08a2b4f11475816606d98180678ba87840f331b818b7e8b7f579a7d2cb6016a7408e50f2ad99759f35922b2e06ac66b311b566c4c77d33550
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/tt2-syntax/metadata.xml b/app-vim/tt2-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/tt2-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
new file mode 100644
index 000000000000..00390f9f7e63
--- /dev/null
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=830"
+LICENSE="vim"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for perl module Template-Toolkit"
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13.ebuild
new file mode 100644
index 000000000000..811edd7c7b55
--- /dev/null
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=830"
+LICENSE="vim"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for perl module Template-Toolkit"
diff --git a/app-vim/txtfmt/Manifest b/app-vim/txtfmt/Manifest
new file mode 100644
index 000000000000..dd50b39f5f5b
--- /dev/null
+++ b/app-vim/txtfmt/Manifest
@@ -0,0 +1,7 @@
+DIST txtfmt-2.4.tar.gz 127123 SHA256 1d3880e4c23e2bdaf8065a569f54bda84292ee9e276ca4e055fca9c8e542f2e0 SHA512 4f3a32c34b11477a7b78fca47367754093b04dbe60bdfee16d2f05c992a82f9f64fb82b8dc811afd43fd4206f426c88ade95943cc1686e6bf57813596b9652f8 WHIRLPOOL 15815e7b69ecc07dc9ca7721c867b752bf2278732152402ff63276a930cacd1564c9fa8030b02054c494495b2447ab421fee4045d0b50d509da5e3d2a103f59f
+DIST txtfmt-3.1.tar.gz 172348 SHA256 fcc8e727075a1ff9ea9463122c18ce954b727f0cc67b3d6dc19cd81aab832420 SHA512 bdef5350626ee5251fbf3cb4a4270e72f0b8ab29948f0469cfadbcf0735ccd7c104b34a25e43d4ff147ed48de3667fba472080f81f72d5a4687467e5c44af5d1 WHIRLPOOL 757a05247ec6eea1736a7e003788fb6ff44006e04e980a7630af0fae32bfd37246f85be9e341a7457b54cdfaab7390841a09bdc799ecc8bc52ad9c88bc102693
+EBUILD txtfmt-2.4-r1.ebuild 492 SHA256 4f6f2577a1493ddef47eeb1d1295108a48f95148033b1e52382b3587898bc3f4 SHA512 0e7eb0f52098c3d4136f658cc56afc4d48ce2e9e0eeebb95938926b70b956f84368d4fbd6493893acb91d7adbf13c07c87a396a34bcd3689195bceb8709cfbe5 WHIRLPOOL c60783976d3b18434c7e8b9ce2c6fc7a7875620febbfd38d7637db731195c4a1ae9033abca3477f5f2ad9001aab08d6eb613f9100fbaed9d5817b43eaba9f21b
+EBUILD txtfmt-3.1.ebuild 492 SHA256 b2110d589f260a3f6004a6717dbfa621d88275c53de6c5a38cb8f16a67127d91 SHA512 177812ee22bd9d2feabc649317dc9b4894f4b9460b9be970537bbfb09125d0ac21c266b227dfb6842baa20be7181845a3254d32b0230e6a6f51b4e710ece9651 WHIRLPOOL bb0a97a0978243da3ed18f1ea159d90579ddb2912ccdd100c70220b940011d8200808148d8899426f28d34353f20f213fc869e35e0c25fcd8c1f0a2069106cb9
+MISC ChangeLog 2930 SHA256 98044d5e3beb16d413a0d58a8d61bfea4dde9f21817899aeb13d0021f66834c3 SHA512 f67ef44ad2a10920d5e7d7a425750fabf1849ff2e5319ab11a96a0b05f52fca8120cc0ea11e7c938926a34a609f8734423533a0c27ee0ee19ce0af847c2feb4f WHIRLPOOL 783059bebcce7120e5af55fc877cbcdf1b66e9ff29712e25918f57092b70e303e24b7c33d220e85ac9d740376cfa28ec1f948e1834624d3b264fce21054a2be5
+MISC ChangeLog-2015 350 SHA256 aeb7c247e3de07aeec0dbe28ea4daf7bcbca108bf4d05f0aa4023c95ed500989 SHA512 4141a0e703999c60d778b72f42306e0b18d61c4f3b88e087c6c032484c0049a4ad11a12a9bbd012939803fce3a46f434294a6d73975ae4f8cf8b36fd5ac8652e WHIRLPOOL 87b1d18a5df87e6732536057adc12e2d38f54809d71220ab6502acf544a656de1c98923a06be59e38d9e3c1b0a013e72b6879033e96aa809c1b2ffbebcfe9a69
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/txtfmt/metadata.xml b/app-vim/txtfmt/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/txtfmt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/txtfmt/txtfmt-2.4-r1.ebuild b/app-vim/txtfmt/txtfmt-2.4-r1.ebuild
new file mode 100644
index 000000000000..05e0149577c9
--- /dev/null
+++ b/app-vim/txtfmt/txtfmt-2.4-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: rich text highlighting in vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2208"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=13856 -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	rm indent_patch.txt || die
+}
diff --git a/app-vim/txtfmt/txtfmt-3.1.ebuild b/app-vim/txtfmt/txtfmt-3.1.ebuild
new file mode 100644
index 000000000000..737dbf320ec1
--- /dev/null
+++ b/app-vim/txtfmt/txtfmt-3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: rich text highlighting in vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2208"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=24489 -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	rm indent_patch.txt || die
+}
diff --git a/app-vim/udev-syntax/Manifest b/app-vim/udev-syntax/Manifest
new file mode 100644
index 000000000000..7a5bd145d5db
--- /dev/null
+++ b/app-vim/udev-syntax/Manifest
@@ -0,0 +1,7 @@
+AUX udev-syntax-20051016-ftdetect.patch 371 SHA256 d2af0aa868209deda9b3524e576d4b9992207188e0847aa28f05d99da586236e SHA512 41369f811f4ce28f182ac61c3113f38248aee839a9d52ee6ba83a48d3689873b9afe69bc938d2c40c06d2fa94b72c2e904a4b338dc24d6131492eb05192395cd WHIRLPOOL f76dedd20908a98ecf1a8f76c97e2feac124b01dfd9d80a62fa22e9748d30e42bb202db7d4295c617b8b5418eb8112315afd78daee5c5c908621f584620a34ef
+DIST udev-syntax-20051016.tar.bz2 1161 SHA256 32e34a163f49e68bce41dc3fe944b52bbc279399a0a422e995a9c77263316239 SHA512 3952cddd2598eb4e09fd6bc7538419c9dbb3eb94d55a81418fc66b5c3fb46f34853d4b97a5475f3330b752d4dbdd3bcf22a3f47c73d1d3e18b5efcc2b4696e34 WHIRLPOOL 9bd909f5c68cd70fb24e108146e144c5f14d4917b9b9418c6d0fd83f9c08bea348d592e239af2ea92bbff79ebc7404a3269addc5f24c8af81f6ea04b547c5ae6
+EBUILD udev-syntax-20051016-r1.ebuild 599 SHA256 c7c477efa8d2236ff8085d1ab00dbdd151b2c1465c87d1314e168b33ba66e6c6 SHA512 4378315968136dae2e774ccf37584c4a8711d3b7b691d7ec0cf68986dbf14308bfe43702bdf966deb026764cfb53e7d9aa6259403733bca28b728d33314b2e17 WHIRLPOOL 030d744c89539dfdd401a64b25f70c5131fa81a11af7e0eeb04b63a9a7bf7e85ab689aa87bae3ba809f8798b4669d7239162231905454e326ee1574664b279b0
+EBUILD udev-syntax-20051016-r2.ebuild 571 SHA256 b7d162eb0590f99a8d578ea4de79fe0290f2016dd40c4f303ad4beeb9d06f1a5 SHA512 fc6774661f772abaca1e452c3f0018f732537cf4fed5ba983d790d9661a6daf27c370c2fe848817e57e7aac9cc51a8633afc1752cce7bdbfe3386a7b991bed76 WHIRLPOOL 7b64e7ba919113f6fa9fc316881af33d95bcf7e1493c04db508f089d0feeca0c524f2ba71a36da20f5f69e0ce56d21479962232495190f4f3ec45cd9d0e72853
+MISC ChangeLog 2889 SHA256 9a50959a503fbb18df1f0864c58ff2f8e20bdcc71db025a1c34f828ba6b1cf7a SHA512 8cbb1bfa79323f47bb91be5d03f28751a847b29a3c14fe359a3fe1e03312ee46eea3bfe406b3fe1a40f1a3e3bde2be3cb8bb42e92131d8d93763a66489d713ad WHIRLPOOL c806a19bbbbd0d718a5cf72d1aed82866f776396e17022fd8979771b6314c568bcdaf49f69f0c86a34fd928716c5f4dcca05f96bb4d6ef5ed88b134aa98a651f
+MISC ChangeLog-2015 1778 SHA256 9679df51ae654cff90c27f1b4ebe1e1987b0b5649fdb263d703904b496fbd352 SHA512 ac2b27093ee1566a99dcf44f9553b7f8b0a7090c64f8aac742e4318f56fd61c9a878d2150f6ccdda4e47e37a2a50c5fc4deaa99ea5b5e484dccf105fc201c339 WHIRLPOOL 11c06460d2b3c4d160aa12f4b15db011852b04abff1bf3b52ecd57d23bfb9c4d464d3fdb76b0581644d1aa07afc21ad70306c07e9a7877887bd33b79073f53e7
+MISC metadata.xml 346 SHA256 f293e1fadb29782fabb215adf96923cfcf09e167fa8c440989edffe35601c772 SHA512 c9cf56d93687fad1a2ae0d37518f46704a481a5ed288baf5e714ee4898f1ef304101453e2f53a05e5e079bd2e042ee403546e8f8c2787a92852910162c3150f0 WHIRLPOOL 7ff90cc8fda5eb0c318401f3884574c07cc8cc72337f16fee0fc1882b8f43af66547a57c9c39a00cab8b8d0980e779284aa211037910d45ff9677dfa6d9d1133
diff --git a/app-vim/udev-syntax/files/udev-syntax-20051016-ftdetect.patch b/app-vim/udev-syntax/files/udev-syntax-20051016-ftdetect.patch
new file mode 100644
index 000000000000..3792be01ce23
--- /dev/null
+++ b/app-vim/udev-syntax/files/udev-syntax-20051016-ftdetect.patch
@@ -0,0 +1,6 @@
+diff -ru udev-syntax-20051016/ftdetect/udev.vim udev-syntax-20051016/ftdetect/udev.vim
+--- udev-syntax-20051016/ftdetect/udev.vim	2007-01-10 16:11:32.876871120 +0100
++++ udev-syntax-20051016/ftdetect/udev.vim	2007-01-10 16:12:04.412703024 +0100
+@@ -1,4 +1,4 @@
+-au BufNewFile,BufRead *udev.rules* set filetype=udev
++au BufNewFile,BufRead *udev/rules.d* set filetype=udev
diff --git a/app-vim/udev-syntax/metadata.xml b/app-vim/udev-syntax/metadata.xml
new file mode 100644
index 000000000000..77e95b35d8e7
--- /dev/null
+++ b/app-vim/udev-syntax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim syntax highlighting for udev.rules files.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/udev-syntax/udev-syntax-20051016-r1.ebuild b/app-vim/udev-syntax/udev-syntax-20051016-r1.ebuild
new file mode 100644
index 000000000000..1e3cddcc06ee
--- /dev/null
+++ b/app-vim/udev-syntax/udev-syntax-20051016-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: syntax highlighting for udev rules files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1381"
+LICENSE="vim"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for udev.rules files. These files
+are automatically detected by filename; manual loading is also possible,
+via :set filetype=udev"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-ftdetect.patch"
+}
diff --git a/app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild b/app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild
new file mode 100644
index 000000000000..68ed0060b73d
--- /dev/null
+++ b/app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for udev rules files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1381"
+LICENSE="vim"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for udev.rules files. These files
+are automatically detected by filename; manual loading is also possible,
+via :set filetype=udev"
+
+PATCHES=( "${FILESDIR}/${P}-ftdetect.patch" )
diff --git a/app-vim/undotree/Manifest b/app-vim/undotree/Manifest
new file mode 100644
index 000000000000..58960831159e
--- /dev/null
+++ b/app-vim/undotree/Manifest
@@ -0,0 +1,6 @@
+DIST undotree-5.0.tar.gz 13646 SHA256 57e49c1c819e53e340b9f76c639c4148ddaec88e050eb22095373dd051151cc7 SHA512 093202633000c15db731c9664b606ced7dd4d259f9fac04e886509a440eb5e31de073250eb400be0b1e4cdabb393d1d88bbcb88fa162c89a3783c961b33d33a0 WHIRLPOOL f3a887362bfc3c3c128fffa9be9365cf45608ada100780d7e6c1315a8c2ca98ea0998f246076e36b0275c3299db5bc56ff80b093c662107a2077050bb4148cc6
+EBUILD undotree-5.0.ebuild 428 SHA256 8c8b0160f80853987c9357b392820cd527afac8e27e79636b224ecbfe4979f5d SHA512 e8d28b08128fc97e2e814bede50e60b0630f8f8584b8a8334fa33c7bdb3eec834a3b361e3ed971ddc8a4a9c947b4e5f9282a2e21cb63fed050df571bf6e6a1de WHIRLPOOL 090b30f72550b984ad075fec62d395f0c08bb9bff55ffbab1b45541e8ccd41abf0b9a5afefa1289eb0da76362d23d1d921f273f0899dfbc62ea513477808d170
+EBUILD undotree-9999.ebuild 374 SHA256 3e78173dd0489b351aad43ad0dec6a46801e1059d034e34e54ec0caec241e19d SHA512 c62ae1a57e626a6f81168c34f99151c0647605d119f6b4b08aad9b943398e8d8cb7e52ffe4d76376e0efe44bd9ab752b9a223e420394ec72bbcd7772e9929bc9 WHIRLPOOL 4ac700002d5c3e89736115e56ab126b15b91a18fa2c6dd1c8c5b1bb902442abfb5b115f8fa17adb86ca4de388d8902b8cfdd9106ec7ac999d6c3a086dade2ad2
+MISC ChangeLog 2737 SHA256 d6ae59338a21b8d2fd7ec09e2806df68f461686a44a3271d0a3e4f8892064293 SHA512 0c7cc1321b7168be1911f44001944de226dc6069bc1f09283f7ccd35ac4da41e313b5b95731a8968e299f13c75ba3429bbec9f9bd453551add82cbcecab9196e WHIRLPOOL f3ad64347ee193ada6e91b1d12309efc89c5eee415f1f93958ed60c652d7fc5daeed5c0e3d1ea75b7bcfee8e912eefa3d92511f474cc819a8c6140e9a0c76d1a
+MISC ChangeLog-2015 1176 SHA256 327f2b059752751784c68819529dcc0f5f8a51bc121992ac54bcead27085245c SHA512 86666f055aa0abec9cc4a433f99a1fccf9fd268a505b9243261fc8fa52e4fd21a5fc72ac4ecbf46be669d1fd80b14c44f1f3c2bbef6b9cf8e5387c735af0157f WHIRLPOOL 612b6bd691e537ba326bc4829f01eb106489a79e8c9e52f3ed73232bb2757ab34b061f56abae237b86738e015a94a86e5438e985749f97882ad53a6fbb0ff066
+MISC metadata.xml 339 SHA256 6aca7df41b051abaa79ae1a939cdcfd7c7a9a2f5b717569e5ccd711fe4e707dd SHA512 1a0531dae60fb8686cde296f695ededc1ac678f55672a73d802a0f6eba101d0c9bab0c4610a3d6a297e885660b635830c251b5db5c06ba8fcb126abc2df5a914 WHIRLPOOL d9743df54923ce02e06424435ce76dc3ba57e9ced972a8331e270c8a0adc56d371c167efc162cf5c0ce1bd9522ae1cc8c53066744d03c90b9cf3c5f2f0e4ce08
diff --git a/app-vim/undotree/metadata.xml b/app-vim/undotree/metadata.xml
new file mode 100644
index 000000000000..db90240ffc50
--- /dev/null
+++ b/app-vim/undotree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mbbill/undotree</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/undotree/undotree-5.0.ebuild b/app-vim/undotree/undotree-5.0.ebuild
new file mode 100644
index 000000000000..a3b9c665fc05
--- /dev/null
+++ b/app-vim/undotree/undotree-5.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2016 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="http://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-9999.ebuild b/app-vim/undotree/undotree-9999.ebuild
new file mode 100644
index 000000000000..e257084dc783
--- /dev/null
+++ b/app-vim/undotree/undotree-9999.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin git-r3
+
+EGIT_REPO_URI="https://github.com/mbbill/undotree.git"
+DESCRIPTION="vim plugin: display your undo history in a graph"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
+LICENSE="BSD"
diff --git a/app-vim/unite/Manifest b/app-vim/unite/Manifest
new file mode 100644
index 000000000000..a6d401ae6102
--- /dev/null
+++ b/app-vim/unite/Manifest
@@ -0,0 +1,5 @@
+DIST unite-4.0.tar.bz2 80472 SHA256 46e3cc1439e6d9d581975c2b742a53ab2c076c01ebdf0d0dbebe1fdf425adc39 SHA512 e554e48d740b0ce6406d8512a0c769e25f78b763d267bbbf8228197835b724154f33452571c771fede1415a9b3108deb096e3bc90291a95e8a3b00d216287928 WHIRLPOOL 0244c1d7da2d9b0e474a429f9d3ebf012635981f7a0b8437172cebcf6c560a584f86143738532d2d9af8609a025ed92aeb31a2839c343496edc2bb3823785e0f
+EBUILD unite-4.0-r1.ebuild 347 SHA256 39859a9bfa6ae8258df9d93597174fa126959f9f688e62d6070b459c566923e8 SHA512 79b138b549c5a17a573c682cc8fc06d4ddd6880338f9cf035748a2aec9ab325fbbe3944b7d13e6f37d7e9170b4291595d08bdcc05e7b163e22a1ecf357bb2277 WHIRLPOOL 791754aa0ad30e594ce50df01025e5e02d8311d628bdf733c8f64d665ea3e4751f5ff8f510d872b95b74714a020039b52663f4d2628ddd95d63f80a4cf283f50
+MISC ChangeLog 2762 SHA256 551dcc5bb94cd287f84ce8ba787e206d2530baca3bcaecb10ccc581f8ee456bb SHA512 0f46af467fe4c5043d946be61f0838f8969357d52b1a3f93b898b92cc271566c0cf028408a89f1d073216df9c67f071e3f67b3a91c81e1dd0226cda7775326f7 WHIRLPOOL d9e965aac4f0bc7e5328034e73f3a1afbfd1eac59673328843041ee94142874223b4ac8bc0c5aad466e8d25df18fb04375291ccfe5245a93fc50479808df6938
+MISC ChangeLog-2015 443 SHA256 3295904cf35ca71eed95fc3473683a9b31f4b5a5fd7c0bd68f3c97020480af3a SHA512 87eea6531a2b6face74e85521cc57d1113b9180f150fea6031ba53ea5f8dbd2eed2c83f766e3189f3364b2231474c96b8ec44a862196ea9aa5b89cdc7389173e WHIRLPOOL d82ca5cc5a6db47358a3d5810ae357cfe44aa2c22e7988143d7c9fd3abc0617b6366a94670d495278e9e95375c0e826478c5e2713ad88ed14429b24195fd251d
+MISC metadata.xml 669 SHA256 8d1974ba98e0a056d89e96227ee91ce0c1654862ef38c39579187c29db5ba1fe SHA512 9a1b6ee71975656291278d75923247438be875af17abf1395a08ac3e9c8ee10b72830f0380117fad38214257ab01fbec35e45b0ce9ae7791a96a1f10cf065426 WHIRLPOOL 5adbfdd80592378df6b470eb824f7b406405211c08744f7b31f5c1db29edd4fae2a6b06b75d6a946ad74ac7088893a614db28557e1f15d2833a76ef3cc3f4490
diff --git a/app-vim/unite/metadata.xml b/app-vim/unite/metadata.xml
new file mode 100644
index 000000000000..393dd84dde7c
--- /dev/null
+++ b/app-vim/unite/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Unite searches and displays information from arbitrary sources like files,
+		buffers, recently used files or registers. You can run one of defined action
+		on a target displayed.
+
+		The differences between unite and similar plugins like fuzzyfinder or ku are
+		that unite doesn't use the built-in completion interface of Vim, and integrates
+		sources at the same time.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/unite/unite-4.0-r1.ebuild b/app-vim/unite/unite-4.0-r1.ebuild
new file mode 100644
index 000000000000..000a1b6c8eda
--- /dev/null
+++ b/app-vim/unite/unite-4.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: unite all sources"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3396"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="!app-vim/neocomplcache"
diff --git a/app-vim/uptime/Manifest b/app-vim/uptime/Manifest
new file mode 100644
index 000000000000..fcca96cfe69c
--- /dev/null
+++ b/app-vim/uptime/Manifest
@@ -0,0 +1,5 @@
+DIST uptime-1.3.tar.bz2 2315 SHA256 bd28b9dfaf51c1ccbc43c83dc7e2ab9fb70fba6e3d30120b8d34ea5f7211d6ff SHA512 42291261eb9f7246b68c32bef08599f604a5e1186eccff0b4ea118bb336e79a5c84cfbc2a834d5e50db3c2341c95c05f2961589efc3e459d3c6dac5f5baf50e4 WHIRLPOOL 2d13afde8858398f3831e2b145f3a3d0599d3dbcc7c2fedcdcf354609bbe67a91de38090ab10cef20dfb61a32ffb836dd0e51d3752a628f1ae1e157c685e6999
+EBUILD uptime-1.3-r1.ebuild 346 SHA256 fb41531c33dc130563683a725f7d8eb9f22fa07159e6d59eb1d001473f0c4fec SHA512 9360127dc77aa48a77b96438b446185bb072f4da80764f445ffa9a1d66c503d8b106e13ab85e0f3fd63b3350a757bc504dd3a5033030d755112f3f083bb8cf8d WHIRLPOOL 66ffe9ff0bee2b83a1b8a60e6fb6fa8b6b7be581d6a2452c8d8da411ab659ac88bb9a65a7f5e1ce560758b4b6357f748d7600674be49e7d6d719b212b6783dcf
+MISC ChangeLog 2916 SHA256 e606e470734979941ab119857ec0d15cab018fa22bb0a466ca7a96090bb6e499 SHA512 0adb3da1c79d081076fc2d889bb6aa0564f30fbf652e831118caa329f80c154e03157758cff488749d99ee59bacaf4a7280469f2f6909e6a3c8ca29faddba159 WHIRLPOOL 969ef3c891ff3560e603aaf84a6eae5f506ddc63ffa47b547338c9616d313624eb921a1584fcd8aef08185763060834465afcbecaf7d966be6dd018f1a4c4709
+MISC ChangeLog-2015 1782 SHA256 00aff571fefe79f2436e41678475e8cb7b96b3272f635b69c70b9ea3c6a2c37c SHA512 af0c1bd82eb25b52d509c14641812bfdd575c3a30a5b4dc0ad8a52f75477ee7e81008a9a979664658dd33dd3e20616d998a5bf3e784eb406ff0b5be963e0d4b7 WHIRLPOOL f3bad8eec00c845603a56193ca9e9ae8ee0b94713ded80d6677dc7afa6eea8f853a4435f0d2f86f775243d882dc79809c8a603622d56b0828b7e682930ac2b3a
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/uptime/metadata.xml b/app-vim/uptime/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/uptime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/uptime/uptime-1.3-r1.ebuild b/app-vim/uptime/uptime-1.3-r1.ebuild
new file mode 100644
index 000000000000..a7090aae74a1
--- /dev/null
+++ b/app-vim/uptime/uptime-1.3-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display vim uptimes"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=965"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="uptime"
diff --git a/app-vim/vcscommand/Manifest b/app-vim/vcscommand/Manifest
new file mode 100644
index 000000000000..042bf0e10f28
--- /dev/null
+++ b/app-vim/vcscommand/Manifest
@@ -0,0 +1,5 @@
+DIST vcscommand-1.99.47.tar.bz2 27281 SHA256 1e219f3e941e49086fb5083a1493c9563cffd004e8bae8a7f6ac65596adf3f56 SHA512 df9180cc3a87dc5fab52d149c1f87993822658edabd77965756fa8ba05ef6f1c5a4f336b54d0b18e3c2bba8f53324ca60526258953a85ce170ab065b5f2e11c7 WHIRLPOOL 9c056921e8757b234ce71a840a7fcebb507dfe7813f2034bdb360ac60038cbfc01fc333353ec8b24b8142236271fa1295d53d7c5650046cbbb61f5bc6a80d478
+EBUILD vcscommand-1.99.47.ebuild 437 SHA256 2d4154ae41e4a63a21ebe596ea03d42f9a6bc5ab39257125395dba1058b27919 SHA512 d7e274397beb1eeac8a8aa5efaee85848258a4897718d78f6b698f5642cfe97f3bdb9045707c7430182922c5bf82b9c92e75cc5f86f04d727a6c703b57ad21c4 WHIRLPOOL 6110ddc51bfde5abe9f113a14cd01885bd4edcc2d0623f8e136fd295860393edce5d37252d4c2c2ddd2afcb811cf90882129ee7ac7e785f974978b357f6c428f
+MISC ChangeLog 2439 SHA256 8182fe2de1f9d1d17a04fbe09efcf125c18e40d6fb0e674b0f6859eb3d2ece29 SHA512 397eae593780069813142d59081527e56a2652275543ed15f936ae3733dae604017e39edfbdfec4ba0c6bfdb6485ed619b08f0cca90e608a73e9873839af6e2a WHIRLPOOL 75cb6bf9a5d938b5d3d486ba59b60bb6a8b7b236848b03499890d5f19129f489076aed40157f6c65412d66c85d65943db73076e24f58ba3c471a655bb5455f07
+MISC ChangeLog-2015 4769 SHA256 9ce1592b4ad23d942d82c740be89588abb18978e9963cbb09cb3c02eded84b6c SHA512 140ccc7915e6111568ce1552839d1073507c07b8cc7278d72472a816a1b940ae66ca4b99e41ebe5e72845e56e4e8e644b5618e8cc524b47c16cfd3f15afe9ef7 WHIRLPOOL 30f413a7436cf31bf0d740ba6502bf1683feadcdba6476ffebd06c712c47bd3f85fcb13eccdb5f71a791654e047308bd7bea46e8d688a761e9b6509bdd6b933c
+MISC metadata.xml 472 SHA256 291e9a251359d88606bf23476c76bc4b364c527bc1cdbc4543eb43c12bc03d46 SHA512 1fe14c8bf9e490646436b8ebd10898f79ea5614a894382397b07dcded1d37f2b8534858c38db7cb2fc859d839a1973f685e96cb9340b2b254273e9e627e3c970 WHIRLPOOL a95edea03fdba5c1859726e4634df08e2dfa4137573e47d0fbfc506de388d44038295b599fa7446e782ed0d4b4b86b4e0e51d7d4d4a11762a6d9e1b12ff6e14e
diff --git a/app-vim/vcscommand/metadata.xml b/app-vim/vcscommand/metadata.xml
new file mode 100644
index 000000000000..8dacacbba2cd
--- /dev/null
+++ b/app-vim/vcscommand/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
+<longdescription lang="en">
+	VIM 7 plugin useful for manipulating files controlled by CVS, SVN, SVK, git,
+	bzr, and hg within VIM, including committing changes and performing diffs
+	using the vimdiff system.
+</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vcscommand/vcscommand-1.99.47.ebuild b/app-vim/vcscommand/vcscommand-1.99.47.ebuild
new file mode 100644
index 000000000000..ca4c1e3fface
--- /dev/null
+++ b/app-vim/vcscommand/vcscommand-1.99.47.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=90"
+LICENSE="MIT"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="!app-vim/cvscommand"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vim-addon-mw-utils/Manifest b/app-vim/vim-addon-mw-utils/Manifest
new file mode 100644
index 000000000000..0fa191142df3
--- /dev/null
+++ b/app-vim/vim-addon-mw-utils/Manifest
@@ -0,0 +1,4 @@
+DIST vim-addon-mw-utils-20121105.tar.bz2 10071 SHA256 6c859f6ae2d4a75c5edd546ce5bf58f447049852060ef36dbeca3b4437e9ea77 SHA512 15104f23416e8dbeb25d60e9b94c0c04434df19bbd3fa418285a1b1106a95dc6bf28cc472014fe431d80086217110c58f267d3d1b5d855bdf85fc4d4fe870346 WHIRLPOOL 6693215eab312bac96247dd93110ca4d30860a581a930125a72dc48f99ddcac6ed26503f1ed5fb1d85d2841bbef0527e922f80e6ba108ea1cdad834c2b08b6d6
+EBUILD vim-addon-mw-utils-20121105.ebuild 369 SHA256 dd803e5bff60c8220b21cbd1fd18e8fb12bab6385bfc0a3666bb5a5f45560d9f SHA512 36b4da806c1d42d56337bd1f22c469275f96ec909ae72496286a4df720a61dd35297bff72d173bd8f08df64b6e7ccb8a2964b67a092c64058ddb087a9469a35c WHIRLPOOL 2ee4dfa4ad91893d7d591eba6d6e31a5eae3f6887333b018b0bea2743e670f390d7737c1ae4fe0d129c0da6eabbe0c3f5887894733df1c4a8ec569665aa2167d
+MISC ChangeLog 462 SHA256 9cf53601d03cfb489f34a735d6163c75c3c281a689bd23802257800bbdd43449 SHA512 0acf1bd43aa5fe52d06b3936fb05e9dc725d5221ff45baf54c08385b0ac7df151923c52d03461d6e1f1924405f1f36686699a7879fec0072bea6551fd8b5a6fc WHIRLPOOL b53b16377d51bf12b668a15feeffaa2791d52a14289c82198c0d23d7cf42aa91cb1b882d0f13b63b7962aa6320fbf7664a640f70bb44bfb19bb21f206f20ac9d
+MISC metadata.xml 342 SHA256 83898f2c332e6db85d5fd0427ed10abc62b730344004c5ab858a9a7c35eefae2 SHA512 ab292ae32011a7ff8367839fe3972e3e2dbe2db977ee81b0a619847d50288be8f2204604c19cb2e4e4942a98980d8ab886395a60b96dbdbfad2e5a739734954b WHIRLPOOL ed1b754301435b4a738922f18ffcd68508d43be7934333dd093bf006c635200f5333b57acb45f64d3bed5a07778ca9f3b3d099a819f459ce59a4cf182871d50f
diff --git a/app-vim/vim-addon-mw-utils/metadata.xml b/app-vim/vim-addon-mw-utils/metadata.xml
new file mode 100644
index 000000000000..96018bf9a027
--- /dev/null
+++ b/app-vim/vim-addon-mw-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MarcWeber/vim-addon-mw-utils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild b/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
new file mode 100644
index 000000000000..9a7dc8299972
--- /dev/null
+++ b/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interpret a file by function and cache file automatically"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2940 https://github.com/MarcWeber/vim-addon-mw-utils"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
diff --git a/app-vim/vim-autoclose/Manifest b/app-vim/vim-autoclose/Manifest
new file mode 100644
index 000000000000..ed99cc72b5e5
--- /dev/null
+++ b/app-vim/vim-autoclose/Manifest
@@ -0,0 +1,3 @@
+DIST vim-autoclose-2.0.tar.gz 35779 SHA256 151cfbfda66f338c63e59aad47c7ae34de96d62628fc48af12b0894771f913d2 SHA512 2604c2c16f25eb60bf660ba4f80d40d9aa51af38cc59a2727f0c705ba2abe5302a58dc60a71c791cc6aa002477587d1dadcc8a9269a93c5a9405a86251f4fcd9 WHIRLPOOL 1a0588cb29c4d9d8fa8c9d97d3bcfe0da61e7a9657f1c2127053cd4f57a086f52139f8b2f689126db320f94a612a05714fa486958c98c645f4450b78c929e17c
+EBUILD vim-autoclose-2.0.ebuild 389 SHA256 95d23f9c57ec9cf0004867411e36236ba99bbd44055225c29b95b0ee43eb767e SHA512 ea690cb014599f55d7c658d76186a898ca3e7f787966bece9d2538dd94bf9a08a6ce62226ed10834013b4bb10e81eec5cddd18b33832da138aa018d63db1af17 WHIRLPOOL 617cf5b6dd6b72f6f737b7770b4f82b4012936bfa2a03c8883e52855cbfa5f3bfbf229dd0803846c6d6ab2502c24cca334d178ded8d24ebf00b65ed64b5f835d
+MISC metadata.xml 445 SHA256 04e4f301c02f74cd2bfe5b8ca34a8d8726197bdd85dca43df9014aafdf48380b SHA512 a78dd7130e0cba7566721294c9e3c7c90481f4eaff8d0d84ad3ad015c9afff79e0972335f9cb7bf9ac15e3f083853a6160c5654d6a0ab6dd2f20c047b4e7f8a5 WHIRLPOOL 93cde7fb59ea0c62fc9be2e95e42b2f7a14c6a04224d5fe0107cabb5ddd72344d15ba3631021c929b2c1af6ae1dffd3c39a743df98f5f671f3c5d1be5235531a
diff --git a/app-vim/vim-autoclose/metadata.xml b/app-vim/vim-autoclose/metadata.xml
new file mode 100644
index 000000000000..0e5ce60b28e0
--- /dev/null
+++ b/app-vim/vim-autoclose/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Townk/vim-autoclose</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-autoclose/vim-autoclose-2.0.ebuild b/app-vim/vim-autoclose/vim-autoclose-2.0.ebuild
new file mode 100644
index 000000000000..b831f463e574
--- /dev/null
+++ b/app-vim/vim-autoclose/vim-autoclose-2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: open-close pair of characters"
+HOMEPAGE="https://github.com/Townk/vim-autoclose"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+src_unpack() {
+	default
+	mv * "${P}" || die
+}
diff --git a/app-vim/vim-flake8/Manifest b/app-vim/vim-flake8/Manifest
new file mode 100644
index 000000000000..f6e6cdc7a3fc
--- /dev/null
+++ b/app-vim/vim-flake8/Manifest
@@ -0,0 +1,4 @@
+DIST vim-flake8-1.6.zip 6499 SHA256 c35dc818ef8fee8bb0e8f4519b417be10ff4297322930c27ead75f8e3cb5bf24 SHA512 2cd6427d946d3ab310c9d04441355545065f501d9176b11e90a2df5b8c0fad679f56b77e934f9cf4078a947f8f35d0200411add0da34f33e6cfef4b9b4089c98 WHIRLPOOL 56dacac8e135e3601a9dfb66d4a6d4dee1a5570843eca748c139c84156705ddafd95f4a02a96df3e0d38adcf1f30f19565174c654758c699d62990479e867c8b
+EBUILD vim-flake8-1.6.ebuild 420 SHA256 1f488569d744261ee4677a52b5b9ef8490900b7b936bfa6093d6beb57958d99c SHA512 ca6beb32316cff12923f5ad2978a77970ee7e6ccc4d563b1adf0f118ce90dc1e8ae38baa75ef68ebd8386b0ac7f2928ddb4837e9f26a97305d30fc0c1af58b49 WHIRLPOOL 341be90ae44380028ffb5e8a4f4c6cfe2c2016dc598f2e8d253aaae1f63dafa707e27c440a966388afac0d59598a2dae68ffcab15c9fe3b25c40f85c52f75003
+MISC ChangeLog 819 SHA256 7839c48f5cf7d4f7c1c6f6b30b0ba6022caf4231a1922a057e485f367b5cfc94 SHA512 7ce7f976b8b1646ba2468e1fb036599bbc2ea4bd499709c03750a1c5f3b8119511add0a37352c5cde662227e728d97e3e6517a645843ac250acafca25a9c5b13 WHIRLPOOL 3a67f65315022fb098f458cb50c010abeb4d71075594581fe2fee42c7fe5d3a03ff04014aded45dee85af89b7b275a0a42356c67b143cb99923f17fa83593aca
+MISC metadata.xml 424 SHA256 8a512e23e67a08c27316da92176de69f040591e108bbccc84b0d5feeea60f6c3 SHA512 eaa032b9c9f247340b0eceffea35d85c14259024eac52195f3aab1d7916ea028b44a4ee4e1a8d1b95cf002972a82f0bf36b8425248da684ef794c8afbe632ac5 WHIRLPOOL 4dd75cc63aad557dee26883d004ac86cbc144186582499dbd39e2b4037baec41ea7ff0dfd4504f41da560cfc24ae067aca606aa00ed8458029b3c984e132079c
diff --git a/app-vim/vim-flake8/metadata.xml b/app-vim/vim-flake8/metadata.xml
new file mode 100644
index 000000000000..f1026b7729be
--- /dev/null
+++ b/app-vim/vim-flake8/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">nvie/vim-flake8</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-flake8/vim-flake8-1.6.ebuild b/app-vim/vim-flake8/vim-flake8-1.6.ebuild
new file mode 100644
index 000000000000..513786e2a7a9
--- /dev/null
+++ b/app-vim/vim-flake8/vim-flake8-1.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: runs the currently open file through flake8"
+HOMEPAGE="https://github.com/nvie/vim-flake8"
+SRC_URI="https://github.com/nvie/${PN}/archive/${PV}.zip -> ${P}.zip"
+LICENSE="BSD"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-python/flake8"
diff --git a/app-vim/vim-hoogle/Manifest b/app-vim/vim-hoogle/Manifest
new file mode 100644
index 000000000000..de21df92039b
--- /dev/null
+++ b/app-vim/vim-hoogle/Manifest
@@ -0,0 +1,3 @@
+DIST vim-hoogle-1.3.tar.gz 3337 SHA256 e1a9b3d9f0741cec04d59cc8ce7806a0e801236e4f25b06d508270bd3b01d2a4 SHA512 ea0d2b723e913836dbff5947e7de4fb5dda19ab1d3bd51cd315b28499f1b6c771b037b16eec6a88862d27f675a9ddac11eb5d8d5a5b3ee3e2eeb7620ed4d565a WHIRLPOOL 641109deddbde97f4d31e3542256e392f72845239f235710b877bad06efd2af9ec9e3718ba7797f01bd8b8c461bef7491a195a3695e773c0a1b9744a52fae1d4
+EBUILD vim-hoogle-1.3.ebuild 478 SHA256 c8a3ee1b4ba315ade181704b0824794722b894a954ef61ee3e8a2edf8405496c SHA512 b62c15abf6b0b4c67aa6ede9ee4f9021ea97ef6c97a40c2a44fa4b5cd679b851c2ad473ddd9b2912e2c14e17a8d3514a7fd775679908383a5b2ba300a86e0f15 WHIRLPOOL 66d715679a3dbf842d631639461db5441e35c89ac70eb83b62744928490a140e9f77dd54b4687fc90ba673f9c988ceb473db03a58d31ec347dce8f58cd14583b
+MISC metadata.xml 333 SHA256 ae8c58283a99969e624e1fd00b1732df5df570bd09f9eb8f5728d7a7bc64c26e SHA512 b24d12456a6fed3864c3159aa935ad04875970f1995b4b6d21fdc3e04dee04c20561a489494c0cc8d8f1d59b880a8bb6156ecd2966ca196b17f9ec0746c78def WHIRLPOOL a5117ed8ac6e17fd906a084cfc75eb38b85ca415bda21c86a89924a68d6f8e26a09954c34ca7099be85bcf6581756b40971c97904e58d1a923c3eb9b27670092
diff --git a/app-vim/vim-hoogle/metadata.xml b/app-vim/vim-hoogle/metadata.xml
new file mode 100644
index 000000000000..ee47616d507b
--- /dev/null
+++ b/app-vim/vim-hoogle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Twinside/vim-hoogle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild b/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild
new file mode 100644
index 000000000000..1dee86affdcf
--- /dev/null
+++ b/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MASTER_COMMIT_HASH="31823f830843385f53a3da7a5bfaf678494383c4"
+
+DESCRIPTION="vim plugin: use hoogle within vim"
+HOMEPAGE="https://github.com/Twinside/vim-hoogle"
+SRC_URI="https://github.com/Twinside/${PN}/archive/${MASTER_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-${MASTER_COMMIT_HASH}"
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
new file mode 100644
index 000000000000..99a99b33f47f
--- /dev/null
+++ b/app-vim/vim-latex/Manifest
@@ -0,0 +1,7 @@
+DIST vim-latex-1.8.23-20141116.812-gitd0f31c9.tar.gz 288376 SHA256 b3f8c395ae4d012bc6597e3beb22568c84554195bcba3cd3edc6c84270458eab SHA512 18444b7aef9ca1d7288e2616c0329274172afa3f932096fddc5e40888f65c8cacae2454ab316c5699395268aa88af13b32f3ae6e36058e27e4e48e6d6591b762 WHIRLPOOL f5a133483fd3f8ce33c82baa82fb6632942baa9d919814516904994c848264ec08d89cac299592d9fd741282a4644f63c2ca46ce5e8296c4dd64bf36d46a46f7
+DIST vim-latex-1.9.0.tar.gz 289271 SHA256 1fe71b034eb72061380ba3f35dde3e4f6095e8584827ce78bf745a546b6f46ee SHA512 4cce21683af74a5a1034e5ecc0f6268b5065324908671d40b4d6b60ac880890df1e9c3d6c16fa57dd1edc33766ded374fd43473699a974ba83e4aeac42030e63 WHIRLPOOL 259920a04e27c780e0857b30a17f6311b358fe89d38fad3786d7ad958a88ce59cbc3d1dacd7f11b89aa32bd02d46e1b9438120f8e5fe073a44011bbe153233b9
+EBUILD vim-latex-1.8.23.20141116.ebuild 1798 SHA256 933d3612e4b2e56eba3479eaced8d62cadb6035446f315e42be68e1bbffe1a2a SHA512 aeffb7b9e604b1941a471bd51fb13aa8c2de410c549b5a07724242adb87158064e23312a4add2c82cdc07da34350fbdd537bafff65b555c97d95cb16bac3c972 WHIRLPOOL 1f175754be31dddf75121a30b11c77c6e8ad45d07f62a23369c8128c2a991ff8f3b3186acd9395f7d02be78958e9a3eadc33b8c5d03e862d29d2e570fd41bb67
+EBUILD vim-latex-1.9.0.ebuild 1562 SHA256 e8230c1a7e998705f99f71494e21510a951d1ea26b9efac73f238b59ded69c59 SHA512 cfb7cccf342788042957425fdf5c1fc1a67836b4cab5ee26513a1c04a8ebf545d5fa4f583c84d934d71c7229adcaf373d8c256c1c871c4519bd7c671ed6012b6 WHIRLPOOL af38d976f1903f9550333a778250c5071c155115db0acd989432a5bdf86ac084d346ffaa3c13ffcf2323beaaae216441b872f1c293733ed5bc70cb94a36ab062
+MISC ChangeLog 3108 SHA256 5084365f3b8bbb1ecba0a16a60806682131fa32508b826718af17a6990cea43e SHA512 6527834058584b70ac25d6876c2a6d0c58fecc63f37dfdfe597c6f5c69fd1b170a54622e40bbf643fc4b4dcf8c66b328284ec0165c21c1fddfb57034e203b519 WHIRLPOOL cd3c481625689601975ae67fd177576b66e5cd41057ca4939e104212b2efa4e71f3b3a1de519d27996957d9ea2bf93f042b9e2ca1151c7dad610f86840edc02a
+MISC ChangeLog-2015 9845 SHA256 acd95e2785e8978153677bedce4125c5b13eed1d841020e4d9980f6b402a528c SHA512 72f6b98ce53284a2061d862880415918172a6f3dbe6cf54860a3d1a178782b3195381740a0f310791598ecc38a4a58399fa5674d5d93bf858540c2041e982c80 WHIRLPOOL 172877f35965687f576ec08d080eb5d5e21465aeae8483af22dff885ff763c41b440165e080e08c0b62432081093cc8bbccdd70736206b62017e3ddda3a67cdf
+MISC metadata.xml 397 SHA256 804909a450b44e2b016f4defe5a7ed9fda0e0581a04d7f5ab392ef679bb675bc SHA512 739228ae8405270009e652df3cce873daa3c7548aeaa0a058a8202e1ecaa844adf11564a54d73082d5b0b191a2d3c84560460c65b960701e22f6cc497fc6eecb WHIRLPOOL e29b2f41d5a5abe6046ccfa3be70b6e8e27d68572d6c1acb606481e7c8fcd5ccaccfecff210a5c89638915912315f140c1ab69a20ca1868e48115996ef1e07c6
diff --git a/app-vim/vim-latex/metadata.xml b/app-vim/vim-latex/metadata.xml
new file mode 100644
index 000000000000..6c05a86c762d
--- /dev/null
+++ b/app-vim/vim-latex/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<use>
+		<flag name="html">Install HTML documentation</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">vim-latex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild b/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
new file mode 100644
index 000000000000..da767f6ade64
--- /dev/null
+++ b/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
@@ -0,0 +1,73 @@
+# 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 versionator python-single-r1 eutils
+
+MY_REV="812-gitd0f31c9"
+MY_P="${PN}-$( replace_version_separator 3 - ).${MY_REV}"
+
+DESCRIPTION="A comprehensive set of tools to view, edit and compile LaTeX documents"
+HOMEPAGE="http://vim-latex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="html"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	virtual/latex-base
+	!app-vim/vimtex"
+
+S=${WORKDIR}/${MY_P}
+
+VIM_PLUGIN_HELPFILES="latex-suite.txt latex-suite-quickstart.txt latexhelp.txt imaps.txt"
+
+src_prepare() {
+	# The makefiles do weird stuff, including running the svn command
+	rm Makefile Makefile.in || die "rm Makefile Makefile.in failed"
+
+	epatch_user
+}
+
+src_install() {
+	use html && dohtml -r doc/
+
+	# Don't mess up vim's doc dir with random files
+	mv doc mydoc || die
+	mkdir doc || die
+	mv mydoc/*.txt doc/ || die
+	rm -rf mydoc || die
+
+	# Don't install buggy tags scripts, use ctags instead
+	rm latextags ltags || die
+
+	vim-plugin_src_install
+
+	# Use executable permissions (bug #352403)
+	fperms a+x /usr/share/vim/vimfiles/ftplugin/latex-suite/outline.py
+
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "To use the vim-latex plugin add:"
+		elog "   filetype plugin on"
+		elog '   set grepprg=grep\ -nH\ $*'
+		elog "   let g:tex_flavor='latex'"
+		elog "to your ~/.vimrc-file"
+		echo
+	fi
+}
diff --git a/app-vim/vim-latex/vim-latex-1.9.0.ebuild b/app-vim/vim-latex/vim-latex-1.9.0.ebuild
new file mode 100644
index 000000000000..f8c537029f98
--- /dev/null
+++ b/app-vim/vim-latex/vim-latex-1.9.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="A comprehensive set of tools to view, edit and compile LaTeX documents"
+HOMEPAGE="http://vim-latex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	virtual/latex-base
+	!app-vim/vimtex"
+
+VIM_PLUGIN_HELPFILES="latex-suite.txt latex-suite-quickstart.txt latexhelp.txt imaps.txt"
+
+src_compile() { :; }
+
+src_install() {
+	# remove unused metadata
+	rm vim-latex.metainfo.xml || die
+
+	# don't mess up vim's doc dir with random files
+	mv doc mydoc || die
+	mkdir doc || die
+	mv mydoc/*.txt doc/ || die
+	rm -rf mydoc || die
+
+	# don't install buggy tags scripts, use ctags instead
+	rm latextags ltags || die
+
+	vim-plugin_src_install
+
+	# use executable permissions (bug #352403)
+	fperms a+x /usr/share/vim/vimfiles/ftplugin/latex-suite/outline.py
+
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "To use the vim-latex plugin add:"
+		elog "   filetype plugin on"
+		elog '   set grepprg=grep\ -nH\ $*'
+		elog "   let g:tex_flavor='latex'"
+		elog "to your ~/.vimrc-file"
+		echo
+	fi
+}
diff --git a/app-vim/vim-misc/Manifest b/app-vim/vim-misc/Manifest
new file mode 100644
index 000000000000..35467a36d1ab
--- /dev/null
+++ b/app-vim/vim-misc/Manifest
@@ -0,0 +1,5 @@
+DIST vim-misc-1.17.6.tar.gz 56548 SHA256 66c9c91062c91a1d3c33d37a2f3bb6d9853c6bec70051c7c32a8a5f16caf5dc7 SHA512 04896559a9179e4f117de4ae78564309c9459ebb78ba1f9aceb7c3abf064e38d403567d01c347eb9ec0a09ed57c8ae51e01c4967e393c58c7b613cf926663e64 WHIRLPOOL c4be7ff87a889be92734a2798a0323cf33c318b5705364e0fc1327cd2d06e66ba891bfaf6bc3d98405c8fd8940430521c6dc199f97b5533c8dba9fa462b6e007
+EBUILD vim-misc-1.17.6.ebuild 474 SHA256 2040c9bc9bd1283f029bdccd10e33f31bf977d182deacf068ae635f92cc1aa06 SHA512 8c5aee37849f8db0fac0d11d1c431a3fc3f78252e77105dc0b52da406db541a08df9277166ef03225fae82eacf35a3b352a906b3fc01a1643490e06ba0f39858 WHIRLPOOL 3eaf1cdd0dcc428e6e5ce40a0eb98419bfa0575fc58796a87c23c17eb5d97f3ba01a78db235db607c4e01b71d8c77a943af5c9cb3e3753c69d9654c7b4e67092
+MISC ChangeLog 3171 SHA256 a407330f9ecce9e60f55ce469da77cf9da5b25016d382a88928ff69cd0aa0fb8 SHA512 a2d1e334cc8291f6d7131abfab3af5eed1a0d03a783ecb85bc95181e16a3bb909797aed378eae8409d1565a3e5d8a6a9de965b8076aff0ce920dc9c86a263a40 WHIRLPOOL 6ff4a1021911cf312d02ac1115d39aa388456e9e119a5b68d1dac2e93d9e38b99aef49dd7806b3d7be4172e8ada7708c001bc6a43d1eaedb4513de4c29b3f93b
+MISC ChangeLog-2015 1691 SHA256 548b2607a3111e2e3f4e4a83eb4986b0b3ee636e9eec39fb30ad25ee20e25f6e SHA512 3fa46366617715e03bd65ab0e653ab77662c1f7e9cf87277660bfd5001c2905b2d6ae78c4ff07e319f44992d90ba4f274c69b786fc6aa8894190eda28bbaa1fa WHIRLPOOL ed606a7d6ead09ca87f38b9c9795f5add651794e8ac930ffa253599edf221a9e0778e9b2ef635d13ade471fa2563e553b2d444a53be6903baaec43b2699b9d90
+MISC metadata.xml 338 SHA256 9591ba0a367dc5258c68d17f9d0d918b661fecd305bc962888cb5ec62e7e485c SHA512 c0c91d66a5125ffe1ebd4442bcc808024151a1019e2aaeb64802d3b0a6423ad5b5dcae7956244ffa81a97386f5642434730e11c0bc435fa8a94fa2e8936a5e7d WHIRLPOOL 74b30b6a6cd016c880c9e5dd5830ad5c4966d070bd77c2186cbcba6e7042e370d9e5fdd75efe6108e1b53326cf453eea3f07990971dd9c44635afc182d2e5ae3
diff --git a/app-vim/vim-misc/metadata.xml b/app-vim/vim-misc/metadata.xml
new file mode 100644
index 000000000000..fd589251215a
--- /dev/null
+++ b/app-vim/vim-misc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">xolox/vim-misc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-misc/vim-misc-1.17.6.ebuild b/app-vim/vim-misc/vim-misc-1.17.6.ebuild
new file mode 100644
index 000000000000..10ce26e479ee
--- /dev/null
+++ b/app-vim/vim-misc/vim-misc-1.17.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: miscellaneous auto-load scripts"
+HOMEPAGE="http://peterodding.com/code/vim/misc/"
+SRC_URI="https://github.com/xolox/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="misc.txt"
+
+src_prepare() {
+	rm INSTALL.md addon-info.json autoload/xolox/misc/echo.exe || die
+}
diff --git a/app-vim/vim-multiple-cursors/Manifest b/app-vim/vim-multiple-cursors/Manifest
new file mode 100644
index 000000000000..fb08c7bf4c02
--- /dev/null
+++ b/app-vim/vim-multiple-cursors/Manifest
@@ -0,0 +1,3 @@
+DIST vim-multiple-cursors-2.2.tar.gz 1055659 SHA256 754d81183d9ef2d17801f9f5518f3343f33ff199f9f602fbae93f6d43f29d9e7 SHA512 109e8117a692e05c450ba30e0a4f635bfd24f08125d06b22c0e850e03e89e193e2ef7b415c8356d326b44ca93254b390d44ee417e8a0ee59fe9a805cf157c0e0 WHIRLPOOL 2856c3a826728e3bdd665c12c8746b97918a722df76252fae255e7fb7dc378a242bb788091453b7f34e5c0437f9a99ffed44426eae1b30bb35f77bb55482d201
+EBUILD vim-multiple-cursors-2.2-r1.ebuild 694 SHA256 ac258feffce70625cf083ee2e51c738fb6777878fad7e177e33e14c1ac91aec5 SHA512 2d8c4b2c46833706500b83d5b3e8db2d82317726f03c298938de0ae3c255d310c076c080dceb6790a127f35a296b11042463924b16a459a8abbc51266400493b WHIRLPOOL c0d546b8fc185242afb73d9cfc156204e826e7a5e226930c4afc9434de02737d0a4af86374404641420c4ace3639995b46ec9fed06f41040b87df4f4e004d512
+MISC metadata.xml 450 SHA256 5d2b721c1f2ae5eb41cbddc27cf0303aa9d6a2735633c8cdb8a21417fd91b94e SHA512 0294668ca3ce283c851e27bcb6854e8fa1189ebb6daadbf2583b05014b2c34efd31194e114b4d7286641673272b8036da8aa7d7358febb1521927a660044ef97 WHIRLPOOL 69e757b18458489caac865039e48d08dde349f8a87651f31c70709ffc98d8e5fc7e17e4886eeb96971bbb8e001c841ede7959ae43298bf08871744087210ef5a
diff --git a/app-vim/vim-multiple-cursors/metadata.xml b/app-vim/vim-multiple-cursors/metadata.xml
new file mode 100644
index 000000000000..b6f784080ccc
--- /dev/null
+++ b/app-vim/vim-multiple-cursors/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">terryma/vim-multiple-cursors</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-multiple-cursors/vim-multiple-cursors-2.2-r1.ebuild b/app-vim/vim-multiple-cursors/vim-multiple-cursors-2.2-r1.ebuild
new file mode 100644
index 000000000000..ebf1fe13f8be
--- /dev/null
+++ b/app-vim/vim-multiple-cursors/vim-multiple-cursors-2.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Sublime Text's awesome multiple selection feature for Vim"
+HOMEPAGE="https://github.com/terryma/vim-multiple-cursors"
+SRC_URI="https://github.com/terryma/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+src_install() {
+	default
+	vim-plugin_src_install
+	rm -r \
+		"${ED}"/usr/share/vim/vimfiles/spec \
+		"${ED}"/usr/share/vim/vimfiles/assets \
+		"${ED}"/usr/share/doc/${PF}/MIT-LICENSE.txt \
+		"${ED}"/usr/share/doc/${PF}/Rakefile \
+		"${ED}"/usr/share/doc/${PF}/Gemfile.lock \
+		|| die "rm failed"
+}
diff --git a/app-vim/vim-r/Manifest b/app-vim/vim-r/Manifest
new file mode 100644
index 000000000000..f3886f36e915
--- /dev/null
+++ b/app-vim/vim-r/Manifest
@@ -0,0 +1,7 @@
+DIST vim-r-1.0.tar.bz2 82116 SHA256 6836f4adc44355607d08b4bed03f4afa2359b40f95afdf685fb771a84bdbbfc9 SHA512 9df3bf35da9da6f650c3de23f0a7607e5e02a6193e1f2352d8129668d0ad37a63088a6ae7ac77831952aa7d35bde2d2d7b6f592a15dc856eaf64a1cbb5cd07cc WHIRLPOOL 9d24f09d7e3c22a0ebe71f1e65809acaffb3d8dbaf511f3703dc327706774634d9722a2093afaabb75178d8f9d62a4c51dddd0b21068089e75d647478c80f2ed
+DIST vim-r-1.2.6.tar.bz2 76361 SHA256 31881c9ea00af18786ef3bd0bb8526447c04f13b00369a6b55e2dc5a66fb6cc7 SHA512 187b31068d32c22c182650571dc5af68cc804562ffdc6b4902729735e4000b1ca4e0636d6b5617f3c2f36403eb4f0b1adc35d2387b5c110286da2ea2254f9009 WHIRLPOOL 118704ba1ce184a09569844d4a2dfeb3c66774a97ad7d4bd7ea695c176fb0093133dd54e0b4cedf49ddb74b75bd324585898a70bb8985c6893d79a2701eee06d
+EBUILD vim-r-1.0.ebuild 552 SHA256 c4aec34fe31b4c69da11653d46e51e3c32af72c60fe3706bcd6167824a25ce24 SHA512 4cd9e542f6b234523ac6b8733d3fd248b1d3913211bc4b49377debd217e17dc2b574d611f58d4e2f73ce3c422a5b7273fa999ed3c98953a28812a5f24a9f37a1 WHIRLPOOL dccd69db2d989718d3655f7403b77fc041a104898c25e4b09b7a61c8342dee00ae1a312a3bcf98e427b665f755df16dbd52e4ea8b572a05bd5f7220d7e81853b
+EBUILD vim-r-1.2.6.ebuild 552 SHA256 c4aec34fe31b4c69da11653d46e51e3c32af72c60fe3706bcd6167824a25ce24 SHA512 4cd9e542f6b234523ac6b8733d3fd248b1d3913211bc4b49377debd217e17dc2b574d611f58d4e2f73ce3c422a5b7273fa999ed3c98953a28812a5f24a9f37a1 WHIRLPOOL dccd69db2d989718d3655f7403b77fc041a104898c25e4b09b7a61c8342dee00ae1a312a3bcf98e427b665f755df16dbd52e4ea8b572a05bd5f7220d7e81853b
+MISC ChangeLog 3051 SHA256 dd86f16b6fab5c3659383da30afdb5b3d2be2604ead3a5758b289504be449327 SHA512 f9942cf27c10511b378fd62a3b343849eb1a4070e6b20a050b15c41dff8c96a7ac74feeda743dc1150b507833b9be2cb5dff0299c0664fc8d4e236c01332a647 WHIRLPOOL eba15327cc670cd024de7197307a1f727ad175411b214de1f8b7da30cc308d3d9089ca4c55140cb7e1777662c6786b127ead12afc5841736b035de6a23c0450c
+MISC ChangeLog-2015 2244 SHA256 7def970ad9a650829400562b153944b4d8bdac918cbd7f39d82d363d56fa7b6d SHA512 eb675f891d98723d235f52179f86486470b87fecaf1edadecfcbc8283e7671029aa6f86cf6426a2811284e73d6c7e60026f6e9783636ed3ea6df9ef7d9a80904 WHIRLPOOL fbe783b46819507bde055916f6bbb4aeeeee18cb6c9d1d989522497f9dfe07b6ae370fde84f64bd221305648d6eb3a4349557a1fcbdc8d4eddefd7fc47cbe5d0
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/vim-r/metadata.xml b/app-vim/vim-r/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vim-r/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/vim-r/vim-r-1.0.ebuild b/app-vim/vim-r/vim-r-1.0.ebuild
new file mode 100644
index 000000000000..df967fc39ce9
--- /dev/null
+++ b/app-vim/vim-r/vim-r-1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: integrate vim with R"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2628"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/R"
+
+VIM_PLUGIN_HELPFILES="r-plugin.txt"
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "This plugin requires the vimcom R package to be installed,"
+		elog "see https://github.com/jalvesaq/VimCom for instructions."
+	fi
+}
diff --git a/app-vim/vim-r/vim-r-1.2.6.ebuild b/app-vim/vim-r/vim-r-1.2.6.ebuild
new file mode 100644
index 000000000000..df967fc39ce9
--- /dev/null
+++ b/app-vim/vim-r/vim-r-1.2.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: integrate vim with R"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2628"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/R"
+
+VIM_PLUGIN_HELPFILES="r-plugin.txt"
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "This plugin requires the vimcom R package to be installed,"
+		elog "see https://github.com/jalvesaq/VimCom for instructions."
+	fi
+}
diff --git a/app-vim/vim-rest-console/Manifest b/app-vim/vim-rest-console/Manifest
new file mode 100644
index 000000000000..ccbd907f2a1f
--- /dev/null
+++ b/app-vim/vim-rest-console/Manifest
@@ -0,0 +1,10 @@
+DIST vim-rest-console-2.3.0.tar.gz 11584 SHA256 e3d07527a41f03eeffc82f12e1de43865f36f7348e4bf99fc4e2af55b234a74a SHA512 04fa4cc2177b87a6d69ad50d0e45f411169d178e4990280afde730c461cb718acd09dc034e61c51f73974369d9be9300281f1e60adf8084730977caa27c65da2 WHIRLPOOL 93b5bc602361a2abe845a688b0e8c22cc7c3e3d6dd671f37e8d576f9d3c06ebaea3da58ac2838634a7219dd6fe1a56cc666d3a076e799bad1cae2636996371e9
+DIST vim-rest-console-2.4.0.tar.gz 11795 SHA256 011e1166f9e8f5831a0288640952d962ab9190cb02c54b8947354049d7146028 SHA512 77f06a9cee534eda2e414c4b0b0fdbdf335b1a397ab9c45b4331f211db1dbeb89bd0a73906945b0ed08c8b795c4be444b9ffcd2c06e145a43b3efb456aa64666 WHIRLPOOL 1b44987d3645a6d16243006f428c66b3d9f980a358865aab644631a5650a330ed38e266ac9d0c2084a3f1d9a10490202be6a45a2af2455e40558e66826643dee
+DIST vim-rest-console-2.5.0.tar.gz 11945 SHA256 8457eb0896e34a6b664c5dccec688d8a5fbca9591ab08c8b2173c578d1ea7f72 SHA512 1c2e2dafdcdd57216bac08adfaef4e5f3dc2331b13fd969064bd460681838cb4eb830644e33e9397388b0ff76b68d992523ba1c258c2385d6daae5ad87cbdd58 WHIRLPOOL 45337e977bef174df92bf36a0c6f08dc0f3930e8b20a32e6ebebca0fe5f8439ba17c0bf65a79dc4a828a049b934de1ef81a03fc4c03813adb84b4d8694988a98
+DIST vim-rest-console-2.6.0.tar.gz 15935 SHA256 55f80fe583393e0af39e44f540de58a46c0a1d7a8a87e357f00693121f3fd90c SHA512 d75b9071eed1bdae604c3fc3457c319a8893ba01001c6b27b8bbea038e9964597bb1a7a2e03ac1d6d9e35e9d96ee350f1eaf6c12f2e8f53929f3f511a470170d WHIRLPOOL c3a62b3178714b940b24443bbeb1a5bb8ab63b08c9327d19362de4f160273db243dbb2618835155204b7f3c2a58efc53bb65a91955f78c27b04f030570b7feb1
+EBUILD vim-rest-console-2.3.0.ebuild 514 SHA256 15ffa73758606e5a8ceeddb9beb14f8d0f83bbbf506986758ea416f0c9d25ff1 SHA512 c6abfddab761c3cd1ed72c572b91d2d3dcf3f73180c3fbed81988eb882bea729b085ac5503c2e1f3d612c26f22ff6df6c4fc20ab6668b32144bd4166d9f30f98 WHIRLPOOL 82f0218ae138e684fe27717788c8fe318a3a17ba4692c4b73c82fd9aed2c93f8bd20b49f1509fddd5c8412093b751c708c540a65cad0add9aa1536efd3c82ef9
+EBUILD vim-rest-console-2.4.0.ebuild 502 SHA256 029a8ec1f0ac03c645892590e6653f475eb9bcd5ffdb5167d379460029ee63f7 SHA512 edb8af6ba3640c2edbbf6c3f2964a5da430ee89a28c13ea9f0c69b0a8beb28e02108341cc58925dbb885b1fcb7f05ddd161177bdd9772cbd72c616cdbf56c166 WHIRLPOOL 50a61142779483f4a7bc31bf331763da8609c0dbd86729eecc27d1ddf4af88cc288be29caececfd87b9d7682fa408a320021ac55ab063f06ae5055a17d900d91
+EBUILD vim-rest-console-2.5.0.ebuild 502 SHA256 029a8ec1f0ac03c645892590e6653f475eb9bcd5ffdb5167d379460029ee63f7 SHA512 edb8af6ba3640c2edbbf6c3f2964a5da430ee89a28c13ea9f0c69b0a8beb28e02108341cc58925dbb885b1fcb7f05ddd161177bdd9772cbd72c616cdbf56c166 WHIRLPOOL 50a61142779483f4a7bc31bf331763da8609c0dbd86729eecc27d1ddf4af88cc288be29caececfd87b9d7682fa408a320021ac55ab063f06ae5055a17d900d91
+EBUILD vim-rest-console-2.6.0.ebuild 511 SHA256 4b52abd8358aca5d47293d30caa5983f3319947704e8b48e41fd5e0a384f2c96 SHA512 61c36d2d6c406be086e743dba199eb9192ec5ddc2fc0a8d51a85072ebfdc9685af182724dd0e7870ecfa295ca272192f2d71e95c62fc38194a2edcea4ac38ced WHIRLPOOL c443f16cc8b238021d06ba7ffddbe82d9beaa2395567824fc07a836d0989434241210964f50288ef51d6ba2e9f04449982e42b7680b68a13f5a14e62d47cf374
+MISC ChangeLog 584 SHA256 20a35546c1eea9cfbe11001571c06813e0aea685278a816091194a4f6928cc23 SHA512 7a43e7243e8eafbed54b399816acce69cff07107ac3089b863ec9b02abc5705a065f51912b538b2a5327aabbbe2409d2dbb53667ca9bb14bc16142c2a12696e4 WHIRLPOOL 131bd534c75c47cd17f5addabc8fc386a7f740863172be39567b5c5c8adcca6d11326f19efa004e2d841412f3cfe71bfafdca203da96fcc3108b2fdbb466f0ce
+MISC metadata.xml 346 SHA256 2a1e0bd8a5904a6fd47c2006b2766f148942b1d9b46462e77bb8bc013146a73b SHA512 9139fde3f2e37523a44c0ae9f4745952e562012ac7338fb533a1698d8b1545c92c431e01c2f3b57ed5e02b651e5a72205205c927005bf23e2e7771c9d2701ba6 WHIRLPOOL 8d0c187962129823a34414bfaf210a848687ce96a959250d53093e4d22e9671bbbf9d5c840ccd43ab26bbb0bdad071dfefd22707a8b466d604003e50c28e4525
diff --git a/app-vim/vim-rest-console/metadata.xml b/app-vim/vim-rest-console/metadata.xml
new file mode 100644
index 000000000000..2d3e3d904848
--- /dev/null
+++ b/app-vim/vim-rest-console/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">diepm/vim-rest-console</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild
new file mode 100644
index 000000000000..0d81387ba989
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a REST console for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+	rm *.md *.json *.rest || die
+}
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild
new file mode 100644
index 000000000000..50a803e38153
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="a REST console for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+	rm *.md *.json *.rest || die
+}
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild
new file mode 100644
index 000000000000..50a803e38153
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="a REST console for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+	rm *.md *.json *.rest || die
+}
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
new file mode 100644
index 000000000000..bfe11117d302
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="a REST console for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+	rm *.md *.json *.rest || die
+	default
+}
diff --git a/app-vim/vim-spell-cs/Manifest b/app-vim/vim-spell-cs/Manifest
new file mode 100644
index 000000000000..3270cef59be6
--- /dev/null
+++ b/app-vim/vim-spell-cs/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-cs-20061021.tar.bz2 1320356 SHA256 f15748bfc46761c4d8d2056740553a3aeebb449a5071dbf79434a2afcae977f2 SHA512 cb9cae6dab11c5cbbe16e0902b18cdbea81dbd7844eda4774f45c6e5a5f3eebb09e062a37845a0e6ff5bc5c0abf7219001824768c0e058998a7c922790006e99 WHIRLPOOL daef13d6398718e9483c58742a1c9f29097d52d152cb87cf63a756f2d5db7e07f68e06b7f90c08aa0b06006e93ae9103a5aeecb3244a1bbff8ffce4f3cd4cb6a
+EBUILD vim-spell-cs-20061021.ebuild 206 SHA256 1c17972929a83ed502426791cb8276737cb74fee14589aa16b0f622880221bb3 SHA512 71312071d9a1bce0e9ef5c00f2bedb1e28991f5462715f08a00ae84a1e96506101ddb69b0db786bd8ef61b3a27cd59fbcacc8d260990c83fe895bb5a5e6cbefb WHIRLPOOL 7dd72a471000e673f90aae075b285265a5aa0ceff15a6c5bad219cffe6fa5dfe437a556a7a72a2a1acda03f9aa2f1e440428442fe01f273e5a7f2ebebc84c9c3
+MISC ChangeLog 2840 SHA256 ddcf7758384ecefdf0d8455399f0eafa264a76e67844b34052c400821220a743 SHA512 c4540339c2fe435b6d19a2f01454ba2baa170c58b14db162cc711e0e5bfcea0b3718ab0d6b360f524276d4357b205d744577bde5c70ab2e72d72bd855704a30b WHIRLPOOL 13d6dd7ba0189057e722fa53f8068a3788fd4576a601d9f5af827c4171fe6f4ed2a9d6704513f780b142df358e07563dc13eb751f265664eec7eabbbf2424d68
+MISC ChangeLog-2015 1156 SHA256 ac1b08cee8cf7091fecc4fb03bcbb313a01358561662618ecfd910fd4a40c62e SHA512 415e6dc4b07eecfccde05f8b1c2b67cef7dd4283dc6122cb76808823170c4c7d51a3527312b11e176e1e60130828a6fb73bac09232fde533c11894f40df466bb WHIRLPOOL b1f861448def5ad7e27438014896cb45f3d9fd202069e458acf854392a0c4fc9b620eaca764c5dd190cb3ea958b539a2f94819e92f436a21d37a6b1aa4e2b750
+MISC metadata.xml 820 SHA256 6877abe234200589b8709a073baf92dd2f0b917533141bddec20a4a0f5c5fd9a SHA512 24f7e0c4c85d4813b21c9f284f046b615225899b4e4f70c9cab9694648ef05e6df3de1d3ec222803c35713b0f5e9908111d2390e7aafcbf397626af217f0861a WHIRLPOOL c2cc91bb8edeb285f142a07638e6fabfce898ea719717f9d16628da4f880f155786660c22f31e7a21fac6911b3156270ff2ca3b9466d5ec03470e992248db91a
diff --git a/app-vim/vim-spell-cs/metadata.xml b/app-vim/vim-spell-cs/metadata.xml
new file mode 100644
index 000000000000..e1cecaf5846b
--- /dev/null
+++ b/app-vim/vim-spell-cs/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- Proxy maintainer. Be sure to also CC vim@ on any bugs. -->
+	<maintainer type="person">
+		<email>jkt@gentoo.org</email>
+		<name>Jan Kundrát</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim spell files for Czech (cs). Supported character sets are cp1250,
+		iso-8859-2, and UTF-8.
+	</longdescription>
+	<longdescription lang="cs">
+		Kontrola českého pravopisu pro Vim. Podporuje kódování cp1250,
+		iso-8859-2 a UTF-8.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-cs/vim-spell-cs-20061021.ebuild b/app-vim/vim-spell-cs/vim-spell-cs-20061021.ebuild
new file mode 100644
index 000000000000..ba4cb069ae6f
--- /dev/null
+++ b/app-vim/vim-spell-cs/vim-spell-cs-20061021.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Czech"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 sparc x86"
+IUSE=""
diff --git a/app-vim/vim-spell-da/Manifest b/app-vim/vim-spell-da/Manifest
new file mode 100644
index 000000000000..01d97046267f
--- /dev/null
+++ b/app-vim/vim-spell-da/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-da-20060116.tar.bz2 629196 SHA256 ad496445e84d1bb30cc65d08a550706ab64d779b19d624b187f018d9c567f21e SHA512 0d055972b15acdd2ea7166711e344b1718975f7de6a49653240fb2e1bb31a82a8174e46de83f38d93d226782b97e2c58aff50cc0efab95dcde3d53b80205f444 WHIRLPOOL aff174966ac527233fc2acc77a74d8a898e38d21f85332971fca6f245d8ce188811f1a843a671abb3105273cdcf58c549b03910cddfd2cf20d54ae9ba8d6d93d
+EBUILD vim-spell-da-20060116.ebuild 225 SHA256 ea256e85b7ff5f19008dcd3a7ad32275063fadc89cf9a32022bbbaa8d4045300 SHA512 df2260d1039b374c75c81b1824888b97b62dffafc1de1f66cb24fd18846def6f8a315f3588259a771390cafc7f5721b7fab7e02be66b03f39737f8fce74ce919 WHIRLPOOL 29817a3008e95df97d4df7f9e6b8bbc80a5e280be84c73ab66232e913525a093b00d808f060d8d0cf5b7b7250b03701edc3631bc97541fd5153079916d7738ab
+MISC ChangeLog 2840 SHA256 212889af7b5d43c6169b2300bf7ae3178e830cca0584e07c84dbdea4aaea1eab SHA512 cb7081e4934fe413b8f3b6e329e7096f01e5ad3cf50a4b55485261208cd787a40545fce1d9eb9b594ba4c7200714abb3a674a7cb10f1464f168156235d433665 WHIRLPOOL b20f1e29512e6d57e979011cece78ea42aeedcdda35ba7d4a3ad309e454c7209a5fc18074a2d9a1d8bc963a329a42066a64907e2dd2e359a212cf3fe0d046693
+MISC ChangeLog-2015 1226 SHA256 fb4992314fc905c87aa3c59826056ecab8e199edb7c44c51d5913ec455d5303b SHA512 7f81f4b49d675e2838c5c41d53653db8807319b54a10ae296297afde2dfe4c6ae58bd59dc11f9e5da2467385ee52ee0995ec576a32d2da50a3f64db4e909b778 WHIRLPOOL 64ef36d484e2609751b4d293b02db0b4f5429a72022b83eca8c37253fce1634a0fe63aee5e4e23096548c37af046a541f9b2d34dfce9526e3ccdb41c133f13dc
+MISC metadata.xml 380 SHA256 3184f8368554777edaa30b486d4dcc636dbdc7e5fb6c3356c98e03fbf6b5079d SHA512 0e165d32c9cc2878b696b33ab8a9d1cac4e41ae0e45a019075be7ea8057acff4a40ec947a74c5edb42e31fb0357f284260efcb30914bfd1fe27aed1f5ff54f9a WHIRLPOOL be191425847ac91a478e42290d31e4770732f2aae920d9c1f326df2252e15aac1877684a2febe49119066263c3e6538c0490a305c60ef79782c9cd26d3f267ab
diff --git a/app-vim/vim-spell-da/metadata.xml b/app-vim/vim-spell-da/metadata.xml
new file mode 100644
index 000000000000..a27b65aadec6
--- /dev/null
+++ b/app-vim/vim-spell-da/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim spell files for Danish (da). Supported character sets are UTF-8,
+		latin-1.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild b/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild
new file mode 100644
index 000000000000..821110060ebf
--- /dev/null
+++ b/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Danish"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc x86"
+IUSE=""
diff --git a/app-vim/vim-spell-de/Manifest b/app-vim/vim-spell-de/Manifest
new file mode 100644
index 000000000000..4ee064ec6ebc
--- /dev/null
+++ b/app-vim/vim-spell-de/Manifest
@@ -0,0 +1,8 @@
+DIST vim-spell-de-20051008.tar.bz2 2156892 SHA256 d54c6dd12a4ffc5374c4957c7510cc48416a0f27dcfcbb97dc2e130b7284fd65 SHA512 015620f87a44709fc73b69465eddf8fb5658f9962370c33eda51a7546f3b8ccafa84b756217f230759b2b1c3b15c0500581c34ad6115d232c5b0353fe08a023c WHIRLPOOL 0bd599686cb3ac26fcc08f3c041b419f38a69a6a5c8975eda8ff01f341ad6b5577f8fc83703132ffb9ce5d722d8779eee217088aa7ed5139aafca1807f0fff58
+DIST vim-spell-de-20080213.tar.bz2 11171578 SHA256 33ba51cb41f2c5d6f6366efb2219e00d9214f7b487f8d0d2ecb7e21699fe8d48 SHA512 6b18d527a61573f865dc51bad1c8f4aca17453c2605c390e330a52f041f1392c438190dcc6168803bf415b4e9e470055a52013ee16ea32c7a8c42b2843fb3698 WHIRLPOOL e550cb191c1bbfe5042ad1cc949d599cbe4a7874bdf7e10f5ceb1a3b50e2a273fad494727ec175a6465d90413f03769298c5ecab8ab4281fc5613d0c9815d9b9
+EBUILD vim-spell-de-20051008.ebuild 246 SHA256 c59a9edacdbe518a6ea1941878a767f7cea5517357910c7e161688a5dc0e8756 SHA512 060e635c9935faf3c5b106ae231e771564f6d69c3710374066536efdb6b848fdaa5f45330aee31ad82eb5a8d1f0eb9e07a8085f424f040d086afaf13d3376ded WHIRLPOOL 19730aa8c379e3c1f773960ad10ba89cd9b971d9b08e6ffaa0766d261801f5e6493a43caf44f89c87a9e1a825461f1f7cfe6cab9dfee41a3072b41b987e1d6be
+EBUILD vim-spell-de-20080213-r1.ebuild 265 SHA256 a368f8bac3bd29bf7796a4c93e088b8980d7db674ed6b1f0d54808948f4bb434 SHA512 cca3ddc0ed01f158aa04e56f8e95f2e999d4ffbe4058d1f3c72a5c728c1b2f15736e4e9933eb1e8e0d22c9e22b68dd8cc201929ef3c7038af1664307d540f77a WHIRLPOOL e58de24f7ce9f1474aa872cc49fa4a4b25a1268de3bb0f1154fcc9aa524a0ebcff648a3b24079622eebe25ea409a8b2c2d44ba84847c4255cc32d9f1bff07d00
+EBUILD vim-spell-de-20080213.ebuild 261 SHA256 f00dbd2f9ea063326bb1ded3c26df1f9af2d939c2830232d04fa802e4a554280 SHA512 e85dd1281e7ee6f946e659472219b080eae65c2d0ef8d8726cb0968fa3a19efd1f75c60529d80522f890ad0dfc244c4947b1797b46fb497173e67e6f1e578d61 WHIRLPOOL aa0ea4684e8c30526dccdb64fc25dc6454b980c50fa102c634c19119c0934f82e871460166acfc8240d162b57236efc1569f9686f24c30957aff8839efd11ddf
+MISC ChangeLog 2515 SHA256 074a3be50512e091991555f5e72f16d0f0bd365720fd335b48e542a2f3a137a3 SHA512 063c703d6cd642c005825b5d3af63f5d0281a552aa894f283609a11048c7dc2973992977b81fdf0a88d7fef0cfec7caa92ab30dd78f81985b127da318d403497 WHIRLPOOL edffedd842791f7b85805be65e0e16f71238ab9aad18dd7037246b48476fedeb9b66939a82e435e0fbfab4203d809af70a94b639c1c5c3535786e781e23cd71e
+MISC ChangeLog-2015 1904 SHA256 1290f8e40b0e332c02e3c9d7c0c5bc9f41839470066685616d3c34bdee863fb7 SHA512 f8991589f06399e506f115ba24886a505a9c6b4c4b3bc6def721894ae5a9f879d9812f0f9d4f491523919a2fbc04bde872b5fc9068bad98bd446134ca25891c4 WHIRLPOOL cac9f91d34e4f03c5761fb358088e606beefefbafc11d2ce24e0c0b2c664a9cf32ff7eac77e02d7cf08263be7843136ac26f224fc40c18fc3051d220bfaedaed
+MISC metadata.xml 383 SHA256 f5fe66ebe176d517127ec18c74f8f3b8f855dc3bf4cd0d4f65c12209787cb126 SHA512 ada270f71eeddd0c7395561b48093bf12933507593334d74e33999432cb2c4665d3f7008779141dab56f4d33e8e6bd08805a125d9643a0cc493025c8fea6784f WHIRLPOOL edd1bbd9bf5609431638ba35925de26ea5b93bce53f58cffab66951857486bc1a02181fdc8f77ec03928ad1e057a6300968760bf7c769aa46d4f1f31e8644792
diff --git a/app-vim/vim-spell-de/metadata.xml b/app-vim/vim-spell-de/metadata.xml
new file mode 100644
index 000000000000..25210cdaf8e5
--- /dev/null
+++ b/app-vim/vim-spell-de/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim spell files for German (de). Supported character sets are UTF-8
+		and latin-1.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-de/vim-spell-de-20051008.ebuild b/app-vim/vim-spell-de/vim-spell-de-20051008.ebuild
new file mode 100644
index 000000000000..96f38dfed45c
--- /dev/null
+++ b/app-vim/vim-spell-de/vim-spell-de-20051008.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="German"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
diff --git a/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild b/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild
new file mode 100644
index 000000000000..94e0a48b5dcd
--- /dev/null
+++ b/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
+VIM_SPELL_LANGUAGE="German"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
diff --git a/app-vim/vim-spell-de/vim-spell-de-20080213.ebuild b/app-vim/vim-spell-de/vim-spell-de-20080213.ebuild
new file mode 100644
index 000000000000..1e2032cb018e
--- /dev/null
+++ b/app-vim/vim-spell-de/vim-spell-de-20080213.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="German"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
diff --git a/app-vim/vim-spell-el/Manifest b/app-vim/vim-spell-el/Manifest
new file mode 100644
index 000000000000..ceac2a831921
--- /dev/null
+++ b/app-vim/vim-spell-el/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-el-20080402.tar.bz2 3360601 SHA256 b8cdd20f6c9e472f6b7d948d3cb194b49eaab0e520a2ea6b2d7e02baeaa17389 SHA512 5cf68b43e213c3d6f36c96c7414927314e25bd45283759490628cd40c6b4052e6f4c7b43db27e9a3393dc32c8960452f94ba42e279c4dad4a5a5520e338d38e9 WHIRLPOOL 9834aad6081fa7abb1e95526d6605726c7424744cb5ef2aefb540653254f4c601f8747ce7c3d7106ea908f6e91f838254f01dc48dd2d54b97b5c60f95b0019b0
+EBUILD vim-spell-el-20080402.ebuild 200 SHA256 594b93c68f96b6a9483aa0f14df19cff4b1753137f1a4b84e437aa32bd9f1071 SHA512 8667c79f90894c9e5adf5d39c130ae8be9dc6e49770f2d140b98adcd30a89a6ffacf91f6f932646413f7364a4b6f368ce7bf2d025da35d16acddf6ad2d4db22c WHIRLPOOL a730c8a259b979acdc603dc489fbb1ee39a21fc9defabb71928d589cd56a8f2cdaab134a5977c0761af01b023ab59fb50e957322a76c486ff2c6485e6a0b1563
+MISC ChangeLog 2447 SHA256 bf908c5d93696c5d07d46126e66e538076bcc2ae5d91e07487a280313420f2a5 SHA512 34932ab7a8380005da9696aabbf1ce5ae30081c082f6794e6edd21c7a9e566deb649e57ce1f6ec4269f6ca681ede42d6b51c5bff6f2f482f26c4e850b6050aad WHIRLPOOL 2f04674843a9db6a662489a6f3dbcc442d947cee42f29f898392938967932b0fe87263242f88b348c010ea636049ab5652fa8037b7be57f96b6133687aa14e5d
+MISC ChangeLog-2015 870 SHA256 8e6ef3cff85066d188693a6d954d15735baad4df69e32662f70847b12955b7bf SHA512 1edbb99d2c8c039f6cfe728773232d308c25435ddc1e266daaf907000799de6d5e2dedd39510c87b6da6347495385e9b7eaa74f93018422a7a4d776286e1f0f6 WHIRLPOOL d33cf46639b870443c6e8e8b0ea2e5bdd56cfc7571fe62ba77c383339a0538e34a9840f02362ba63680a42ff9756d69f5c5d44f881b4739da2b2118f12672546
+MISC metadata.xml 375 SHA256 722e0322007b1cf0f63578dc64897bea198af03edbcdadf4fecf2aa44b9db194 SHA512 bea1fc36ab389418f57fc9d66dc6c2c4a20da1b11fdb4ab6e412dea40a8c0ec4dc58525cd1d0e6839c257ffa61f4859079f3dc3df28e028f0b6482e0eda6e220 WHIRLPOOL a8a062b1c3fdfad9780b19fd384c73a6fb40a8e45d18ace87f417eb59039f49701720327c59b2da145d71c5b369246368b29680b5cf4e4ae90b21046f25bf63b
diff --git a/app-vim/vim-spell-el/metadata.xml b/app-vim/vim-spell-el/metadata.xml
new file mode 100644
index 000000000000..8202659c959a
--- /dev/null
+++ b/app-vim/vim-spell-el/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription>
+		Vim spell files for Greek (el). Supported character sets are UTF-8 and
+		ISO-8859-7.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-el/vim-spell-el-20080402.ebuild b/app-vim/vim-spell-el/vim-spell-el-20080402.ebuild
new file mode 100644
index 000000000000..aaaea4a6abdb
--- /dev/null
+++ b/app-vim/vim-spell-el/vim-spell-el-20080402.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Greek"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/app-vim/vim-spell-en/Manifest b/app-vim/vim-spell-en/Manifest
new file mode 100644
index 000000000000..c1ec7c041a97
--- /dev/null
+++ b/app-vim/vim-spell-en/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-en-20060123.tar.bz2 1819791 SHA256 e9e8b8714a940226de8936914a6e77296b277658d5f0fdb7e9e8d42e08fe8365 SHA512 145a4cbf976b5472b2474f9d84978e9907f0dabdee05fa55b0b4ce5f56dc27ef568e8c28fe67d9d8b86a33e0392b1fc6af6f44d6f147ce894070b58e40109dc0 WHIRLPOOL 2ac5d667befe3079618239ec8291e1a58c7b5f174239bd5db5f61ee39b155db64653f58d6d4dfe75856923d4d35d274774a726994ff2fae7b7f39b98b446c8d0
+EBUILD vim-spell-en-20060123.ebuild 291 SHA256 b6f2010ce30584ebe4e2f81218d7bf96baa8665aaf1a1be7fa20d32f3b32c0b2 SHA512 5ff59b0d1c4674d677d1e5eab96afb43788835fac6962090cbb1334fa55bad2d617a272ee39ffca3fdd0b05a1965403bc4f9bc73b8c13aa4adc9015a49686f38 WHIRLPOOL 37153e3e37e7a2375d78ccce2498a660e50da524f35c08210c845bc3a653b1548143cb3f21282899ff27c92ff22ad319950742444a08c326bc2b4a66a76ac6ba
+MISC ChangeLog 2840 SHA256 723a3b06e07602f05e88f8cb9d6f43be38c756349ce08ba073fbc6a66389ddfd SHA512 853df8dee30fdfb0b33c28cce2e9976cf8444c0255d79c63ba7ad3b627c8d80f0e2b266904c6c06029638e1d62f00005cf4f1a2faa7cd4569402ad2bc225ebb0 WHIRLPOOL c29047d7580f2afee5797417c3a87b16da4262be3182e8e8d1246885816a3b0e0ed9114ed4a7f295a396a35be6b494226f23abb036456f37dadd2d5ffe921c4d
+MISC ChangeLog-2015 2132 SHA256 238c5cc5dc023e6120f3c5e9bd259ddf3968603032bf53f40a8cf7e829dadeb1 SHA512 b4e7a7c5c0c505aab9501873021ee635b97f2b1e37941f3998e766bb2773aaaa5cecc65a8fd45bd9a2fdf81e208e59a3d320e792c762d8221adf8898084d2f0b WHIRLPOOL ed09110ea824f5782f5a0bd7f3994b0f86275cfb1a39874521168bb31e61105c8d07c1d391c603959a20a281b1b368118c7c9e0bf7bda7c9a7568a66f06c6aa6
+MISC metadata.xml 391 SHA256 abb183b0251e375362c7cfcdfced9fa9065118abc26d4f457e24d7b7c7ff15f0 SHA512 365599ae6c6ab09d6efb59870c5a640cac2442fe1c3c584c94a4218baaeb4905540e9572e650ee808b15070e4860fa286224c5cd68dfd0bbc1de675113919425 WHIRLPOOL 22c1a22e275c8f4385f3f1701d563c7f110c2faa69f44f130aaee1ce27a89ba9faf62a7943600624ea7ca582af53df8a641981b6d69a33f646b605491989fd8e
diff --git a/app-vim/vim-spell-en/metadata.xml b/app-vim/vim-spell-en/metadata.xml
new file mode 100644
index 000000000000..2011f80d0660
--- /dev/null
+++ b/app-vim/vim-spell-en/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim spell files for English (en). Supported character sets are UTF-8,
+		latin-1 and ASCII.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-en/vim-spell-en-20060123.ebuild b/app-vim/vim-spell-en/vim-spell-en-20060123.ebuild
new file mode 100644
index 000000000000..2daff4277b66
--- /dev/null
+++ b/app-vim/vim-spell-en/vim-spell-en-20060123.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="English"
+
+inherit vim-spell
+
+LICENSE="BSD LGPL-2.1 public-domain"
+KEYWORDS="~alpha amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
diff --git a/app-vim/vim-spell-es/Manifest b/app-vim/vim-spell-es/Manifest
new file mode 100644
index 000000000000..9343b5a59e00
--- /dev/null
+++ b/app-vim/vim-spell-es/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-es-20060208.tar.bz2 2417510 SHA256 9c7d86d8a3405c16fc9a7a7468ed4a1aed0e9da6e51378c1f7df6bd917cba983 SHA512 e035e587191eabc78672ff4cb72c637e8f582480c67ab79b93879de6791d09484108ddd213213186a0fef02869012d28d31793274a638ac7c87fe9e2aeeadec2 WHIRLPOOL 22eb1f7a155727a62032febd1a3776111a8d91b902aaeb070c21de1e74d4a0cc4a98ce4f0cc0a1e1c3a9e3ca3e83a39e0fc0287ae10fda05f94b8844fc9e6819
+EBUILD vim-spell-es-20060208.ebuild 219 SHA256 b8061de4e1fc06ccdd365dbc6b310807f93f3ae660ca9959b091983d6a08b3a5 SHA512 4d114065085a12a1625e12870418e42b57060dd4331be7cc7329f90d2118f4e0830858957a3fc2a626bba704b71a480f99dbbe580091d48d9cc1de2603236ade WHIRLPOOL 4bb0cfb4b3a78a829344171252b508f78cb059b88807c99fa3b99b1a0d9b107696185b98f33836c21c6893f12782e91188efd8562bf1bf55f169e54b7a5ce1f4
+MISC ChangeLog 2447 SHA256 8dae3bf5dbc063dbb7fd81e214612b427a6ee9be914572fa011132a1de20f6b5 SHA512 c6167dd22cc999ee70010c2756121d99f8e83bdffa8f08cbd93245da6ac3d5426fd0026cba3e91463afec4928d1b9aa27437ed98a63d667166c74de050082c7a WHIRLPOOL f74b346a64ccf6d38f960416450d92c8204b347253b05c93f4e374691e08b3a5fea19f48c7f897a67856f013caeb756643cc2f92c844c1c5be679df693ce46dc
+MISC ChangeLog-2015 1763 SHA256 6bfdcbc696de1a67d64c2c68261e693e06de15042dfc250e42f78c263057b9bf SHA512 aeca33cb990aa2d910afdae23cacdba909e0f332591ef16f315784327ac21bb919c3f96a4db8a30bc025eea5a21f4a20f98bdf1e606cb36964336b2ae82e4b10 WHIRLPOOL 4b3d14e93100a21a3e72d32643b27015932aa84ff83e9df873e5b48a12e7c62269ac6d9431ee2e4875315f765f0c665e827f163bc2f592f77c63c3e0a264d38f
+MISC metadata.xml 395 SHA256 4ac4be3f4efcef2e6e7c4efe247c8d1067bb85b55581894e3a2e20f342a2173d SHA512 a495a85b7630e9f0849fd15c7a1d7809e547a2851c556771b79d56980621666d8eced0fad73cd6caba8a9405456b273dc7fd2161d4189dde25a679ded94aeaaa WHIRLPOOL f01871efa38f283671073a0439e4128fcfeae11407721d9bb04ae31fad9983445320ad1e2d5ce1da5a5143003fa8821330d1a917135bc8dcad9a038cfeefab29
diff --git a/app-vim/vim-spell-es/metadata.xml b/app-vim/vim-spell-es/metadata.xml
new file mode 100644
index 000000000000..b02d68b4342b
--- /dev/null
+++ b/app-vim/vim-spell-es/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Vim spell files for Spanish (es). Supported character sets are UTF-8 and
+    latin1.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-es/vim-spell-es-20060208.ebuild b/app-vim/vim-spell-es/vim-spell-es-20060208.ebuild
new file mode 100644
index 000000000000..175cbd88d6ad
--- /dev/null
+++ b/app-vim/vim-spell-es/vim-spell-es-20060208.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Spanish"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ppc sparc x86"
+IUSE=""
diff --git a/app-vim/vim-spell-fr/Manifest b/app-vim/vim-spell-fr/Manifest
new file mode 100644
index 000000000000..1c058b30c6b3
--- /dev/null
+++ b/app-vim/vim-spell-fr/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-fr-20060121.tar.bz2 408587 SHA256 050cc224b78f3368379b5f00ad89b9a755c0855c9c87d7fc1c61e348dd3c1cce SHA512 2f826751d450bae22aff918004e980fb3f9065fdf418bc0071510b8b0fa2d4bae3d4c9563231e4e6be8320a39018d8b2bee0ea06c6206c3b5a60b6c3d4db2575 WHIRLPOOL e7052b320c8bc4153704996ec0892a4aa74b3d692496ccefb754e3caf6e9b9049f4bc0f3c08b19004e8a2f642a11c6f93136515131b578d3ff3a69170454c14b
+EBUILD vim-spell-fr-20060121.ebuild 211 SHA256 827688bac5802a0451373a77387f3bbae017d94c1664ce1c523a8608aa55e17a SHA512 26a731c21ac73e592f3ef94c4f77761d0b355e2f63f735ca692551fed193ff42b895c44a7687eaa1c2b48e7f0470fe495f39f36fce9150bdd1cb9c49bb36cafc WHIRLPOOL 3ccd9d285224a2d981a63d048a2015b30081d1f9b52d152aff6405f43cd40f5184a2dd2298d6b07d4003736dce131d2e9923b2d11555603b6967356a4bfcbcb6
+MISC ChangeLog 2447 SHA256 6207cbfebabf0cd510d18da3231d30474a7c2970ea160681550d0e4ac05ba942 SHA512 c10498ec0dba298ac6cb3211c05f2983cc7243e0d6c913598b7b57310ec107ad0faad8ae8c208e4b859b76721e01a11d00ab12e471644f389eee2284e452ecc7 WHIRLPOOL 4b994ab6229c9397119ae755ec29f961f942295c4888249efb10a29fb3949d4bb134b94f08f958a29b7c1a8186b9ad5e5b2fe11523f9ad3fbca688231c797298
+MISC ChangeLog-2015 1361 SHA256 d016a855a2d33e9ddec181fe4efa6a1d17eac1139f399297c71ca2266b899fa9 SHA512 f4205bc02433103bb9e4020e883947c13221a12624bd07d9df431db9c494022cbd2c2eedba884b4c3955ebc470b76910203b5ddd1ccd9f47c36eed40f79eb383 WHIRLPOOL 9b3b7bae91f87d6c55f784816db4d2c2290775e6a4541e6f4d5c40fe4ab13a4edc0677c6302cd1b8e9656d742decf2a4026280568435852fec673913ae4f8973
+MISC metadata.xml 390 SHA256 163d7190dc60f63aa71fe7687bf20f49ea503f855c19aa5d2b4a0ed7808b55f9 SHA512 8cf1056f85a5012b21bbd8607791a9c5924b30e7468e253dded8cadbf54e48b83c1d60d6e39a62b79cd443efd06cc30429ba06b4f0c3818a1627e9ccf1b2adc8 WHIRLPOOL abe9a892ab239a69edce8d635156e807a68690ff237f32df9be213b112e42b0340f108ffc346400e3d0f99f6cc965c3ccd289725e1e6a65206846547b6e5be22
diff --git a/app-vim/vim-spell-fr/metadata.xml b/app-vim/vim-spell-fr/metadata.xml
new file mode 100644
index 000000000000..9664b0a03706
--- /dev/null
+++ b/app-vim/vim-spell-fr/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim spell files for French (fr). Supported character sets are UTF-8,
+		latin-1 and ASCII.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-fr/vim-spell-fr-20060121.ebuild b/app-vim/vim-spell-fr/vim-spell-fr-20060121.ebuild
new file mode 100644
index 000000000000..b4dae6197d29
--- /dev/null
+++ b/app-vim/vim-spell-fr/vim-spell-fr-20060121.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="French"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
diff --git a/app-vim/vim-spell-he/Manifest b/app-vim/vim-spell-he/Manifest
new file mode 100644
index 000000000000..f775820a0704
--- /dev/null
+++ b/app-vim/vim-spell-he/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-he-20100312.tar.bz2 177495 SHA256 1ae7bb6569b5e47fd95180b0acd2e9b6940187ca442c3771cd7c5836f6e52530 SHA512 c6cb7c7eca7b842ceb0aa8b62e0afb215403004fb76d11ef2bfd55398657799e92dfc7d6ed3802008bd7f5bc3caf8cf15697fbfb64f935361c6958d26c7e5775 WHIRLPOOL eda5640f4db969729d8c4835866028cb2bf490a2de6bff18dd4b456c71d29828e61be4cbb535f8b74a4a936717bbdc1f440c964405a0b0a63bc8940f06b3698b
+EBUILD vim-spell-he-20100312.ebuild 201 SHA256 7db97e99a519b746e67d137f3dc596123073740c8f57714ce7645b8d712922c1 SHA512 fc4e2878db009801a4b171e86473355fb380ab768de415dac411da9e30f55d125869ef0a14be05b94ed8f3610164194b2d995fb51f8a51c07974cd5dc1589e1d WHIRLPOOL 9c39f4e80f69308ce7cbf2b2e938bc48fa7f1a44d21f68d321a5a638a69900fcb1efdbc95a54cd8468e07cb0fae6e1ca34df635a6ebd40eed9fefcd688cb4a71
+MISC ChangeLog 2447 SHA256 404c1cd2572b6a3aee7450b63ffbdb508dd5f2bc20bf4075dfb311c746be4627 SHA512 bec8d38abee370763ddf2c3db195aa093adb0b800dd79604a0b4b32a10580fca15b74d37edcd9c86fc770e339a80edb2e06a5ad3df8b33c93bcb5d10bccf52fd WHIRLPOOL 4994d2b4ee83b5b77e5122256def8507edc7f70b6f04fcbf14db6e8136d18ce3d440ed55b7ad6b415a12b5deb770a1053f1e213e67c6e1a53ff388400d897fb5
+MISC ChangeLog-2015 875 SHA256 a85f4c2cc2d80456836a838506c2a5304020fd47248d3dc11fc0577cf96ba87a SHA512 bea0d6092e76287262487812ebe647f30ec046763b8306d432889041508e84e874c57a7f2d206e4c627980ba6b87d443b125b2a6faf6c5ee26733d17b1f008f5 WHIRLPOOL 6b28f2c337e5dd6b8ce2cd909c82f87b42c307385e045224215ab6e4e013aa3f9a88f6b9865447d53bdf02da388f2ce4d718711b4612d243b6c5a84f1428cc92
+MISC metadata.xml 376 SHA256 163bb9010fe2369135dfcbedd9abd15a7bbab16635ebb1d5580a4bdfe7a5dfff SHA512 aa8a05990413c093f8e9b7ea7e99a8701a3127492362690cc9ab273a23a83ab71f113d03680fac4d23d65968fa48709740726ca6c73ae71f2afcf7437f74857c WHIRLPOOL b2e3dff7e643c630e78b43abaf54b5a86b03838cd3f65bfb78f8e5c7b168af605613eaef1124c4892d6204f5cad707d909c0e63d2e13f6d4bf2ea566efab2728
diff --git a/app-vim/vim-spell-he/metadata.xml b/app-vim/vim-spell-he/metadata.xml
new file mode 100644
index 000000000000..22067f199f87
--- /dev/null
+++ b/app-vim/vim-spell-he/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription>
+		Vim spell files for Hebrew (he). Supported character sets are UTF-8 and
+		ISO-8859-8.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-he/vim-spell-he-20100312.ebuild b/app-vim/vim-spell-he/vim-spell-he-20100312.ebuild
new file mode 100644
index 000000000000..a0426764dc60
--- /dev/null
+++ b/app-vim/vim-spell-he/vim-spell-he-20100312.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Hebrew"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/app-vim/vim-spell-hu/Manifest b/app-vim/vim-spell-hu/Manifest
new file mode 100644
index 000000000000..e57114d293c5
--- /dev/null
+++ b/app-vim/vim-spell-hu/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-hu-20100312.tar.bz2 2516564 SHA256 0da634528c98e7aa2bff23b8992d713291155b1e9e09eeb61dff7face8326469 SHA512 44c94f84c3edd94020fdae430723b2e264113d29f5e295e6593274741ef094a8fe1dfa1d692cddc266f2cb3d58fa5601f80576d4ca55fd185c1213e983a3fb99 WHIRLPOOL c68ea642bf1598a924896149af8dfad8311acf4492e150519ea023b0fbc51be2ec05dcf6034665ef24c2de662f33f52ed3181ff14d113aa78bae5c0259335831
+EBUILD vim-spell-hu-20100312.ebuild 204 SHA256 70a938fd7d2c0bf257baff70aa6227991cd01dc03021d1bccd8026acde8d917f SHA512 70a3d0788c4dc216f2906aca07228418bfdbf08f6ed6fe231afaea3e7bf31407a35d9b14e060972f37354467a1612ca6f717fde19c14296526ebfbf9d226334d WHIRLPOOL e78dfac638c95289605346998f1a674ab0fbca1440076e95cfc29e101e7b7108c5e84f2a4dca1657993d8c1b012ec97f7e686aa7e0926621a832ddb0b6a66164
+MISC ChangeLog 2447 SHA256 acbc3309c8b0392d255024e17cadf4351c6ac6fa0a69022ceef37443126fce0b SHA512 797f8bbb8a1cae523a8188f534e4a05655554248a568a55f62bed69a2bb7845f14d1fa8bc62b8c40c12ede11f5ecc35b98a8488f798236cd1fe3ef176512510f WHIRLPOOL 0713308c467c378016568e1304683f38e68bfc0a44dd41f7e48c2d5a6299303c2365187309732a70a6edcf81d7a7ec4fe7aa7756fd64acb33b2c8b6f8adbed20
+MISC ChangeLog-2015 908 SHA256 df4f8dfa283bcac8c81284b0fd4cc33be24260cddaee3a24253fedfc2bdd02e5 SHA512 9ff0d6cc2761eed1977e347de5f928351cbeafe96c260725ec3928272f548dda6d3c012df3165c60d111617c701c02ab530381b5e42a023d05fa6dde065c122f WHIRLPOOL 3fb3a7c6ddfc39e8e01a5c6de7526465074314b50c29b29de859b50a274bf299731336fd6bd80f18bcdc6d5e61bc986bef6c0d57bd0a322c1a3efa4311dd1695
+MISC metadata.xml 388 SHA256 eaecdacbf17bc007c3b505fee24a62c80d11af2f8e387b1728de07e68d4ba407 SHA512 83b6bd49cfe90820c36e56f4b2e822ec58f7dcaca24c2194877f516f09ec82d460bf201d702468d74d9218e9bab19e42fe66ee9af49b8be5adbf54e590170179 WHIRLPOOL 88fad4db6bf10df4bd6f812141a7c908f81a7377a067374beea0fbe9bc5a5ee1184f33cb5aa6fd3f5b84b4e73882f2fe6f110043a0061de626a74d07a5eff432
diff --git a/app-vim/vim-spell-hu/metadata.xml b/app-vim/vim-spell-hu/metadata.xml
new file mode 100644
index 000000000000..b6bfa7f4fd95
--- /dev/null
+++ b/app-vim/vim-spell-hu/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription>
+		Vim spell files for Hungarian (hu). Supported character sets are UTF-8,
+		ISO-8859-2 and CP-1250.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-hu/vim-spell-hu-20100312.ebuild b/app-vim/vim-spell-hu/vim-spell-hu-20100312.ebuild
new file mode 100644
index 000000000000..716e6fbcff2d
--- /dev/null
+++ b/app-vim/vim-spell-hu/vim-spell-hu-20100312.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Hungarian"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/app-vim/vim-spell-it/Manifest b/app-vim/vim-spell-it/Manifest
new file mode 100644
index 000000000000..e4290cc9f9ea
--- /dev/null
+++ b/app-vim/vim-spell-it/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-it-20100312.tar.bz2 874072 SHA256 e9e8092d8cc3cb4b949c8a96aa08d0b6fd66aa3ab6fa610fae511184217ec236 SHA512 7f215d65a798c64c33f38c52205f5c15ce132361d078eb0c48ea5058c97da21b25c24952b15a2737b6b8d1de1d5bb6fbbc880acb57834e6d00773ce97c80de5d WHIRLPOOL 3bfca30a21881111c27d9faf8f0bcdb87a98a131f74bd094abf46dbb988b60e62c09e67a6acd5556f7cb1c8fc613cc8fac0483dffeb0c8ff782e55434e3e7d17
+EBUILD vim-spell-it-20100312.ebuild 202 SHA256 7832c581c9cb18c05ef0827f09e803b84710c3e56ee4a36af5fae8a8f54ad185 SHA512 4716dbc7456e9336a6f7d91db1268b039e45b7fcbe33bbe09795ce7362c6d97b56610bf865758864f618dc5ca23f28754590521b9c8ba6336f48a42cf514d32f WHIRLPOOL 46d1c94b3894eaf1ffc28f0e9fbd6c40c6c39dbc76a001a680ca9062071aff17eaca6021992e75b7779634aad87cda793cff7d542ae5feccb664afdd5a291706
+MISC ChangeLog 2447 SHA256 d9ca8555c680abda1e437bed53037af05f478022fccf1d07ab0c6896bbaaf10c SHA512 2e56da55e8f4e3d4b9ce05d9317ffe3d0fa7d9907cbe12dab6ef3b9ad3b569f02fe28f540800d126e86a6e08a1324b72debb1f56d057f59f0ae471caafe51913 WHIRLPOOL a9f46c82fff27dbcaca21f048c529d1fd3a43a1ce377e345ecfae7c318014ac87c84674ad9cbf3a889a5ec27a0845152c4aedcb4ecf6bb1ec67f47407d9aae0c
+MISC ChangeLog-2015 887 SHA256 5b5080848946a433bcad988b636749aeafc671c44b34db473b91e27f85e2ba9a SHA512 0735122ef02b7f0ce4b80de031f1207d32d1d8d11f28744c4cec22f076e9043bb12022e2e228115e325d8703242df98b6c8fa96a6ffc4bf5137f187e6f2e13c5 WHIRLPOOL 681f8cd2bfd1a543ce0c77756597bb2b610073f889e799b5ea15c3ef7c4d593535f765d7e4c9342bb62c6a89f6dcea42df26c6388055d1c78aa0a9fd6b5b3393
+MISC metadata.xml 373 SHA256 7e6d2f712af540c77e12da9927f8315c103f604fc0e2fb4324beeebab566ef9e SHA512 24301bc530f8b8d182f8a2ac5d0ba705e7d46af37f989a62e73ed46e08d32b2b36c7c4ba6a6308ae26b8c7a4502104664318e6546d5cf2bb2ba34b7c1d04bb30 WHIRLPOOL 306610432cb51efb6854c4fb3b92aa523e12623f6ed62b16456ef204d32e1075087d776704bcdd6fbd7206e70f9248ebedd0310cc6aae669ad7b3d970f0aa48e
diff --git a/app-vim/vim-spell-it/metadata.xml b/app-vim/vim-spell-it/metadata.xml
new file mode 100644
index 000000000000..cd13f1a69e42
--- /dev/null
+++ b/app-vim/vim-spell-it/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription>
+		Vim spell files for Italian (it). Supported character sets are UTF-8 and
+		latin1.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-it/vim-spell-it-20100312.ebuild b/app-vim/vim-spell-it/vim-spell-it-20100312.ebuild
new file mode 100644
index 000000000000..c911a0e61a1f
--- /dev/null
+++ b/app-vim/vim-spell-it/vim-spell-it-20100312.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Italian"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/app-vim/vim-spell-nl/Manifest b/app-vim/vim-spell-nl/Manifest
new file mode 100644
index 000000000000..8f4cff458bf3
--- /dev/null
+++ b/app-vim/vim-spell-nl/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-nl-20051007.tar.bz2 670750 SHA256 053f1f37d6df8e281797368d810dfa78e7939015b57c492727b98f37e5659c67 SHA512 5d62c84178c91e139516181e35c6e2802aaeb1897e70f50dcad93f7ad7efad1e9f983334bc7d3a3a3355e20a535c2e81096583a3ee11aab0f49698f4dee03c5e WHIRLPOOL 00f264f4b6079de691ec347a6a82f577da860ac639ea844022f0419c916b48a96a6bd651b822708ce80efc002c326005d16143febd055bac0711f8827094d7db
+EBUILD vim-spell-nl-20051007.ebuild 245 SHA256 6f8f5dcd84695b8ae55f98ef430a2875e508f9c13ca190179bc7b0587a3a3ece SHA512 7e053a1cd02429eb94943ea2add6cf36bfa0325d3d570b9657836e087d0f2f26e73c6cf58b992c1386ca983fd6c97f6d678839cac1f8ed15c6aebd4d8cde5855 WHIRLPOOL 09b0a9758d98f791a9debf99ab5aae17df1fd710e738109664f36fe23d870c45bf4eda8664e6f98a45a7cde631351a9a74f89438ab311e7b5d4602ad776078cc
+MISC ChangeLog 2447 SHA256 d1ebd9cd4ca71fbef533a97ff7c01fc69c9d7fdf21a9633df1f21fa47abad071 SHA512 948663827974d7e913c279b92d99ce8a59ead7db33d351e9d04ac622e72a27a946da1677db69dd44d36da6da6ba37119d56472171d83906be25393b4888581d5 WHIRLPOOL 8aa7d7c5af4a29c98d8480f0730b0237906320d94f341ee50bf3757be8e72dcc44966319bad3c90fbaf55c688e60b9bf5749837b32eda9a5e9850945a28c8f71
+MISC ChangeLog-2015 1487 SHA256 3f105a5481f6fc013d3893a15a88211f29956f1ecebbb1d1fc9b33ae0225fe24 SHA512 d79ab47c3ac2a6053048688afffd6c33d91eda6c8bf77abcb6d1c648fe663c4f2688fa2ff8900308c95358d174b286dc6188a45840a311c88774c66ace7cc9a8 WHIRLPOOL b1fb77b5fe8e3a9fd6e94cca1593c1f00910333fb233372a66b74677d2a1826e86b3f066c361f1c3a12ded51588eb44ba61a318618354a93a808556100dfbce8
+MISC metadata.xml 383 SHA256 d9f0e2d0ca5673bba7422af8dd196c93a48f6cfaabe68aba5818f4bfdaefbc13 SHA512 fc8b540bcdfff4d5eb72d82cefc763fe8186cf43be7a80057d7ea2942739fb665eac6694352eb3d46bc7ffb1a153dafee1f64e417ac09875c75244129c97c35a WHIRLPOOL b6eca363283c6860b66b34625f8bf705cf501d38b37615106e07ed5fbe46e519dd5feabc0fcaef67e3c7b69eed370e5f3cf4a639836630188b812aceba5e99cc
diff --git a/app-vim/vim-spell-nl/metadata.xml b/app-vim/vim-spell-nl/metadata.xml
new file mode 100644
index 000000000000..756e08e56d3e
--- /dev/null
+++ b/app-vim/vim-spell-nl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim spell files for Dutch (nl). Supported character sets are UTF-8,
+		and latin-1.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-nl/vim-spell-nl-20051007.ebuild b/app-vim/vim-spell-nl/vim-spell-nl-20051007.ebuild
new file mode 100644
index 000000000000..1586ecc0028a
--- /dev/null
+++ b/app-vim/vim-spell-nl/vim-spell-nl-20051007.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Dutch"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
diff --git a/app-vim/vim-spell-pl/Manifest b/app-vim/vim-spell-pl/Manifest
new file mode 100644
index 000000000000..8458a042efff
--- /dev/null
+++ b/app-vim/vim-spell-pl/Manifest
@@ -0,0 +1,6 @@
+DIST vim-spell-pl-20060218.tar.bz2 1489524 SHA256 3321d7c6f0a8163d5a20a35cb591c85393d9e2259f3408e19cb6ce15570821aa SHA512 a83900e0cf0702c70498bbf47c9db5048205d0a70ed8fcd7c984353987fa5a97334093cce7844ad639a80a910bdfa644302191d8f27d465af4a53bcaa42acde0 WHIRLPOOL 43bb2e14736e2ab5e27290c6014b1ec3d771adbc851ec6eb95af1773422c7a3c9a6823e426c2818157c2a589d78ab86fef31afc87f0a8eae5693ef61672eff56
+EBUILD vim-spell-pl-20060218-r1.ebuild 230 SHA256 c30178e2a7b234cbe4541336f17dfba12da525f57de64c11744bb9dfcb118308 SHA512 007562dbb10e84c3a0dbc3ae3dd7b40b20fb026601330479a8e2e2b33226c66320a049799402fb8f217fd1ab779a4d1f087925a982d6e764058f7caa298a3ce9 WHIRLPOOL 2f928a6d28900601f65e3f9a6ef0a95af7ec2c7c6e0e79ab64a936fdd984307fd63c516e4966a69588821e4d2c5d0b79d37fe5c3eee9dc7abdbe3fdcf6e95cb8
+EBUILD vim-spell-pl-20060218.ebuild 218 SHA256 9e9374a3722224aa1b1520f2ba7a593f1243979a907942c8b702319cc8dbb8da SHA512 51e5db44ef701ae55a83d28ef16ef68fe6b70d2675e44db0718be8f2ee8625aa904b23f6b262eab20d6fddc1f11226ce0e1a44745d68f60edbffea5cc024f1a7 WHIRLPOOL f136cd82cf3f471f979f185f8db56f49d00de5f2ba8e4d32b6d87f0c3e369e9130b08432383019aa02f6f0d43139d91dd8c160029fe4cec6eae7185b2d8444d1
+MISC ChangeLog 3154 SHA256 3c0cf16d4b1813f1d42eeadbd719dc0a9b2d3cbc680a3eb6037b292655eedba0 SHA512 639289f6672d5029ff33b654f4307c1fd941b4be83a2df8431e0c1b2ed485f7a4aaa26c75d53d49d0e8e50d730eead2d85f206c8d08bc81c3e9b8d51fb5218e7 WHIRLPOOL f29043cd0349fa8a79184cf45d038adf2e9902bd49343473d4b792c793e25d3b5c579ad935f191f3b7de9f866f778465d4a2f7fb2d86e7fe69f2590d79fe2bac
+MISC ChangeLog-2015 1591 SHA256 efa318ea535c88b451f5921b98bb47997133d37608d86a479155c39017a989d7 SHA512 09a9d6112b3b2a0c59023b3aede2fca0081fd53f7f51aa4ccfbb57b256db0615f30deaf11ad4f1ddc6a22e68fc6299870f13fec7bc92c16e1635fb9f12144bfb WHIRLPOOL c3d24ae5150109b0e9f88f3eb8e26b677bc18361613ef68b3ec932c68be89bde1feca6941bf1005e384bf4c771b2100e344cb3d3922ede57baec19affa7aa7a1
+MISC metadata.xml 394 SHA256 e9d3c817764bea278711a163eee46ff07c0b9012c760b8c9619d00bff26ab459 SHA512 a26bef5bdb42cda8e3f34937de3294d6c792ba8e575d2ab69b3b2e0caa2e9856e6de1f0a1453d08829fbc76f96c3babcdafc414737ec47c5b6672fe304d32c65 WHIRLPOOL d2ef347c10e13d1492a11301252bbed906ed4a26b20636c3b6e0dff3c31663b095a231153ae393854845083af3d7be24de1c035ae5bf668e79419abcc40896f1
diff --git a/app-vim/vim-spell-pl/metadata.xml b/app-vim/vim-spell-pl/metadata.xml
new file mode 100644
index 000000000000..91a799e6df0a
--- /dev/null
+++ b/app-vim/vim-spell-pl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim spell files for Polish (pl). Supported character sets are UTF-8,
+		ISO-8859-2 and CP1250.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild b/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
new file mode 100644
index 000000000000..d452bb97ea6d
--- /dev/null
+++ b/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Polish"
+
+inherit vim-spell
+
+LICENSE="CC-BY-SA-2.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
diff --git a/app-vim/vim-spell-pl/vim-spell-pl-20060218.ebuild b/app-vim/vim-spell-pl/vim-spell-pl-20060218.ebuild
new file mode 100644
index 000000000000..08fe2801c81b
--- /dev/null
+++ b/app-vim/vim-spell-pl/vim-spell-pl-20060218.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Polish"
+
+inherit vim-spell
+
+LICENSE="CC-BY-SA-2.0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
diff --git a/app-vim/vim-spell-pt/Manifest b/app-vim/vim-spell-pt/Manifest
new file mode 100644
index 000000000000..88643af914be
--- /dev/null
+++ b/app-vim/vim-spell-pt/Manifest
@@ -0,0 +1,5 @@
+DIST vim-spell-pt-20100312.tar.bz2 2018267 SHA256 d6438b991192ef92b61140d832367349256ab40fd0c6cffd839e772e90de6f32 SHA512 0bd90524a4066f1b7d29ad85389557718cae5d3b6815a0037e2ca55987658278f0a1aa5e02614fc84a5862721a58404d8582d62ee6e8d15ef954e004481af49e WHIRLPOOL a9356edf1d987d31e83eff9ee24d87007f7adad93d449a1586f88c5c891ac0b0fab28d1ee1b193d55abd6e791496e957b8a73efef7fb2fa1fea6997b163bad17
+EBUILD vim-spell-pt-20100312.ebuild 222 SHA256 d9b631370c37e509ad0b7c6a54da69f3f497a8bff948d408cb369603f3d02236 SHA512 a463131c68c2c897f40c0a33b77feb9a7a7e5d642747a81ba1d5e764101c143eaa9a646d1d3efaa5d9c90071e518b8db1a1218df7cd8fa567cc5acc9847661f4 WHIRLPOOL 24b43db4284ddf4b2a0b5fa1ae4f4edccae4c561982df0cd7dba4ff4e2faa94291a3a0dc6bcccec7215962fac471a97960b8aa4f83a249af47042259288d5243
+MISC ChangeLog 2447 SHA256 686a730239c228da3591d1833f61a9a3211d3b60bc935365763ba2a1b3d44b1b SHA512 96b6c45a12dd877fdbbdcfdf0803cb94d3f9f094362775ee211c4ba5e8ae281925b6c5bc9bc52157672735ed14fb4ca019ed03cd23783320a239d79a3c3c399a WHIRLPOOL 9de4bd24ba3d8fc6d7d9563751d89c68f47aaef68c3e2da7810c442ed5d5b9f7348751f829f1ca36478979617d8adbd2831c55bf607febdfaa5cf28483b1ea85
+MISC ChangeLog-2015 804 SHA256 74422fe1b2c7d14395b27e6c53faa0f5868dea85715ab9dcf77ccdf558e4d89f SHA512 2ff3fadb4c76ad3f4733470a4ad1748618a71fd7c6f1ceb9048abd99cc296b5a6f483f15d4af530ca8d021d6214321e967b802bd5a9e276ae430556d252bc7bb WHIRLPOOL 6b92a4ded049d9e46c21c908c8916e618b9e23bbbe430485bc9db9a68cd8513ca88bef932f9b4da73dc3ae181530c14fb2f6414dd3628fe6e46430ebf016cd1b
+MISC metadata.xml 376 SHA256 caadbe122fd69af3e379e45d345f087df4da57771275e8f0d5cd4a1a1ff023de SHA512 da8126fd7b6d5a92d2c53dd678194071cb0b26d550a58ae2439a820be573b92fddca9522f0fe4d99724b0960aa7f2b9fa075589f44ad73bfe55741ece6d94340 WHIRLPOOL b901f834c0b25234483aca863f23258a3f32e11bf7d35a24f5325a7dfd659b4df0daa04e26502b4d301dc52c1381d5b22c8d028ef660d7d761436b9218e76c21
diff --git a/app-vim/vim-spell-pt/metadata.xml b/app-vim/vim-spell-pt/metadata.xml
new file mode 100644
index 000000000000..8cf406951664
--- /dev/null
+++ b/app-vim/vim-spell-pt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription>
+		Vim spell files for Portuguese (pt). Supported character sets are UTF-8
+		and latin1.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-pt/vim-spell-pt-20100312.ebuild b/app-vim/vim-spell-pt/vim-spell-pt-20100312.ebuild
new file mode 100644
index 000000000000..3a936f99dda9
--- /dev/null
+++ b/app-vim/vim-spell-pt/vim-spell-pt-20100312.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Portuguese"
+
+inherit vim-spell
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/app-vim/vim-spell-ru/Manifest b/app-vim/vim-spell-ru/Manifest
new file mode 100644
index 000000000000..1c5c6d090e60
--- /dev/null
+++ b/app-vim/vim-spell-ru/Manifest
@@ -0,0 +1,7 @@
+DIST vim-spell-ru-20060506.tar.bz2 7242609 SHA256 c5d7ddd556a7cb2ff3325e66f76189bbdbf142a8357f3de6af74094044fa138b SHA512 d36bec4b984a3eaa45ca8c634fb4bf83fbdb1eb7b282b1d71838c503da4f70f82eda589dbb6972a70ad7f1fe89bedf0d54b51bef8f46ae7d09114a535746b4b5 WHIRLPOOL 611f1e2b8105e3296c75a6092e2bcba81d250387ca8d61ada5b9c92309ea3b183b8b7efc06af320f123a00273fd2bc6205fdc8b644507602eae4c2cb56c2a0d6
+DIST vim-spell-ru-20070506.tar.bz2 7232867 SHA256 cdfbea6e6ba8f8714ebf5e5078f6e6a129a834b9e4d130f91ee7c7ebfec01a3e SHA512 268ff4c56299ed06e329c8342c3d9ec567278c8a8c0a90d56f6320052d7ee38b17b1724e0f8fbf72d616285a9d7ba3a8e7a1f5f4d78ff8bdc41c73655eebdf33 WHIRLPOOL e493bd448e3a4c7565018f1b6effd941c4a83b0f5c5975022eb1c21a5c517bce1d7f57faedb1e545b6616d733d242b9b553cab9b9892cafe470bbdbe5fae032f
+EBUILD vim-spell-ru-20060506.ebuild 240 SHA256 1cb4980eeb1119b46b1aa8a49a0243e44effd35ee4d515ae042b971fa656fc43 SHA512 87f0a05b962ef952274ccf16a1b02ffd4a10d00f0ff4155e6b596e653fad061775212f7de4d6840cede7b618a9ee7e985f26ea5c3954b17cd3963e51128558cc WHIRLPOOL e37649264fd214e8ba96961b267cbff582dfef0352a30b19ebb7e411d01fd95f0e61a9e06f798841723868f6dad27961d043aa4bb6aabdf68e0a9a7b2d09cbfb
+EBUILD vim-spell-ru-20070506.ebuild 237 SHA256 4c41fb7ac21c4e46c9839ed9f0c2e9f1e4358abf9fe4a61f62a40ef695e78187 SHA512 b73cd65ba9ff3e6417f3f5edb411e06d915243418e8f04894be148c74446e2c8082f64a678b05b85c05e4797ee2b743ebb62e0cd06bcaf809a709b3e78716109 WHIRLPOOL 3c77c923f95b69d3609c6f9ea8aee0ed3cb1abedec1ffe738c77c112f80b7b1d3263a947c67059016e6bb017301e02f76d98a7de9e6390388b99afdfe5726d85
+MISC ChangeLog 3096 SHA256 f8f63cb6dae2960121cbfde2dbd358616b3b6de4e296a56d6fec48f59f054b88 SHA512 659c6d28b6f54307eca6f0f60e09c3c0a70eda829faa163a4c599ab23c4fb16df32480c09bcd2374dd74a2deacce8ed80457edf30aa4cbdee12dfd06b7326c08 WHIRLPOOL fc95d071327e6de6166d19ce8f88487b3ff470000d51e901f37ec022ce93e2795450590aced4b3f9540e96c4270cbf997cfe9babbfed4d9c6a0ddc35b5de6406
+MISC ChangeLog-2015 1930 SHA256 f2b3a8a50c6a0e7a48fb1558c7115002b64c28b8d3a0870d282bb2da84ec0df4 SHA512 882c2f969b69d1bf203e7362bae281e508c8bf9a9a51178ef5b27d48f2f298359117c39d67baba82061cf56cdec3a9db860b09827e3e7791101f978d1d07ff06 WHIRLPOOL 20b3a496fc90f8f2a00f43c026af6da6b5aad049f249a962b84dfd3d4bfe0f6f8718fbde2071ff95fd6682e8f0980d8ba1e9113c9d8820e0a6fd90c0ff3498c4
+MISC metadata.xml 645 SHA256 af68eea4023a01c0a7462389268ea16b0689d2e9ac2aff5540f19587284f5099 SHA512 dea1e29b3b235ccc9f3cbda4d057ed8bf77c7df394631f89095a674f17760f6b051738e9e2bc4db2d63b49d900a5a8f3db4447fb6feaa419b5b459c983fd3891 WHIRLPOOL 6370ff36ecea0be73374cee4dbec60e694a3580f9bf341a1dc1cb74ee151907e1d9acd48b4c9d043a3eea9f34608bbe4feb9e8a78695cdafd3b18d793cb3a074
diff --git a/app-vim/vim-spell-ru/metadata.xml b/app-vim/vim-spell-ru/metadata.xml
new file mode 100644
index 000000000000..9575a80b2219
--- /dev/null
+++ b/app-vim/vim-spell-ru/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Vim spell files for Russian (ru). Supported character sets are UTF-8,
+		koi8-r and cp1251.
+	</longdescription>
+	<longdescription lang="ru">
+		Файлы необходимые для проверки правописания Русского языка (ru) в vim'е.
+		Поддерживаемые кодировки UTF-8, koi8-r and cp1251.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-ru/vim-spell-ru-20060506.ebuild b/app-vim/vim-spell-ru/vim-spell-ru-20060506.ebuild
new file mode 100644
index 000000000000..8ea1c6160afe
--- /dev/null
+++ b/app-vim/vim-spell-ru/vim-spell-ru-20060506.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Russian"
+
+inherit vim-spell
+
+LICENSE="myspell-ru_RU-AlexanderLebedev"
+KEYWORDS="~amd64 ~ppc sparc ~x86"
+IUSE=""
diff --git a/app-vim/vim-spell-ru/vim-spell-ru-20070506.ebuild b/app-vim/vim-spell-ru/vim-spell-ru-20070506.ebuild
new file mode 100644
index 000000000000..aea71f63c88c
--- /dev/null
+++ b/app-vim/vim-spell-ru/vim-spell-ru-20070506.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VIM_SPELL_LANGUAGE="Russian"
+
+inherit vim-spell
+
+LICENSE="myspell-ru_RU-AlexanderLebedev"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
new file mode 100644
index 000000000000..5b055d8e3fba
--- /dev/null
+++ b/app-vim/vim-tmux/Manifest
@@ -0,0 +1,4 @@
+DIST vim-tmux-3.0.0.zip 12713 SHA256 8ca059d610489a7d8be010aa1136c2501cbe18e86b0552e173fc0a5b6694dc24 SHA512 d6bc94c34ab32608610fdfffc3a3522b6056b3b61dd3cb9c63a71cb20d1597954aec65a06c5ce22352731d4e70b6a239ca5f303427182cce93324042b7f10c8c WHIRLPOOL 49f5b3e9b6e7d4608c049684605b393686c5f1ab447a71ac4af5c6b208829ab5df7f053eaa3bd8b327e6f9d5bd8d0af1547da8a47e89873325d3328ee42830bb
+EBUILD vim-tmux-3.0.0.ebuild 538 SHA256 23d01c0e533e70d38f19b7e0c11e36d3b07d278d4fdaa42414b1afd2e0738041 SHA512 58af16f82a16436e2c993d342666a8cfd2d05728081f7aea53b9c5b22346a83c0d8aeb07637c044678e16904622913ed93369e49018fbfd47199c7941e90339a WHIRLPOOL d37adfcfadd474442f5855d85bcb366c2df3dc80eecee8c66c1b33930395c658495dfde403636fdcd65c5ccc3ce6abdf2bbc954e7660fea04d8a58aae9ebe576
+MISC ChangeLog 622 SHA256 9d76a754efc20e43771cb60034cb4ed378cffc8a86ce221dee0337acfdd28687 SHA512 f002c84049dc62fcff1c70da02621f4d3e337204f2bdb7a7d3f10e5552280ac4c913dc9a994a01725433717fa9dc05f7eb16854caceebd93cdeb672209fa788e WHIRLPOOL 622bc6de357eaf58790d75ebfb71a957922e53a5ec40bf643bae010c3e0ef59fbf6c3b1d2f2ef95ed5dfd8c91993c6c64e6b99875a13242cb74a46c7b5f82e4f
+MISC metadata.xml 556 SHA256 a3ba40e558ce9377d27f02609691978ce6f9ffe0e065dcd7742d87ce6bf0cab6 SHA512 181979dee06b24a1d4f1b3b325558c628fcdb0ee4d628c7002777f7e460e8a35026f021bb21c79db243fd067d16168c7db804a33c10be0c59f6bb22d46cbf9a9 WHIRLPOOL b3ea09c226254badd532db93e3019afbad7378e3ff39e5d568a0920079d8482e6ae2c2414ebb7e4d0c32cf3b0736c46bf2411d3826def0829611c905383a34fc
diff --git a/app-vim/vim-tmux/metadata.xml b/app-vim/vim-tmux/metadata.xml
new file mode 100644
index 000000000000..2e81ab74af54
--- /dev/null
+++ b/app-vim/vim-tmux/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Tools Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tmux-plugins/vim-tmux</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
new file mode 100644
index 000000000000..21c876b7995e
--- /dev/null
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: tmux support for vim"
+HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
+SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="vim.org"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+
+# Bug 603526.
+# Remove this line once this version is marked stable
+# and the old ones are gone.
+RDEPEND="!<app-misc/tmux-2.5-r2"
diff --git a/app-vim/vimagit/Manifest b/app-vim/vimagit/Manifest
new file mode 100644
index 000000000000..f4b7a634b91c
--- /dev/null
+++ b/app-vim/vimagit/Manifest
@@ -0,0 +1,6 @@
+DIST vimagit-1.7.1.tar.gz 35302 SHA256 96b61af002f31f1a73bb67ced06e8aced696e6c9539f0d5be9f25c469f1a16c4 SHA512 8ce2959c135da90b880ccdcd66e71661c7908f250d47a24ede025762a6e9422cebcf8fd516bf99e475605f4278e232713c66293781ceb95f47a22031e9260a71 WHIRLPOOL 8331ab3736017b8930934e8661002edf3d24efe92032f7e0656338ae44f21b02037a9673f91e6733b4ef09b15a75b413419b91a656a54224317d5aba24aa1f9d
+DIST vimagit-1.7.2.tar.gz 37398 SHA256 bac4b3b3e91815699ae34374874e2fd181f31108f8dd4be6c434d79c8eb462d5 SHA512 8b825da4b411732db022b1a3f25f6f779ba5e58df5ca4d404e985b16a4811f911c626674f1a7f4a285d78369f4c7ad3a33b7ffa2b50f1a4a94372a3c5fb29a15 WHIRLPOOL e1376e9fd3652812a963eb94840022a513ef2ef563ad81329e601db956c40ccdb18d2ecfc2d3995aef4648768ade73883c9c0f4cc35b712e102e18ec812aba24
+EBUILD vimagit-1.7.1.ebuild 528 SHA256 3fd49e4e1a708d95109edded3d5e9b3864a36774ae42f6fb98ad08e2c4624f39 SHA512 c40090e5f0c543911e41d4edb33be1775806fb67ede5d32690c5513539f9861d30a8013bb2ae378ef38c4020daa7cb76d275648ecbf43721484005fbfbdec382 WHIRLPOOL c775e26a9e47e5ca5651712016c9a6abc148f0c3065bc429e3bec2bfb85b1f12c77ef8b6b2997c25cff8b5641d811a1b712e79bd6ed646278c809ff28062c963
+EBUILD vimagit-1.7.2.ebuild 579 SHA256 856528c3e30de4db938be3d294f0d71c7813cd1a1d683f60b0ab540df19ae746 SHA512 52896f63772d399f5e6da40c3e622c6b87e7a8e7c65978883b60715dd4882d5aec2450bf3c766cc23de6851750030dd8bf3b26867bc963aafe1c21c59c9f6a0c WHIRLPOOL d5d728aca01985f81466437f96f90bfbdf2bca5ac2250ad312eb6773e2e9ab47a70ad79b7fb0b3f260426a837684ddc8dc7adec7f783627edbb417e63d43be4c
+EBUILD vimagit-9999.ebuild 579 SHA256 856528c3e30de4db938be3d294f0d71c7813cd1a1d683f60b0ab540df19ae746 SHA512 52896f63772d399f5e6da40c3e622c6b87e7a8e7c65978883b60715dd4882d5aec2450bf3c766cc23de6851750030dd8bf3b26867bc963aafe1c21c59c9f6a0c WHIRLPOOL d5d728aca01985f81466437f96f90bfbdf2bca5ac2250ad312eb6773e2e9ab47a70ad79b7fb0b3f260426a837684ddc8dc7adec7f783627edbb417e63d43be4c
+MISC metadata.xml 340 SHA256 c46d1f0dbd40a0b0f93d9d7b21c7430668ad5dc68f72a27e0454d1a74e6ffd09 SHA512 f9c0871441cc968a62ebc15e75f7f3977a827b7c303b3cf721cadb5030deb9af5356667e149bdd7fb02af63398fe6226e24bc11a770e3c4d6a03c5c9d241d60b WHIRLPOOL 9515d006ffffdc40f3ea270283c55b31faeb19a706aed6d88752fb31effb3f1b15b152ed41ebe5a7f3d1d03154ac311e8fcd126358d28100de95cc122e4e6e21
diff --git a/app-vim/vimagit/metadata.xml b/app-vim/vimagit/metadata.xml
new file mode 100644
index 000000000000..5b153f66c473
--- /dev/null
+++ b/app-vim/vimagit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jreybert/vimagit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/vimagit/vimagit-1.7.1.ebuild b/app-vim/vimagit/vimagit-1.7.1.ebuild
new file mode 100644
index 000000000000..1583759b0cc2
--- /dev/null
+++ b/app-vim/vimagit/vimagit-1.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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"
diff --git a/app-vim/vimagit/vimagit-1.7.2.ebuild b/app-vim/vimagit/vimagit-1.7.2.ebuild
new file mode 100644
index 000000000000..5e291f76fe70
--- /dev/null
+++ b/app-vim/vimagit/vimagit-1.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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
new file mode 100644
index 000000000000..5e291f76fe70
--- /dev/null
+++ b/app-vim/vimagit/vimagit-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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/vimbuddy/Manifest b/app-vim/vimbuddy/Manifest
new file mode 100644
index 000000000000..d2099bf8bea1
--- /dev/null
+++ b/app-vim/vimbuddy/Manifest
@@ -0,0 +1,5 @@
+DIST vimbuddy-0.9.2.zip 1547 SHA256 53cb3ebbe6c0ce74e0a1edc668ff55f62a37e3594b7cb5377d181239e2cc7f72 SHA512 cf42e9c2898e4b5335341215019c732075da7821c25c2887e718d0ae428c390afc5c81c9724c738f74b81d125e9b995dc279411e3a23e048e704bb1e3648e680 WHIRLPOOL e2768e2d34ee391cdaf10e9a0b6c6d8e8ddc1ce8afedbf42d263922cd9aee43a7071354782742f80665ba3caf95504f746a6c7582996130ae43eb121133df041
+EBUILD vimbuddy-0.9.2-r1.ebuild 522 SHA256 cfb3a14057cf8ac907f0389aceebf9d0645a5f51bfe4275589fbbb2e2ef28bcd SHA512 b3644d55c727d4b54efd0f6f695c8b96bf6fdc0fe3ee460ac18b0f09d2ff37ffaf304c1596491fcaeeb36962bc37211068006624503e950ef618e451797171f9 WHIRLPOOL 1e3923a1e15f92efdbf0a2f38b0a7ae5503c22dfa2f50a752c37a549dc318268b3f438e04eef0337171947bedb065e3ca7d54075fa367ee5924227821380fef4
+MISC ChangeLog 2784 SHA256 38e3d61356f2b239fd0a993fccfadcaa7cf000bb7fe6a513558476a74692d4e3 SHA512 63cfdf49b06ca7204106054ba91ab88f38f2298e3c545f663acc0e60587e6ffe4cb10135732ee3e0c4be32698c8542cae6007fce9d5da00e8bebe02d72726a6c WHIRLPOOL 84102bf72f345325052e0d524764b3dfce9f4b7273461abf2e5b49a99011f3e7c4849ab9ebd8de4f4d01c10bbeec982028cbcf7ec3ddcff2303105052089fcaf
+MISC ChangeLog-2015 2763 SHA256 1688ea873152d335e7a4d44ce0c26741f2cf70a71bccf357f21f547a93e04098 SHA512 ae88315bebece9be1c9f2a34304dc32cb7228706e81f1b723d5872c9187650845968c19af9337dd25a4340c67731a47712e2a8951d56ba953458242fc70d47da WHIRLPOOL a77a884eaf89ff323a370f924b4eabd7055c6ff3a19eaff02ebb6ecd72d48ffd1c30aa4da6d673d4d8f8d7d56da1b2cba52116a75c96783f6f105365fb7f68d4
+MISC metadata.xml 338 SHA256 e88c75e1116443acc1bb36a08477b53a088700262f096b725078d03017261e34 SHA512 1a949dd9cc669a43a63ac53b3429325ab44873aee6ffa02c8e8f1abfd64d47c6645c1c4fd4a312cba81de1196abee5ceee5510e59b6637bc19cd34880ff32048 WHIRLPOOL a267b8e917aa708b5bd45012b9f9ac29c62e743d66296addb91e169f7c21d117b9284e0e2a3fb1507e06e91163d85b660a2bba8a370a7fdbbe56f732dc1886d5
diff --git a/app-vim/vimbuddy/metadata.xml b/app-vim/vimbuddy/metadata.xml
new file mode 100644
index 000000000000..0cf1ee0aac77
--- /dev/null
+++ b/app-vim/vimbuddy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/vimbuddy.vim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild b/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..8cd913f07dd4
--- /dev/null
+++ b/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: vimbuddy for the status line"
+HOMEPAGE="https://github.com/vim-scripts/vimbuddy.vim"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="public-domain"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=8"
diff --git a/app-vim/vimcalc/Manifest b/app-vim/vimcalc/Manifest
new file mode 100644
index 000000000000..7cf02ce5053e
--- /dev/null
+++ b/app-vim/vimcalc/Manifest
@@ -0,0 +1,5 @@
+DIST vimcalc-1.3.zip 24993 SHA256 16216a413f54f2e0143306ae535c620204faf255f3259cfd3f55a68e9f1c6b86 SHA512 1b377f284a7b68d200b08bdacee2080a60412e6ba1fd530eb0075dbc84fba30b37cec45e60d916aa80d057809b79f4d816f3a85f903d0e2fc7d06240dcdbb600 WHIRLPOOL b099c23e0c84006a7cb8a1f4d912aa0234a3a063b85de275948882659d75e946ce088f289e2d4b3c750f9b019d8ba15bbff2ef8642487d1ed42b53c95b5e85b7
+EBUILD vimcalc-1.3-r2.ebuild 961 SHA256 234e14ef4d0870b1b92e20f3323a5d14b55da58fd59f06e7f4d9138b2f216d63 SHA512 0f24ddf257c43c363251210adf5e7b14535672639c79201f92fb21736abb8bd2cd5a2abb2a1a2bdc144a5297d5e4ff6adb9f2515a31f0d649311c00207fc5f8e WHIRLPOOL 7063cfccb7ae49ed2e475a214236bab876a44f1640ac13f44ab202569ff5df4ea0fdd51c90c31779b4dd0c5f434787f60b7cb1419778660b4837af3f0bf28ffc
+MISC ChangeLog 3078 SHA256 e3a4d663989c21b38a3fd28fc5c9ac18661fbbaf198a1f68a78c71375f727747 SHA512 2fad1265a53f6409b72497996c5c286b3fe30eb941da14a90fde5f22385f3e55ceacb2acdaaea9058fa9491ce9d5ea8317dbca701a05c3d5dbf39297d5158469 WHIRLPOOL 36fc741473adfaa1a5812b5550cddca49dfd078fadcb27d31239d25a0ff5643b17f0d46383a1ed41b2b5800e3a48fece24bb64b92e43efb9a20cceb63cdea04b
+MISC ChangeLog-2015 1182 SHA256 3866a5f775a97a79b4426365e7f49b1e4b29a0c709d60dda77b098e319c91af6 SHA512 8af43c4794135d7906b4ab9c69fb5305f00a5dad529e20189270883b37cd7a1c887903101ed9a2e8f914823e2a210e1753f7553608aa2441e1c8bf5be8482cd1 WHIRLPOOL e58e45adc3cdfe3764312195e29c290c2aa1f4c6b62059a396cfae09df617fbdcf15d90dc2b8cbdf12c701541f14d24e3eeb19cccc759f67e7b7ef9138ce4528
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/vimcalc/metadata.xml b/app-vim/vimcalc/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vimcalc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild b/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
new file mode 100644
index 000000000000..2acd5b13dcf4
--- /dev/null
+++ b/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 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
+
+DESCRIPTION="vim plugin: provides an interactive calculator inside vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3329"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=15317 -> ${P}.zip"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="vimcalc"
+
+DEPEND="
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="
+	|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+	# Remove .DS_Store files that should not be installed
+	find -type f -name '.DS*' -delete || die
+}
+
+src_test() {
+	cd plugin || die
+	"${PYTHON}" tests.py || die "Tests failed"
+}
+
+src_install() {
+	rm plugin/tests.py || die
+	vim-plugin_src_install
+}
diff --git a/app-vim/vimcdoc/Manifest b/app-vim/vimcdoc/Manifest
new file mode 100644
index 000000000000..2cb34dc7267c
--- /dev/null
+++ b/app-vim/vimcdoc/Manifest
@@ -0,0 +1,3 @@
+DIST vimcdoc-1.9.0.tar.gz 1969682 SHA256 eee60f8b50aa4858f6668061ef0b35b81f67cd5f2114a871b14d422622eb435b SHA512 f12e6e12d481d6cf718c97aecc1619c11d5c19ef647155ed66c8c6b79f7a82ca36249e7f60aeb246404dbb31c68eced135c53247f0d99acaf05bc8e7a5679fc9 WHIRLPOOL ba65b334735a16720c6eedeaf5a075d2a6aa020e2e46adfda1a2595b2c3f7eca43266a797169678fb46a00df35c0f7dd665e3a899458edaf12cfd46caa8c73a2
+EBUILD vimcdoc-1.9.0.ebuild 331 SHA256 fc7992a8ba0db2a80c4037998a375a7f0abef01e9442f257077c149065b137c7 SHA512 24947daf81ecbebc36b2f8b1f376cb3d33619f685044c2530cd8341c24ef3f37eb44901c887ba1b1a046a7905cd688b2d3876ef37e79a097f82163633da485a9 WHIRLPOOL 9b8a511b7eca4f618ed129bae757d50e1c08957a19fb22b22f31be1aa300cfc482b0a97379b3a7df2676b1fe48400586944b58bdbde5600d963672b7e3a6b63d
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/vimcdoc/metadata.xml b/app-vim/vimcdoc/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vimcdoc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild b/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild
new file mode 100644
index 000000000000..187c5de190b8
--- /dev/null
+++ b/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="online vim documentation translated into Chinese"
+HOMEPAGE="http://vimcdoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vimclojure/Manifest b/app-vim/vimclojure/Manifest
new file mode 100644
index 000000000000..83912445eec3
--- /dev/null
+++ b/app-vim/vimclojure/Manifest
@@ -0,0 +1,5 @@
+DIST vimclojure-2.3.6.zip 44737 SHA256 7c1a9197e8ed2540c921a4e448c88d784740de891cfe58c57e19e9c5c499cd5b SHA512 daf4f691500c3b901a57849c6f07b500c49f7086e0733921f589e362a53a0d07b99eab7d6ea42f1828822942b294f51a684eec93ebab1797438da4b81199ca9d WHIRLPOOL b908cf86313cdd3521f15c2090cbb9f4f2a8a7c656ff1a152fa3707f62e1c6a49fbf6dcf2d596107e6cb2ab579f9aa3e5aec60d04fc91a8f08396bb813b43481
+EBUILD vimclojure-2.3.6-r2.ebuild 1088 SHA256 18c4a80377ad38c1e87cca543a4b4af2b3adb9625dd1c514977142594ec717e3 SHA512 5b2a640e1452d780cf0f3383426835f588dccd277c7980008051324c46af08b3345c1b6ca6e6f5dadb8553b2c3d2533ecdfe89d2a7d9d77eb875925837374ad4 WHIRLPOOL b1e0f7122a18510b32fa240b2cddcb0845d1d5c0235a869b59ed7adcf1ef78cb3853b72cb59c25b0b4ec572dc049381d1a377d7e6597fa88ffe43c07d45e1dda
+EBUILD vimclojure-2.3.6-r3.ebuild 1108 SHA256 e23c127ab7ad7373bbf2061a8cc912991bda310ad938f631c453d3fb7a041392 SHA512 eadf16aa54a26904f6b5518e85143ffe91cef9c19249cde504d9f4086c2e03367efd4094f28892e33de41564b61abf9249e7fab1e819c91f96fae0139d2b6d09 WHIRLPOOL 6acd3b0cd1064c0ba452955d7ea5f4dcb2498bb38c18f9c88ac5e4b28d083c4566165584e140f2f4a3dc1149025179077fd29d3d7603c8799be38af230964143
+MISC ChangeLog 2437 SHA256 bc4744797a4d7032d1a88a21a920cc58a02c012a688a43e8d27c49b673e4590f SHA512 6cc658a183f0cf4eceba0307d9f66dae9f5b85e929b5b481daac1489b81bfc7ccba331a1a44f14c2c6bdb261409c99ebcc68e2539729f71aa29eb24d33b221ca WHIRLPOOL c059c73ab7f1d9890ee2dbc034f1819c7dabfc2f12facab38bcac766e0cb31696516415fce3c7c46accfa55cfeccb2c3a21d92a4b0c53908600d3048dd0d9306
+MISC metadata.xml 404 SHA256 17b6b6a141ebb66021e1fd2f9bf12f08658aea277220a5e8be0086a94038ccaf SHA512 492984271208a8c95a7ea91cfe48d11c7f6c9052ac3e062e53667173e77c70e2c20fadc6dd15a953196e131a4bb810127335272595a183b84163435928561832 WHIRLPOOL 3915325007408d90e754a754d34c41f145fb93ffd9becd34f176678d5363a875d9ec16baf642fb1f2c0f19142521abe286d96fe6ee58c33371ce53cc1dd3610e
diff --git a/app-vim/vimclojure/metadata.xml b/app-vim/vimclojure/metadata.xml
new file mode 100644
index 000000000000..939141a74d5d
--- /dev/null
+++ b/app-vim/vimclojure/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/VimClojure</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild b/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
new file mode 100644
index 000000000000..70458eaecd0f
--- /dev/null
+++ b/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="VimClojure"
+
+DESCRIPTION="vim plugin: Clojure syntax highlighting, filetype and indent settings"
+HOMEPAGE="https://github.com/vim-scripts/VimClojure"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-lang/clojure"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Files with similar names are already installed by app-vim/slimv.
+DUPLICATE_FILES=(
+	indent/clojure.vim
+	ftdetect/clojure.vim
+)
+
+src_prepare() {
+	find . -type f -name \*.bat -exec rm -v {} \; || die
+
+	# Let's simply rename them.
+	for file in "${DUPLICATE_FILES[@]}"; do
+		[[ -f "${file}" ]] || die "Couldn't find: ${file}"
+		bname="${file##*/}"
+		path="${file%/*}"
+		noext="${bname%%.*}"
+		newname="${path}/${PN}_${noext}.vim"
+		mv "${file}" "${newname}" || die
+	done
+}
+
+src_install() {
+	local my_license="doc/LICENSE.txt"
+	dodoc "${my_license}"
+	rm -v "${my_license}" || die
+	vim-plugin_src_install
+}
diff --git a/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild b/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild
new file mode 100644
index 000000000000..2bf1249e8565
--- /dev/null
+++ b/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="VimClojure"
+
+DESCRIPTION="vim plugin: Clojure syntax highlighting, filetype and indent settings"
+HOMEPAGE="https://github.com/vim-scripts/VimClojure"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-lang/clojure"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( doc/LICENSE.txt )
+
+# Files with similar names are already installed by app-vim/slimv.
+DUPLICATE_FILES=(
+	indent/clojure.vim
+	ftdetect/clojure.vim
+)
+
+src_prepare() {
+	default
+
+	# Remove .bat files.
+	find . -type f -name \*.bat -exec rm -v {} \; || die
+
+	# Let's simply rename ${DUPLICATE_FILES[@]}.
+	local f
+	for f in "${DUPLICATE_FILES[@]}"; do
+		[[ -f "${f}" ]] || die "Couldn't find ${f}"
+		bname="${f##*/}"
+		path="${f%/*}"
+		noext="${bname%%.*}"
+		newname="${path}/${PN}_${noext}.vim"
+		mv -v "${f}" "${newname}" || die
+	done
+}
+
+src_install() {
+	einstalldocs
+	rm -rv "${DOCS[@]}" bin || die
+	vim-plugin_src_install
+}
diff --git a/app-vim/vimcommander/Manifest b/app-vim/vimcommander/Manifest
new file mode 100644
index 000000000000..c9b297113eb7
--- /dev/null
+++ b/app-vim/vimcommander/Manifest
@@ -0,0 +1,5 @@
+DIST vimcommander-0.81.tar.bz2 8447 SHA256 0f2f2f4c0d9f8d9207dff30c961a7f2a179fb01e6136c97e662b082889415ef2 SHA512 903c97cd56d24f9c568b863c52f69878bc3aab7f8728de38697437bf0c0697b585b1d5ac5d824d472518dabf0f2367dff24b1881742b7d28c0f5452d74c37fab WHIRLPOOL cc24b8b80b2bc750f9c22010a443d0c8ae04a2477ee34b446fd14e4be271536f6691a6b0b52757e90bfae88405141deb67619951aed672fb5ac3355ead32f875
+EBUILD vimcommander-0.81.ebuild 387 SHA256 f1f18a4c20a2484e1d829478e02440743760eb12f8d39be8b62145ebe761e7ef SHA512 1cb3f975c074004b22b511e037df0e5c6314c4d9c43dcd563642f1d683a90dbe6237b2a16d6cda1e0fa79f59433b285cb5e88fd862b55f318209d5c18dd0edca WHIRLPOOL 2c65181b0751c68cd0560a3ad2e2d263016a93019ecd56a8f50fd7225389f01ade5b0b933d19c3ad43bd87aa1c4cfaa441d20a468cc0ff383bee1fe974621bf4
+MISC ChangeLog 2853 SHA256 02179659acf0b267534f5c153165fd4a42035246f9aa97b2fa597a8335f8dfe3 SHA512 fcb2bc7267d882344a9636751941fa149a52254e96080631d600e6e42edb7e0e51cd3ec03e2bb8e26a28d8c02579fe6360c0852349500a1265759b1f903ed0ec WHIRLPOOL 48c69c57a1d4b199b43fd2c6a45add6ac29d5ff2e3c1b2e501c1da43cc1e52513c8eb01cb7f4a3ee448988aeb78b1c9c846197b5d2d39593e028ca36f318621d
+MISC ChangeLog-2015 3953 SHA256 2f8af8093963762dc295eb866e50e4c182e0afc9e38cabb29152dedc58fea18d SHA512 1af601a45b083817aec7dfc0ab66c72d0834b75ec9cd264d6d1d55bee8cf37448ebf9e445c562681f0d1e1a8fb7784a1f9e05dec7004e94930c045cd7235d87d WHIRLPOOL 8c1b658cfefda1f2b4adabbb3cd2fbb27b36c82ab3ca6aa9413a1a978358b5b82baf44e494367473e4c40f6c71da55381bc1550090fddfdf2b6fd9877968b775
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/vimcommander/metadata.xml b/app-vim/vimcommander/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vimcommander/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimcommander/vimcommander-0.81.ebuild b/app-vim/vimcommander/vimcommander-0.81.ebuild
new file mode 100644
index 000000000000..d61a775fe9f5
--- /dev/null
+++ b/app-vim/vimcommander/vimcommander-0.81.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Total Commander style file explorer"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=808"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
new file mode 100644
index 000000000000..51b54fad990a
--- /dev/null
+++ b/app-vim/vimoutliner/Manifest
@@ -0,0 +1,7 @@
+AUX vimoutliner-0.3.6-fix-shebangs.patch 972 SHA256 a40b288da6b1227b31b01c244ceff2761d7f628e8b676f7b5591b413ced049f5 SHA512 44bb6760c11a21ab817141cae5817cc4d5b88a5c94ca4e30238d9e009f080d5ae98522dcde910d5352090e7bf998ad47fa658a56bb16bb50ca905b14e5d2df2b WHIRLPOOL 76533cdad24507cf14954927c0f518b72978b7fc127a4b2d5d1dc75be687ff0ce7621b74e2a0c36c4d60eb8617d5cb3826e6a15cab566eb37d4a6655f00bc11d
+DIST vimoutliner-0.3.6.zip 249053 SHA256 54db454651152a3bd88da37b210259fb369c6a44e74824d2085a8e8ea8969c1d SHA512 20d348ff1b1b9572956fdc56b75e742b25b7deac2637fa6972a1e451edc1f679d8255847a291b84c80866a9ad8a37421524b8eb33565a1bb32ff2b75d0b68dde WHIRLPOOL 87c86930f02162e4819e8ef2feccbbbdfd31629fda9665a6ae64698b89d26663e989238ee9d1e8c360986a05c813807a2906cbe4fd9eb5f422e7b6e79723686b
+EBUILD vimoutliner-0.3.6-r1.ebuild 1271 SHA256 971599cf43c0cb9f9b560ffbc790fc2a9b87c39432e7c55d20dd51af57d56f10 SHA512 e31218e7927c424c9964412beaceb797383e38b2f114ca9732edc269f414b1b90d1e28c8e5fd00992b1871e22b3c079ceeedd67e39ff71fd0c6983d7d2f258c1 WHIRLPOOL 80ed916f164a3be8820bdc56e16a3db68bd26c7617e8b63a029b106b94800f3d327f7ab2bc06f0f7b9c59f908338826ac3e3e6e7c67f9bb85297b12f41fed50d
+EBUILD vimoutliner-0.3.6.ebuild 694 SHA256 8d1199e5bf75d2c203e47b61573505f0b18cd0329d9bd0d79329db3cf36185f2 SHA512 61b12471b3bdf1ff68ea13260c73d12df79e4a2d704758f40ebc276bb3e051c4681bf66af07b636452d28a52f0bb4168f5360e4d2deed19aaf025924ae2aacc4 WHIRLPOOL 3f68d662602b84b91ccde58f7f21ec6ec4aa6ab8540fa6e5acb2e25770b11be72be296af583fa06783826c9c1cc1822504e6dac6cf33f8e2fdf5ea5dfc7ba527
+MISC ChangeLog 2626 SHA256 9c02f844fdd1957954f98951070512db37187241f29723a0c3f73b130994455c SHA512 11e09df3af1e1574039c4ba0930899f4fa8e10c916d165eeb3dc48321d647c60eca538e8c3a45689cfe0acc341c1977b67f2c52ae38a79ba96d33d6d69b18af6 WHIRLPOOL c94c082a4d0ec008236252825b9f855c8b7a49b268dd901b145d198706feb0177e8f4b3556cdb3fd314b79d763d91d5c367db418766583006d8a9177c8d63e0a
+MISC ChangeLog-2015 3017 SHA256 ec10d10a2b30122b36ff9221ee80e43daeb8892efd027253075d5e4caa8c9117 SHA512 1df756fe3d03d19a0c7a23d94a2b1e843681dc88ad5f1d9cde1212ad0c89679f8f6c24c6fadff6d80d62ea0197bbf7cc63628729a0d20916098a506770c73307 WHIRLPOOL bdf9dcab992c82abd83858327469d9c23cf1a01b34ca3262c28df37b38d1f665747b5b7e0ae02223ff76b3f0de1923aae0bd3b93140a1f37f0dfb38b95d0922d
+MISC metadata.xml 337 SHA256 998cfda49b12bb0984ed3d32f50c96d2a6ceb7f2d02e736faaeb91d25735d0ec SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b WHIRLPOOL 98a70910cefc68814923094408c67e1ef95658b982166a7aca8304602dfe46254f85fc2dc1eba9142d8990e96c4b38c85aae786afdcb397ebf41b2b5ac5faa4d
diff --git a/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch b/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch
new file mode 100644
index 000000000000..a363d96b34f6
--- /dev/null
+++ b/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch
@@ -0,0 +1,21 @@
+--- a/vimoutliner/scripts/outline_freemind/outline_freemind.py	2017-08-24 21:20:25.138762046 +0000
++++ b/vimoutliner/scripts/outline_freemind/outline_freemind.py	2017-08-24 21:20:34.484797791 +0000
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ '''Read in an otl file and generate an xml mind map viewable in freemind
+ 
+ Make sure that you check that round trip on your file works.
+--- a/vimoutliner/scripts/outline_freemind/otl.py	2017-08-24 21:23:08.194385573 +0000
++++ b/vimoutliner/scripts/outline_freemind/otl.py	2017-08-24 21:23:14.756410662 +0000
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ # Some integer IDs
+ # headings are 1, 2, 3, ....
+ bodynowrap = -1 # ;
+--- a/vimoutliner/scripts/outline_freemind/freemind_outline.py	2017-08-25 08:07:01.985459421 +0000
++++ b/vimoutliner/scripts/outline_freemind/freemind_outline.py	2017-08-25 08:07:11.244502161 +0000
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ '''Converts a freemind xml .mm file to an outline file compatable with vim 
+ outliner.
+ 
diff --git a/app-vim/vimoutliner/metadata.xml b/app-vim/vimoutliner/metadata.xml
new file mode 100644
index 000000000000..8472d599577a
--- /dev/null
+++ b/app-vim/vimoutliner/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vimoutliner/vimoutliner</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
new file mode 100644
index 000000000000..d639684e4902
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
+
+RDEPEND="dev-python/autopep8"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
+	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
+	rm -v install.sh || die
+	find "${S}" -type f -exec chmod a+r {} \; || die
+}
+
+src_compile() {
+	local pyscript _pyscript
+	for pyscript in $(find "${S}" -type f -name \*.py); do
+		_pyscript=$(basename "${pyscript}")
+		einfo "Processing ${_pyscript}"
+		sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
+		2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
+		autopep8 -i "${pyscript}" || die
+		python_fix_shebang -q "${pyscript}" || die
+		eend $?
+	done
+}
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
new file mode 100644
index 000000000000..36ebfb95a0a7
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
+	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
+	rm -v install.sh || die
+	find "${S}" -type f -exec chmod a+r {} \; || die
+}
diff --git a/app-vim/vimpress/Manifest b/app-vim/vimpress/Manifest
new file mode 100644
index 000000000000..0b9ff4558592
--- /dev/null
+++ b/app-vim/vimpress/Manifest
@@ -0,0 +1,7 @@
+DIST vimpress-2.1.5.tar.gz 11341 SHA256 2c08753b0a022f74232b895fe73146f91795585bf2102f425c2b7773ce6d1071 SHA512 34bbf205ecc92dee4ab897bd3d3d34fc808acdd0a60eb3c3e763056aa2c0487d9423a1e5e9fe252d0da5a8ecaaa7a64a3dc406bea472942a35ada4875b30db47 WHIRLPOOL 8877dcd0ead65b5c8d0019161c46d8e846bdffb606211373de763ab2b758c814159f0ed5ef16309facd57c3c07a3b76a729f7b6a80aaadf46d38748cce82af79
+DIST vimpress-3.2.0.tar.bz2 11456 SHA256 27371c8279ee9a4f656ffa245784979bcedc8544ff68729b3abf185d172ebe39 SHA512 793f013ccc42180e095c2e8cc847719479418cc0b184688924520f0782ee27e99a7fc64e44bf5c25f2a720b19dd813a4756fc90b87c18e13766ef0ce7772334a WHIRLPOOL 63ef626d59babcdad3c9600db49d15801d1365617384d07124acb7272b9cf26e63a552710c0e3d4b23e7fe3b63f84dbe08ffbae5c2d573c8d7c036aff6180e67
+EBUILD vimpress-2.1.5.ebuild 661 SHA256 de87a2a99a9708c72e23466088c2dce239f6bb4d240376c69f835f2d37150ca1 SHA512 aea8b86b0eb25ae8503bdb2dc907973dc4363c3118d48d85f9323bce7b93c18468272008c138f0b1b230a8c13915154c6810d44718c5d89ea22cdb76d0a7deb8 WHIRLPOOL 5fbd685ea48b49899d099a91c87e3ddc1a988558e8c858dda8584cc2efcd51b3e14ffbe5619634235091bd533e94140b272ddf7e15dc9b376075075b6798593d
+EBUILD vimpress-3.2.0.ebuild 572 SHA256 ca99fe8aff44839e60f8c39da1a14b8bb11966844d0fe802866c928084740433 SHA512 9e7341b9fcb4fcc43f8385d1c7df1b28d4832e9ce8ea454609b9e22f44ca9feb1a69e9d5ce76b311ebc089cb0a7d4858e2a90a1c729bbf9e33085d95f3ca36a5 WHIRLPOOL 5ec88f0da61c090aa2d21105facaa226076eef1f18aa436601dfdbb598d5d9146ab44ae2c03fa62f750635375a2157513b1e98e4bc417a646d6c339f5ad22c9e
+MISC ChangeLog 3008 SHA256 ee6c50b6ea44cc904f26c8f26ba35c6768396e2fe302551fe24b30efb0755ae5 SHA512 5ad810e07554e67be9c779d37eeb1718ea490ad8dc883adfc450abdd2364f525296dd06076bf4870397a30c4b16e4e58f24b5caed461caef3b2dbcbdd1cfb0c1 WHIRLPOOL c5df3ad14f1bf296224c9607a6d356f9b6459d3da77d8d36de929fa3b1fb1bda8311a75cb2e2e8ad066a244efe0e953c71c8cf95aaa46db24b359de56e5298d5
+MISC ChangeLog-2015 1337 SHA256 b9c836257e74e319b4e0ab76f1ee5f31acdcf0f43df253f45c1c544eaa8f5b95 SHA512 caa6043a75e9a3a5cfca801a806e1691930cc538f443b06e161b832074b2ffcccf0199e6b76458cc4a8517dbcb976f3fde1ccdcc34f397345e47a5d3ce81f090 WHIRLPOOL b5fcd78c2a0be03db7ac6ba525e454c9757609fa3808954efd4f7dfeb52fa9e78c5a0d7afd0a57aaedf14aa37665140c8adde4e70cf15f7fa724a4901b313974
+MISC metadata.xml 336 SHA256 74bc7667113e15abd376997af98d92b1153f83af1b4527d6c4d8e4f0bf0b9605 SHA512 f2f18b31a5a60c51d7d563d8a53814625a6310ad2925ef297275a75ed5b40f475a25aa7089a0f641335e2c73d889d39e6473f224644c572ffe3118cf03fe4c90 WHIRLPOOL e4a2617c1efa167633c23dae3605ef0cc16221ec481049f0b026e9d5fb1d3c36ce0c231941643197f860bb662fbae87fc62df7224cc9c4c02b85edbee0ad51eb
diff --git a/app-vim/vimpress/metadata.xml b/app-vim/vimpress/metadata.xml
new file mode 100644
index 000000000000..11cff59d4bb2
--- /dev/null
+++ b/app-vim/vimpress/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/VimRepress</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vimpress/vimpress-2.1.5.ebuild b/app-vim/vimpress/vimpress-2.1.5.ebuild
new file mode 100644
index 000000000000..0153e0641076
--- /dev/null
+++ b/app-vim/vimpress/vimpress-2.1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+MY_PN="VimRepress"
+DESCRIPTION="vim plugin: manage wordpress blogs from vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3510"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	dev-python/markdown"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${MY_PN}-* "${S}"
+}
+
+src_prepare() {
+	rm README || die
+}
diff --git a/app-vim/vimpress/vimpress-3.2.0.ebuild b/app-vim/vimpress/vimpress-3.2.0.ebuild
new file mode 100644
index 000000000000..800fe671ea65
--- /dev/null
+++ b/app-vim/vimpress/vimpress-3.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 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
+
+DESCRIPTION="vim plugin: manage wordpress blogs from vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3510"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	dev-python/markdown[${PYTHON_USEDEP}]"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
new file mode 100644
index 000000000000..93767721cf31
--- /dev/null
+++ b/app-vim/vimpython/Manifest
@@ -0,0 +1,6 @@
+DIST vimpython-1.13.tar.bz2 4270 SHA256 1760148137c19756b62ef9ae8ca5701621bf6a14e93fff283499229bc350852d SHA512 467217ad160f02d3ecdc8c43e35966e496e6c5f99bef115bd4905795c0fd5b8f68f68bc8edd64ca1dbb1c6fbc088ef6ae996f524f0343943702f2a92dcc144ce WHIRLPOOL e95b0827c7553985be857a1ac86f70db8740939e8b315fca82506cb9cd0b240613ce6b5892bb87889eba9f29f040910ece07d8b8edafbe182dff4b932080c743
+EBUILD vimpython-1.13-r1.ebuild 384 SHA256 ec2af4d6bd7b94d932e26763ec1f8b686557b48e4494b978561260c3e7c4d9cb SHA512 e784eba4c97b9eef12ee03f0d6893c720ae2dbf8890f52725345677a3c37973961567d235404bff415d32af92853fcdb6707261207282e41736f4285edd3d9f5 WHIRLPOOL 87e760a3773ebef9c22a5744164e97df7dd5eb96867f695fc0ea11921a97ba9a369bdd721d9a0e7f99336fe60dbb88c78af47992f9b27954113f4e899921b433
+EBUILD vimpython-1.13-r2.ebuild 488 SHA256 340c5448957c1bcd1a6c53a1f13caaa210f6479902aa882f3cfc18e0d322ed7d SHA512 aff9fa6e247342f57ebe4209a902b8b1d26cbe3145d98597c9bc75190d132474c5fd1422a05285b120b0d227e89f66e2a038a57ac334367333a6a089a0af3cde WHIRLPOOL 1640835b806d6ab3d4f8e2be1bc94a27011ce5f117c3d5c60f71c8fa6d6f32e3344626b89664c9d8ee2f97666602945da36c1e5b3e1c8c86e4482124d72032ff
+MISC ChangeLog 3206 SHA256 e21fc9044c78b5416e5b0a94a2f0822f0d2719e3aa6d53d3efa6157f3364d383 SHA512 7445afc2c06f4dfcc171e0c65e540516ece89ff886e2c0e397d0902dae9c5b5b9ea38966a2a80d0aa3a516d3cce88b78f488c2e8816a188c8537edd06da5db24 WHIRLPOOL 18a213f281bfc4de762a98c95f55d5c965fa5d11b8d06113eb38bfbe603cc1316f8ad78f41384ed3e67d3881045230a0f7f5ff279139c444b51d84487d5e92e6
+MISC ChangeLog-2015 2807 SHA256 e59dd84c75a5065004c9c0da0e649bc82d479218b54b7772b786f102a22a72b1 SHA512 2f69521085355c6c54ceb942593958271fb4c06d3c731d28559371cb1b8f65d294c26016cc25ab1a47d919203410f19030a1eabcb953345427ad1dae5fdc743b WHIRLPOOL b9a4fe5ea6fdd13db8219db03ddb4b2276100896d1811d05541ac4147c9167170079fe57b48224f22539dd80163b7735284c9cefe28e1a02c49ce02c05acb462
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/vimpython/metadata.xml b/app-vim/vimpython/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vimpython/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimpython/vimpython-1.13-r1.ebuild b/app-vim/vimpython/vimpython-1.13-r1.ebuild
new file mode 100644
index 000000000000..bd653c8a3cc2
--- /dev/null
+++ b/app-vim/vimpython/vimpython-1.13-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=30"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/python:*"
diff --git a/app-vim/vimpython/vimpython-1.13-r2.ebuild b/app-vim/vimpython/vimpython-1.13-r2.ebuild
new file mode 100644
index 000000000000..3f5071ff2c8b
--- /dev/null
+++ b/app-vim/vimpython/vimpython-1.13-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=30"
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
diff --git a/app-vim/vimtex/Manifest b/app-vim/vimtex/Manifest
new file mode 100644
index 000000000000..f395c85c92ff
--- /dev/null
+++ b/app-vim/vimtex/Manifest
@@ -0,0 +1,4 @@
+DIST vimtex-20160324.tar.bz2 95040 SHA256 4afc63478fc6480bb2240613efef89c498806be5b17383edf3f2e5ed3c1f11c0 SHA512 0c0d2a95f3b62239f47113f5b8876728d6d9fddf7e526477e92ef1f09317cb607ddd3b2aa07f6e8bebd357308adf21e4c353795952dc30372b493963bd0554ff WHIRLPOOL a7bb550a7ebf4f3b9395d44620e883c91ae238729b0cdc912baf4a83fd95f0ffc145edf0c2b34a6b08ad6953467e0610ea8e57101d5ad188c0349d87ff1345cb
+EBUILD vimtex-20160324.ebuild 427 SHA256 af15d7bfeab0fc2d34084eab1ea1043864f6c1443ec76c9c63d216e71118b8b1 SHA512 6445a566b4cee4841ce7c40b96610d4b3e5e3f60e4eb35aac6e525c2d1b7ef9d79c6281e00f2e5fbb7d0f230fc5109e221d35769d4a957f21cf36d95767a379b WHIRLPOOL becdf652ea348c7e5b6b44cadd270862dcd7dec400fc0d0f09dd760382103f6d1b31fd9b4cfe6ff0d8c9f12e0f437a070fee6d9481139e574e2e56b5472d4489
+MISC ChangeLog 275 SHA256 c9c2cadcea62380351d74dc49c7261ff151eb6c556b57405f4ed9c66dd015e2a SHA512 c955537c33c98425852088e938f88608613fec2ce0444d1359014af868164da1f335899f7e0a893af56106be510576ca3bdfc7535e58f967ec29f640b21eeab7 WHIRLPOOL 57553862e45dc637554a90e69c162bb4bf73bc564e9021e372efe775610ca3d69cda073ecd750f940c26d4c85f912bddb7d849d4846bc0ff2dca3090a30db2f6
+MISC metadata.xml 337 SHA256 fed729d7a56d64c63c7ccc7c8e02339351339d4de92e4a6919d6ee7c4de39327 SHA512 d2be801e0e552815e32e818ed13172288ebaa4505d6074dcabfaac760fab3227d019e4ddb8610062ceb5680e8b0cd543bd169333eefc80cefc6f5bf790801a0f WHIRLPOOL c41e17efea74fac6fcae98262fe7bacf552bdb2a847ba1b837fe88fb2d05a7636a22d453c67834db80428abea8c3620ec49512b5d11d0b65e69305af4f5b215e
diff --git a/app-vim/vimtex/metadata.xml b/app-vim/vimtex/metadata.xml
new file mode 100644
index 000000000000..761c713e285d
--- /dev/null
+++ b/app-vim/vimtex/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lervag/vimtex</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/vimtex/vimtex-20160324.ebuild b/app-vim/vimtex/vimtex-20160324.ebuild
new file mode 100644
index 000000000000..3b8069b4db5a
--- /dev/null
+++ b/app-vim/vimtex/vimtex-20160324.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
+HOMEPAGE="https://github.com/lervag/vimtex"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="!app-vim/vim-latex
+	virtual/latex-base
+	dev-tex/latexmk"
+
+src_prepare() {
+	rm -rf *.md test || die
+}
diff --git a/app-vim/voom/Manifest b/app-vim/voom/Manifest
new file mode 100644
index 000000000000..85122fa2303e
--- /dev/null
+++ b/app-vim/voom/Manifest
@@ -0,0 +1,6 @@
+DIST voom-5.1.tar.bz2 102211 SHA256 2af7f5589606ecb214671fc817aacf599f3bb39e38e295ff76891839b161e931 SHA512 3798c6d5079ebdf4f447f62613340e46a6b593e0a97226b0aecc90889c6cd2f6f2ce36eb88395a12a0e27ff3803c7693f1c56443928914bfea134d8a75df8c91 WHIRLPOOL 4c96caedc4413487c6fd213c62315334c9e8bc2707455413f0c39d297576d076bddc6a5cf99a99ecd40c55b453f370e8f021402c5139607cf55f79a7f3e153da
+EBUILD voom-5.1-r1.ebuild 570 SHA256 377206c69eb0e03aaa73e1824f70fd5ad6abb4169b32d486baac966230c7e8bd SHA512 8c63d6482fd262aaa75ce97930efec78b5e97699d719663a31203e277a5c8b4dbfd3b41a6dc2d4179abef6170ba56d5d0b416d8c14e17c725fc522bfd898a588 WHIRLPOOL 76247347a9aebf5159c8f14703176ab4e836ec9628c728658fce7ab349c77ecb89954ec701ef8831f0b687edfdfddf6a0888d09526fde37ba747d89e9b2e4cf6
+EBUILD voom-5.1.ebuild 429 SHA256 83c543c53a874ec9c2236aa0b9d9bf81ec2476a12aa2835b502a9afe60bc1dbf SHA512 9e82948a27e24d4d16324c124d7537aad601d93425cb3abc079b84e1c4dc9afa2a40194ce57ad0a7c52893986d6d31dda4a4ee0e5b661c09dcca0fbefe441c00 WHIRLPOOL 03d7fb9e0718a5ff514c66b89784c98b0020c6286d481035bdf539089223a53db4ffd0db1f8a82c2a82324e19eeeeb66a909409e65683ec7a79f4c56d4710e37
+MISC ChangeLog 3064 SHA256 2cd49167b1c125549934eb42965ffbf58888c84e2fcf52a20958efa36f851b9b SHA512 c8e2cf31199234a77d5fc17408ac482150d2afea75669faae304154d41aa09d7070949e4ce891e9bd4cece454ae4a6fbdfd52da9cdf7e0dd49c423ede4932f2d WHIRLPOOL 3f7084768bb29a9d47a3498d93a046a9ec652ca401b846088fc4cb03cf7cebce99a1e25f85a6ef471d2c7048f3ec18bb748b1b9723eee91602fb273d8eabd23e
+MISC ChangeLog-2015 771 SHA256 2da3be9478034d262e0eafe8147de3a3657486825616484e9c74af0e2a11aef3 SHA512 83025eff6e006ba761e773261c94343928353f944f2a28ef8d5bae85b9e6767eb07c3403785c03d34502061e2d36e39d87c32f078bd87a9e074170fbdaf3fda6 WHIRLPOOL fb4bd9b9d33bfc5adf270cc0c9e5de4aa3c7844c5e4b8bbd9f5b9563ff64d0550b2952428d02ec0a6150cce8c4f7f617d20c3bc256c13aab3e75d66401eb9417
+MISC metadata.xml 245 SHA256 a8b1695a5ced5d18651f2c27eb007b4eaf4af0a421f0cbc21e2be1d9282d9e62 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2 WHIRLPOOL 5bd04d29b34b35ffc355cf4fa5048b94bea046b3bcd327674a05c25d5ad3f8a131a1ba4c06e0f897be0037df160acdb82303be1c89057e7ed3586d0bd493a47b
diff --git a/app-vim/voom/metadata.xml b/app-vim/voom/metadata.xml
new file mode 100644
index 000000000000..f1abc6411341
--- /dev/null
+++ b/app-vim/voom/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/voom/voom-5.1-r1.ebuild b/app-vim/voom/voom-5.1-r1.ebuild
new file mode 100644
index 000000000000..b09489346009
--- /dev/null
+++ b/app-vim/voom/voom-5.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: emulates a two-pane text outliner"
+HOMEPAGE="https://vim-voom.github.com/ http://www.vim.org/scripts/script.php?script_id=2657"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)"
diff --git a/app-vim/voom/voom-5.1.ebuild b/app-vim/voom/voom-5.1.ebuild
new file mode 100644
index 000000000000..74b2d2e811b5
--- /dev/null
+++ b/app-vim/voom/voom-5.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: emulates a two-pane text outliner"
+HOMEPAGE="https://vim-voom.github.com/ http://www.vim.org/scripts/script.php?script_id=2657"
+LICENSE="CC0-1.0"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )"
diff --git a/app-vim/webapi/Manifest b/app-vim/webapi/Manifest
new file mode 100644
index 000000000000..9aed6459fcff
--- /dev/null
+++ b/app-vim/webapi/Manifest
@@ -0,0 +1,5 @@
+DIST webapi-0.2.tar.bz2 20690 SHA256 ab2c4a6f693e04787ccb9570e22e512cbd0f8011e40b559fb1b728c0f960cc24 SHA512 ca513053c361041bfaeeea11a0bb70c8e6e011985dc5ba801c654f919dd7d94304b6ff475ce49525909b575e7cc0d9233b56cab2326adc6a689e05c5faf4a3da WHIRLPOOL 13f22c36f930ff2d6d507b61b7873a0aaeac9e274606c731355f16229fa98fedaa99aa6b2555d64a91fa7a4e0547a53990433f9c59a36abec328662120460000
+EBUILD webapi-0.2.ebuild 327 SHA256 3af2155a5eaf450e67d742bb54dbbb411d7197c0143fb854e40813a58c8dec15 SHA512 798d1f2893f5360f8363ab4a368f031072f5f420e29f30a4307da7ffa5be5ab84b2a33e2a53b26d2c31063d7e47262c67e1266ef98e4138fdc0119f76c185ca0 WHIRLPOOL 699f898f72662fb70924a66dd43475c84f0bd10dd9ba38f6eb5d36cf3f6b99b38beee7e28ac9b938b9fba55c1b58adb724e89e54c26ec635f23e1a12261fc231
+MISC ChangeLog 2801 SHA256 bafcd326915d3d4189a9362ef7c4ef45b504ca37bca36fee1595f079fc19a72f SHA512 a831c5b55e29cb5acacc1c32cfb2429b625b1fd96924d869f4b2e91822274a6376ee0deb5220bba88f4a752af52461d563ad8c31046f10f8307e29890ec62d35 WHIRLPOOL 8ea2b9e093977dca93fdc6a8446896254f280fdd25c544cae0c2041e4bd74dcae70fdafd8d82ae14cec867264c309d666ad4fe96115df9bab45e4f4e06517eb4
+MISC ChangeLog-2015 592 SHA256 455d98c4ec407c5dc9a25db3fb3a9313fd178ff89fcc28d6983a1c4b97ad889f SHA512 4de41474104056d33f87f3d5174552926a877b67542e6ff05d22eddbf49eda890f8738d36648188e2501f9612c4b08e703d93cee9a84d38319210ff2ff1e1f51 WHIRLPOOL 2b3063ecb5cbeae6a78842f31607fc54274207e1caadce371b4779f1eb45813059e23bfd8d5dd2d462c82259e817a3d042e91fbdda18063499f0d2220e3ec2a6
+MISC metadata.xml 245 SHA256 a8b1695a5ced5d18651f2c27eb007b4eaf4af0a421f0cbc21e2be1d9282d9e62 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2 WHIRLPOOL 5bd04d29b34b35ffc355cf4fa5048b94bea046b3bcd327674a05c25d5ad3f8a131a1ba4c06e0f897be0037df160acdb82303be1c89057e7ed3586d0bd493a47b
diff --git a/app-vim/webapi/metadata.xml b/app-vim/webapi/metadata.xml
new file mode 100644
index 000000000000..f1abc6411341
--- /dev/null
+++ b/app-vim/webapi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/webapi/webapi-0.2.ebuild b/app-vim/webapi/webapi-0.2.ebuild
new file mode 100644
index 000000000000..0fa081bc7874
--- /dev/null
+++ b/app-vim/webapi/webapi-0.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 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="http://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/wikipedia-syntax/Manifest b/app-vim/wikipedia-syntax/Manifest
new file mode 100644
index 000000000000..2743bfd52f49
--- /dev/null
+++ b/app-vim/wikipedia-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST wikipedia-syntax-20101113.tar.bz2 3463 SHA256 7b8d87d1875725eb766bd6f33710e63c3ca9e79ec7a3d95437ee08b8ca97b4bd SHA512 e0e52d4cf6e6e5a3f6cb32b0dc22c91c6b3b58292f1e0d67cb4de4ed2675d7f6bbb069d37e6a59b0cfad201c082322e3cb5300639e39447bbcda22d99c88b4b4 WHIRLPOOL 42ce70408b0ee04315496479873a2759091b634184ffa4b4a0542b56dcb63363df3846adb8e606d851d1939060fa2247c3eb949d7e74868c8b79c12e033133f7
+EBUILD wikipedia-syntax-20101113-r1.ebuild 501 SHA256 982046874c243f3c31a5a0909508d0bb485c537bbc6c4a46a6382fa422afb1b3 SHA512 13b9c316e4e5c3a935232d0e2a54cc205439f6f73be93fb57037c4e6e8c1b82bb380db589ed50e0aaebbb763fbfc5daf95d051c9697b2b7a03b3749dea895a41 WHIRLPOOL e21bad977f544a317f599a87788cdff163b02fc58d83b370547b892c2fb52eb3f3ce693e02e49605d4bd4025dc339d4004fb20e11ff013f19be2b84b44df777a
+MISC ChangeLog 2770 SHA256 e69c21cad686dddf8d930bc6fbf5b13dafbc0cb4f41b7139dd6cf163849a2e73 SHA512 28430f6b45069c34274538bdf2527223c8ce8fd70f9d2eb8a50eb1ee3b0ac92e56aa4a316ff4ec7d826ee1732d28f1144c62add10f8b0a2855e59832324e1ef6 WHIRLPOOL bbbf9b5cd6ce6e91c2b8a129da6a8acaca4ea4c1c2b6646d65989ec4ad154f1f2d5d418b5cbc646c3a7157ddbe88b9d356c900d81ed33dc828cd3fe1e3df1feb
+MISC ChangeLog-2015 2937 SHA256 6cfe53cfbceb1dc83a1912db4010f57ce56947895d04ce32244bfd14ade70989 SHA512 ea36a364650b8c7c317d707d325898e4411c129a8549be9e6edd71061ccdf805855f7587a5a46f9a451ea1f4fcee26a756ebdb4fdb29d2e23cbd405163bf7dbe WHIRLPOOL 2177b40657d35c9912040dd7915073cebdf5d93df706f87fb974b358d3f642c2b42ce6708a1c74e98c8f708112757d3a87a5b6e3a8c61d29f1368c4c401182cf
+MISC metadata.xml 441 SHA256 c58397d61bcf608230d675dd4c016b5ab35fb905d4936103e3c6f277601968b1 SHA512 46bd57e33bc8214c4823ea84d1cebe83a55e7bc7b01e67d88fca2bbc3bf2e2eebad2041a76b6a70702e51bd934723b5a337f326ab33970a534b15e46c2177c45 WHIRLPOOL 79e3d2b1872438900284a0241b6d8cdb598f9a6889fd2c5e2b5f80791c41335cf346d1278e85b237d87f27d9323aa46f9d2c04e9171a988357f992e31787b62b
diff --git a/app-vim/wikipedia-syntax/metadata.xml b/app-vim/wikipedia-syntax/metadata.xml
new file mode 100644
index 000000000000..9f257c75a967
--- /dev/null
+++ b/app-vim/wikipedia-syntax/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package provides Vim syntax highlighting for Wikipedia
+		files, and automatic filetype detection for these files based upon
+		filename.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
new file mode 100644
index 000000000000..2d5a786a30ae
--- /dev/null
+++ b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
+HOMEPAGE="http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
+LICENSE="CC-BY-SA-3.0"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Wikipedia article
+files. Detection is by filename (*.wiki)."
+
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/xquery-syntax/Manifest b/app-vim/xquery-syntax/Manifest
new file mode 100644
index 000000000000..65cec2f0d09d
--- /dev/null
+++ b/app-vim/xquery-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST xquery-syntax-0.1.tar.bz2 1552 SHA256 b1939738070242ad2d7448b7cf4203e63afefce9020f61cc0b3280e99b9bd448 SHA512 277503e2d7089702c58b2e04a48345e579b6cfdee5042da90e8401b914c1d515c811cbf71f6dedbeee4a21e7a4807bd0d694323ddb2bd6b9437edaaba5a0f2fd WHIRLPOOL b2d332392183ae3d8b1aaa9a63665a8d9e55aeb3c900abe285c66297edaa5b1df8ab5eee9d1b3e53c9c8e9bdfef86b4b5916a840759fb5250933ab6fdf14e915
+EBUILD xquery-syntax-0.1-r2.ebuild 583 SHA256 a10a14cd23eb2fe5bb640bb3239ff882facbad87efa6bdba5bf469996add948d SHA512 3b6e1d7f5fcf7a9c5871179f7543ff62f45dc4be189d82f0d3ba69e367c1c4ea2951a1de544e9c7513586f22a55b92c5b5177ceeccd39513433381952bc8baea WHIRLPOOL ac513fd5b1c5741482620e35be81e305867b62fcfedeb34639304625f8bf832bb82bef022eb23c88cf2bf3bd2ead5b2b32a44e36807b339f4617e06012152a27
+MISC ChangeLog 2980 SHA256 688824dd4e7c6014ac5b2857086ec4d4d846fa9209601c00398cf7fbaad86beb SHA512 4dbd999af274f4c51d2707f947a559ca80fbf794d24f012f9820210f567102c6a87af19aebc1e4a1ed2a9de8bf7ae21137b4ed6f0d173061c01ed92f28160a8c WHIRLPOOL ddb16dd92b403395731111f7ce439b4b8cc57e80d8bc0fe61a945178373cbfc73003ee82946c6eb97b32070b605c67cbd8f7d943a0a5c5c705c0e3f95fa8256b
+MISC ChangeLog-2015 2246 SHA256 e19282d0de31ee241ac1986147da3cbf5dd90e8e00740d47b03cd0fd1e61d345 SHA512 ad8401de252fcd0ee51ae705749a5761da195909307b9afeec68a319ffb80cf87f548e511108d4a48d3598bb2f4120b572c75b0d8ce26d210053b91a4857d16e WHIRLPOOL 0dd4fb85fdb4a05671c9fbb1d012d33b1f4dff06640ee19eb48bdf84bd9fb595588aa31e6f365e1244ba8a0f5370b42fabe553ab5be9bdb067e695dd24a645ec
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/xquery-syntax/metadata.xml b/app-vim/xquery-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/xquery-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild b/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild
new file mode 100644
index 000000000000..a20ffecdbfe6
--- /dev/null
+++ b/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: XQuery syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=803"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for XQuery files."
+
+src_prepare() {
+	default
+	# use hi def link. Bug #101788, bug #101804.
+	sed -i -e 's,^hi\(ghlight\)\? link,hi def link,' syntax/xquery.vim \
+		|| die "sed failed"
+}
diff --git a/app-vim/xsl-syntax/Manifest b/app-vim/xsl-syntax/Manifest
new file mode 100644
index 000000000000..d8c74831c343
--- /dev/null
+++ b/app-vim/xsl-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST xsl-syntax-0.3.11.tar.bz2 5770 SHA256 ad4e5eefaf8ba7ce7bb6190d263b6331164d379831f33a577ad32ad9c6937155 SHA512 e09f0f6ebe023a681560a12e919c9573abc2bf0f1a6fe1bda233ca296fa4fa81bead99aeb7eafb387f04e199f7601d8ce6593c767be1b3e94ff73135ea0f4361 WHIRLPOOL 5a5e004bb941a215cba37c3d63b77c0d238f03c3333b253925c81b70df3899c723cf3c06d9ea848cb21cfed5f6d8ff37d0f9ee04f0a86bdbbbb4a48e40570c1d
+EBUILD xsl-syntax-0.3.11-r2.ebuild 563 SHA256 ba25ecf075070a859ec0a4f716f193c5d41601831c98d5f01d26a2a8186e23d2 SHA512 ea78b6bb527e032601c32c12e5f7f51575144fb823d88c4b89dccf14d408fc51353c35b2ada7928eb5fafe1fc53ad9f765404a879f9efacaac308ab9aa5f461c WHIRLPOOL 2944cd3d5079b703e737d6ac20a3eca7e46396e4d64b9858b0b048ac8b200f2da4c99c36bc3d4594ac2c9d1780bdaeb3c3c4f3abd213123c09bb8e722e1a40d4
+MISC ChangeLog 2977 SHA256 6aa542c0d730f7b7209c20d0c5e7adfcc8f293b2d8683423f2f9d4c6965bd74a SHA512 1c23fd7dc6fe5062d721788cb20d1a472f2e752ee8ab5cfba67c1315c57aff575f84261a56134e87dd10286117f06352ba774bf2808f222185b746c2227e2cf4 WHIRLPOOL f12ab8341cbfcea9c5328e20794e5bf9c6b0ca6287e44423ae5f2c5ec9778502d33c08a0081b26ac08ae2cf1041163046e7737be8ea2318ed558428b96bafe4c
+MISC ChangeLog-2015 2986 SHA256 35b19e539bf5b37dda30fc51301360a14fd404d9dfd3a55f3448d9c4c7f8e670 SHA512 f55b5334963c6438148f27be1612f4a9c9b748a0e1f61113808beb38984913fe6ce8a43f24d2abae6b47b0d9bf6146aae2da24e6ab75156eadec7667231fe60c WHIRLPOOL a74d21e0b21aad915ac69e8094929c184e2f2959678dff26cd0d58d0a0f03aab2785fb8361f1bc455ddf1a52d5c9e8742a8faeb6072d8c3a8f8ec5de6953fdda
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/xsl-syntax/metadata.xml b/app-vim/xsl-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/xsl-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild
new file mode 100644
index 000000000000..3776c50a1256
--- /dev/null
+++ b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Syntax for XSLT (with HTML and others)"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=257"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=257"
+
+src_prepare() {
+	default
+	# hi link is evil. See bug #101787, bug #101804.
+	sed -i -e 's,^hi link,hi def link,' syntax/xsl.vim || die "sed failed"
+}
diff --git a/app-vim/yankring/Manifest b/app-vim/yankring/Manifest
new file mode 100644
index 000000000000..c642ebd74758
--- /dev/null
+++ b/app-vim/yankring/Manifest
@@ -0,0 +1,5 @@
+DIST yankring-19.0.tar.bz2 36512 SHA256 0324b0da275d16b2f3fd817cbc8196ff9829b3675743027c19f7f7faf4904a31 SHA512 714d619e572f739c6d02b32d1da1ede449dccd45c4a74441c4806df1c6fdf51033da84412534dc021b0d082f72925ddcd9b29b5b0b1afcca34a79d0133263b18 WHIRLPOOL aa7bbd1874a760742428c3fdb6d1b4d30f160b5f2d8b2cdb6b9403a0e05cb3bcd7d221ce96ae91a2cb8f246a591c69a1bb6cf1894fbb55a319647beb4ab6b57b
+EBUILD yankring-19.0.ebuild 343 SHA256 c30c9eea2aced9a07088b4190b10a30ce878cff4cd8d875bcae2ee28a2eae52c SHA512 345e7ea47b74102b75527cf1d6bc2d75d8a5c43bc783349950730f995a38e106ebd1a3dabaa91d02fe1fb3259940bee0306b734b197f8af91a9216d51a461ac3 WHIRLPOOL 1658b58821084238a11ce5584ef2e4bc2aec8ca082bc93bdd031abc9d438557a88f8de5bb034da8c229adc3562baaccaa935351c9a028cb3196ba22cc13c9f6a
+MISC ChangeLog 3177 SHA256 74342b2862e48d8948d175a5cc1aa103129fc1cba987c5c6aa365fb3d42166ff SHA512 346d67b9d7151deed113a81fb34b525f7bd7683b56464ae97c514e160cb9ef9959a3caeed5e45d5b7d37dc2743c008fa52b7f8e300e04ee7051a707c5c7eb7f2 WHIRLPOOL 0ae0ff6829c7233c483cfb675c99464088a05527880be10d91e0c9b817afb80993dfd39c936872d810eda44b9a916fd8c550cada796172e9b5afe3ec9ce064e4
+MISC ChangeLog-2015 1047 SHA256 b43b8a26c67f68c53805b47cc85f00ac68916050a15e8578d696f8d9854b4a16 SHA512 b6142d4ac21148edafa9b3b58a0c708475fd19f8ec913b2420528bad8155d3a94aaf873797067d340fac30e70257a20ddf491b70605462ab36cad049d2bc2478 WHIRLPOOL e7e488b189760ceb9e62a47855d800eb81e0416b97af4efa1eacef3de5d940ba5cad229a3d57f0ea0b2698bc7463ce34234a8141217b7500bc9e1672355db51e
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/yankring/metadata.xml b/app-vim/yankring/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/yankring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/yankring/yankring-19.0.ebuild b/app-vim/yankring/yankring-19.0.ebuild
new file mode 100644
index 000000000000..1877e6a615e2
--- /dev/null
+++ b/app-vim/yankring/yankring-19.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: maintains a history of previous yanks and deletes"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1234"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
new file mode 100644
index 000000000000..58226557d7a3
--- /dev/null
+++ b/app-vim/youcompleteme/Manifest
@@ -0,0 +1,6 @@
+DIST youcompleteme-20130910.tar.xz 2340104 SHA256 00906c92ba3c0f113c73398997008d9c8b3f31d617f5da233f25174a6d488bac SHA512 c1022a27ced00e8ba8e9aa25029a0032805331cf0f80342aaaf9d7d4ec7780a098ffbd315068f19f6c98b00c4b4b43e59c7fa40070057e097ca40f6398b53b6b WHIRLPOOL 867c3f0c08473246c52377bdb9ac52b96af1d1b3a970cb087784e54082afe19e6549c54bb37f460d379b5fac8f5f7aa4bccb1e24b0984a98c08750469ff518c6
+EBUILD youcompleteme-20130910.ebuild 1880 SHA256 3045f2b7cb084ec65ec2c085730e17c5dd21c2fc0300bf02603ab6417b0536ab SHA512 03089f783e771c95be0cc435d3a30b8d57ebb44731f15f961b6ea68ab030b0df4a1cd90e21423470c6634ed3f3295af5cf6b3ca174c8cc2192046899f94102a6 WHIRLPOOL e1f89501b9c0ce7a3cd0c2e00333fe7ed0e97cfd8378efaa92a015be72beae46349bb313e7b10761565bad7b5ee87b69e726bc29da2c69fd49dba896de3ccf64
+EBUILD youcompleteme-99999999.ebuild 2879 SHA256 c1b097d51b1b125b816c6da847c94cb4939bb6fabc60c49d778c0b9d3dadb0ef SHA512 a4eacbe291515bf00a934cb82ddcf0fe1fcda085d08b5ce9e4508ab8ccda92764f8b41912b4f6ff38ba3cd2bb649f106e9fcac769257c5e83d0f13f7ee8f49d2 WHIRLPOOL 20d0c47f6749aab1249baca9d24b244ac1c1d5a9efcb774c3a8b10f3e7666e342287a6c5b8a0f17ff28846522e19dc4b68bdb7f8ca3e8513674d63a714f19f84
+MISC ChangeLog 3053 SHA256 3f209be036eaaab8d1d5825a48d025495d2b56a6128a004b97efa35f229e5539 SHA512 b55b31b581070e8300c1e56b4334cda12162ccfe9e193766b75663f5dd6844ebf3ce9c86943aaa969acb3afc0ed994f13c5e52080baca5fe781d4339033c081f WHIRLPOOL 32d821345614c54cb24a86ffd327656321402820bd753d18d879f7a0ab7c1e17e7efe7a4a1edab2e1ea48296fab44ab9ad627fe684fe3b840d9a5d01e8fec178
+MISC ChangeLog-2015 1263 SHA256 34e8c4495f1a581c0f6506706b2613176e1a9978c0d51fc2ba3a75190df9fc82 SHA512 eb3ed3bfcb74c803044023f9eb8a1425c8d362930387cd2ad10a46dcbc5f6fe8a1ec016915f7de3294b62a2fde0e4a10e8249edf49e64ee40b69864d719d854e WHIRLPOOL 0850eb329d95a1f48b2e449ec41552b1d685e84daf4b54548c59dbaa7fed9801bb63408de968acee985b998c4b8a038c8b272fcf0b36d6111e169aedf8fca586
+MISC metadata.xml 372 SHA256 e3dd72be40b227af12daab42f7c3e887c7cf5f204833873384a155e8bcd065e9 SHA512 3afacd989d495928012e5a1b1c2bb6d14209cbcb1e347a24c1c0881c758642cc8457ee7b6202b8d129e3f08dc21492792715fc5452f8ffc33f719da9a447fdac WHIRLPOOL 2f70b46a70e97e9f8ecec4bf6d5fea40669fa1f92335362a45321f8b3f414228faa2d4152e52846bfbe92d1d659086d1f34bf42970d206a27fcbdeaefa4c9ea9
diff --git a/app-vim/youcompleteme/metadata.xml b/app-vim/youcompleteme/metadata.xml
new file mode 100644
index 000000000000..1b0669747edd
--- /dev/null
+++ b/app-vim/youcompleteme/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<use>
+		<flag name="clang">Enable semantic support for C-family languages using <pkg>sys-devel/clang</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
new file mode 100644
index 000000000000..fae51f91ec97
--- /dev/null
+++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 cmake-utils vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
+fi
+
+DESCRIPTION="vim plugin: a code-completion engine for Vim"
+HOMEPAGE="https://valloric.github.io/YouCompleteMe/"
+
+LICENSE="GPL-3"
+IUSE="+clang test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	clang? ( >=sys-devel/clang-3.3 )
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_USE_DIR=${S}/cpp
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+	if ! use test ; then
+		sed -i '/^add_subdirectory( tests )/d' cpp/ycm/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use clang CLANG_COMPLETER)
+		$(cmake-utils_use_use clang SYSTEM_LIBCLANG)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# TODO: use system gmock/gtest
+	cd "${S}"/cpp || die
+	emake ycm_core_tests
+	cd ycm/tests || die
+	LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
+		"${S}"/cpp/ycm/tests/ycm_core_tests || die
+
+	cd "${S}"/python/ycm || die
+	nosetests --verbose || die
+}
+
+src_install() {
+	dodoc *.md
+	rm -r *.md *.sh COPYING.txt cpp || die
+	find python -name *test* -exec rm -rf {} + || die
+	rm python/libclang.so || die
+
+	vim-plugin_src_install
+
+	python_optimize "${ED}"
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	[[ -z ${REPLACING_VERSIONS} ]] && \
+		optfeature "better python autocompletion" dev-python/jedi
+}
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
new file mode 100644
index 000000000000..a0ad8cf03db7
--- /dev/null
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 cmake-utils vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
+fi
+
+DESCRIPTION="vim plugin: a code-completion engine for Vim"
+HOMEPAGE="https://valloric.github.io/YouCompleteMe/"
+
+LICENSE="GPL-3"
+IUSE="+clang test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	clang? ( >=sys-devel/clang-3.3 )
+	dev-libs/boost[python,threads,${PYTHON_USEDEP}]
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/bottle[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sh[${PYTHON_USEDEP}]
+	dev-python/waitress[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		dev-cpp/gmock
+		dev-cpp/gtest
+	)
+"
+
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_USE_DIR=${S}/third_party/ycmd/cpp
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+	if ! use test; then
+		sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die
+	fi
+
+	for third_party_module in requests pythonfutures; do
+		if [[ -d "${third_party_module}" ]]; then
+			rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
+		fi
+	done
+
+	# Argparse is included in python 2.7
+	for third_party_module in argparse bottle jedi waitress sh requests; do
+		if [[ -d "${third_party_module}" ]]; then
+			rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
+		fi
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use clang CLANG_COMPLETER)
+		$(cmake-utils_use_use clang SYSTEM_LIBCLANG)
+		-DUSE_SYSTEM_BOOST=ON
+		-DUSE_SYSTEM_GMOCK=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${S}/third_party/ycmd/cpp/ycm/tests" || die
+	LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
+		./ycm_core_tests || die
+
+	cd "${S}"/python/ycm || die
+
+	local dirs=( "${S}"/third_party/*/ "${S}"/third_party/ycmd/third_party/*/ )
+	local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}")
+
+	nosetests --verbose || die
+}
+
+src_install() {
+	dodoc *.md third_party/ycmd/*.md
+	rm -r *.md *.sh COPYING.txt third_party/ycmd/cpp || die
+	rm -r third_party/ycmd/{*.md,*.sh} || die
+	find python -name *test* -exec rm -rf {} + || die
+	egit_clean
+	rm third_party/ycmd/libclang.so || die
+
+	vim-plugin_src_install
+
+	python_optimize "${ED}"
+	python_fix_shebang "${ED}"
+}
diff --git a/app-vim/zenburn/Manifest b/app-vim/zenburn/Manifest
new file mode 100644
index 000000000000..fe370461caaf
--- /dev/null
+++ b/app-vim/zenburn/Manifest
@@ -0,0 +1,4 @@
+DIST zenburn-2.25.zip 8167 SHA256 bfdae357da421ad9803177904d2a1b5f2323df468357be331fe8cd2b0d1b0515 SHA512 4c448724682cc05ddcc60ed03e0368082ba42031e84960bdb21fd457daca07cfda05a54b68283b4524360bf97e0959fe018a14ea2edc5980d88b7b6b96105ce5 WHIRLPOOL 8b8ae029b089c935da4090ee03bc7bd0672c4b621b636db9be4ecd0ce444a9f52a8d702e8f3f98597d3fdc1409a796229e9d2458019b48cf773f2282e0ce82ad
+EBUILD zenburn-2.25.ebuild 429 SHA256 219ad02cefa7cc2a79ec1a668e4a3f2d960fe2eb186640456f009f6e2faad997 SHA512 1f04fdf364f6f309a5ccb0130734a51a152da536d81567088f9f04bf285e6fd1ae23b5363ee2941fa4266de52a3d2f5e76de33a7e31b69514de38c270ed9d6c5 WHIRLPOOL fb85f0aab27f89d5c9652d50da0b2a1482b237e683878adb9c70f3a5cbe2cb78a0ccac2f3c099357b35a38c4e8c69943c04669a87fe8e19a6b5a0ff3ed25d7ff
+MISC ChangeLog 518 SHA256 f3b06d12367d4e73e665ff1e9c7c419435d47d58ee271b50dd66c46278782350 SHA512 27203f4ee3ba491ebb71ffe10fd74f42f01c5e49f8784aad03d78f51b520aadf7724b5afb507ee31c16bf69e96ad58189fb0564ae094b83e24de8ff4c7d6740b WHIRLPOOL b2516ae2954972703acf46df7daa1a2fb393733a55d4b711a889d950387e8debc9a8937c28273f327174c2fb8e09e9546ccecd2cf53a877a4f7e16523f8e16a0
+MISC metadata.xml 425 SHA256 eb1d30494545fd9bd275cc8fa3618098c2dae8cdbaab8c5b3aa7c657f1838786 SHA512 66ba23df2866a13c9117fe6d51ebda94bcec609a588f1560ac5fbe86f20b6a38f279796ee2105b07fb968bd5c0e04db31b290d43dc9227540b20548af5e24025 WHIRLPOOL c9477a1c58e016854a45f3c81e07e4c74c95df43d64e8607b914e90cc15134b5f93c13ce0369ae579effef5687acc86edfa37262e8643925816feb303995587e
diff --git a/app-vim/zenburn/metadata.xml b/app-vim/zenburn/metadata.xml
new file mode 100644
index 000000000000..2c84d77fc719
--- /dev/null
+++ b/app-vim/zenburn/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jnurmine/Zenburn</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-vim/zenburn/zenburn-2.25.ebuild b/app-vim/zenburn/zenburn-2.25.ebuild
new file mode 100644
index 000000000000..ca115c1f72a5
--- /dev/null
+++ b/app-vim/zenburn/zenburn-2.25.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="Zenburn"
+
+DESCRIPTION="Low-contrast color scheme for Vim"
+HOMEPAGE="https://github.com/jnurmine/Zenburn"
+SRC_URI="https://github.com/jnurmine/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-1"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-vim/zoomwin/Manifest b/app-vim/zoomwin/Manifest
new file mode 100644
index 000000000000..a19b6bb7ad4e
--- /dev/null
+++ b/app-vim/zoomwin/Manifest
@@ -0,0 +1,5 @@
+DIST zoomwin-24.tar.bz2 7928 SHA256 b33c0283e3739bdb832d43668fae6ea1df225977374f93ac22579cc2856d64e5 SHA512 fb20958813c1cd956c25f34c9355454b5003cf1a2d3582149c07ea3cdb4630a0407f2407f3a8f96abec37659e75facef13094d6d1ec2972b937dab8bdf9d61a9 WHIRLPOOL d6814dedaef5554d72db83b37809eea66e7228c6c845ecb9f571739509d2524ffe3336ded32b0f7179829a24813e33f432dfb32ac3fa7db5e87794f032d757ef
+EBUILD zoomwin-24.ebuild 354 SHA256 6db054fdd3351443d6e7282eb79d93d01a4f01bbf1f29678a8b875c1bb9716c3 SHA512 42289997c6eb206a6aba453c9b4bae5330f32227af4c5bb3c8e855bf190e0145f26082e34e4b1322656ae14c303c17090765841f1ba380aede11175ebd56d84e WHIRLPOOL 3a809ff41cf69b010f8fb038c95606aa05e1b971c8b9cc6447f92d29b433b4c86559090bc8afc91a1c80dbdbff0c1ba9830fce78f5f17cd26c3a81a37da18fe7
+MISC ChangeLog 2549 SHA256 055193ec5f3cfa0b01fa003fa73f5b2ae9b4e57740b97e1a0955aa87dcaad9cd SHA512 7fdec6acecbaa4e9d5a2c78d1017e6fff02e43448ba14f39d789bd3cab19df90fd67da6db18a6899e39d1120964b8e2769354f0e5e7441f4b8411cd92e38c0b0 WHIRLPOOL cf1177f83354a234d63db9f69a855b9603fb96cef719073543ee6d48fb1b47ee11fea6e7be00e78b89f09d79d3355975e369aefd4ebec90734caf3a856b19829
+MISC ChangeLog-2015 4481 SHA256 6faaaa8d69c34671adc933ad1533255eed78cb8d6723c8ae9f2e7c518ef68898 SHA512 18d1b738a6baf601abf8b810c52c6dfaf8c55f38dbc0373c54ed4c2c511c718c1175748b7b39f5aba722e442c2ff6222d22c5f5ec0f371c4ab53ad1b65afd9ca WHIRLPOOL 5f7140ed4995a0d97780fd6044c62786d5610c169256593a91698aa697d4f8567efa1e08ec732d2837c678d0e092251bf5e818ba109384256d0689193bd96b0d
+MISC metadata.xml 249 SHA256 d4adb0d6593130c430b51f47b187c0848b8a16d353d419cb39e44edf8baa033b SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7 WHIRLPOOL 0e859a788faf27de759428701100b3134df0b6d5e8402bbb125fce791e778353ddcd819d86f54063928836417f2cefb2c1e30e8568b8d2aa4cd336d3b695b10a
diff --git a/app-vim/zoomwin/metadata.xml b/app-vim/zoomwin/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/zoomwin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/zoomwin/zoomwin-24.ebuild b/app-vim/zoomwin/zoomwin-24.ebuild
new file mode 100644
index 000000000000..6b8008f13afe
--- /dev/null
+++ b/app-vim/zoomwin/zoomwin-24.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: brief-style window zooming"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=508"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="zoomwin"
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-vim