diff --git a/app-vim/neocomplete/Manifest b/app-vim/neocomplete/Manifest
index dcb0af0..430bb35 100644
--- a/app-vim/neocomplete/Manifest
+++ b/app-vim/neocomplete/Manifest
@@ -1,3 +1,3 @@
-EBUILD neocomplete-20171018.ebuild 733 SHA256 e609b3090e458decf49d9e8fade6a8e9a49311ba04e2fb46ebc524b8631c9aa8 SHA512 9cd84179168cd67708533492c70e0b58629bd4531961c9920ad6483e2a0938a77d5f0ccbed819be8b2338697fd54a0842abb2668d6c9ca074d319a62ed0561fa WHIRLPOOL 719539d9a4c07f76b2b232fd35b51b1f3a39cc72e78527a5afa8bc57e11e151e454e8e3be0eec3c8070dab8a2f4c0306da7167c3af57236ffe51a2a921d8272b
-EBUILD neocomplete-20171216.ebuild 733 SHA256 d6e7bbb120acced4895aa3883c752aac41fcb5e481d49c025a0960883d96e809 SHA512 167680636449b47e2b377424208cbf034b38819194401ea91e204bb4ecd83d883eeb59eaeb6c83e4624e4b3203d0daa8adaf086647c39bef9174fbaced0baed6 WHIRLPOOL f7fabf9a2f2faa9c19c307ffda19f70b863231f253c17c310bba1190862553112eb8bf3ada8ccb569b69bb6e2980b0ca6647816d1a8d6dd1b8fa75572e74d9e3
-EBUILD neocomplete-20180219.ebuild 733 SHA256 4c8579b8a126902f0ae5f615b7ef8974e5f5c92bc822e9cd8e39417d20d6c983 SHA512 a4be26b85e4b81f741a401768f43ae979c0489d50dec96375300725a07c5b11808c3bee2e164f18dd3c29e7575be19cbceb093a276155d38ed2e6bf64d25c56a WHIRLPOOL fff39dde76f56d8562d6f8c11f23a3088790cabf3448408d0182d0a80c9fcd989c10aea3f747b6a5f62369e026673c914029b7565fde5e7d2f9e6a3f5afeae3d
+EBUILD neocomplete-20171216-r1.ebuild 794 SHA256 3d37a956658dee92cfcbe9bc686e034ee4b1e8cdfd1c8e3e9e83d7470dda3ff3 SHA512 dc7a7e1a3294df37b50dbc81b9beb1a9d198c47572669105d6c99bad6c8fd4cd2a1627b7fa3a2eb3c606d5e48233225f94fe08cbab5c783adad960ec23edbc87 WHIRLPOOL a1a0eefefbd9a2c512a27cbb8a4d21a6faa24e05d08dc263f0129551e7f73048b81436b57cdd93e55fd554586e277ad3635ca835d1e213cdba355e19a1a55a13
+EBUILD neocomplete-20180219-r1.ebuild 794 SHA256 831c1e3e8aaec10c837c85c960e8fe3dc11276e7c0a84224ef7d9cce7cf81c67 SHA512 4bdd6a7b10db8c6ccf23bd53d800a2a0887691b9e687e0348c135f0e589820e93df017d78393b8e392ead63a758c7804f38fd38b3100c503db917bc6b334204e WHIRLPOOL 83dbc7a0c12bacc8d9362762a90f661d28715be774c389b89eb0412e8ab2e868636b7fb86bc755aface7b96dff462df05c44adb884ae88c4ef8512e843b4bd88
+MISC metadata.xml 222 SHA256 f41a53e7bfb1eeafcb57bea0b0a2249a053267c03d444ce6cb62077bb5fc27e9 SHA512 dad470f0096a4fb3af9eeb60dab3216ece032790f6c49a3b014799ee0c02dee96a67317a672344e32f5614c5e05419727cc99113c6ecc37ae594931dd6441eef WHIRLPOOL 2e6b58f457c8d368b58e8396edba4364c28d9890a1903973809089e175457f754be7ea65400a9ee2b6223ed4cf23dde7fbdc7162537ecc218e9c637e78a814c0
diff --git a/app-vim/neocomplete/metadata.xml b/app-vim/neocomplete/metadata.xml
new file mode 100644
index 0000000..5993c93
--- /dev/null
+++ b/app-vim/neocomplete/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>trenttdually@gmail.com</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/neocomplete/neocomplete-20171018.ebuild b/app-vim/neocomplete/neocomplete-20171018.ebuild
deleted file mode 100644
index 11755f6..0000000
--- a/app-vim/neocomplete/neocomplete-20171018.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin git-r3
-
-
-DESCRIPTION="vim plugin: Next generation completion framework after neocomplcache"
-HOMEPAGE="https://github.com/Shougo/neocomplete.vim"
-EGIT_REPO_URI="https://github.com/Shougo/neocomplete.vim.git"
-EGIT_COMMIT="970cba438d3baf8239ccaaf53105bf880732507f"
-SRC_URI=""
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-
-IUSE=""
-
-RDEPEND="|| (
->app-editors/vim-7.3.885[lua]
->app-editors/gvim-7.3.885[lua] )
-!app-vim/neocomplcache"
-
-VIM_PLUGIN_HELPFILES=""
-VIM_PLUGIN_HELPTEXT=""
-VIM_PLUGIN_HELPURI=""
-VIM_PLUGIN_MESSAGES=""
-
-src_prepare() {
-	default
-}
-
-src_install() {
-	egit_clean
-	vim-plugin_src_install
-}
diff --git a/app-vim/neocomplete/neocomplete-20171216.ebuild b/app-vim/neocomplete/neocomplete-20171216-r1.ebuild
similarity index 91%
rename from app-vim/neocomplete/neocomplete-20171216.ebuild
rename to app-vim/neocomplete/neocomplete-20171216-r1.ebuild
index 090fed1..af632c3 100644
--- a/app-vim/neocomplete/neocomplete-20171216.ebuild
+++ b/app-vim/neocomplete/neocomplete-20171216-r1.ebuild
@@ -5,17 +5,17 @@ EAPI=6
 
 inherit vim-plugin git-r3
 
