6 files changed, 14 insertions, 88 deletions
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index abc2b8d09237..d5852cb95282 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index eaa0e6346b67..37858c8e8ccf 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,12 +1,8 @@
 DIST gentoo-syntax-20160530.tar.gz 18950 BLAKE2B 0e769cb4d67ebf1b4299a1aa0dc1bc1ce942a9e6b4f3528b5499ff83ffe9d165697576901c5ba9cca52de6e26abd0298f1f7a5383cdc0c8ca1dff0de2945080c SHA512 38881c5f16499eb053eb7a5514f6324b2a161f1392a044db0bbaf0cb71a0f17e1edebd4a685ff856a78525fbcb8c6267daa2503cfbc6f94d841cf3f6a25045bd
 DIST gentoo-syntax-20170225.tar.gz 18939 BLAKE2B 7586b45791e74e69ad6e0607bc0a4d52eba4747a6c4d9933d43db1196ceb57ac6317279c9e86f77c71bdb7379828dd96fe6d63a2933a3660f1639faf1b6df5d5 SHA512 2c01577910eccd413b85c094dbd12bf8445e2f560be1fffc4a4c3130b32587f9c298d8442b5cf12bd7d2950ab8c9e5b95a72f2f41c42c6dc939ffa2c26fd71d5
-DIST gentoo-syntax-20180814.tar.bz2 18337 BLAKE2B e2808ff4bab17378ac9a15270f32edb67c0a8f4a7e17757d9c128e186fe31add967c169aa9e62fd5fc95dfbadeab72e37c34a14a5452b80c0a1ceafd8bdec85a SHA512 a524a324e3bb1656b2dba9333e03bd130d3700791782d98fed57ea6065f398e4ad29f7980ad823940a44cd1f9f58244b8a908ef4aa3c82c0f7c46882005f358e
-DIST gentoo-syntax-20180820.tar.bz2 18470 BLAKE2B dc536724cd8cf8547b54c7ecc1fc12364ee4542903627e7a3518b9583157d18645e62be519a5d0d0c50f36fe05dfdd19d6999ad049722519f4d6d5707274da44 SHA512 b07fd9b93796a775da0f0fedacbd09cdd30dc414abd05636e96cc0658d1bc12dc5b88cbe4475544f3c79b1a28dacab234cf3c463ddb90bd4e62bec8de4024a57
 DIST gentoo-syntax-20180821.tar.bz2 18361 BLAKE2B 4134fd0a3d75d86f3984f135021063b68588083f191efcb94d7b599460703d6eb501bad7de2aa0cc9cdc4447d73b83e4b36cee2acdd113e7d0a879e1e864e2fb SHA512 09c70ded667b489e03f02e0e72fca32f13a40501a5e319b387967e75f616c7f3dc44ceab3a46b776a509263f58668223eb85d51ba58ca3fbc48e4c05d7345dfc
 EBUILD gentoo-syntax-20160530.ebuild 1808 BLAKE2B af7306c5b7ad151ef2da28bac70168ba6a2b0dd943fec7566b9392517ec04a851b5aa0fbea0c3cb355e9d2a79dbea352fa01d31cc8291db7a7bde5ff9a206387 SHA512 24f5f1a13094fa7afbad40c681270f867c6e9459b3558ed27c26a2664ba59f71b6f3dc34e142553f028cf1735577e6bdac6aecb030661af51faea237f2316e91
 EBUILD gentoo-syntax-20170225.ebuild 1823 BLAKE2B 1798286c3791945b838adab32855a01ad592e60d6f295d8dd31c2c95549651e17fc262bbe3f9c8d00480b6c0537a116fd26b70ae042c56983f845d64785b92e5 SHA512 1c6aa3f277c45d217d14347b32b44c14ccc3cdbea89ed8383177c51682cc2ce057f58d4f89406ee7b0289799df456575562031006110ea788523f6244dd9398e
