[arch-commits] Commit in vim/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Thursday, September 1, 2011 @ 17:32:01
  Author: eric
Revision: 136822

upgpkg: vim 7.3.289-1

Upstream update, Add python3 support (close FS#25529), Clean up depends and makedepends, Make vim and gvim contain their own license file

Modified:
  vim/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-01 21:15:55 UTC (rev 136821)
+++ PKGBUILD	2011-09-01 21:32:01 UTC (rev 136822)
@@ -4,17 +4,17 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgbase=vim
-pkgname=(vim gvim vim-runtime)
+pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=266
+_patchlevel=289
 pkgver=${_topver}.${_patchlevel}
-__hgrev=124a81f12ca4
+__hgrev=ba9f075a347d
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
-makedepends=('gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2'
-             'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed')
+makedepends=('gawk' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2'
+             'mercurial' 'rsync')
 source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
         vimrc archlinux.vim gvim.desktop)
 md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
@@ -88,7 +88,7 @@
     --with-features=big --enable-gpm --enable-acl --with-x=yes \
     --enable-gui=gtk2 --enable-multibyte --enable-cscope \
     --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --enable-rubyinterp
+    --enable-python3interp --enable-rubyinterp
 
   make
 }
@@ -118,14 +118,13 @@
   rm -r "${pkgdir}"/usr/share/vim
 
   # license
-  install -dm755 "${pkgdir}"/usr/share/licenses/vim
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/vim/license.txt
+  install -Dm644 "${srcdir}"/vim/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' 'perl' 'python2>=2.7.1' 'ruby' 'libxt'
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
            'desktop-file-utils' 'gtk2')
   provides=("vim=${pkgver}-${pkgrel}")
   conflicts=('vim')
@@ -153,14 +152,14 @@
   install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
 
   # license
-  install -dm755 "${pkgdir}"/usr/share/licenses/gvim
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/gvim/license.txt
+   install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_vim-runtime() {
   pkgdesc='Runtime for vim and gvim'
-  backup=(etc/vimrc)
+  depends=('perl' 'gawk')
+  backup=('etc/vimrc')
 
   # Install the runtime split from gvim
   install -dm755 "${pkgdir}"/usr/share