gentoo resync : 09.06.2018

23 files changed, 113 insertions, 84 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 445d200d7d50..0016f14d7969 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/ctrlp/Manifest b/app-vim/ctrlp/Manifest
index e92a01ea8e2c..510f5254b0c5 100644
--- a/app-vim/ctrlp/Manifest
+++ b/app-vim/ctrlp/Manifest
@@ -1,3 +1,5 @@
 DIST ctrlp-1.80.tar.gz 75269 BLAKE2B 38b70168d5b220dca220b2f1bfddcae1234fabf01348083fd9db4e1ca0396b56eb3f88f1cda84c22884c3946b731de06a710ca89f51a916f4758345afa748b19 SHA512 40175e64bb9c4ccdc202bc31b8956b96ede5761a3a4f17706c4d915f8083991cb7729e33c79d021bf6faff00f381fe9272145f852981e487b279f0471b86cadd
+DIST ctrlp-1.80_p20180418.tar.gz 76376 BLAKE2B 2ae3e85eac29bb07bfafcc60b879b506b57b7874ee9798d4fc0e420e06283ceca4cfe4d282fb9552c1971db48de25dc8df03d3e20d85ae1bbfc72f1162cc1fba SHA512 08a566087e0be0496c3dd1d60e24d65421b7fc758c95d3959181293502dd1e3581066bebea58cc1ef85f2a7cba76b45eee2e5ff2c522e27523ea31bebe4a36d5
 EBUILD ctrlp-1.80.ebuild 456 BLAKE2B b7f36c26f668cbff5c3be99395e1555a51f28f083efeefd05aac83cc9bef07abcdc25e0f8f69ef2b44aecf1dcc8993906f80c2971ba02838fc782399eb018a5c SHA512 9f8a52fd5d00138b7619b7d8c0ff2d166f48375e02ca4ca872d7ed655a2bcaf80282bd71bd4c122d479ad33c395cb57bee6421497d4da34e857663c9dfc283ab
+EBUILD ctrlp-1.80_p20180418.ebuild 521 BLAKE2B 6131d17541c56e2a41eca6fc11eee8e4f2149756dcc04d73f0e094f47ffa08420d345f1685b131599e20b35f9d171bc103b3ec47ec956b04a702975758d73b43 SHA512 ea8499bf3114e73df549efcc324c2779a61dce182109541d3c401d51a077f47f0856cd39391fa733fce86388d6b72e7b950d5e957e60fa802fed7672be20b743
 MISC metadata.xml 338 BLAKE2B 41c758d6fb547d7d7baabc1dd88431b320430d5549861120d9667082474c6ce45dd17983f2be9dd8f7b7044d3e8ba707b8baffc05d59430b9435ae3e0bc4138a SHA512 5167190c5206fc93a419c088f08ff5fd89ff0f12198824576f652973baa99c16ed8b8856e7afb2ba8c7e1bf9c90d4c94b83ff38dfd1ee63c06d9a69d57b07d45
diff --git a/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild b/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild
new file mode 100644
index 000000000000..cf9b207e7672
--- /dev/null
+++ b/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+# Commit Date: 18 Apr 2018
+COMMIT="4b9e7cac612902a25498cca49f13475fe1a821a4"
+
+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/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/genutils/Manifest b/app-vim/genutils/Manifest
index 8a587a13cb29..52263a6a7f37 100644
--- a/app-vim/genutils/Manifest
+++ b/app-vim/genutils/Manifest
@@ -1,3 +1,4 @@
 DIST genutils-2.5.zip 30510 BLAKE2B 4e9466844efc0cc607b22ed6aca4cb49f1b65ce569e631a2a0c7f4534e433ac70a3b57b18b8de930eb2604169f71e35c4fbca26b4a521a2ee34a48471a6c6240 SHA512 80a751038f629d58ce962a6be7d806cf2b7c35ad28f9d90e58cad32e1e462083629f2069ac23281683db026510d7e3d96d6883027d424fae3de63352b80fc5db
