gentoo resync : 10.11.2017

22 files changed, 197 insertions, 51 deletions

diff --git a/app-vim/diffchar/Manifest b/app-vim/diffchar/Manifest
index d8557dbfa9cd..dcc6c096e08c 100644
--- a/app-vim/diffchar/Manifest
+++ b/app-vim/diffchar/Manifest
@@ -1,6 +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
+DIST diffchar-7.2.tar.bz2 20092 SHA256 21e4f608356af1ddbd1cc7cd81accf394b50e7b67a12f5f0e5e2cafa3205af43 SHA512 7c9a9239ae4eae1d325984ab40ae8d90e2dabf96dc929ed6f05c3496352aeb562452bd154fe3d1ec96353356c287604162f5b89d762b7afe26bc975449d92427 WHIRLPOOL dbbd3fe50aa9608ba0efe82f49d4f1cc1244222163c86a39e08ce4b7cc30d77851a523d11688e87ecf1ce58a45bbd2d62bb433736d4c8fbc2a56cca95bee2e9b
+EBUILD diffchar-7.01.ebuild 403 SHA256 3c733d16bf87e1f1138ebb6370bf32cd50d9e3b5d655e30b296c29cd1752330e SHA512 d55b3dc9e0ba654d4d23108f8f29bef93062b261c0ee5c30625a5786a43531686b24b69c6baa0de97dc87a7c8bdf19ca2ed9101ecfdc3c70d2813b9ae46a8d05 WHIRLPOOL 91afe2804f201cfb05dfb9aabd9aca064c7fbd46ab6a73565f698d863324e4a410e3323bbab4348fe000bdecbf17aaf199b59a6152fe02949a3642687cfbcabb
+EBUILD diffchar-7.2.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-7.01.ebuild b/app-vim/diffchar/diffchar-7.01.ebuild
index 6790b0da6cf5..c7ec4e2fdc9a 100644
--- a/app-vim/diffchar/diffchar-7.01.ebuild
+++ b/app-vim/diffchar/diffchar-7.01.ebuild
@@ -8,6 +8,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
 HOMEPAGE="https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932"
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/diffchar/diffchar-6.9.ebuild b/app-vim/diffchar/diffchar-7.2.ebuild
index c7ec4e2fdc9a..6790b0da6cf5 100644
--- a/app-vim/diffchar/diffchar-6.9.ebuild
+++ b/app-vim/diffchar/diffchar-7.2.ebuild
@@ -8,6 +8,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
 HOMEPAGE="https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932"
 LICENSE="vim.org"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitv/Manifest b/app-vim/gitv/Manifest
index 9fe7e0b68c20..8fc09c2c23af 100644
--- a/app-vim/gitv/Manifest
+++ b/app-vim/gitv/Manifest
@@ -1,7 +1,5 @@
 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-1.3.1.ebuild 683 SHA256 a9c7113143a9cc78ab63533e166cff57d6a9fb0946e8c86c85fa428de3cb3a6f SHA512 437e9ede3da5d52016e35fce2c2e2b3430bb0ac5b60e3ba0c9d7e09e92db7c3c26dfad421205f568438cba3a910b6fe762f3fc6d5fd217ea4a26577f8ae9fcf7 WHIRLPOOL 31b635f24c931493da0cb0a6ca882ccabb25c0f7c90de769812a941c4d7e906f34c2ac7a91320119aa2fff93b8ba7b5118df02f36b3c6cb20bd71a4e480750a8
 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
diff --git a/app-vim/gitv/gitv-1.3.1.ebuild b/app-vim/gitv/gitv-1.3.1.ebuild
index a772cbef62f2..32b603a8c921 100644
--- a/app-vim/gitv/gitv-1.3.1.ebuild
+++ b/app-vim/gitv/gitv-1.3.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit vim-plugin
 
 if [[ ${PV} == 9999 ]]; then
@@ -9,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="amd64 x86 ~ppc-macos"
 fi
 
 DESCRIPTION="vim plugin: gitk for vim"
@@ -18,7 +19,8 @@ LICENSE="vim"
 
 VIM_PLUGIN_HELPFILES="gitv"
 
-RDEPEND="dev-vcs/git
+RDEPEND="
+	dev-vcs/git
 	app-vim/fugitive"
 
 src_prepare() {
diff --git a/app-vim/gitv/gitv-1.3.ebuild b/app-vim/gitv/gitv-1.3.ebuild
deleted file mode 100644
index 243f24d52892..000000000000
--- a/app-vim/gitv/gitv-1.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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/merginal/Manifest b/app-vim/merginal/Manifest
index 8c7404083f9a..096a1c8504f2 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,5 +1,7 @@
 DIST merginal-2.0.2.tar.gz 15048 SHA256 e1f5030dfc30cf7c2c98f9193529c385c86def213ea2bc36c3feb5feea789a59 SHA512 fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721 WHIRLPOOL 5101f0040f608370296fc57ab5b61be281c5190f9957dfbeb553714fa983434d22e8b866a60457a633e8ff89a4a49f4629bc20d47d310669708464065b966c9e
+DIST merginal-2.1.0.tar.gz 13510 SHA256 742efa7ee598bcb605368faffa0082dcf329156f57768a32705ef9c5bd5292fe SHA512 3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed WHIRLPOOL b8282b61017a53474291ae5b5438849c4e69d99cc8009a9bfd26c5bc53dcbd05fb296e5dbf06d82abfcbc2f384127edafac20c9f3c1414e4f4b425a47956606e
 EBUILD merginal-2.0.2.ebuild 606 SHA256 1b25c78c97afb4c33d8ac73c27d4547969fea46aff96e522c05a38da272dfe80 SHA512 a6ce247cb63895e38bc8ae65256ebe9e0d40e2e6bfbb2a49aeba81cb5b2b34ebf16441294caccd46cee24dfb9d969dcb7dd03b7471ca956694000aa74c8ad00c WHIRLPOOL a2b102e2e89265884f23ff6d7335c01e0e6ea91fe82beef51dc7c77ec8a42ea8ac4662dfe6dda5c87e0a348c413dee61917ef09af58524d18dd156a4562f6613
+EBUILD merginal-2.1.0.ebuild 725 SHA256 2b9da031324a8c8a787ffba51f75edb4d2c437bf68a8db0236f1b088ba62f14f SHA512 07723127315f34c04686248fcd3f4cc6598f055fb014d0b8aa7954fa45c439f694274a9daf531821fbfa58c2ec641e49d257a0cc6a49de94d8d57643c5de0363 WHIRLPOOL 04a1f22564fec2aa3c72848228688ed4a4301fc40c90d307f4b875d96985d8a944d43e05f6a9001ce4c7a09d41e1a6d188d09fa356d24eb98452fac74575cd4b
 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.1.0.ebuild b/app-vim/merginal/merginal-2.1.0.ebuild
new file mode 100644
index 000000000000..642e1deb87ae
--- /dev/null
+++ b/app-vim/merginal/merginal-2.1.0.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/molokai/Manifest b/app-vim/molokai/Manifest
new file mode 100644
index 000000000000..165b442a83be
--- /dev/null
+++ b/app-vim/molokai/Manifest
@@ -0,0 +1,3 @@
+DIST molokai-0.1_p20151115.tar.gz 3817 SHA256 692de2b63e9dec45b8fca13c7acc5e0326af90307457e49f4ff8772c85feaa8c SHA512 8ba5821dfae8c723185999d038142b2061b01ec8c9c6340fd082bac0bdf78d2fcc21a8e3103f20b58bc60c38ed62966376903e85f5b9b49947d38c8c34d14908 WHIRLPOOL 48f9b3272d40de3523b59efd76d3ddac83869a77e73790392df165b07549d04300985d5fa7968825e10a00f62d93b1060a94bddf7ba1ee3ceafa12d6e1722d75
+EBUILD molokai-0.1_p20151115.ebuild 436 SHA256 93b8c1c99cf0fbdb7d76fde851ae5b2549f5406d7e98f21a7ac30ef78ee0ee2e SHA512 132d5c76c23247cbdcc912f9257952450d8e436ac3a397b4eb05b312124af05421fcefab20f42e525ae695adfce08c9e5c7825825f39b35a641712853952138a WHIRLPOOL 60e2636b1b5aa5bfe831dd5b8d3334ac23d4e3fa87916d1055b2ad979e963e112e45890932a191665a38817ebc3ed4036f5f54758aa26b42833accdad4d63fba
+MISC metadata.xml 328 SHA256 75880d073e1dff383082d10049a64671f536c8a38393614b79436dbef29c14e2 SHA512 06b187681e64b1cdea061d8a24e96cc2f55cd18ecb8dc7235a790670cb76f5a1b6cadd571bafb1c8a23ae2e9f77935972e543be6b274cc6cef148df381c84717 WHIRLPOOL 5a4f2fe19d688a6fda4143a0b2f395ea5d973cdb85e6248a91b89c062189351e50e2c7c4c8e697467b3f4c7af5934c9332715a1dfe8f825fe7e2ba08d8a55df0
diff --git a/app-vim/molokai/metadata.xml b/app-vim/molokai/metadata.xml
new file mode 100644
index 000000000000..51e9088578cb
--- /dev/null
+++ b/app-vim/molokai/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">tomasr/molokai</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/molokai/molokai-0.1_p20151115.ebuild b/app-vim/molokai/molokai-0.1_p20151115.ebuild
new file mode 100644
index 000000000000..eb7b16b1b275
--- /dev/null
+++ b/app-vim/molokai/molokai-0.1_p20151115.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
+
+COMMIT="c67bdfcdb31415aa0ade7f8c003261700a885476"
+
+DESCRIPTION="vim plugin: molokai color scheme"
+
+HOMEPAGE="https://github.com/tomasr/molokai"
+SRC_URI="https://github.com/tomasr/molokai/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/molokai-${COMMIT}"
diff --git a/app-vim/perl-support/Manifest b/app-vim/perl-support/Manifest
index 370a30c9724a..0372f31d0161 100644
--- a/app-vim/perl-support/Manifest
+++ b/app-vim/perl-support/Manifest
@@ -1,5 +1,7 @@
 DIST perl-support-5.3.2.tar.bz2 178598 SHA256 b192d1d12eb06bb7b3067ad89f091afd87d3b36b15995eb907c688f0c9f464d6 SHA512 1eff321b0c5184b58737e79de379fbe431b32fbe5a140914b950d024ee9b512393b46cf4e45cafe50289ee9f9d4747984534efeade399882a17237a1a1ca1161 WHIRLPOOL 945634b4d5f6344efb91826f51dc3415f7b9c63018424a6054da5bcddec9519c3b686acf5bd2399031c44bc5ccfd7f5a302592a5668e6489a7c250db2bed77c8
+DIST perl-support-5.4.tar.gz 267155 SHA256 04a3e6a2a4e99458cdcefc96e9d91643034c8fd8c2260bd147c6eb956e0f87f1 SHA512 d9d06ea2299be6135b5423aa7f062874736d7aa8118428a9abcd20c53eea410f0d384d0a79324e5ad0101105aa0aa10eb23f031084f34908f879633e5d18c795 WHIRLPOOL a321135b5c4adceff571b942b30a59f5a4b1b7a87dae60d198abf797a614d712de21f7a2709afa589b443daeba113d5051f229289ed59fc099eebee4e1d04e7a
 EBUILD perl-support-5.3.2.ebuild 680 SHA256 4cc4f4f3c9a0a159b627e75c500b1fe7761052fa997921fd26bd9a30369d2062 SHA512 f1ad2bfd7dbeabbde9442bb88c5c1931437dc9db93d9cb75e4bd08ade45d02837fe62bb5c2d67395fa6cd05f5829aebdb06f61aec9f6f1af8b1cec94c1eb565b WHIRLPOOL 150c8542101d39e7639c1ded2bf1327677b922620a2d9990ceaacc35255eee273be25232c4f127632a0c44c58fee5fed27e9573e18252c201421b85e0170c40c
+EBUILD perl-support-5.4.ebuild 1369 SHA256 b71b197f028bc7ae573f54f523658121a873f7a02c58b1d792ae4be52d8561c6 SHA512 e0bac777a79d8853bc925aa897c8300c317ac9e1c3a71f49f05039e67158db8c5e1c06608c883570c065fa1c912c8972a4f894773170fef3b1dd0034de64e09d WHIRLPOOL f957746d19a365aabefe706e91cae7f916849fc78286b0e3a4c5bad6ec4498f7134c392a42ec2fa6827243b4b7bd9c0fe6db38c60d7e944e3031311dcbb360f9
 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/perl-support-5.4.ebuild b/app-vim/perl-support/perl-support-5.4.ebuild
new file mode 100644
index 000000000000..11fbe9c4a123
--- /dev/null
+++ b/app-vim/perl-support/perl-support-5.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 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"
+SRC_URI="https://github.com/WolfgangMehner/perl-support/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2 GPL-2+"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+VIM_PLUGIN_HELPFILES="perlsupport.txt"
+
+RDEPEND="
+	!ppc? ( dev-perl/Devel-NYTProf )
+	dev-perl/Perl-Tidy
+	dev-perl/Perl-Tags
+	dev-perl/Perl-Critic"
+
+S="${WORKDIR}/${PN}-version-${PV}"
+
+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
+}
+
+pkg_postinst() {
+	elog "${PN} can utilize the following modules on top of the ones installed as"
+	elog "dependencies:"
+	elog
+	elog "Devel::SmallProf     - per-line Perl profiler"
+	elog "Devel::FastProf      - per-line Perl profiler"
+	elog "Devel::ptkdb         - Perl debugger using a Tk GUI"
+	elog "Pod::Pdf             - A POD to PDF translator"
+	elog "YAPE::Regex::Explain - regular expression analyzer"
+	elog
+	elog "You may need to install them separately if you would like to use them."
+}
diff --git a/app-vim/pfsyntax/Manifest b/app-vim/pfsyntax/Manifest
new file mode 100644
index 000000000000..cc0fc9131c0f
--- /dev/null
+++ b/app-vim/pfsyntax/Manifest
@@ -0,0 +1,3 @@
+DIST pfsyntax-1.3.tar.gz 1540 SHA256 4a30e8292b5fba503d0fdb5e9e083a9dd47f917126a89318e21ff0e24333038e SHA512 6967cee9a039f405a4b42a44678d5c632eb93ef48486c03a6929991d31ac03677cba4223f49c14e6c9d73b15db9469b3fa3c0f2586b4994d25634d0885121c5b WHIRLPOOL 0c83df168e0263398f17695ebcb2e7d9fde1358b1d2d24b64ee3b803ef540366aabab817ec9973fce52e1b7713f9fbc5a36a7074d3c155290c6bc60e0ba0fe08
+EBUILD pfsyntax-1.3.ebuild 410 SHA256 c7252f826a77581a4e9c7329e172e582fc0220eb1755197484cf7316075256b8 SHA512 cdb8f2c515bede52c62c5308ef2833b883d502d914f2c585d19485328c8696f45b1488b1eb437d5e1a219104b6b3f690642c861e2e76694cef5c37f362562016 WHIRLPOOL 7c29e3c291442fb8d333c57686b335c25ef4d1632f9f9fea6bad32e7d64704eb43039c52c98c725a6067050d67d24c150f2298f70f1baed627f170879c80d62d
+MISC metadata.xml 255 SHA256 fa2495381a46939e915222bc4f5e8c1e704f336ca63c064a2a63090c79b0e5ff SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167 WHIRLPOOL 0e543ebc68a9501374d42528b31fc9d94ab416939eefc6cc37dcf033d0ecd85397ec58ab67e02d6a08b2f4c0048891d441a2b217075e4596ffc25d5b12cc8ec8
diff --git a/app-vim/pfsyntax/metadata.xml b/app-vim/pfsyntax/metadata.xml
new file mode 100644
index 000000000000..84f8f1cf6bcb
--- /dev/null
+++ b/app-vim/pfsyntax/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/pfsyntax/pfsyntax-1.3.ebuild b/app-vim/pfsyntax/pfsyntax-1.3.ebuild
new file mode 100644
index 000000000000..734f5d503723
--- /dev/null
+++ b/app-vim/pfsyntax/pfsyntax-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
+
+MY_PN="pf.vim"
+
+DESCRIPTION="vim plugin: pf syntax highlighting for vim"
+HOMEPAGE="https://github.com/vim-scripts/pf.vim"
+SRC_URI="https://github.com/vim-scripts/pf.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
index 7d6b9ba000b8..1de320981ffe 100644
--- a/app-vim/pydoc/Manifest
+++ b/app-vim/pydoc/Manifest
@@ -1,5 +1,4 @@
 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
