aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD64
2 files changed, 58 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a1670c8906b6..4c9cf4727643 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
pkgbase = deoplete-jedi-git
pkgdesc = jedi add-on for deoplete completion plugin for neovim
- pkgver = r226.f7a0c4f
+ pkgver = r242.45f1ac2
pkgrel = 1
url = https://github.com/zchee/deoplete-jedi
arch = any
license = MIT
makedepends = git
depends = deoplete-git
- depends = python-jedi
- depends = python2-jedi
provides = deoplete-jedi
conflicts = deoplete-jedi
- source = deoplete-jedi::git://github.com/zchee/deoplete-jedi
+ source = git+https://github.com/zchee/deoplete-jedi
+ source = git+https://github.com/davidhalter/jedi.git
+ source = git+https://github.com/davidhalter/parso.git
+ md5sums = SKIP
+ md5sums = SKIP
md5sums = SKIP
pkgname = deoplete-jedi-git
diff --git a/PKGBUILD b/PKGBUILD
index c28d861c668b..4499366b5857 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,82 @@
# Maintainer: Trent Palmer trenttdually at gmail
+###########################################################################################################
+# Build Options
+###########################################################################################################
+# _vim="y" would require deoplete in addition to nvim-yarp and vim-hug-neovim-rpc
+_vim="n"
+#
+_neovim="y"
+###########################################################################################################
+
_name='deoplete-jedi'
pkgname="${_name}-git"
-pkgver=r226.f7a0c4f
+pkgver=r242.45f1ac2
pkgrel=1
pkgdesc="jedi add-on for deoplete completion plugin for neovim"
arch=('any')
url="https://github.com/zchee/deoplete-jedi"
license=('MIT')
groups=()
-# python-jedia pulls in python-parso
-# perhaps the arch packages can be used instead of
-# the git submodules?
-depends=('deoplete-git' 'python-jedi' 'python2-jedi')
+depends=('deoplete-git')
makedepends=('git')
provides=('deoplete-jedi')
conflicts=('deoplete-jedi')
replaces=()
backup=()
options=()
-source=("${_name}::${url//https/git}")
+source=(
+'git+https://github.com/zchee/deoplete-jedi' # deopletejedi
+'git+https://github.com/davidhalter/jedi.git' # jedi
+'git+https://github.com/davidhalter/parso.git' # parso
+)
noextract=()
-md5sums=('SKIP')
+md5sums=('SKIP' 'SKIP' 'SKIP')
pkgver() {
cd "${srcdir}/${_name}"
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-# hack server.py so it doesn't source jedi and parso submodules
prepare() {
- cd "${srcdir}/${_name}/rplugin/python3/deoplete/sources/deoplete_jedi/"
- sed -i -e 's/vendored//g' server.py
+ msg2 'Setting up Git submodules...'
+
+ deopletejedi=("jedi" "parso")
+ gitprepare "deoplete-jedi" "rplugin/python3/deoplete/vendored/" "${deopletejedi[@]}"
+}
+
+gitprepare() {
+ local CD_DIR=$1
+ local GIT_PREFIX=$2
+ c=0
+ for val in "$@" ; do
+ if [ $c -gt 1 ]; then
+ FEED[$c]=$val
+ fi
+ c=$(( c + 1 ))
+ done
+
+ cd "$srcdir/$CD_DIR" || exit
+
+ git submodule init
+ for GITSUBVAR in "${FEED[@]}" ; do
+ git config submodule."$GIT_PREFIX$GITSUBVAR".url "$srcdir/$GITSUBVAR"
+ done
+ git submodule update
+ unset -v FEED
}
package() {
+ if [ "$_neovim" = "y" ]; then
mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete"
- cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/sources" \
- "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/"
+ cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/"{sources,vendored} \
+ "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/"
+ fi
+
+ if [ "$_vim" = "y" ]; then
+ mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete"
+ cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/"{sources,vendored} \
+ "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/"
+ fi
install -D -m644 "${srcdir}/${_name}/README.md" $pkgdir/usr/share/doc/$pkgname/README.md
install -D -m644 "${srcdir}/${_name}/LICENSE" $pkgdir/usr/share/licenses/$pkgname/LICENSE