diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index b64538c..c0d0081 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,6 +1,4 @@
-EBUILD youcompleteme-20190125.ebuild 6147 BLAKE2B 0b132fd28a12d8349811c73223c70cedd12d7206e0adffdc890c493ce368b09428533a6b5a7ee5b0ce24e916a39919e8a72a8b751a409a719b3383912b6a5ae5 SHA512 cbfd029190931ea6aafaf3cf26260b82228697eb2f989a304c9dcc05391c9a335b9a694f8ac3ad8f0e9eacab94bac237674c8543ee3b2cbcf4fc8ce5be9c3537
-EBUILD youcompleteme-20190129.ebuild 5793 BLAKE2B 0f65a153594f509832499c3c50668fd92010288bcad6d71f02109a6511dfbe553e77db17d5ac9d93eeec24771d4722a4b143bdf89e57d73211b00c99c8e7c94b SHA512 26a484ffea882ed47b3986a240d6ee300141ea3e4e17454dee0e6a7613028502a69f81876fafb2c0a76cdfb6c4cb265d6ac68edcbca540aa70ab0f6a5acfb392
 EBUILD youcompleteme-20190213.ebuild 5793 BLAKE2B 88586674f570eb09b90d47470e2c06832241f84f181243f20b6c64fada8417bc8c7a3a13716d39723a2c16bbbfaf28c219c726101d85514ef33427ebdb810547 SHA512 f14905bb392510d3a62d49ab85c8326b538558664a5bf0ad85f172130650b94e15c420a19e7cd3abdb81dc31916e86e598497007e41ed798e7f4a91d12e8dce7
-EBUILD youcompleteme-99999999-r6.ebuild 6096 BLAKE2B 9962d2de9ec931bcc2b504a44aa77b89f3479b66c4dbf220bd30bb88a85c342b175e6bad11a8a7af9195b829fd1e8740481ba11e88262b91cc22119cca9ff3ce SHA512 81991f1a56729a69d459dad83e2162532f9519d43a8b0bf7eed5ecf4b0785511229806d8507a12343a6d8da7c2e35d5e4d4706fe86098a93409f11a41f43646d
+EBUILD youcompleteme-20190218.ebuild 5793 BLAKE2B 86cabaadbd6d0dc862e718d78cfc0ff3ae42e51adb2136cb82893c0bb8bd8c36cd58cb8ec7269badedc786f585fcc81cbf291ed9665d2d47fdcf3b7ea760c182 SHA512 558efdbd3ba73b82e7cf2df957e50ba6398f912b8ccaae8975adfcf8b44cf97ab024f8cc1f5aaf79e25f09f3e615e3bc22c20434b3e3818f28409068d22abd87
 MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f
 MISC metadata.xml 672 BLAKE2B 27d98400640fe6befc7cc4f35803af907c631d7204b24cafe2f799d528fbfda3be5e1fb2e9dbf93ebc72a66e0ac5a0a7e3c164bb29596a8bde3b1ec2579bed8a SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70
