diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 8a0253d..b9d4db8 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,5 +1,5 @@
-EBUILD youcompleteme-20190604.ebuild 6180 BLAKE2B 489a3fb3fec18a703b0bc80d4f25f943c11b7e693ade48116ef80172a25b22a340134ede950de9f18eea1ade0950596217a45327a536f5ed7cafe74da1ea42e7 SHA512 1efb93a47b053dbb51daade7fa4de64837ca4ffcade4104f3b29dd96cf93e272f3e1f9b5607c4943b2d9d2a73e8a3a51e994704c7f97032e00e2a08ea19d65cf
 EBUILD youcompleteme-20190627.ebuild 6180 BLAKE2B 803e95e7c07b31afffca4d651f38d4b36af35705eecc9b7198696247c43524013c78ff50909854f621d9f70dee58d87f6f48493dae8a951c1323112c1d087398 SHA512 bbeb5884e23ae6684bccdef314bea8d2f8be39e26daa2fcc8949b74df7be11e0f7eda2f2fc55ff5faa032bdcc9524b08782d411a2ab995e9e642a394c7001e38
 EBUILD youcompleteme-20190629.ebuild 6180 BLAKE2B f31fff596b682b28d1123b8f036158fab437147fe282e965948d0a62365ea8c406e7260962e7f28221cb6ade2a82842355b0b2fdad0128cd6d433287cd7c4a9a SHA512 32001d09321a34c5e4c4148c8f7b2f091ce4993a23e9fed338ebf9fbd0dbd326380cb5b61bd393d8a82bb9dde72acaa62a6ff0e6c0463ae7112edeb1693f6e84
+EBUILD youcompleteme-20190711.ebuild 4509 BLAKE2B 058948c4ca4775eb3f28a0050786531dab2def34db5bfb8d6db079d4afc2fa44972298671cd00ca43d42c024ecc01a22ddb35ac1717880375a593a0b4fa964ca SHA512 03acb47def96841ed78607b0416cc3e7fb06ebdf956d916fa63e4c816d658aa5f95751015e28141bf58e89ec960f05fb9d42e934aeeb749a4f588480fde1417d
 MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f
-MISC metadata.xml 672 BLAKE2B 27d98400640fe6befc7cc4f35803af907c631d7204b24cafe2f799d528fbfda3be5e1fb2e9dbf93ebc72a66e0ac5a0a7e3c164bb29596a8bde3b1ec2579bed8a SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70
+MISC metadata.xml 572 BLAKE2B fcfb5f3b820aa0390b541f67d78976faaeaa4822b8a221991abfbfff5253e0513d857acb1b3a22ee611443a958605d9751ebea749b167c09e221b27beb9a3cc3 SHA512 9b299e8fe489b4df623609ce946341dddcc93fc51f7bec583f96931606dfcd613288ca72c6790f10769ab1521602f6ba6416893d4aed4411ed4e436b086f3887
diff --git a/app-vim/youcompleteme/metadata.xml b/app-vim/youcompleteme/metadata.xml
index aeb47e4..c90c324 100644
--- a/app-vim/youcompleteme/metadata.xml
+++ b/app-vim/youcompleteme/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="clang">Enable semantic support for C-family languages using <pkg>sys-devel/clang</pkg></flag>
 		<flag name="go">Enable semantic support for go language using <pkg>dev-lang/go</pkg></flag>
-		<flag name="rust">Enable semantic support for rust language using <pkg>dev-lang/rust</pkg></flag>
 		<flag name="nodejs">Enable semantic support for nodejs language using <pkg>net-libs/nodejs</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-vim/youcompleteme/youcompleteme-20190604.ebuild b/app-vim/youcompleteme/youcompleteme-20190711.ebuild
similarity index 63%
rename from app-vim/youcompleteme/youcompleteme-20190604.ebuild
rename to app-vim/youcompleteme/youcompleteme-20190711.ebuild
index 3a93fa5..54cb706 100644
--- a/app-vim/youcompleteme/youcompleteme-20190604.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20190711.ebuild
@@ -10,31 +10,23 @@ 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="59eea79da8acaf4cd01631b15d6c762f9b9bdb14"
+EGIT_COMMIT="04c3505129cd80b92f1b6177dca8aecc55cb0760"
 SRC_URI=""
 EGIT_SUBMODULES=(
 	'third_party/ycmd'
-	'third_party/OmniSharpServer'
-	'cecil'
-	'NRefactory'
-	'third_party/racerd'
-	'third_party/go/src/github.com/mdempsky/gocode'
-	'third_party/go/src/github.com/rogpeppe/godef'
+	'third_party/go/src/golang.org/x/tools'
 	)
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="clang +doc test mono go rust nodejs +neovim"
+IUSE="clang +doc test go 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] )
@@ -99,31 +91,19 @@ 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"
+		# export GOPATH="$GOPATH:${S}/third_party/ycmd/third_party/go"
+		cd "${S}/third_party/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls" || die "failed cd to gopls"
 		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=python3 || die "npm install failed"
+		mkdir -p "${S}/third_party/ycmd/third_party/tsserver" || die "no dir third_party/tsserver"
+		npm install -g --prefix third_party/tsserver typescript --python=python3
 	fi
 
 }
@@ -143,43 +123,10 @@ src_test() {
 
 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$')
+		cd "${S}/third_party/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls"
+		for f in $(ls -a | tail -n +3 | grep -v '^gopls$')
 		do
 			rm -rf "${f}"
 		done
@@ -196,9 +143,6 @@ src_install() {
 
 	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"