keep ycmd URL unchanged

2 files changed, 7 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90652db911a4..3188d04499ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = neovim-youcompleteme-core-git
 	pkgdesc = A code-completion engine for Vim
-	pkgver = r2282.788c293a
-	pkgrel = 2
+	pkgver = r2359.e49f817b
+	pkgrel = 1
 	url = https://valloric.github.io/YouCompleteMe/
 	arch = i686
 	arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = neovim-youcompleteme-core-git
 	optdepends = nodejs-tern: JavaScript semantic completion
 	optdepends = racerd-git: Rust semantic completion
 	optdepends = typescript: Typescript semantic completion
-	optdepends = python-jedihttp-git: Python semantic completion
+	optdepends = python-jedi: Python semantic completion
 	source = git+https://github.com/Valloric/YouCompleteMe.git
 	source = git+https://github.com/Valloric/ycmd
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index bd82ad969eb0..7f6ce519d370 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@
 _clang_completer=y
 
 pkgname=neovim-youcompleteme-core-git
-pkgver=r2282.788c293a
-pkgrel=2
+pkgver=r2359.e49f817b
+pkgrel=1
 pkgdesc='A code-completion engine for Vim'
 arch=(i686 x86_64)
 url='https://valloric.github.io/YouCompleteMe/'
@@ -26,7 +26,7 @@ optdepends=(
 	'nodejs-tern: JavaScript semantic completion'
 	'racerd-git: Rust semantic completion'
 	'typescript: Typescript semantic completion'
-	'python-jedihttp-git: Python semantic completion')
+	'python-jedi: Python semantic completion')
 # https://github.com/Valloric/ycmd/pull/213
 #'omnisharp-roslyn: C# semantic completion'
 
@@ -46,10 +46,9 @@ fi
 
 prepare() {
 	cd "${srcdir}/YouCompleteMe"
-	git reset --hard
-	git -C 'third_party/ycmd' reset --hard
 	git config submodule.third_party/ycmd.url "${srcdir}/ycmd"
 	git submodule update --init 'third_party/ycmd'
+	git -C third_party/ycmd checkout master
 }
 
 build() {
@@ -79,11 +78,9 @@ package() {
 		unset clang_version
 	fi
 
-        install -Ddm755 "${pkg_ycmd_dir}/third_party/JediHTTP"
         install -Ddm755 "${pkg_ycmd_dir}/third_party/tern_runtime/node_modules/"
         install -Ddm755 "${pkg_ycmd_dir}/third_party/gocode/"
         install -Ddm755 "${pkg_ycmd_dir}/third_party/godef/"
-        ln -s /usr/bin/jedihttp "${pkg_ycmd_dir}/third_party/JediHTTP/jedihttp"
         ln -s /usr/lib/node_modules/tern "${pkg_ycmd_dir}/third_party/tern_runtime/node_modules/"
         ln -s /usr/bin/gocode "${pkg_ycmd_dir}/third_party/gocode/"
         ln -s /usr/bin/godef "${pkg_ycmd_dir}/third_party/godef/"