+EBUILD genutils-2.5-r1.ebuild 575 BLAKE2B 4d6b2df7ccb4507a477277da8f274d56770fbfbfe06edcaecb5d30b5dfd8ef5789e089a02e94d8d2ea92b0b699bc38b4950f0203831c5eae2e999de3c0dee31f SHA512 7e62d6852e6deec0b15e0fe34b7fc763f29f1862c6c0d35bc78eadd5187dc742b6062693907da5a58e2a67eb2cf1e581439a75e17933a1e46431c2290bcb7268
 EBUILD genutils-2.5.ebuild 567 BLAKE2B 542af48484cad7edba2febb8aa6694f3e4c508f48ee2cf0b03d81dccf54b200ae384df18fabf19547e75bcf3f8562acad96c814105e98b3673602636e59b5dff SHA512 76d043c8fc73223ae91309490f8834d9c5db03e3ad74457ca4b1985f670caaf5e278fe3fe76b831a7e398483dab7cc8dfff4543ff44f748eb6c2334bf7ac44e8
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genutils/genutils-2.5-r1.ebuild b/app-vim/genutils/genutils-2.5-r1.ebuild
new file mode 100644
index 000000000000..57fc9d0c385a
--- /dev/null
+++ b/app-vim/genutils/genutils-2.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library with various useful functions"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
+SRC_URI="https://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/indentpython/Manifest b/app-vim/indentpython/Manifest
index 5bf88dc6bee5..444220dd7ad7 100644
--- a/app-vim/indentpython/Manifest
+++ b/app-vim/indentpython/Manifest
@@ -1,3 +1,3 @@
-DIST indentpython-0.3.zip 2682 BLAKE2B 0c803921ce23796dc48792a2e55ab721edd86d690e75df35e646cb71c53d32e3aa37870e2840b2363bb1ae277d4e35631a1b6d0d1735a62374b4fbc6e14154d9 SHA512 d358579357d5197dc035816b02557b8e84d5f0c85fb6433d171b9880e211dee75ef6f5fd7a37651677591c6c31a570c39094d6bbd5052a29ef344ec18b0e13c5
-EBUILD indentpython-0.3.ebuild 450 BLAKE2B 20ff5fd3e6ed5af3832fb3eb13360155e373d545332982131effb344e8ff9a23984f7a790f78e22ac081d65899fa9db4756dc5638e07417099ffa645b905bc20 SHA512 d28ec498ac1ae50d043df161b8f053d7443ccf649c2606600d00b7927e2a13c1d2309b7f6c9fcaafdbb5d0168843c3864fb4c7af62e6b2c75dfdefa7fe8afdd3
+DIST indentpython-0.3.tar.gz 2305 BLAKE2B 080224b87a10d1a7cd87523b37257b099efc873a954a5af63d8046351ad67fa6a58c6d84405ca50416b735f52835029e2fe653a24cd80d66dfb851f050b2421c SHA512 a3750ad7f935be914821cdff6b55b9bca1fe4d076d6c364be3854679c8c3466f14a4df486258fbee5a24d58373bc6258080e598992b22a0897e18a170555ebd6
+EBUILD indentpython-0.3.ebuild 431 BLAKE2B 50793b88fb7e1d5e03782ad8383cc02da2199048cabd15799f21ba805d3f034adcf871244d6f356249dfc020ccb9b5380e949c810af0bfb6d47fc4d0a8d31925 SHA512 80710b0d87c4e1ca973be6c8c00274d9e23b0346662201f54c6e9aa443f65cbfa0fed107c8a1df63a7b46ab8d47d6bfaff2771d5722807aab131b340fb45de5c
 MISC metadata.xml 437 BLAKE2B 302eee78ee54aea1ade2aa9206518258d8d4d8d2382ff7f5ce786c404561aa049f0e9a1b50330fe54d3c3432d688a7ddda193161d38dc43559278f802c378d3f SHA512 a6dc546a8b543e5e568f0dace43860187d1ea909b614ade44ecf3eb6cc03507b77fd4f62da85284c191b7007376ac31ca9933171983df84b5da04bfdb8424ac7
diff --git a/app-vim/indentpython/indentpython-0.3.ebuild b/app-vim/indentpython/indentpython-0.3.ebuild
index 2f897aa847fc..d2abc1777cf7 100644
--- a/app-vim/indentpython/indentpython-0.3.ebuild
+++ b/app-vim/indentpython/indentpython-0.3.ebuild
@@ -7,10 +7,8 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: Indent Python code according to PEP8"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=974"
-SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-DEPEND="app-arch/unzip"
-
 S="${WORKDIR}/${PN}.vim-${PV}"