+EBUILD pydoc-2.0-r1.ebuild 632 SHA256 8591dc311304b6f934068321d8d7eb588715bd893bd242f5edbc7c01353f10c9 SHA512 ec0fbd7cd508e9fab0cad0723f137dcc6b133b92ed570bc8cce3667125454b707b0325cc71506ab2a257f69a1b98a4c1672a60cd4120bdf59fccfdc4ede4119c WHIRLPOOL 2e26cd72fd6e4366c42acdc6be22fd9ea8358fb2b6e719f7c99020c00cdb8208b90df25ae6fb974c299e1a01ffb2a46d9b0242446b363f5d755eb2380b13bbbb
 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/pydoc-2.0-r1.ebuild b/app-vim/pydoc/pydoc-2.0-r1.ebuild
index 7114a955e20b..88fd9c7ffd56 100644
--- a/app-vim/pydoc/pydoc-2.0-r1.ebuild
+++ b/app-vim/pydoc/pydoc-2.0-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-vim/pydoc/pydoc-2.0.ebuild b/app-vim/pydoc/pydoc-2.0.ebuild
deleted file mode 100644
index ad9661d62975..000000000000
--- a/app-vim/pydoc/pydoc-2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/vim2hs/Manifest b/app-vim/vim2hs/Manifest
new file mode 100644
index 000000000000..659697593080
--- /dev/null
+++ b/app-vim/vim2hs/Manifest
@@ -0,0 +1,3 @@
+DIST vim2hs-0.1_p20171106.tar.gz 259627 SHA256 7190ad8b7f205331d6485b584acfdca6c0b45aed4e5242e482110d17871bc728 SHA512 835ea1344f055af06843a327bf7294ae9fe0e735455b3c21d4fba56eab75f19b578ff8cd962f6527efee0e0f89084c9c2cd86d3944e0ac35b89b33a6047df4a0 WHIRLPOOL 40caa6f1fccd6b344e8b808c99387c4ecceec935fce219ba42587e59b9a390fc23e99c8bbbf7e7933a3c95975dc773c0be5363aee6ebaf6e4ac1b3131c891711
+EBUILD vim2hs-0.1_p20171106.ebuild 682 SHA256 d67d7a2dce99438b1b92dbee79c4260ac6410fbede75ca4c1db79e4cdafc6bd1 SHA512 9f241d711331ebad1a1c590ff93932ee7abd52176bc0075bb60aadeaad9ec40be609fb1e752d7a9fc9b64c066b35a1c4468b46992052dc33b5c4476dbccf4bdf WHIRLPOOL 9da7cb4629b953155c54d4f8fcb1ed784c6d3c9fd222f3b6a0eb15b5d8a1346eda3b79524ddc3b386cd979d473b48f5193e396371f17c33649726f12102665af
+MISC metadata.xml 324 SHA256 8750a8930ef38315645edadc6e67dae9f36f794eeeaead9ddfe000b2f52b144f SHA512 6e87e1076ba13e49fa20313e9761cee9628350e718ab871bfd2bab0409f69dc9afa48d7d530540be8af5d7b10d2c7a14269fc70839ae63351a2a3d3f82e1481c WHIRLPOOL 968bb1993b8b2d94b927129a276996aae2eaa5c2c2528e03bd17bae56ef7706fa8926044367b2a2c618e24fe608545fff4dfece8011fe93d69c479093b713e7d
diff --git a/app-vim/vim2hs/metadata.xml b/app-vim/vim2hs/metadata.xml
new file mode 100644
index 000000000000..cf984477fc49
--- /dev/null
+++ b/app-vim/vim2hs/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">dag/vim2hs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild b/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild
new file mode 100644
index 000000000000..4d8504e4b3a0
--- /dev/null
+++ b/app-vim/vim2hs/vim2hs-0.1_p20171106.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
+
+# Commit Date: 16 Apr 2014
+COMMIT="f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"
+
+DESCRIPTION="vim plugin: collection of vimscripts for Haskell development"
+HOMEPAGE="https://github.com/dag/vim2hs"
+SRC_URI="https://github.com/dag/vim2hs/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/ghc"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_compile() { :; }
+
+src_install() {
+	# We want a stripped-down version of these.
+	local f
+	for f in screenshots/*; do
+		bzip2 -9 "${f}" || die
+	done
+	vim-plugin_src_install
+}