[arch-commits] Commit in vim-jedi/repos (5 files)

Wed May 28 19:16:55 UTC 2014

Date: Wednesday, May 28, 2014 @ 21:16:55
  Author: lfleischer
Revision: 112035

archrelease: copy trunk to community-any

Added:
  vim-jedi/repos/community-any/
  vim-jedi/repos/community-any/4724e18b633e54dbaac39759770601cc1979893a.patch
    (from rev 112034, vim-jedi/trunk/4724e18b633e54dbaac39759770601cc1979893a.patch)
  vim-jedi/repos/community-any/PKGBUILD
    (from rev 112034, vim-jedi/trunk/PKGBUILD)
  vim-jedi/repos/community-any/d9a43db019da0390406e34cb161a61fba43bf250.patch
    (from rev 112034, vim-jedi/trunk/d9a43db019da0390406e34cb161a61fba43bf250.patch)
  vim-jedi/repos/community-any/vim-jedi.install
    (from rev 112034, vim-jedi/trunk/vim-jedi.install)

------------------------------------------------+
 4724e18b633e54dbaac39759770601cc1979893a.patch |   47 +++++++++++++++++++++++
 PKGBUILD                                       |   41 ++++++++++++++++++++
 d9a43db019da0390406e34cb161a61fba43bf250.patch |   25 ++++++++++++
 vim-jedi.install                               |   31 +++++++++++++++
 4 files changed, 144 insertions(+)

Copied: vim-jedi/repos/community-any/4724e18b633e54dbaac39759770601cc1979893a.patch (from rev 112034, vim-jedi/trunk/4724e18b633e54dbaac39759770601cc1979893a.patch)
===================================================================

--- community-any/4724e18b633e54dbaac39759770601cc1979893a.patch	                        (rev 0)
+++ community-any/4724e18b633e54dbaac39759770601cc1979893a.patch	2014-05-28 19:16:55 UTC (rev 112035)
@@ -0,0 +1,47 @@
+From 4724e18b633e54dbaac39759770601cc1979893a Mon Sep 17 00:00:00 2001
+From: Dave Halter <davidhalter88 at gmail.com>
+Date: Wed, 15 Jan 2014 12:17:51 +0100
+Subject: [PATCH] new version stuff
+
+---
+ jedi_vim.py | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/jedi_vim.py b/jedi_vim.py
+index ef2ce97..1fd7afd 100644
+--- a/jedi_vim.py
++++ b/jedi_vim.py
+@@ -10,7 +10,7 @@
+ 
+ import vim
+ import jedi
+-from jedi._compatibility import unicode, is_py3k
++from jedi._compatibility import unicode, is_py3
+ 
+ 
+ def catch_and_print_exceptions(func):
+@@ -62,7 +62,7 @@ class PythonToVimStr(unicode):
+     __slots__ = []
+ 
+     def __new__(cls, obj, encoding='UTF-8'):
+-        if is_py3k or isinstance(obj, unicode):
++        if is_py3 or isinstance(obj, unicode):
+             return unicode.__new__(cls, obj)
+         else:
+             return unicode.__new__(cls, obj, encoding)
+@@ -466,5 +466,11 @@ def escape_file_path(path):
+ def print_to_stdout(level, str_out):
+     print(str_out)
+ 
+-if not hasattr(jedi, '__version__') or jedi.__version__ < (0, 7, 0):
++
++version = jedi.__version__
++if isinstance(version, str):
++    # the normal use case, now.
++    from jedi import utils
++    version = utils.version_info()
++if version < (0, 7):
+     echo_highlight('Please update your Jedi version, it is to old.')
+-- 
+1.9.3
+

