Updated to 8.0.0005

3 files changed, 49 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f947ec63416..7f3ceba4d975 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Sep 12 04:02:59 UTC 2016
+# Tue Sep 20 05:36:52 UTC 2016
 pkgbase = vim-pydyn-xclip
 	pkgdesc = Vi Improved with dynamic python (python/dyn, python3/dyn) and clipboard support
-	pkgver = 7.4.2334
+	pkgver = 8.0.0005
 	pkgrel = 1
 	url = http://www.vim.org
 	arch = i686
@@ -14,13 +14,17 @@ pkgbase = vim-pydyn-xclip
 	makedepends = ruby
 	makedepends = libxt
 	makedepends = lua
+	makedepends = gawk
+	makedepends = tcl
 	depends = vim-runtime
 	depends = gpm
-	depends = ruby
-	depends = lua
-	depends = python
-	depends = python2
 	depends = acl
+	optdepends = python2: Python 2 language support
+	optdepends = python: Python 3 language support
+	optdepends = ruby: Ruby language support
+	optdepends = lua: Lua language support
+	optdepends = perl: Perl language support
+	optdepends = tcl: Tcl language support
 	provides = vim
 	provides = vim-python3
 	provides = xxd
@@ -29,11 +33,14 @@ pkgbase = vim-pydyn-xclip
 	conflicts = vim-python3
 	conflicts = gvim
 	conflicts = gvim-python3
-	source = vim-7.4.2334.tar.gz::http://github.com/vim/vim/archive/v7.4.2334.tar.gz
+	replaces = vim-python3
+	replaces = vim-minimal
+	replaces = gvim-python3
+	source = vim-8.0.0005.tar.gz::http://github.com/vim/vim/archive/v8.0.0005.tar.gz
 	source = vimrc
 	source = archlinux.vim
-	sha1sums = 3a1cf404cf54ec0ea09d86202f63d345cf3b284a
-	sha1sums = 15ebf3f48693f1f219fe2d8edb7643683139eb6b
+	sha1sums = a18072d7c2e22fbd50c3a6b92075a21e2b616160
+	sha1sums = 0612c9d685ca7bb3b7bad8ebb9eaaefd5e724376
 	sha1sums = 94f7bb87b5d06bace86bc4b3ef1372813b4eedf2
 
 pkgname = vim-pydyn-xclip
diff --git a/PKGBUILD b/PKGBUILD
index b0d17d4c0f62..f1a192d416e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,41 @@
 # Contributor: Nikita Sivakov <cryptomaniac.512@gmail.com>
 
 pkgname=vim-pydyn-xclip
-pkgver=7.4.2334
-_versiondir=74
+pkgver=8.0.0005
+_versiondir=80
 pkgrel=1
 pkgdesc='Vi Improved with dynamic python (python/dyn, python3/dyn) and clipboard support'
 arch=(i686 x86_64)
 url='http://www.vim.org'
 license=('custom:vim')
-depends=("vim-runtime" 'gpm' 'ruby' 'lua' 'python' 'python2' 'acl')
-makedepends=(gpm python2 python ruby libxt lua)
-provides=("vim" "vim-python3" "xxd")
+depends=('vim-runtime' 'gpm' 'acl')
+makedepends=(gpm python2 python ruby libxt lua gawk tcl)
+optdepends=('python2: Python 2 language support'
+            'python: Python 3 language support'
+            'ruby: Ruby language support'
+            'lua: Lua language support'
+            'perl: Perl language support'
+            'tcl: Tcl language support')
+provides=('vim' 'vim-python3' 'xxd')
 conflicts=('vim-minimal' 'vim' 'vim-python3' 'gvim' 'gvim-python3')
+replaces=('vim-python3' 'vim-minimal' 'gvim-python3')
 source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
         vimrc
         archlinux.vim)
-sha1sums=('3a1cf404cf54ec0ea09d86202f63d345cf3b284a'
-          '15ebf3f48693f1f219fe2d8edb7643683139eb6b'
+sha1sums=('a18072d7c2e22fbd50c3a6b92075a21e2b616160'
+          '0612c9d685ca7bb3b7bad8ebb9eaaefd5e724376'
           '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2')
 
 prepare() {
-  cd vim-$pkgver
+  cd vim-$pkgver/src
 
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
-  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
-    src/feature.h
-  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
-    src/feature.h
+  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h
+  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h
 
-  (cd src && autoconf)
+  autoconf
+
+  cd "$srcdir"
 }
 
 build() {
@@ -47,19 +54,19 @@ build() {
     --enable-multibyte \
     --enable-cscope \
     --enable-netbeans \
-    --enable-perlinterp \
-    --enable-pythoninterp \
-    --enable-python3interp \
-    --enable-rubyinterp \
-    --enable-luainterp
+    --enable-perlinterp=dynamic \
+    --enable-pythoninterp=dynamic \
+    --enable-python3interp=dynamic \
+    --enable-rubyinterp=dynamic \
+    --enable-luainterp=dynamic \
+    --enable-tclinterp=dynamic
 
   make
 }
 
 check() {
-  # disable tests because they seem to freeze
   cd "${srcdir}"/vim-$pkgver
-  #make test
+  TERM=xterm make -j1 test
 }
 
 package() {
@@ -81,6 +88,10 @@ package() {
   # Runtime provided by runtime package
   rm -r "${pkgdir}"/usr/share/vim
 
+
+  # no desktop files and icons
+  rm -r "${pkgdir}"/usr/share/{applications,icons}
+
   # license
   install -Dm644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
diff --git a/vimrc b/vimrc
index 3642e25c9d1e..8b6c812369ec 100644
--- a/vimrc
+++ b/vimrc
@@ -14,3 +14,5 @@ runtime! archlinux.vim
 " Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual
 " and configure vim to your own liking!
 
+" do not load defaults if ~/.vimrc is missing
+"let skip_defaults_vim=1