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

Conflicts:
	community-testing/virtualbox-modules/PKGBUILD
	community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
	community-testing/virtualbox-modules/virtualbox-modules.install
	community/ircii-pana/PKGBUILD
	extra/nasm/PKGBUILD
	extra/vlc/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/evince/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/evolution/evolution.install
	gnome-unstable/gcr/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	gnome-unstable/gnome-control-center/gnome-control-center.install
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-font-viewer/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-power-manager/gnome-power-manager.install
	gnome-unstable/gnome-screenshot/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install
	gnome-unstable/gnome-system-log/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libgxps/PKGBUILD
	gnome-unstable/network-manager-applet/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/telepathy-glib/PKGBUILD
	gnome-unstable/vte3/PKGBUILD
	gnome-unstable/yelp/PKGBUILD
	gnome-unstable/yelp/yelp.install
	testing/kmod/PKGBUILD
	testing/kmod/depmod-search.conf
	testing/lirc/PKGBUILD
	testing/lirc/lirc.install
	testing/openssh/PKGBUILD
	testing/xf86-video-neomagic/PKGBUILD
	~fauno/notmuch/PKGBUILD

1 files changed, 12 insertions, 15 deletions

diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index c4513a89e..bd2266fb7 100644
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -3,27 +3,26 @@
 # Maintainer: Richard Murri <admin@richardmurri.com>
 
 pkgname=notmuch
-pkgver=0.11.1
-pkgrel=2
+pkgver=0.12
+pkgrel=1
 pkgdesc="Notmuch is not much of an email program"
 arch=(i686 x86_64 mips64el)
 url="http://notmuchmail.org/"
 license=('GPL3')
-depends=('xapian-core' 'gmime24' 'talloc')
-makedepends=('python2' 'emacs-nox' 'gnupg' 'ruby' 'pkgconfig' 'git')
+depends=('xapian-core' 'gmime' 'talloc')
+makedepends=('python2' 'emacs' 'gnupg' 'ruby' 'pkgconfig')
 optdepends=('emacs: for using the emacs interface'
             'vim: for using the vim interface'
             'python2: for using the python bindings'
             'ruby: for using the ruby bindings'
             'gnupg: for email encryption')
-source=(
-  # "https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz"
-  "http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz"
-)
-md5sums=('e78e0a2a99177f5b0edf472baa6f1128')
-# md5sums=('764abeb6e277c4c03bd64914c72d89a8')
+options=(!distcc !makeflags)
+
+source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('466974db1d8a215c6a2d7cca7c969b4f')
+
 build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
+  cd "$srcdir/${pkgname}-"*
 
   ./configure --prefix=/usr --sysconfdir=/etc
   make
@@ -34,12 +33,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/${pkgname}-${pkgver}"
+  cd "$srcdir/${pkgname}-"*
   make test
 }
 
 package(){
-  cd "$srcdir/${pkgname}-${pkgver}"
+  cd "$srcdir/${pkgname}-"*
   make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
 
   install -D notmuch $pkgdir/usr/sbin/notmuch
@@ -64,5 +63,3 @@ package(){
   sed -i -e 's,/site_ruby,,g' Makefile
   make prefix=${pkgdir}/usr install
 }
-
-