-
 DESCRIPTION="vim plugin: Next generation completion framework after neocomplcache"
 HOMEPAGE="https://github.com/Shougo/neocomplete.vim"
 EGIT_REPO_URI="https://github.com/Shougo/neocomplete.vim.git"
 EGIT_COMMIT="46791e7692e07384a089d125c5c536246698d04c"
 SRC_URI=""
 KEYWORDS="~amd64 ~x86"
+PROPERTIES="live"
 
 LICENSE="MIT"
 
-IUSE=""
+IUSE="+doc"
 
 RDEPEND="|| (
 >app-editors/vim-7.3.885[lua]
@@ -34,4 +34,5 @@ src_prepare() {
 src_install() {
 	egit_clean
 	vim-plugin_src_install
+	use doc || rm -rf "${D}/usr/share/doc"
 }
diff --git a/app-vim/neocomplete/neocomplete-20180219.ebuild b/app-vim/neocomplete/neocomplete-20180219-r1.ebuild
similarity index 91%
rename from app-vim/neocomplete/neocomplete-20180219.ebuild
rename to app-vim/neocomplete/neocomplete-20180219-r1.ebuild
index 5e254f7..62934f8 100644
--- a/app-vim/neocomplete/neocomplete-20180219.ebuild
+++ b/app-vim/neocomplete/neocomplete-20180219-r1.ebuild
@@ -5,17 +5,17 @@ EAPI=6
 
 inherit vim-plugin git-r3
 
-
 DESCRIPTION="vim plugin: Next generation completion framework after neocomplcache"
 HOMEPAGE="https://github.com/Shougo/neocomplete.vim"
 EGIT_REPO_URI="https://github.com/Shougo/neocomplete.vim.git"
 EGIT_COMMIT="1401a1c6ab56546c55804ba09e6c9fe87654e954"
 SRC_URI=""
 KEYWORDS="~amd64 ~x86"
+PROPERTIES="live"
 
 LICENSE="MIT"
 
-IUSE=""
+IUSE="+doc"
 
 RDEPEND="|| (
 >app-editors/vim-7.3.885[lua]
@@ -34,4 +34,5 @@ src_prepare() {
 src_install() {
 	egit_clean
 	vim-plugin_src_install
+	use doc || rm -rf "${D}/usr/share/doc"
 }