Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/notmuch/PKGBUILD
	extra/calligra/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD

1 files changed, 5 insertions, 5 deletions

diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index b41bcf521..4ca5f46c1 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92216 2013-06-02 21:17:12Z dwallace $
+# $Id: PKGBUILD 95030 2013-08-03 23:12:06Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
@@ -6,15 +6,15 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.15.2
-pkgrel=4
+pkgver=0.16
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://notmuchmail.org/"
 license=('GPL3')
 makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
 options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e86968dfcd7ffaf162b7b87de56b7f18')
+md5sums=('9de9f8a91eb2323d8503872a059c7f11')
 
 prepare(){
     #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
@@ -42,7 +42,7 @@ build() {
     make -C "contrib/${pkgbase}-mutt" "${pkgname}-mutt.1"
 
     cd bindings/ruby
-    ruby extconf.rb
+    ruby extconf.rb --vendor
 
 	cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
 	python setup.py build