diff --git a/app-vim/vim-commentary/Manifest b/app-vim/vim-commentary/Manifest
new file mode 100644
index 000000000000..5c7ed952dfd6
--- /dev/null
+++ b/app-vim/vim-commentary/Manifest
@@ -0,0 +1,3 @@
+DIST vim-commentary-1.3_p20180530.tar.gz 3062 BLAKE2B 72018b6e84313a5c7f44b994f1892724155bcecb14f3142d83a5b10ba8e8b813859bf3af660ebea840c196a6c9bd40c6daccfcdbfef47967be83a19201b65ce0 SHA512 a2aa9db16f12006842aaa61b69c1279bca046f840de9342cb0a3d0af7fc7a5bf0905ea87762f7519e858d4e04d4fea8b0e4efca7d4bc346ce2c5b76fa78d321f
+EBUILD vim-commentary-1.3_p20180530.ebuild 441 BLAKE2B 41fc32d94bcd6f499ddac3f730f845fedeb5cd6ae7525c679b6d7adf4151a5761a05e01c66c79b466f216f6f2111c1da9df9a86dc7ee53ddea2b3ab170a4cfde SHA512 eecdbab7ab1cbe5d36a9a4515da0566cef11ad273c570a51f425fad8d3b513ad12dc55f414c5ab8c5e1304ebe3673476d4e250cdb0241473e4d9b9332cee73d7
+MISC metadata.xml 334 BLAKE2B 4aa8711aba5240ff427b6b09abe504aabb86d128f3574a7c3c43d0b552300b0f89e6725f0d738c1659d65b6399c29d4cf7e658be8240442735c7fcc2fb7a032d SHA512 31d1c930133ebac9def519a58e99d4e7dc1c7c303cc2ed3866731eaf357e23ceac6b6cf4b37ca67599c743442d353f6bc640ed2a7e8278c7cfaf10b34d50238b
diff --git a/app-vim/vim-commentary/metadata.xml b/app-vim/vim-commentary/metadata.xml
new file mode 100644
index 000000000000..0f541f75ae23
--- /dev/null
+++ b/app-vim/vim-commentary/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-commentary</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild b/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
new file mode 100644
index 000000000000..a717143cd472
--- /dev/null
+++ b/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+# Commit Date: 30 May 2018
+COMMIT="7f2127b1dfc57811112785985b46ff2289d72334"
+
+DESCRIPTION="vim plugin: comment stuff out"
+HOMEPAGE="https://github.com/tpope/vim-commentary"
+SRC_URI="https://github.com/tpope/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vim-flake8/Manifest b/app-vim/vim-flake8/Manifest
index 34f965b779fe..ed011b53e30b 100644
--- a/app-vim/vim-flake8/Manifest
+++ b/app-vim/vim-flake8/Manifest
@@ -1,3 +1,3 @@
-DIST vim-flake8-1.6.zip 6499 BLAKE2B 2e07dce7d53ce96f02c4d2fdb1ddbc55a9ae8c877ce1ca6ec59046fef6dce1311e9a182960646b732690599ca66add6fecdc0a6d0c2ac6b1092b87dc3ae52789 SHA512 2cd6427d946d3ab310c9d04441355545065f501d9176b11e90a2df5b8c0fad679f56b77e934f9cf4078a947f8f35d0200411add0da34f33e6cfef4b9b4089c98
-EBUILD vim-flake8-1.6.ebuild 420 BLAKE2B 161cc4bc4b154b92969054c777b88d956134522420fed83547c30d8743a5d472ecda42643f5664b51ad34a2579ae8440adf36f1cfd274c1fbf9f4c75bd04a663 SHA512 ca6beb32316cff12923f5ad2978a77970ee7e6ccc4d563b1adf0f118ce90dc1e8ae38baa75ef68ebd8386b0ac7f2928ddb4837e9f26a97305d30fc0c1af58b49
+DIST vim-flake8-1.6.tar.gz 5345 BLAKE2B dd726798a49231841f9fcb915999cf965a42b8b5f593a66f97268bc6d7993584d5f9ed0cfc50508bc57d60c5dcd19c8476e86ae26fb8be9c1dcf7007db2d0323 SHA512 a4208478f9754ef2d188a51e3262c449ef16b48fc0208425795d71c304118c129ae20a723fff96863291bae66237f1479a591cc23e5ec90222e0614d2dcccce9
+EBUILD vim-flake8-1.6.ebuild 402 BLAKE2B eb5c93251f30ef79ce9d76954d24f739e7dc4465ffdf9d6fae92747b065e058b5bb0e89961d77d526039f0bc023d47d19e8bfb50b3c7d07a02877c7c6b5e825e SHA512 e597905db4f37dc796bdd01cb6d2e5e5c121c6483347a7189dcfd16e36445636bbd8cadb3182fb3be9e14493bb9a44a8cf1569d9587e6a8806412698b76d8c6f
 MISC metadata.xml 424 BLAKE2B 3229e40038f1b81d9e30930a93fd292caacefb1425f4fe070348ccfacc377fd52a972735eff894cbbc01f838c2ba1d0f5a1f1fd84d3a9a2b76cf952a185914a5 SHA512 eaa032b9c9f247340b0eceffea35d85c14259024eac52195f3aab1d7916ea028b44a4ee4e1a8d1b95cf002972a82f0bf36b8425248da684ef794c8afbe632ac5
