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

Conflicts:
	community/newsbeuter/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/ruby-ncurses/PKGBUILD
	community/subtle/PKGBUILD
	extra/gegl/PKGBUILD
	extra/libebml/PKGBUILD
	extra/libmatroska/PKGBUILD
	extra/ncmpc/PKGBUILD
	extra/nx/PKGBUILD
	extra/qtwebkit/PKGBUILD

1 files changed, 16 insertions, 13 deletions

diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index 4a240b159..e89d3ffe7 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82559 2013-01-20 23:36:23Z dwallace $
+# $Id: PKGBUILD 86877 2013-03-23 23:10:36Z td123 $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
@@ -6,7 +6,7 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.15
+pkgver=0.15.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://notmuchmail.org/"
@@ -14,12 +14,13 @@ 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=('a79454042e508c8a1d7aaf1a617526f0')
+md5sums=('e86968dfcd7ffaf162b7b87de56b7f18')
 
 build() {
     cd "$srcdir/${pkgname}-$pkgver"
 
-    ./configure --prefix=/usr --sysconfdir=/etc
+    ./configure --prefix=/usr --sysconfdir=/etc \
+		--includedir=/usr/include
     make 
     (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt"
     make ${pkgname}-mutt.1)
@@ -33,14 +34,14 @@ build() {
     cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-    env LD_LIBRARY_PATH="." python setup.py build
+    #env LD_LIBRARY_PATH="." python setup.py build
+    find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
+	python setup.py build
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    find "." -name '*.py' -print0 |xargs -0 \
-        sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-        -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-    env LD_LIBRARY_PATH="." python2 setup.py build
-
+    find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
+    #env LD_LIBRARY_PATH="." python2 setup.py build
+	python2 setup.py build
 }
 
 package_notmuch-runtime(){
@@ -73,15 +74,17 @@ package_notmuch(){
 
     # Install python bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir"
+    #env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir"
+	python2 setup.py install --prefix=/usr --root="$pkgdir"
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-    env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir"
+    #env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir"
+	python setup.py install --prefix=/usr --root="$pkgdir"
 
     # Install ruby bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby"
     sed -i -e 's,/site_ruby,,g' Makefile
-    make prefix="${pkgdir}/usr" install
+    make DESTDIR="$pkgdir" includedir=/usr/include install
 
 }