Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/btanks/PKGBUILD
	community/highlight/PKGBUILD
	community/luaexpat/PKGBUILD
	community/luakit/PKGBUILD
	community/luasec/PKGBUILD
	community/luasocket/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/lua/PKGBUILD
	extra/openal/PKGBUILD
	extra/sane/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD

1 files changed, 46 insertions, 21 deletions

diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 95d3391de..44f1a5452 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 169591 2012-10-24 01:48:33Z tdziedzic $
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: tobias [ tobias at archlinux org ]
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: tobias [ tobias at archlinux org ]
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=712
-__hgrev=57e8b75298d6
+_patchlevel=754
+__hgrev=52bfa939fc07
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('368435a6494a2559565ce4d668c4513c'
-         '1613bbbd2a794cd321db09c6cfe2d35f'
+md5sums=('187bec934962a7b5418dbe233e606eef'
+         '3a41d935a372c712088cdee997e1287f'
          '6e7adfbd5d26c1d161030ec203a7f243'
          '20fceda56badf201695c57999b0bc609'
          '10353a61aadc3f276692d0e17db1478e'
@@ -30,7 +30,6 @@ md5sums=('368435a6494a2559565ce4d668c4513c'
 
 # source PKGBUILD && mksource
 mksource() {
-
   [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
 
   __hgroot='http://vim.googlecode.com/hg/'
@@ -51,7 +50,11 @@ mksource() {
   rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
   tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
   rm -r ${pkgname}-${pkgver}
-  #gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
+
+  gpg --detach-sign ${pkgname}-${pkgver}.tar.xz
+
+  scp ${pkgname}-${pkgver}.tar.xz ger:/srv/ftp/other/vim/
+  scp ${pkgname}-${pkgver}.tar.xz.sig ger:/srv/ftp/other/vim/
 }
 
 build() {
@@ -71,23 +74,45 @@ build() {
 
   cd "${srcdir}"/vim-build
 
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --with-features=big --with-compiledby=Parabola \
-    --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
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var/lib/vim \
+    --with-features=big \
+    --with-compiledby=Parabola \
+    --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}"/gvim-build
 
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --with-features=big --with-compiledby=Parabola \
-    --enable-gpm --enable-acl --with-x=yes \
-    --enable-gui=gtk2 --enable-multibyte --enable-cscope \
-    --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --disable-python3interp --enable-rubyinterp --enable-luainterp
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var/lib/vim \
+    --with-features=big \
+    --with-compiledby=Parabola \
+    --enable-gpm \
+    --enable-acl \
+    --with-x=yes \
+    --enable-gui=gtk2 \
+    --enable-multibyte \
+    --enable-cscope \
+    --enable-netbeans \
+    --enable-perlinterp \
+    --enable-pythoninterp \
+    --disable-python3interp \
+    --enable-rubyinterp \
+    --enable-luainterp
 
   make
 }