diff --git a/app-vim/vim-flake8/vim-flake8-1.6.ebuild b/app-vim/vim-flake8/vim-flake8-1.6.ebuild
index 513786e2a7a9..8ff3e0444938 100644
--- a/app-vim/vim-flake8/vim-flake8-1.6.ebuild
+++ b/app-vim/vim-flake8/vim-flake8-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,9 +7,8 @@ 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"
+SRC_URI="https://github.com/nvie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-DEPEND="app-arch/unzip"
 RDEPEND="dev-python/flake8"
diff --git a/app-vim/vim-go/Manifest b/app-vim/vim-go/Manifest
index 9597635e893c..d24ed6b18398 100644
--- a/app-vim/vim-go/Manifest
+++ b/app-vim/vim-go/Manifest
@@ -1,3 +1,3 @@
-DIST vim-go-1.13.zip 900566 BLAKE2B 31867c47ce7ab11a4948ad52775793586f51ebbfdcdb49ae934ee26842e1d25156ac606b44dcaee56787bd4ea761705f1730f092ff59a3ab6cfffd8c9acfef9c SHA512 3a1818c126c6ab01cd6993336c9e87f88357375b5252e0aeed434dccd0514cbcb1b7c96dce2aaf8f8c2e21909a17bf4bbb39a386ee1f7049b50a85ed9c635817
-EBUILD vim-go-1.13.ebuild 581 BLAKE2B 2596dc163c37365108359bf1c3049760fe172e04c48b7e7d42b7007ee6c4aceaa24223db14dc78d53cf2e66242898e36c7ffbc5ba9af325185e4aca2943a43a1 SHA512 39be06222c2466c2fee043542a471fd2e75b237c276c9126a63024fe2ac94f29f5ee0b08fe4afcfde4902aa6b3f5f74aacf89cdcda6449d67e5789c5fb3c8349
+DIST vim-go-1.13.tar.gz 870173 BLAKE2B a2f67cef249191cf91caf45c120e471301a89ee365ba9add839edea17990ff3aba7238965dac1c71a89d2004dfcfd486319fc4f1474c7ee94d3845724cd9b289 SHA512 c2aa31104168f3a8e1f96b0ad2c51dc1c2e5a1de3db76f0009edfb38bf60ebfcd9bd8a86fedb6ff6d6d789973a557d6ed03e38e67159bc43c5231449b0253c25
+EBUILD vim-go-1.13.ebuild 585 BLAKE2B a46b8e468163abddf2ec305b76e24fe82ab82f631dbf773bf927c0962f55303b21e2eeba36e44a0c2d172160c65fa6ec02cde729260783b0ae9c7a5e0f199fe5 SHA512 4d7b8ba229f5c1318993517923701078909ac0fda31c34ea296b62e5e16395a7bb926ea9811b6fbfc8df4e660435bdc1407da209dc4dbb56cb7f887854e31e73
 MISC metadata.xml 326 BLAKE2B 2c1d1ecf6dc417d2646fbeeebbd2bf1191c93f6439df663e863cebe0b33cfea5040bbe3f1b85107f5370395d9472c4f903379c3a5cf925a997789c492ac0cc66 SHA512 0075500c50b5ad7cf5610fbc4bb71e3ee3d655bc089916371ee0d66731387a2268df98ed6d7fcad6e70db28d6852b48c2e6742e131b7c5d50fc7a9656807fc60