diff --git a/app-vim/youcompleteme/youcompleteme-20190125.ebuild b/app-vim/youcompleteme/youcompleteme-20190125.ebuild
deleted file mode 100644
index c790a15..0000000
--- a/app-vim/youcompleteme/youcompleteme-20190125.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: a code-completion engine for Vim"
-HOMEPAGE="https://github.com/Valloric/YouCompleteMe"
-EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe"
-EGIT_COMMIT="48c3bcc491a0d4d98924cc1999773c31398fbc35"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clang +doc test mono go rust nodejs +neovim"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	clang? ( >=sys-devel/clang-7.0:= )
-	mono? ( dev-lang/mono )
-	go?   ( dev-lang/go )
-	rust? ( dev-lang/rust
-	        app-vim/rust-vim
-	)
-	nodejs? ( net-libs/nodejs )
-	neovim? ( app-editors/neovim[python] )
-	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}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sh[${PYTHON_USEDEP}]
-	dev-python/waitress[${PYTHON_USEDEP}]
-	virtual/python-futures[${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() {
-	default
-
-	if ! use test ; then
-		sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die
-	fi
-	for third_party_module in pythonfutures; do
-		rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
-	done
-	# Argparse is included in python 2.7
-	for third_party_module in bottle python-future requests waitress; do
-		rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
-	done
-	rm -r "${S}"/third_party/ycmd/cpp/BoostParts || die "Failed to remove bundled boost"
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CLANG_COMPLETER="$(usex clang)"
-		-DUSE_SYSTEM_LIBCLANG="$(usex clang)"
-		-DUSE_SYSTEM_BOOST=ON
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_PYTHON2=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use rust;
-	then
-		cd "${S}"/third_party/ycmd/third_party/racerd || die "no dir third_party/racerd"
-		cargo build --release || die "cargo build failed"
-	fi
-
-	if use mono;
-	then
-		cd "${S}/third_party/ycmd/third_party/OmniSharpServer" || die "failed cd to OmniSharpServer"
-		xbuild /property:Configuration=Release || die "xbuild command failed"
-	fi
-
-	if use go;
-	then
-		export GOPATH="$GOPATH:${S}/third_party/ycmd/third_party/go"
-		cd "${S}/third_party/ycmd/third_party/go/src/github.com/mdempsky/gocode" || die "failed cd to gocode"
-		go build || die "failed to go build gocode GOPATH is $GOPATH"
-		cd "${S}/third_party/ycmd/third_party/go/src/github.com/rogpeppe/godef" || die "failed cd to godef"
-		go build || die "failed to go build godef GOPATH is $GOPATH"
-	fi
-
-	if use nodejs;
-	then
-		cd "${S}/third_party/ycmd/third_party/tern_runtime" || die "no dir third_party/tern_runtime"
-		npm install --production --python=python2 || die "npm install failed"
-	fi
-
-}
-
-src_test() {
-	cd "${S}/third_party/ycmd/cpp/ycm/tests"
-	LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
-		./ycm_core_tests || die
-
-	cd "${S}"/python/ycm
-
-	local dirs=( "${S}"/third_party/*/ "${S}"/third_party/ycmd/third_party/*/ )
-	local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}")
-
-	nosetests --verbose || die
-}
-
-src_install() {
-
-	if use rust;
-	then
-		cd "${S}/third_party/ycmd/third_party/racerd" || die "racerd target wasn't built"
-		for f in $(ls -a | tail -n +3 | grep -v target)
-		do
-			rm -rf "${f}"
-		done
-		cd "${S}/third_party/ycmd/third_party/racerd/target/release" || die "racerd target wasn't built"
-		for f in $(ls -a | tail -n +3 | grep -v '^racerd$')
-		do
-			rm -rf "${f}"
-		done
-	fi
-
-	if use mono;
-	then
-		cd "${S}/third_party/ycmd/third_party/OmniSharpServer"
-		for f in $(ls -a | tail -n +3 | grep -v '^OmniSharp$')
-		do
-			rm -rf "${f}"
-		done
-		cd "${S}/third_party/ycmd/third_party/OmniSharpServer/OmniSharp"
-		for f in $(ls -a | tail -n +3 | grep -v '^bin$')
-		do
-			rm -rf "${f}"
-		done
-	fi
-
-	if use go;
-	then
-		cd "${S}/third_party/ycmd/third_party/go/src/github.com/mdempsky/gocode"
-		for f in $(ls -a | tail -n +3 | grep -v '^gocode$')
-		do
-			rm -rf "${f}"
-		done
-		cd "${S}/third_party/ycmd/third_party/go/src/github.com/rogpeppe/godef"
-		for f in $(ls -a | tail -n +3 | grep -v '^godef$')
-		do
-			rm -rf "${f}"
-		done
-	fi
-
-	cd "${S}"
-	use doc && dodoc *.md third_party/ycmd/*.md
-	rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt ci third_party/ycmd/cpp third_party/ycmd/ci third_party/ycmd/ycmd/tests third_party/ycmd/examples/samples || die
-	rm -r third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,.travis.yml,build.*,*.txt,run_tests.*,*.ini,update*} || die
-	find python -name *test* -exec rm -rf {} + || die
-	find third_party/ycmd/third_party -name test -exec rm -rf {} + || die
-	egit_clean
-	use clang && (rm third_party/ycmd/libclang.so* || die)
-
-	vim-plugin_src_install
-
-	use mono || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/OmniSharpServer"
-	use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/racerd"
-	use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/rust"
-	use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/go"
-	use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/go"
-	use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/tern_runtime"
-	use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript"
-	find "${D}" -name .gitignore -exec rm -rf {} + || die
-	find "${D}" -name .travis.yml -exec rm -rf {} + || die
-	find "${D}" -name README.rst -exec rm -rf {} + || die
-
-	python_optimize "${ED}"
-	python_fix_shebang "${ED}"
-}
diff --git a/app-vim/youcompleteme/youcompleteme-20190129.ebuild b/app-vim/youcompleteme/youcompleteme-20190218.ebuild
similarity index 99%
rename from app-vim/youcompleteme/youcompleteme-20190129.ebuild
rename to app-vim/youcompleteme/youcompleteme-20190218.ebuild
index 57505e4..d23f75c 100644
--- a/app-vim/youcompleteme/youcompleteme-20190129.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20190218.ebuild
@@ -10,7 +10,7 @@ inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin
 DESCRIPTION="vim plugin: a code-completion engine for Vim"
 HOMEPAGE="https://github.com/Valloric/YouCompleteMe"
 EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe"
-EGIT_COMMIT="c25e449f4e72667aca3d18d8bfccd7b289b2e9a1"
+EGIT_COMMIT="032281307dddeabdb0173b5fcd54b283e950d4ce"
 SRC_URI=""
 
 LICENSE="GPL-3"
diff --git a/app-vim/youcompleteme/youcompleteme-99999999-r6.ebuild b/app-vim/youcompleteme/youcompleteme-99999999-r6.ebuild
deleted file mode 100644
index 5d1991f..0000000
--- a/app-vim/youcompleteme/youcompleteme-99999999-r6.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: a code-completion engine for Vim"
-HOMEPAGE="https://valloric.github.io/YouCompleteMe/"
-EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clang +doc test mono go rust nodejs +neovim"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	clang? ( >=sys-devel/clang-3.8:= )
-	mono? ( dev-lang/mono )
-	go?   ( dev-lang/go )
-	rust? ( dev-lang/rust
-	        app-vim/rust-vim
-	)
-	nodejs? ( net-libs/nodejs )
-	neovim? ( app-editors/neovim[python] )
-	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}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sh[${PYTHON_USEDEP}]
-	dev-python/waitress[${PYTHON_USEDEP}]
-	virtual/python-futures[${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() {
-	default
-
-	if ! use test ; then
-		sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die
-	fi
-	for third_party_module in pythonfutures; do
-		rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
-	done
-	# Argparse is included in python 2.7
-	for third_party_module in bottle python-future requests waitress; do
-		rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
-	done
-	rm -r "${S}"/third_party/ycmd/cpp/BoostParts || die "Failed to remove bundled boost"
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CLANG_COMPLETER="$(usex clang)"
-		-DUSE_SYSTEM_LIBCLANG="$(usex clang)"
-		-DUSE_SYSTEM_BOOST=ON
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_PYTHON2=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use rust;
-	then
-		cd "${S}"/third_party/ycmd/third_party/racerd || die "no dir third_party/racerd"
-		cargo build --release || die "cargo build failed"
-	fi
-
-	if use mono;
-	then
-		cd "${S}/third_party/ycmd/third_party/OmniSharpServer" || die "failed cd to OmniSharpServer"
-		xbuild /property:Configuration=Release || die "xbuild command failed"
-	fi
-
-	if use go;
-	then
-		export GOPATH="$GOPATH:${S}/third_party/ycmd/third_party/go"
-		cd "${S}/third_party/ycmd/third_party/go/src/github.com/mdempsky/gocode" || die "failed cd to gocode"
-		go build || die "failed to go build gocode GOPATH is $GOPATH"
-		cd "${S}/third_party/ycmd/third_party/go/src/github.com/rogpeppe/godef" || die "failed cd to godef"
-		go build || die "failed to go build godef GOPATH is $GOPATH"
-	fi
-
-	if use nodejs;
-	then
-		cd "${S}/third_party/ycmd/third_party/tern_runtime" || die "no dir third_party/tern_runtime"
-		npm install --production --python=python2 || die "npm install failed"
-	fi
-
-}
-
-src_test() {
-	cd "${S}/third_party/ycmd/cpp/ycm/tests"
-	LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
-		./ycm_core_tests || die
-
-	cd "${S}"/python/ycm
-
-	local dirs=( "${S}"/third_party/*/ "${S}"/third_party/ycmd/third_party/*/ )
-	local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}")
-
-	nosetests --verbose || die
-}
-
-src_install() {
-
-	if use rust;
-	then
-		cd "${S}/third_party/ycmd/third_party/racerd" || die "racerd target wasn't built"
-		for f in $(ls -a | tail -n +3 | grep -v target)
-		do
-			rm -rf "${f}"
-		done
-		cd "${S}/third_party/ycmd/third_party/racerd/target/release" || die "racerd target wasn't built"
-		for f in $(ls -a | tail -n +3 | grep -v '^racerd$')
-		do
-			rm -rf "${f}"
-		done
-	fi
-
-	if use mono;
-	then
-		cd "${S}/third_party/ycmd/third_party/OmniSharpServer"
-		for f in $(ls -a | tail -n +3 | grep -v '^OmniSharp$')
-		do
-			rm -rf "${f}"
-		done
-		cd "${S}/third_party/ycmd/third_party/OmniSharpServer/OmniSharp"
-		for f in $(ls -a | tail -n +3 | grep -v '^bin$')
-		do
-			rm -rf "${f}"
-		done
-	fi
-
-	if use go;
-	then
-		cd "${S}/third_party/ycmd/third_party/go/src/github.com/mdempsky/gocode"
-		for f in $(ls -a | tail -n +3 | grep -v '^gocode$')
-		do
-			rm -rf "${f}"
-		done
-		cd "${S}/third_party/ycmd/third_party/go/src/github.com/rogpeppe/godef"
-		for f in $(ls -a | tail -n +3 | grep -v '^godef$')
-		do
-			rm -rf "${f}"
-		done
-	fi
-
-	cd "${S}"
-	use doc && dodoc *.md third_party/ycmd/*.md
-	rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt ci third_party/ycmd/cpp third_party/ycmd/ci third_party/ycmd/ycmd/tests third_party/ycmd/examples/samples || die
-	rm -r third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,.travis.yml,build.*,*.txt,run_tests.*,*.ini,update*} || die
-	find python -name *test* -exec rm -rf {} + || die
-	find third_party/ycmd/third_party -name test -exec rm -rf {} + || die
-	egit_clean
-	use clang && (rm third_party/ycmd/libclang.so* || die)
-
-	vim-plugin_src_install
-
-	use mono || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/OmniSharpServer"
-	use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/racerd"
-	use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/rust"
-	use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/go"
-	use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/go"
-	use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/tern_runtime"
-	use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript"
-	find "${D}" -name .gitignore -exec rm -rf {} + || die
-	find "${D}" -name .travis.yml -exec rm -rf {} + || die
-	find "${D}" -name README.rst -exec rm -rf {} + || die
-
-	python_optimize "${ED}"
-	python_fix_shebang "${ED}"
-}