Copied: vim-jedi/repos/community-any/PKGBUILD (from rev 112034, vim-jedi/trunk/PKGBUILD)
===================================================================
--- community-any/PKGBUILD	                        (rev 0)
+++ community-any/PKGBUILD	2014-05-28 19:16:55 UTC (rev 112035)
@@ -0,0 +1,41 @@
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Danilo Bargen <gezuru at gmail.com>
+
+pkgname=vim-jedi
+_reponame=jedi-vim
+pkgver=0.7.0
+pkgrel=4
+pkgdesc='Vim plugin for jedi, an awesome Python autocompletion.'
+arch=('any')
+url="https://github.com/davidhalter/${_reponame}"
+license=('LGPL3')
+depends=('vim' 'python-jedi' 'python')
+optdepends=('vim-supertab: for tab completion'
+            'python2-jedi: for Python 3 support')
+groups=('vim-plugins')
+source=("https://github.com/davidhalter/${_reponame}/archive/${pkgver}.tar.gz"
+        '4724e18b633e54dbaac39759770601cc1979893a.patch'
+	'd9a43db019da0390406e34cb161a61fba43bf250.patch')
+sha256sums=('cb1b157800024f587e227cd901762963a98e1242eba070875d4aac9f08c0c11e'
+            'e6f252574b65a0fbcfb8a8c771d0eb00e0f7aadae10a24623169a27b1cf64852'
+            'b228a592aee79f346bd3ee98743394a25790fcbb48ccc69bb1413a58f1bcb41c')
+install=${pkgname}.install
+
+prepare() {
+  cd "$srcdir/$_reponame-$pkgver"
+
+  patch -p1 -i ../d9a43db019da0390406e34cb161a61fba43bf250.patch
+  patch -p1 -i ../4724e18b633e54dbaac39759770601cc1979893a.patch
+}
+
+package() {
+  cd "$srcdir/$_reponame-$pkgver"
+
+  install -d ${pkgdir}/usr/share/vim/vimfiles/
+
+  cp -dp --no-preserve=ownership jedi_vim.py initialize.py "${pkgdir}/usr/share/vim/vimfiles/"
+  cp -dpr --no-preserve=ownership after "${pkgdir}/usr/share/vim/vimfiles/after"
+  cp -dpr --no-preserve=ownership autoload "${pkgdir}/usr/share/vim/vimfiles/autoload"
+  cp -dpr --no-preserve=ownership ftplugin "${pkgdir}/usr/share/vim/vimfiles/ftplugin"
+  cp -dpr --no-preserve=ownership plugin "${pkgdir}/usr/share/vim/vimfiles/plugin"
+}

Copied: vim-jedi/repos/community-any/d9a43db019da0390406e34cb161a61fba43bf250.patch (from rev 112034, vim-jedi/trunk/d9a43db019da0390406e34cb161a61fba43bf250.patch)
===================================================================
--- community-any/d9a43db019da0390406e34cb161a61fba43bf250.patch	                        (rev 0)
+++ community-any/d9a43db019da0390406e34cb161a61fba43bf250.patch	2014-05-28 19:16:55 UTC (rev 112035)
@@ -0,0 +1,25 @@
+From d9a43db019da0390406e34cb161a61fba43bf250 Mon Sep 17 00:00:00 2001
+From: Dave Halter <davidhalter88 at gmail.com>
+Date: Mon, 13 Jan 2014 15:38:48 +0100
+Subject: [PATCH] remove unused jedi.keywords import that caused jedi-vim not
+ to work because the file was moved internally in the Jedi package
+
+---
+ jedi_vim.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/jedi_vim.py b/jedi_vim.py
+index 0307e35..ef2ce97 100644
+--- a/jedi_vim.py
++++ b/jedi_vim.py
+@@ -10,7 +10,6 @@
+ 
+ import vim
+ import jedi
+-import jedi.keywords
+ from jedi._compatibility import unicode, is_py3k
+ 
+ 
+-- 
+1.9.3
+

Copied: vim-jedi/repos/community-any/vim-jedi.install (from rev 112034, vim-jedi/trunk/vim-jedi.install)
===================================================================
--- community-any/vim-jedi.install	                        (rev 0)
+++ community-any/vim-jedi.install	2014-05-28 19:16:55 UTC (rev 112035)
@@ -0,0 +1,31 @@
+warn_nopy3() {
+	py3grep=`vim --version | grep "\+python3"`
+    if [ ${#py3grep} -le 1 ]
+    then
+        echo "-----------------------------------------------------"
+        echo -e "\e[1mWarning:\e[m"
+        echo "Your vim install doesn't seem to support Python 3."
+        echo "If that's the case you should install the python2 and python2-jedi packages."
+        echo "-----------------------------------------------------"
+    fi
+}
+
+update_helptags() {
+    printf "Updating vim help tags..."
+    vim -e -s -c "helptags /usr/share/vim/vimfiles/doc/" -c "quit"
+    printf "done\n"
+}
+
+post_install() {
+    update_helptags
+    warn_nopy3
+}
+
+post_upgrade() {
+    update_helptags
+    warn_nopy3
+}
+
+post_remove() {
+    update_helptags
+}