diff --git a/app-vim/vim-go/vim-go-1.13.ebuild b/app-vim/vim-go/vim-go-1.13.ebuild
index 2cffe300bf04..39d68cf0d91e 100644
--- a/app-vim/vim-go/vim-go-1.13.ebuild
+++ b/app-vim/vim-go/vim-go-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,9 +7,9 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: Go development plugin for Vim"
 HOMEPAGE="https://github.com/fatih/vim-go"
-SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="$PN"
 
diff --git a/app-vim/vim-spell-da/Manifest b/app-vim/vim-spell-da/Manifest
index 9e1438dba521..df5f56efff4e 100644
--- a/app-vim/vim-spell-da/Manifest
+++ b/app-vim/vim-spell-da/Manifest
@@ -1,4 +1,3 @@
 DIST vim-spell-da-20060116.tar.bz2 629196 BLAKE2B fd8829e2920514ddd2e6c224521d6337b3e18d0cec1bfbfa89ff93aac35fa22d9a908ea353b969c0cd3e6c86bbee8bca58fa5e80c01141aa74c6a54dd016214c SHA512 0d055972b15acdd2ea7166711e344b1718975f7de6a49653240fb2e1bb31a82a8174e46de83f38d93d226782b97e2c58aff50cc0efab95dcde3d53b80205f444
 EBUILD vim-spell-da-20060116-r1.ebuild 276 BLAKE2B e3e21ed341a4c999d68ac4c3e0e047001189df6f12d065e7622abb14a8adae1f00eadfd254bcbc952c86ef05be4911ef8fea97ac0d97cc800d7bf7c51858bbf6 SHA512 50ca2086b9f15a81705fb8f4005befea20f14b3a4b6fd8356b94418db89bb8c7508cd3ef3383d6efc37da1d147be2408f0691fcf7f87e4678e9abca75fb3b7e9
-EBUILD vim-spell-da-20060116.ebuild 233 BLAKE2B 1374cee4d055426118cc20f0457ceec0c2393940a95f5c80c572b4929426c744e027d53483e133df11c909d1e185f99244d05275683a6bc4148ba44861a2156c SHA512 6c7f41332b603427079b48200e77929d2afa485b047fee0afa7a21efd1740abb66f5d759f6c5b27fcefe19e20d5871d4eef0496e8a36a62f7b8346e0e11cf52f
 MISC metadata.xml 380 BLAKE2B 9663ddc26c4b2e454365796824d351e6b35410e8eccd8bdec574e17d6fa4b3b6207e24cc4867324b6a0fbe18d2dc1626a0c565f25703bb1a8337d3ffb3ec879d SHA512 0e165d32c9cc2878b696b33ab8a9d1cac4e41ae0e45a019075be7ea8057acff4a40ec947a74c5edb42e31fb0357f284260efcb30914bfd1fe27aed1f5ff54f9a
