vim-7.4.1089-1.parabola1: updating version

* vim now uses dynamic language bindings for Ruby, Lua, Python, Perl and all these
  dependencies became optional. there is no difference in dependencies between
  vim-minimal and vim.
  because vim compiles dynamic loaders for bindings its installed size is 0.45M bigger than vim-minimal.
  it is only 0.45/28.12=1.6% size difference and does not justify vim-minimal package existance.

1 files changed, 51 insertions, 133 deletions

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index 589a211ad..20eb54f8e 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 257650 2016-01-08 21:26:32Z anatolik $
+# $Id: PKGBUILD 258182 2016-01-13 20:16:30Z anatolik $
 # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>
 # Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com>
 # Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com>
@@ -8,8 +8,8 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=vim
-pkgname=(vim-minimal vim gvim vim-runtime)
-pkgver=7.4.1063
+pkgname=(vim gvim vim-runtime)
+pkgver=7.4.1089
 _versiondir=74
 pkgrel=1.parabola1
 arch=(i686 x86_64)
@@ -19,75 +19,25 @@ makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 lua gawk)
 source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
         vimrc
         parabola.vim)
-sha1sums=('2efe8f5454b37ff234d93d1e146db2e616732753'
+sha1sums=('5c1859d60d8c44f409d9959149440bb5a3809afe'
           '7bacf26cb66f6c36184a62bc306ef33bfe892686'
           'a72ca0f8d941ff221598091338d9c1bf75a3494b')
 
 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"
-  for pkg in ${pkgname[@]}
-  do
-    cp -a vim-$pkgver ${pkg}-build
-  done
+  cp -a vim-$pkgver gvim-$pkgver
 }
 
 build() {
-  cd "${srcdir}"/vim-runtime-build
-
-  ./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 \
-    --disable-netbeans \
-    --disable-perlinterp \
-    --disable-pythoninterp \
-    --disable-python3interp \
-    --disable-rubyinterp \
-    --disable-luainterp
-
-  make
-
-  cd "${srcdir}"/vim-minimal-build
-
-  ./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 \
-    --disable-netbeans \
-    --disable-perlinterp \
-    --disable-pythoninterp \
-    --disable-python3interp \
-    --disable-rubyinterp \
-    --disable-luainterp
-
-  make
-
-  cd "${srcdir}"/vim-build
-
+  cd "${srcdir}"/vim-$pkgver
   ./configure \
     --prefix=/usr \
     --localstatedir=/var/lib/vim \
@@ -105,11 +55,9 @@ build() {
     --enable-python3interp=dynamic \
     --enable-rubyinterp=dynamic \
     --enable-luainterp=dynamic
-
   make
 
-  cd "${srcdir}"/gvim-build
-
+  cd "${srcdir}"/gvim-$pkgver
   ./configure \
     --prefix=/usr \
     --localstatedir=/var/lib/vim \
@@ -127,45 +75,57 @@ build() {
     --enable-python3interp=dynamic \
     --enable-rubyinterp=dynamic \
     --enable-luainterp=dynamic
-
   make
 }
 
 check() {
   # disable tests because they seem to freeze
-  cd "${srcdir}"/vim-build
+  cd "${srcdir}"/vim-$pkgver
   #make test
 
-  cd "${srcdir}"/gvim-build
+  cd "${srcdir}"/gvim-$pkgver
   #make test
 }
 
-package_vim-minimal() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with a minimal set of dependencies)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl')
-  conflicts=('vim' 'gvim')
-  provides=("vim=${pkgver}-${pkgrel}" "xxd")
+package_vim-runtime() {
+  pkgdesc='Runtime for vim and gvim (Parabola rebranded)'
+  backup=('etc/vimrc')
+  replaces=(${pkgname}-parabola)
+  conflicts=(${pkgname}-parabola)
 
-  cd "${srcdir}"/vim-minimal-build
-  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+  cd "${srcdir}"/vim-$pkgver
 
-  # provided by (n)vi in core
-  rm "${pkgdir}"/usr/bin/{ex,view}
+  (cd src && make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" installruntime install-languages installtools)
+  # man and bin files belong to 'vim'
+  rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/
 
-  # 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
-    rm -f evim.1    # this does not make sense if we have no GUI
-  done
+  # Don't forget logtalk.dict
+  install -Dm644 runtime/ftplugin/logtalk.dict \
+    "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/logtalk.dict
 
-  # Runtime provided by runtime package
-  rm -r "${pkgdir}"/usr/share/vim
+  # fix FS#17216
+  sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
+    "${pkgdir}"/usr/share/vim/vim${_versiondir}/filetype.vim
+
+  # patch filetype.vim for better handling of pacman related files
+  sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
+    "${pkgdir}"/usr/share/vim/vim${_versiondir}/filetype.vim
+  sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
+    "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/changelog.vim
+
+  # rc files
+  install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+  install -Dm644 "${srcdir}"/parabola.vim \
+    "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim
+
+  # rgb.txt file
+  install -Dm644 runtime/rgb.txt \
+    "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
 
   # license
-  install -Dm644 runtime/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+  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
 }
 
 package_vim() {
@@ -176,11 +136,11 @@ package_vim() {
               'ruby: Ruby language support'
               'lua: Lua language support'
               'perl: Perl language support')
-  conflicts=('vim-minimal' 'gvim')
-  provides=('xxd')
-  replaces=('vim-python3')
+  conflicts=('gvim' 'vim-minimal' 'vim-python3')
+  provides=('xxd' 'vim-minimal' 'vim-python3')
+  replaces=('vim-python3' 'vim-minimal')
 
-  cd "${srcdir}"/vim-build
+  cd "${srcdir}"/vim-$pkgver
   make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
@@ -215,7 +175,7 @@ package_gvim() {
   replaces=('gvim-python3')
   install=gvim.install
 
-  cd "${srcdir}"/gvim-build
+  cd "${srcdir}"/gvim-$pkgver
   make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
@@ -239,45 +199,3 @@ package_gvim() {
    install -Dm644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
-
-package_vim-runtime() {
-  pkgdesc='Runtime for vim and gvim (Parabola rebranded)'
-  depends=('perl' 'gawk')
-  backup=('etc/vimrc')
-  replaces=(${pkgname}-parabola)
-  conflicts=(${pkgname}-parabola)
-
-  cd "${srcdir}"/vim-runtime-build
-
-  (cd src && make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" installruntime install-languages installtools)
-  # 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 \
-    "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/logtalk.dict
-
-  # fix FS#17216
-  sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
-    "${pkgdir}"/usr/share/vim/vim${_versiondir}/filetype.vim
-
-  # patch filetype.vim for better handling of pacman related files
-  sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
-    "${pkgdir}"/usr/share/vim/vim${_versiondir}/filetype.vim
-  sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
-    "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/changelog.vim
-
-  # rc files
-  install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
-  install -Dm644 "${srcdir}"/parabola.vim \
-    "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim
-
-  # rgb.txt file
-  install -Dm644 runtime/rgb.txt \
-    "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
-
-  # 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
-}