From b16d519b281d1e867b760587ff1eb8a1aad33466 Mon Sep 17 00:00:00 2001
From: layman <layman@localhost>
Date: Mon, 11 May 2020 15:45:47 -0700
Subject: [PATCH] add youcompleteme-20200511

---
 app-vim/youcompleteme/Manifest                |  2 +-
 ...5.ebuild => youcompleteme-20200511.ebuild} | 21 +++++--------------
 2 files changed, 6 insertions(+), 17 deletions(-)
 rename app-vim/youcompleteme/{youcompleteme-20200415.ebuild => youcompleteme-20200511.ebuild} (88%)

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index fd0fb87..e03654e 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,5 +1,5 @@
-EBUILD youcompleteme-20200415.ebuild 4768 BLAKE2B f31f1ceaea3c87648899847654cc1781caa0cf00043e1ea849e89fea3cd68d990219f74aed9cc9b028921a841a4c2725c3de2441495d53c5b570d763f5f57e60 SHA512 2a7a9d0b0d3b10de976ebde50b8e9487fa8f695a7c13c9ad1a1f538566cfe599a5d94a3b251339b372abe34c7ee2b396e225b36489ae8444b189d8aaa374635e
 EBUILD youcompleteme-20200420.ebuild 4430 BLAKE2B ac35190110eef93264debdbfd10957f7f4c9c0025d927457bf8d6d09ca9c128880491fcc71a11932ce4d10e6154e62718d9450244d8defc8dd68b1141668d9c0 SHA512 bff0625e2f2cd97041c1722f6384e078d1dc6b11551035247346ad4c27949fed1e20684fe1a2c59c443a3dc32d88a7d7abe49018b62ce6925c1edba728927ed1
 EBUILD youcompleteme-20200505.ebuild 4430 BLAKE2B 751e45fd96783f3e83952a256fdeb7e64ae820b80ed797a4f99afc9084a0cebba497a9d62374f9489ab02b4d725772148c414d9ad5f663d2658bf019df0eec73 SHA512 b9c725ee6689e3b37eee567cdd2ac27d18932fe64bdd5af9c9d7fbc9e849d7d57ef5d8eab1e386bc0b3c1b5e4097fa83694eeda52ded8cf03211b6144b637f06
+EBUILD youcompleteme-20200511.ebuild 4430 BLAKE2B abb5c9ae7f2257c4251384010524e52a71aa01719cbd072e20fa962d250a2fc9e2bf39d37fe0c441b42bbe5f273a3d2edc4cbb4be60b7edafa1ed21cc97f2742 SHA512 d0e277efd54afebee8422908690e7412e4413c0d66509c130cad7a28ca115657aaf10be5ecc7c11b09a4afaf7a6b1d514008e7c552da9a65017fd7a8409ea4e5
 MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f
 MISC metadata.xml 684 BLAKE2B ad2a46ec4665b4530aeca2821030dec6a7eccb020b65f61a79b58b2bff959f4964e44d81c3e2914ed344758bc1b80e18bd166ae638339d67b5360b9473804f0d SHA512 b9d20edf383cd83dfefaa2d46811c876de7b02985d5d8c86645d0e787f243710100d85adaf24311ef0c9020aace0a41083f4443134009f2b6533d8e2ba2887b9
diff --git a/app-vim/youcompleteme/youcompleteme-20200415.ebuild b/app-vim/youcompleteme/youcompleteme-20200511.ebuild
similarity index 88%
rename from app-vim/youcompleteme/youcompleteme-20200415.ebuild
rename to app-vim/youcompleteme/youcompleteme-20200511.ebuild
index d1b74a9..2350166 100644
--- a/app-vim/youcompleteme/youcompleteme-20200415.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20200511.ebuild
@@ -3,18 +3,17 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_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="7080933e27dba55990beaa4f37282e68f43e2d5e"
+EGIT_COMMIT="b48e6d49fa3441f507f91a9dae3437ff64f876f6"
 SRC_URI=""
 EGIT_SUBMODULES=(
 	'third_party/ycmd'
-	'third_party/ycmd/third_party/go/src/golang.org/x/tools'
 	)
 
 LICENSE="GPL-3"
@@ -26,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	clang? ( >=sys-devel/clang-7.0:= )
-	go?   ( dev-lang/go )
+	go?   ( dev-go/gopls )
 	tern? ( net-libs/nodejs )
 	typescript? ( net-libs/nodejs )
 	neovim? (
@@ -94,13 +93,6 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 
-	if use go;
-	then
-		# export GOPATH="$GOPATH:${S}/third_party/ycmd/third_party/go"
-		cd "${S}/third_party/ycmd/third_party/go/src/golang.org/x/tools/gopls" || die "failed cd to gopls"
-		go build || die "failed to go build gocode GOPATH is $GOPATH"
-	fi
-
 	if use tern;
 	then
 		cd "${S}/third_party/ycmd/third_party/tern_runtime" || die "no dir third_party/tern_runtime"
@@ -132,11 +124,8 @@ src_install() {
 
 	if use go;
 	then
-		cd "${S}/third_party/ycmd/third_party/go/src/golang.org/x/tools/gopls"
-		for f in $(ls -a | tail -n +3 | grep -v '^gopls$')
-		do
-			rm -rf "${f}"
-		done
+		mkdir -p "${S}/third_party/ycmd/third_party/go/bin"
+		ln -s /usr/bin/gopls  "${S}/third_party/ycmd/third_party/go/bin/gopls"
 	fi
 
 	cd "${S}"