diff --git a/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild b/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild
deleted file mode 100644
index 61033b4f9f2e..000000000000
--- a/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-VIM_SPELL_LANGUAGE="Danish"
-
-inherit vim-spell
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc x86"
-IUSE=""
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
index 48f75a388341..807453de4b7d 100644
--- a/app-vim/vim-tmux/Manifest
+++ b/app-vim/vim-tmux/Manifest
@@ -1,3 +1,3 @@
-DIST vim-tmux-3.0.0.zip 12713 BLAKE2B 11b2aa2a3a2da98d1977023b42063dd66ffc330894e76284699a0988d94d373116606decc4505b739ecf9454261bec43f9f88ada1196a1050320788709aebc99 SHA512 d6bc94c34ab32608610fdfffc3a3522b6056b3b61dd3cb9c63a71cb20d1597954aec65a06c5ce22352731d4e70b6a239ca5f303427182cce93324042b7f10c8c
-EBUILD vim-tmux-3.0.0.ebuild 550 BLAKE2B 4bb9e8bae67b1efb7436f47b4e03a12e443c3fe9ef37d6401c02c1bba22ce0d971df5c2eaeecf24573c5d94ab6c5f1e627177385645c9f7f9a5aee12d5479e1c SHA512 02a20074f86728ae0e47b79649562158385fc3fa5aeb0dadb4efdda5ffc6901a3044b4cc1e568d8ac142b196bc4a67b0936545d3e62ff204f8d200ac5965a027
+DIST vim-tmux-3.0.0.tar.gz 9658 BLAKE2B 188485b4c74e60292aa153693246c9e612cbc4736accb7aafad3ee901084023b3f40374212afe2139c634b8457c2ec871f0cf5e6d02beb69fc3c433f26b8610d SHA512 d251ff07b0702e4f9969d02a9c32924db62f77b71250fda175053883abc35c18932f9869ea0514df1b7acb9cc65f6b39e2b8c640ad77ff36a19ceaa74d13d77b
+EBUILD vim-tmux-3.0.0.ebuild 556 BLAKE2B 4b7af70822955d4135f9d6745b3b4d5210335ff143d6bfe3f6407373e6b9ceb1562fb672ed83fa8051074205c6a4f12daa8ae1ddd5ebb388509ca3a44dca97b4 SHA512 2ca554af0c52d9af4e9f57d47d2d05b1848350b6fca2e580190dc2d7b0a485094735de2be99d6a942881363ae6178529a6f9356be7b49b4aa7f934ed14522cff
 MISC metadata.xml 556 BLAKE2B e9419237fa1f3b2b3c15d1adf7ca5afdc0da4a1fd051a4b46d839a67079170487c85e05e121c64b4ec4cc82064e217898831db1ed0a2018c345b227c44554ebe SHA512 181979dee06b24a1d4f1b3b325558c628fcdb0ee4d628c7002777f7e460e8a35026f021bb21c79db243fd067d16168c7db804a33c10be0c59f6bb22d46cbf9a9
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
index 3694ce4b6ad6..ab382fc6fe5a 100644
--- a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
@@ -7,7 +7,7 @@ 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"
+SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 
diff --git a/app-vim/vimclojure/Manifest b/app-vim/vimclojure/Manifest
index 5575312eed80..361f6f1302de 100644
--- a/app-vim/vimclojure/Manifest
+++ b/app-vim/vimclojure/Manifest
@@ -1,4 +1,3 @@
-DIST vimclojure-2.3.6.zip 44737 BLAKE2B a2eb0beafa54413d5557f8353c84274068df82a716890d2f1511d27c599d301c2ff2f7363e14e2f3132b52ede59ee4cd2eb091d94034aebc7f6a4aec398b8371 SHA512 daf4f691500c3b901a57849c6f07b500c49f7086e0733921f589e362a53a0d07b99eab7d6ea42f1828822942b294f51a684eec93ebab1797438da4b81199ca9d
-EBUILD vimclojure-2.3.6-r2.ebuild 1088 BLAKE2B beef293d5d6831b68b6750aae9c6e900672ac410e72ce8145d763c61f2a81f0f3e1891b65c06ac361d4b23bdc55fc0fcd26e03fc14d310b95323bff6076ed667 SHA512 5b2a640e1452d780cf0f3383426835f588dccd277c7980008051324c46af08b3345c1b6ca6e6f5dadb8553b2c3d2533ecdfe89d2a7d9d77eb875925837374ad4
-EBUILD vimclojure-2.3.6-r3.ebuild 1108 BLAKE2B 821bc08acf632a6c5aca9b45deecc564a90665c6c6e8dc656071f169a556bc76d875dcc00e69c70f02541809a800349d2e9437743a9856622d2a821364864e2e SHA512 eadf16aa54a26904f6b5518e85143ffe91cef9c19249cde504d9f4086c2e03367efd4094f28892e33de41564b61abf9249e7fab1e819c91f96fae0139d2b6d09
+DIST vimclojure-2.3.6.tar.gz 32456 BLAKE2B 7c80611516cf7e1d46400c8cc8c9f9f8146ce8f1ce2fc7458ad9e5a7c778f54496f3a1b2fe47a6cc9cb28cb8f6f0e0e67ace77a09c7258f1585cb76758d6e908 SHA512 186fd5607ccaa4b4344aed4d165d257d0518b3fe19d7b9d858b11a672f68c601bbd453fde7189dd61c3fc2f0b8517c3481579355bf5405ab90517dc48900fd51
+EBUILD vimclojure-2.3.6-r3.ebuild 1112 BLAKE2B f09d2572c902d2c2532e12a5ed56077958a19c09c814d00ccc441427c9444b06e09fdcab793f2fd2df75e2675aa12f7c27acd2b7a5fa63a4b065815670e0a4e6 SHA512 f37b8683a73d2db3b273c97cc6ef43889779b05a34b4748f64d95b83de715ade037b495f85ab378a6b00c0ca37eaaa1569470ede434bd337e2e02bf006fc85fd
 MISC metadata.xml 404 BLAKE2B 3a8d975056ed280081818051d51dd60de3d8d8da257b9be8ad8855e5ac9356ad78a9748dc307bc0c7b63ab7f5143abec09c24317d73e699fdb04e90e9f669888 SHA512 492984271208a8c95a7ea91cfe48d11c7f6c9052ac3e062e53667173e77c70e2c20fadc6dd15a953196e131a4bb810127335272595a183b84163435928561832
