update hook and version

3 files changed, 52 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7176dddd3046..a0d6c205540e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,48 @@
 pkgbase = vim-clipboard
-	pkgver = 8.0.0628
+	pkgver = 8.0.0722
 	pkgrel = 1
 	url = http://www.vim.org
 	arch = i686
 	arch = x86_64
+	arch = armv7h
 	license = custom:vim
 	makedepends = gpm
 	makedepends = python2
 	makedepends = python
 	makedepends = ruby
 	makedepends = libxt
-	makedepends = desktop-file-utils
-	makedepends = gtk2
-	makedepends = gtk3
 	makedepends = lua
 	makedepends = gawk
 	makedepends = tcl
-	source = vim-8.0.0628.tar.gz::http://github.com/vim/vim/archive/v8.0.0628.tar.gz
+	source = vim-8.0.0722.tar.gz::http://github.com/vim/vim/archive/v8.0.0722.tar.gz
 	source = vimrc
+	source = vimdoc.hook
 	source = archlinux.vim
-	sha1sums = a6345466133f84874f11c93c4f59b82a069a3b46
+	sha1sums = 24824406544144938f07f021fd9aa8a9821eccea
 	sha1sums = 15ebf3f48693f1f219fe2d8edb7643683139eb6b
+	sha1sums = adc4c82b6c4097944e5a767270a772721455eb8c
 	sha1sums = 94f7bb87b5d06bace86bc4b3ef1372813b4eedf2
 
 pkgname = vim-clipboard
 	pkgdesc = Vi Improved, a highly configurable, improved version of the vi text editor with +clipboard enabled
-	depends = vim-runtime=8.0.0628-1
+	depends = vim-runtime=8.0.0722-1
 	depends = gpm
-	depends = acl
+	depends = libxt
 	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=8.0.0722-1
 	provides = xxd
 	provides = vim-minimal
 	provides = vim-python3
-	conflicts = gvim
+	conflicts = vim
 	conflicts = vim-minimal
 	conflicts = vim-python3
-	replaces = vim-python3
-	replaces = vim-minimal
+
+pkgname = vim-runtime
+	pkgdesc = Runtime for vim and gvim
+	backup = etc/vimrc
 
diff --git a/PKGBUILD b/PKGBUILD
index a8d1dc340777..c908be4a0a30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,33 @@
 # Maintainer: mesmer <mesmer@fisica.if.uff.br>
+# Contributor: xiretza <xiretza+aur@gmail.com>
+# Contributor: TJM <tommy.mairo@gmail.com>
 
-pkgname=(vim-clipboard)
-pkgver=8.0.0628
-_versiondir=74
+pkgname=(vim-clipboard vim-runtime)
+pkgver=8.0.0722
+_versiondir=80
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 armv7h)
 license=('custom:vim')
 url='http://www.vim.org'
-makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 gtk3 lua gawk tcl)
+makedepends=(gpm python2 python ruby libxt lua gawk tcl)
 source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
         vimrc
-        archlinux.vim)
-sha1sums=('a6345466133f84874f11c93c4f59b82a069a3b46'
+        vimdoc.hook
+        archlinux.vim
+        )
+sha1sums=('24824406544144938f07f021fd9aa8a9821eccea'
           '15ebf3f48693f1f219fe2d8edb7643683139eb6b'
+          'adc4c82b6c4097944e5a767270a772721455eb8c'
           '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2')
 
-
 prepare() {
-  cd vim-$pkgver/src
+  cd "${srcdir}"/vim-$pkgver/src
 
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h
   sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h
 
   autoconf
-
-  cd "$srcdir"
-  cp -a vim-$pkgver gvim-$pkgver
 }
 
 build() {
@@ -50,36 +51,11 @@ build() {
     --enable-luainterp=dynamic \
     --enable-tclinterp=dynamic
   make
-
-  cd "${srcdir}"/gvim-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib/vim \
-    --with-features=huge \
-    --with-compiledby='Arch Linux' \
-    --enable-gpm \
-    --enable-acl \
-    --with-x=yes \
-    --enable-gui=gtk2 \
-    --enable-multibyte \
-    --enable-cscope \
-    --enable-netbeans \
-    --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
-
-  cd "${srcdir}"/gvim-$pkgver
-  #make test
+  make test
 }
 
 package_vim-runtime() {
@@ -115,24 +91,29 @@ package_vim-runtime() {
   install -Dm644 runtime/rgb.txt \
     "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
 
+  # no desktop files and icons
+  rm -r "${pkgdir}"/usr/share/{applications,icons}
+
   # license
   install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
   ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
+
+  # pacman hook for documentation helptags
+  install -Dm644 "${srcdir}"/vimdoc.hook "${pkgdir}"/usr/share/libalpm/hooks/vimdoc.hook
 }
 
 package_vim-clipboard() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor with +clipboard enabled'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt')
   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')
-  conflicts=('gvim' 'vim-minimal' 'vim-python3')
-  provides=('xxd' 'vim-minimal' 'vim-python3')
-  replaces=('vim-python3' 'vim-minimal')
+  conflicts=('vim' 'vim-minimal' 'vim-python3')
+  provides=("vim=${pkgver}-${pkgrel}" 'xxd' 'vim-minimal' 'vim-python3')
 
   cd "${srcdir}"/vim-$pkgver
   make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
@@ -150,47 +131,12 @@ package_vim-clipboard() {
 
   # Runtime provided by runtime package
   rm -r "${pkgdir}"/usr/share/vim
+  
+  # no gvim stuff
+  rm -r "${pkgdir}"/usr/share/icons
+  rm "${pkgdir}"/usr/share/applications/gvim.desktop
 
   # license
   install -Dm644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
-
-package_gvim() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'desktop-file-utils' 'gtk2')
-  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=${pkgver}-${pkgrel}" "xxd")
-  conflicts=('vim-minimal' 'vim')
-  replaces=('gvim-python3')
-  install=gvim.install
-
-  cd "${srcdir}"/gvim-$pkgver
-  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
-  # provided by (n)vi in core
-  rm "${pkgdir}"/usr/bin/{ex,view}
-
-  # delete some manpages
-  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
-    while read _mandir; do
-    cd ${_mandir}
-    rm -f ex.1 view.1 # provided by (n)vi
-  done
-
-  # need to remove since this is provided by vim-runtime
-  rm -r "${pkgdir}"/usr/share/vim
-
-  # freedesktop links
-  install -Dm644 runtime/gvim.desktop "${pkgdir}"/usr/share/applications/gvim.desktop
-  install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
-
-  # license
-   install -Dm644 runtime/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
diff --git a/vimdoc.hook b/vimdoc.hook
new file mode 100644
index 000000000000..b77d5929f920
--- /dev/null
+++ b/vimdoc.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Operation= Remove
+Type = File
+Target = usr/share/vim/vimfiles/doc/
+
+[Action]
+Description = Updating Vim help tags...
+Exec = /usr/bin/vim -es --cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q"
+When = PostTransaction