diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 89b663a..f423cbd 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,5 +1,5 @@
-EBUILD youcompleteme-20200130.ebuild 5025 BLAKE2B c8060c8c79b3eedb24e09a954561cc4be22409585ba86d7aab1c14af93f746159061f64e72289bfddbed73a85093c8516fafa0e7848f319d1c4bc8e208d63b4f SHA512 5167e6356e9cb1fa5270c812c274a15bd5fb73cd3c8748053a5920f629cde8e54c41438d702c2fd4e0f04f5e980ab5c46b357755d5f5306f72c0240e2637233b
 EBUILD youcompleteme-20200213.ebuild 4701 BLAKE2B f1d2d1419f0cea301c61ee498b9b386371b536e4c7d73eeb895489493fc56bbad3b1b8a14078d760d45abacb7def2fdcf7189f0c1a9b865df2c20d4794bd5eab SHA512 12b65bb6c52cec624e32c6db6689b7710681955388dff5a20ffcfd9b31085f11c6297fe82ef928f9d9fa84056c29136c316f522757a68370a36c48eb7e476664
 EBUILD youcompleteme-20200219.ebuild 4701 BLAKE2B cc5916b98371eda22d19e8cc25f2ffdee19a9b77004bf39eb1bf5df4c9a6f502869184476934d0f46cccdc697b171e6bf11c85ac009e95341df0e93b31ad620f SHA512 5a07a49c26e1360360af7ea840130257292c171c96992130a31d371003d927645c20329762a17b5836274a6eae1f2d5aac7f909305ba23d9136724cbde42c0f4
+EBUILD youcompleteme-20200305.ebuild 4701 BLAKE2B 461a7c3689bb99b1a061a4ea5e6c889623e3fcfc5257c1a7bdc74dc83c725a73094b4c2ab95a9f42a19737407c57e1fe7813abdd7de09cb967c4885a0b9f1348 SHA512 692f415b0a357e72c53b412fab89decbf96c63ce5a2db2fbd01f2590e35f8fad1b20d406daa2599dee871378395c90e0e6140033ad4eed784d263e4cd2382ff1
 MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f
 MISC metadata.xml 684 BLAKE2B ad2a46ec4665b4530aeca2821030dec6a7eccb020b65f61a79b58b2bff959f4964e44d81c3e2914ed344758bc1b80e18bd166ae638339d67b5360b9473804f0d SHA512 b9d20edf383cd83dfefaa2d46811c876de7b02985d5d8c86645d0e787f243710100d85adaf24311ef0c9020aace0a41083f4443134009f2b6533d8e2ba2887b9
diff --git a/app-vim/youcompleteme/youcompleteme-20200130.ebuild b/app-vim/youcompleteme/youcompleteme-20200305.ebuild
similarity index 86%
rename from app-vim/youcompleteme/youcompleteme-20200130.ebuild
rename to app-vim/youcompleteme/youcompleteme-20200305.ebuild
index 77599fe..d7bbe04 100644
--- a/app-vim/youcompleteme/youcompleteme-20200130.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20200305.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="124661f218e80b96c1f9f3d124e99f9a2fd2d83b"
+EGIT_COMMIT="d9da0432e777b52fdce04439049c6f5208080ae2"
 SRC_URI=""
 EGIT_SUBMODULES=(
 	'third_party/ycmd'
@@ -31,33 +31,31 @@ COMMON_DEPEND="
 	typescript? ( net-libs/nodejs )
 	neovim? (
 		app-editors/neovim
-		dev-python/neovim-python-client
+		dev-python/pynvim
 	)
-	dev-libs/boost[python,threads,${PYTHON_USEDEP}]
+	dev-libs/boost[python,threads]
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python]
+		app-editors/gvim[python]
 	)
 "
 
 RDEPEND="
 	${COMMON_DEPEND}
-	dev-python/bottle[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/requests-futures[${PYTHON_USEDEP}]
-	dev-python/sh[${PYTHON_USEDEP}]
-	dev-python/waitress[${PYTHON_USEDEP}]
-	dev-python/numpydoc[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.12.1[${PYTHON_USEDEP}]
-	dev-python/parso[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
+	dev-python/bottle
+	dev-python/regex
+	dev-python/requests-futures
+	dev-python/sh
+	dev-python/waitress
+	dev-python/numpydoc
+	>=dev-python/jedi-0.12.1
+	dev-python/parso
 "
 DEPEND="
 	${COMMON_DEPEND}
 	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1
+		>=dev-python/nose-1.3.0
 		dev-cpp/gmock
 		dev-cpp/gtest
 	)