diff --git a/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild b/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
deleted file mode 100644
index 70458eaecd0f..000000000000
--- a/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
index 2bf1249e8565..6d3c5d62b0e7 100644
--- a/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild
+++ b/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,9 +9,9 @@ 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"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/app-vim/webapi/Manifest b/app-vim/webapi/Manifest
index 8e2f50be3e04..f042d0b4bcf4 100644
--- a/app-vim/webapi/Manifest
+++ b/app-vim/webapi/Manifest
@@ -1,3 +1,5 @@
 DIST webapi-0.2.tar.bz2 20690 BLAKE2B 5438a88c94f77cbe5ce2a79b11c4da31199cc071b35a22fc78b01c9f4c1195d830353639ca05d3c95182fe3ae5c177cddec9d6acd0b2de198a3f77de5e1ad92f SHA512 ca513053c361041bfaeeea11a0bb70c8e6e011985dc5ba801c654f919dd7d94304b6ff475ce49525909b575e7cc0d9233b56cab2326adc6a689e05c5faf4a3da
+DIST webapi-0.3.tar.gz 26388 BLAKE2B 878e9f760f9940b81647359fb8779d6386b4bd2d2190c77f2ef886a12a6d293f6f0e5829e05fe98e0c842cb927186f9e4a02dcddcdfe99d5e13d52ae43e7f775 SHA512 215516872a32f8d967a9bff6d13916d6571399184728c422babf486152fc4c3f57aa4a7fa7591d7205d4b2dd99138c36796d1f2d186d494d74cf5dd2fa7cdec8
 EBUILD webapi-0.2.ebuild 328 BLAKE2B 1dbcbbb4a1ae8fa48871f527564061c5c1b8a4ba3ccb846ff82e4496af55bdb2f2834a7b79f6c4795517af4e0dfb8be3fa9f8cfcb1a59ed92fa38f4ac8935330 SHA512 3621693275ed6aa6b0b9ab14c79648b8d5cabf609e7ff2ef5df3d45b85de5d58c6560df7103dfc4b2a2ba67dbbaefcaf19f8651ad045ba0af6f76d726e7814e6
+EBUILD webapi-0.3.ebuild 468 BLAKE2B 81ad741b8522f2557471e33fca8e53184b1150a1ef54f61bebf5687cfb5eab502b3d1d2976c0568a0ee34d5d1a7c24f1372256faa579a1b58f5e8215b5af6ad6 SHA512 9c92be9f70769f76b709f8e8fc73de3db05bec9299434dab5644941617f95cc619ddeac137d13c998f4ba5daaacaa68a982fa6e001b43dc0a7d9d2d345970a30
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/webapi/webapi-0.3.ebuild b/app-vim/webapi/webapi-0.3.ebuild
new file mode 100644
index 000000000000..7a9673e4e753
--- /dev/null
+++ b/app-vim/webapi/webapi-0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface to Web APIs"
+HOMEPAGE="https://github.com/mattn/webapi-vim"
+SRC_URI="https://github.com/mattn/${PN}-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND="net-misc/curl"
+
+S="${WORKDIR}/${PN}-vim-${PV}"
+
+src_prepare() {
+	default
+	rm -v Makefile || die
+}