vim-8.0.0987-3.parabola1: updating version

1 files changed, 83 insertions, 85 deletions

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index b130c0a3c..2333a5c49 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -1,96 +1,94 @@
 # $Id: PKGBUILD 290068 2017-03-06 22:24:55Z anatolik $
-# Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>
+# Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>
 # Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com>
 # Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor (Arch): tobias [ tobias at archlinux org ]
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor (Arch): Christian Hesse <mail@eworm.de>
 # Contributor (Arch): Eli Schwartz
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Márcio Silva <coadde@parabola.nu>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgbase=vim
-pkgname=(vim gvim vim-runtime)
-pkgver=8.0.0628
+pkgname=('vim' 'gvim' 'vim-runtime')
+pkgver=8.0.0987
 _versiondir=80
-pkgrel=1.parabola1
-arch=(i686 x86_64 armv7h)
-license=('custom:vim')
+pkgrel=3.parabola1
 url='http://www.vim.org'
-makedepends=(gpm python2 python ruby libxt gtk3 lua gawk tcl)
-source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
+arch=('i686' 'x86_64' 'armv7h')
+license=('custom:vim')
+makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'gtk3' 'lua' 'gawk' 'tcl')
+source=(vim-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgver}.tar.gz
         vimrc
         parabola.vim
-        vimdoc.hook
-        perl_526.patch::https://github.com/vim/vim/commit/3653d904171e94097b0a8ac68c1ee02d7adf2d56.patch)
-sha1sums=('a6345466133f84874f11c93c4f59b82a069a3b46'
-          '1030d4be309802375832b8b2313c69e8fe9724b9'
-          'a72ca0f8d941ff221598091338d9c1bf75a3494b'
-          'adc4c82b6c4097944e5a767270a772721455eb8c'
-          '3c77787fe87a43c9e368772db774170b3927b1c5')
+        vimdoc.hook)
+sha256sums=('2c104dd55dec46a37f9a1e4bc886c2720f10431f97248517fde04fbb6d355b59'
+            '6c22ef5791004dc3a1151400a3ce6aec35f660237aed734bcde0a8a16882cbc0'
+            '2d0cae071444b5b07015c4692c47661214788d47b3aade9ffccdf703784517d0'
+            '7095cafac21df7aa42749d6864d1c0549fe65771d8edda3102c931c60782b6b9')
 
 prepare() {
-  cd vim-$pkgver
-  patch -p1 < ../perl_526.patch
-
-  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
+  (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|' feature.h
+    sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h
+    autoconf
+  )
+  cp -a vim-${pkgver} gvim-${pkgver}
 }
 
 build() {
-  cd "${srcdir}"/vim-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib/vim \
-    --with-features=huge \
-    --with-compiledby='Parabola GNU/Linux-libre' \
-    --enable-gpm \
-    --enable-acl \
-    --with-x=no \
-    --disable-gui \
-    --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
-
-  cd "${srcdir}"/gvim-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib/vim \
-    --with-features=huge \
-    --with-compiledby='Parabola GNU/Linux-libre' \
-    --enable-gpm \
-    --enable-acl \
-    --with-x=yes \
-    --enable-gui=gtk3 \
-    --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
+  msg2 "Building vim..."
+  (cd vim-${pkgver}
+    ./configure \
+      --prefix=/usr \
+      --localstatedir=/var/lib/vim \
+      --with-features=huge \
+      --with-compiledby='Parabola GNU/Linux-libre' \
+      --enable-gpm \
+      --enable-acl \
+      --with-x=no \
+      --disable-gui \
+      --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
+  )
+
+  msg2 "Building gvim..."
+  (cd gvim-${pkgver}
+    ./configure \
+      --prefix=/usr \
+      --localstatedir=/var/lib/vim \
+      --with-features=huge \
+      --with-compiledby='Parabola GNU/Linux-libre' \
+      --enable-gpm \
+      --enable-acl \
+      --with-x=yes \
+      --enable-gui=gtk3 \
+      --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() {
-  cd "${srcdir}"/vim-$pkgver
+  cd vim-${pkgver}
   TERM=xterm make -j1 test
 }
 
@@ -100,14 +98,14 @@ package_vim-runtime() {
   replaces=(${pkgname}-parabola)
   conflicts=(${pkgname}-parabola)
 
-  cd "${srcdir}"/vim-$pkgver
+  cd vim-${pkgver}
 
   make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
   # man and bin files belong to 'vim'
   rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/
 
   # Don't forget logtalk.dict
-  install -Dm644 runtime/ftplugin/logtalk.dict \
+  install -Dm 644 runtime/ftplugin/logtalk.dict \
     "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/logtalk.dict
 
   # fix FS#17216
@@ -121,24 +119,24 @@ package_vim-runtime() {
     "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/changelog.vim
 
   # rc files
-  install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
-  install -Dm644 "${srcdir}"/parabola.vim \
+  install -Dm 644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+  install -Dm 644 "${srcdir}"/parabola.vim \
     "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim
 
   # rgb.txt file
-  install -Dm644 runtime/rgb.txt \
+  install -Dm 644 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
+  install -dm 755 "${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
+  install -Dm 644 "${srcdir}"/vimdoc.hook "${pkgdir}"/usr/share/libalpm/hooks/vimdoc.hook
 }
 
 package_vim() {
@@ -154,7 +152,7 @@ package_vim() {
   provides=('xxd' 'vim-minimal' 'vim-python3')
   replaces=('vim-python3' 'vim-minimal')
 
-  cd "${srcdir}"/vim-$pkgver
+  cd vim-${pkgver}
   make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
@@ -163,7 +161,7 @@ package_vim() {
   # delete some manpages
   find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
     while read _mandir; do
-    cd ${_mandir}
+    cd "${_mandir}"
     rm -f ex.1 view.1 # provided by (n)vi
     rm -f evim.1    # this does not make sense if we have no GUI
   done
@@ -175,7 +173,7 @@ package_vim() {
   rm -r "${pkgdir}"/usr/share/{applications,icons}
 
   # license
-  install -Dm644 runtime/doc/uganda.txt \
+  install -Dm 644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
@@ -192,7 +190,7 @@ package_gvim() {
   conflicts=('vim-minimal' 'vim')
   replaces=('gvim-python3')
 
-  cd "${srcdir}"/gvim-$pkgver
+  cd gvim-${pkgver}
   make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
@@ -201,7 +199,7 @@ package_gvim() {
   # delete some manpages
   find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
     while read _mandir; do
-    cd ${_mandir}
+    cd "${_mandir}"
     rm -f ex.1 view.1 # provided by (n)vi
   done
 
@@ -212,6 +210,6 @@ package_gvim() {
   rm "${pkgdir}"/usr/share/applications/vim.desktop
 
   # license
-   install -Dm644 runtime/doc/uganda.txt \
+   install -Dm 644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }