notmuch: update to 0.32.2.

srcpkgs/notmuch-emacs

@@ -1 +0,0 @@
-notmuch

srcpkgs/notmuch/template

@@ -1,21 +1,28 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.31.3
+version=0.32.2
 revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+build_style=configure
+configure_args="--prefix=/usr
+ --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+ --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
+ desktop-file-utils emacs gnupg2 python3-setuptools"
 makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi"
 depends="gmime3>=3.2.7"
-checkdepends="python3-pytest mdocml dtach gdb tar xz"
+checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
+ openssl"
 short_desc="Thread-based email index, search, and tagging"
 maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://notmuchmail.org"
 distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
  https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
+checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
  4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
 skip_extraction="database-v1.tar.xz"
+replaces="notmuch-emacs>=0"
 
 # Not a real conflicts, but this package is broken with gpgme 1.13.1-
 # gpgme is optional dependency
@@ -23,21 +30,10 @@ conflicts="gpgme<1.14.0_1"
 subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
 
 if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" desktop-file-utils"
+	makedepends+=" ruby-devel"
-	makedepends+=" ruby-devel emacs"
+	subpackages+=" notmuch-ruby"
-	subpackages+=" notmuch-ruby notmuch-emacs"
-	_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
-		--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
-else
-	_args="--without-emacs"
 fi
 
-do_configure() {
-	./configure --prefix=/usr \
-		--bashcompletiondir=/usr/share/bash-completion/completions \
-		--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
-}
-
 do_build() {
 	make ${makejobs}
 	make -C contrib/notmuch-mutt
@@ -48,33 +44,37 @@ do_build() {
 do_check() {
 	mkdir -p fake-bin
 	ln -sf /usr/bin/gpg2 fake-bin/gpg
+	ln -sf /usr/bin/gpgv2 fake-bin/gpgv
 	PATH=$PWD/fake-bin:$PATH
 	cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
 		test/test-databases
-	case "$XBPS_TARGET_LIBC" in
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	musl)
 		# Seem like gpgconf's problem,
 		# mutt on musl also have problems with smime
-		export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
+		NOTMUCH_SKIP_TESTS="smime.3 smime.5"
-	*)
+	else
 		# This test run under gdb is problematic
-		export NOTMUCH_SKIP_TESTS="count.14" ;;
+		NOTMUCH_SKIP_TESTS="count.14"
-	esac
+	fi
+	# libconfig because of fqdn
+	# we don't ship python-cffi
+	NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
+	if [ $(id -u) = 0 ]; then
+		NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+	fi
+	export NOTMUCH_SKIP_TESTS
 	make test
 }
 
 do_install() {
 	make DESTDIR=${DESTDIR} install
-	pushd bindings/python
+	cd bindings/python
 	python3 setup.py build --build-base=build \
 		install --prefix=/usr --root=${DESTDIR}
-	popd
+	cd -
 	if [ ! "$CROSS_BUILD" ]; then
 		make DESTDIR=${DESTDIR} -C bindings/ruby install
 	fi
-}
-
-post_install() {
 	rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
 }
 
@@ -94,18 +94,6 @@ libnotmuch-devel_package() {
 	}
 }
 
-notmuch-emacs_package() {
-	short_desc+=" - Emacs interface"
-	depends="${sourcepkg}-${version}_${revision} virtual?emacs"
-	pkg_install() {
-		vmove usr/bin/notmuch-emacs-mua
-		vmove usr/share/applications
-		vmove usr/share/emacs/site-lisp
-		vmove usr/share/info/notmuch-emacs*
-		vmove usr/share/man/man1/notmuch-emacs*
-	}
-}
-
 notmuch-mutt_package() {
 	short_desc+=" - Mutt interface"
 	depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools