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

Conflicts:
	community/bird/PKGBUILD
	community/drbd/PKGBUILD
	community/etherape/PKGBUILD
	community/ext4magic/PKGBUILD
	community/fcron/PKGBUILD
	community/fcron/systab.orig
	community/gnome-panel/PKGBUILD
	community/libident/PKGBUILD
	community/libtorrent/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/usbipd.service
	community/makedev/PKGBUILD
	community/minbif/PKGBUILD
	community/noip/PKGBUILD
	community/notmuch/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/pound/PKGBUILD
	community/preload/PKGBUILD
	community/python-cchardet/PKGBUILD
	community/rtorrent/PKGBUILD
	community/tor/PKGBUILD
	community/ude/PKGBUILD
	core/openldap/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cvs/PKGBUILD
	extra/epiphany-extensions/PKGBUILD
	extra/fbset/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libical/PKGBUILD
	extra/mutt/PKGBUILD
	extra/netkit-bsd-finger/PKGBUILD
	extra/ossp/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/rtkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/liferea-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD

1 files changed, 24 insertions, 22 deletions

diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index 23a5ba397..4e6847d67 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 90380 2013-05-12 06:14:15Z dwallace $
+# $Id: PKGBUILD 90768 2013-05-13 18:27: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>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgbase=notmuch
-pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime')
+pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
 pkgver=0.15.2
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://notmuchmail.org/"
 license=('GPL3')
@@ -16,47 +16,49 @@ options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
 md5sums=('e86968dfcd7ffaf162b7b87de56b7f18')
 
+prepare(){
+    #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
+    cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
+
+    find "$srcdir/${pkgname}-${pkgver}/bindings/python" -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
+    find "$srcdir/${pkgname}-${pkgver}/bindings/python2" -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
+}
 build() {
     cd "$srcdir/${pkgname}-$pkgver"
 
     ./configure --prefix=/usr --sysconfdir=/etc \
-		--includedir=/usr/include
+		--includedir=/usr/include \
+		--without-zsh-completion
+
     make 
+
     (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt"
     make ${pkgname}-mutt.1)
 
-    cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
-
     cd bindings/ruby
     ruby extconf.rb
 
-    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
-    find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
+	cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
 	python setup.py build
 
-    cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
-    #env LD_LIBRARY_PATH="." python2 setup.py build
+	cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
 	python2 setup.py build
 }
 
 package_notmuch-runtime(){
     pkgdesc="Runtime for notmuch and notmuch-mutt"
     depends=('xapian-core' 'gmime' 'talloc')
-    cd "$srcdir/${pkgname}-$pkgver"
+    cd "$srcdir/${pkgbase}-$pkgver"
     make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
+	chmod 755 $pkgdir/usr/bin/notmuch
+}
 
-    install -Dm644 notmuch "$pkgdir/usr/bin/notmuch"
 
+package_notmuch-vim(){
+	pkgdesc="Vim plugins for notmuch"
+	depends=('notmuch-runtime')
     mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax}
-
-    make -C vim prefix="$pkgdir/usr/share/vim/vimfiles" install
-
-    # Remove conflicting zsh completion
-    rm -r ${pkgdir}/usr/share/zsh
+    make -C "$srcdir/$pkgbase-$pkgver/vim" prefix="$pkgdir/usr/share/vim/vimfiles" install
 }
 
 
@@ -90,7 +92,7 @@ package_notmuch(){
 package_notmuch-mutt(){
     pkgdesc="The mail indexer"
     depends=('notmuch-runtime' 'perl-mailtools' 'perl-mail-box' 'perl-term-readline-gnu' 'perl-string-shellquote' 'perl-file-which')
-    cd "$srcdir/$pkgbase-runtime-$pkgver"
+    cd "$srcdir/$pkgbase-$pkgver"
 
     install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
     install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz"