vim-7.4.525-1.parabola1: updating version

1 files changed, 64 insertions, 58 deletions

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index f0b07d952..e3628ce6c 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -7,70 +7,74 @@
 
 pkgbase=vim
 pkgname=('vim-minimal' 'vim' 'vim-python3' 'gvim' 'gvim-python3' 'vim-runtime')
+# list of tags can be found at https://code.google.com/p/vim/source/list
 _topver=7.4
-_patchlevel=473
-__hgrev=48540909aba2
+_patchlevel=525
+_tag=v${_topver/./-}-${_patchlevel}
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
 url="http://www.vim.org"
-makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
-source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
+makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua' 'mercurial')
+# It would be great to use downloadable archives https://vim.googlecode.com/archive/$tag.tar.gz
+# unfortunately its content changes each time you download one (files modification date is different)
+source=("${pkgbase}-repo::hg+https://vim.googlecode.com/hg#tag=${_tag}"
         'vimrc'
         'parabola.vim'
         'gvim.desktop')
-md5sums=('f40c51bd44fa712c7922a108d1291865'
-         'SKIP'
-         '27820c2bdc34624674c561ae6476bc6a'
-         '41c9a52bbd972f009437450a003ad3cd'
-         'd90413bd21f400313a785bb4010120cd')
+sha1sums=('SKIP'
+          '7bacf26cb66f6c36184a62bc306ef33bfe892686'
+          'a72ca0f8d941ff221598091338d9c1bf75a3494b'
+          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
 
-# source PKGBUILD && mksource
-mksource() {
-  set -e
+prepare() {
+  cd ${pkgbase}-repo
 
-  [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
-
-  __hgroot='http://vim.googlecode.com/hg/'
-  __hgrepo='vim'
-  __hgbranch='default'
-
-  hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
-
-  pushd ${__hgrepo}
-  if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then
+  _latesttag=$(hg parents --template '{latesttag}' -r default)
+  if (( $_tag != $_latesttag )); then
     printf 'You are not building the latest revision!\n'
-    printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n"
+    printf "Consider updating to tag $_latesttag.\n"
   fi
-  popd
-
-  (cd vim/src && autoconf)
-
-  mv vim ${pkgbase}-${pkgver}
-  find ${pkgbase}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \;
-  rm ${pkgbase}-${pkgver}/{.hgignore,.hgtags}
-  tar -cJf ${pkgbase}-${pkgver}.tar.xz ${pkgbase}-${pkgver}/*
-  rm -r ${pkgbase}-${pkgver}
 
-  gpg --detach-sign ${pkgbase}-${pkgver}.tar.xz
-
-  scp ${pkgbase}-${pkgver}.tar.xz* nym:/srv/ftp/other/vim/
-}
-
-build() {
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
-    ${pkgbase}-${pkgver}/src/feature.h
+    src/feature.h
   sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
-    ${pkgbase}-${pkgver}/src/feature.h
+    src/feature.h
+
+  (cd src && autoconf)
 
+  cd ..
   for pkg in ${pkgname[@]}
   do
-    cp -a ${pkgbase}-${pkgver} ${pkg}-build
+    cp -a ${pkgbase}-repo ${pkg}-build
   done
+}
+
+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 \
+    --enable-perlinterp \
+    --disable-pythoninterp \
+    --disable-python3interp \
+    --disable-rubyinterp \
+    --disable-luainterp
+
+  make
 
   cd "${srcdir}"/vim-minimal-build
 
@@ -197,7 +201,7 @@ check() {
 
 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')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl')
   conflicts=('vim' 'vim-python3' 'gvim' 'gvim-python3')
   provides=("vim=${pkgver}-${pkgrel}")
 
@@ -219,13 +223,13 @@ package_vim-minimal() {
   rm -r "${pkgdir}"/usr/share/vim
 
   # license
-  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+  install -Dm644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_vim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python2')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python2' 'acl')
   conflicts=('vim-minimal' 'vim-python3' 'gvim' 'gvim-python3')
 
   cd "${srcdir}"/vim-build
@@ -246,13 +250,13 @@ package_vim() {
   rm -r "${pkgdir}"/usr/share/vim
 
   # license
-  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+  install -Dm644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_vim-python3() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python' 'acl')
   conflicts=('vim-minimal' 'vim' 'gvim' 'gvim-python3')
   provides=("vim=${pkgver}-${pkgrel}")
 
@@ -274,7 +278,7 @@ package_vim-python3() {
   rm -r "${pkgdir}"/usr/share/vim
 
   # license
-  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+  install -Dm644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
@@ -299,8 +303,8 @@ package_gvim() {
     rm -f ex.1 view.1 # provided by (n)vi
   done
 
-  # Move the runtime for later packaging
-  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
+  # need to remove since this is provided by vim-runtime
+  rm -r "${pkgdir}"/usr/share/vim
 
   # freedesktop links
   install -Dm644 "${srcdir}"/gvim.desktop \
@@ -308,7 +312,7 @@ package_gvim() {
   install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
 
   # license
-   install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+   install -Dm644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
@@ -335,7 +339,7 @@ package_gvim-python3() {
   done
 
   # need to remove since this is provided by vim-runtime
-  rm -rf "${pkgdir}"/usr/share/vim
+  rm -r "${pkgdir}"/usr/share/vim
 
   # freedesktop links
   install -Dm644 "${srcdir}"/gvim.desktop \
@@ -343,7 +347,7 @@ package_gvim-python3() {
   install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
 
   # license
-   install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+   install -Dm644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
@@ -354,12 +358,14 @@ package_vim-runtime() {
   replaces=(${pkgname}-parabola)
   conflicts=(${pkgname}-parabola)
 
-  # Install the runtime split from gvim
-  install -dm755 "${pkgdir}"/usr/share
-  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
+  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 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+  install -Dm644 runtime/ftplugin/logtalk.dict \
     "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
 
   # fix FS#17216
@@ -378,7 +384,7 @@ package_vim-runtime() {
     "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim
 
   # rgb.txt file
-  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \
+  install -Dm644 runtime/rgb.txt \
     "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
 
   # license