-EBUILD gentoo-syntax-20180814.ebuild 1298 BLAKE2B 45b48ba8b37fee689acc274d29077fbabc9cef589ee64a008b0a846058850931daa7078e31dd21feaaba58da9c2ecae170256b585fe2d119d13746923ab1a1b8 SHA512 b73c42777d5a6a295222e420bfb62be97ce6b2153d4b9b7ae16dbae24ca11150c58e8b30e22e8175801a2679985a407a5e0608d4b735fbff83498864f5192577
-EBUILD gentoo-syntax-20180820.ebuild 1298 BLAKE2B 45b48ba8b37fee689acc274d29077fbabc9cef589ee64a008b0a846058850931daa7078e31dd21feaaba58da9c2ecae170256b585fe2d119d13746923ab1a1b8 SHA512 b73c42777d5a6a295222e420bfb62be97ce6b2153d4b9b7ae16dbae24ca11150c58e8b30e22e8175801a2679985a407a5e0608d4b735fbff83498864f5192577
 EBUILD gentoo-syntax-20180821.ebuild 1298 BLAKE2B 45b48ba8b37fee689acc274d29077fbabc9cef589ee64a008b0a846058850931daa7078e31dd21feaaba58da9c2ecae170256b585fe2d119d13746923ab1a1b8 SHA512 b73c42777d5a6a295222e420bfb62be97ce6b2153d4b9b7ae16dbae24ca11150c58e8b30e22e8175801a2679985a407a5e0608d4b735fbff83498864f5192577
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 560 BLAKE2B 21f954af20949469ae0f30a81743d9bdd1114b64b51b640d0da2d294897a885878a13bb1d408c69cd9e1afe936fd02c1ae7170e48a2f5d2280afe525266e448a SHA512 89d979077e4171aece29bd44f3d6ab6a84261dfa8eaa655b5b5d77dc20c5e2ea7cd361002e0f4d8212793449bd86da03e2d2e59bc6d23a158dceca1d60d416fe
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20180814.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20180814.ebuild
deleted file mode 100644
index badfc293470c..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20180814.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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."
-		fi
-	fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20180820.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20180820.ebuild
deleted file mode 100644
index badfc293470c..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20180820.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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."
-		fi
-	fi
-}
diff --git a/app-vim/undotree/Manifest b/app-vim/undotree/Manifest
index 3516689bec45..ecba8604d9c6 100644
--- a/app-vim/undotree/Manifest
+++ b/app-vim/undotree/Manifest
@@ -1,4 +1,6 @@
 DIST undotree-5.0.tar.gz 13646 BLAKE2B 12fb31433b95ac980cae9d313ccb7cd30d0a63a25f440027ae0dd8cd240a80aa825582f60a88b44346f392f8e52c7ff5d86a87d8891b0adc3fcf17daf0c86ce3 SHA512 093202633000c15db731c9664b606ced7dd4d259f9fac04e886509a440eb5e31de073250eb400be0b1e4cdabb393d1d88bbcb88fa162c89a3783c961b33d33a0
+DIST undotree-6.0.tar.gz 16288 BLAKE2B 38e7d185f0c2d9dd139c0c9b49593e1f6d14f7eab81b984c641b9d6917888510cda6a03d3030e051e257fde72f86d5dddbf65a8b29e4cd68323e9b976281f9ee SHA512 2654206adc8e4f021d5f2f3927ab5cb218e333a34fa5121e5ad48bf9b26e8d15c6b58cf88988407a587fb60cf406a4ed766fc4388672e93d4fceddc8712c4c49
 EBUILD undotree-5.0.ebuild 429 BLAKE2B 75a918dcac1810cd1df0b59aace9f5397a932d45596e96f7acfedae7508e90220ec05e3ce1b05ebc2e8fbceb410c39d3c9863686de27f33fcaab02548c345fd2 SHA512 f9beb5ea6481b928cfb3118b709f310328ea3e57634e9fbcd19d7383a292cd7761ba9d5c8ff53dfa0e64149d4b54d48d64ce319e4fb056401ae7083c19cb6075
+EBUILD undotree-6.0.ebuild 431 BLAKE2B e518cced54df3af8ff798787e8ffffca8e9158fad66abc0d4510d126e77e72953122161badd9559de881f213c20bb0aafac55b9d9fd643e60b87faf8130d4131 SHA512 959ab5408c8ff75d1ba0561af0c44da061a4d84b1cb12a8715a06f821084596d0c7ff992bc927692ce6041384259714cfe816e2af386a13804231c69ee622a43
 EBUILD undotree-9999.ebuild 375 BLAKE2B 8f9af682845764821ef513fbb6073ada622d71db6613535025b79a04403bebea5a20fce419472b0034908376ae24e58cd3e5647a87e132256734477251fcd34b SHA512 f9ab75289ae10de12e2a53fdf9db5df5d21dd316e9802ec4a9a946436e4c9e684910562c5b72d5a66602fcbcd45ff0087909ca27852087528f90bada84d27fd2
 MISC metadata.xml 339 BLAKE2B 3794ae7391ce0454ad19c2b24694ece64bb98808bd4e82d001de32af28e6784266ec3edd4ce275a6549316a6245dad1a3eb4e683d9a84076323b23cd5e84b814 SHA512 1a0531dae60fb8686cde296f695ededc1ac678f55672a73d802a0f6eba101d0c9bab0c4610a3d6a297e885660b635830c251b5db5c06ba8fcb126abc2df5a914
diff --git a/app-vim/undotree/undotree-6.0.ebuild b/app-vim/undotree/undotree-6.0.ebuild
new file mode 100644
index 000000000000..ef1f2f67d99e
--- /dev/null
+++ b/app-vim/undotree/undotree-6.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+DESCRIPTION="vim plugin: display your undo history in a graph"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
+SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"