gentoo resync : 22.05.2021

8 files changed, 8 insertions, 1287 deletions

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 1f5e847b4d80..e7f808b749ed 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,16 +1,6 @@
-AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
 AUX notmuch-0.31.3-glib-2.68.patch 1807 BLAKE2B adca6eef581704ccf91bff0206de9bec8925ea26a837a95f57bf905b15c69cb54b06d1a9d775f55a1829291ae2f3bcde9b6f08e3c3e133824e95e490718b8231 SHA512 a48ae1494b5c7960979dd34d33b8b84f26b763f2a5a987b3964b3a5e256143296eb1d777bb500c65e6559e951075ee3a7e5eac2bca376a8527a9dc291437376f
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
-DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
-DIST notmuch-0.31.2.tar.xz 713388 BLAKE2B 20029f55206b66e7956316fca2d16ae53a49fc196ea2e730ae5ebd96ce893fa2065b7eee9b625629bbb0d3816a70d98e8943920cf8895ef81a97a1d8dc59dd62 SHA512 b134ef79648cb6fe9f17b2f1b600d651d57359ae9fa576c808b794aa64a09955f0597a624cc3c498da4ef56e44bca6bb485bc402c2dff48cd000959f9a9ceeaa
 DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
-DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5
-EBUILD notmuch-0.29.3-r2.ebuild 5058 BLAKE2B 01e47dcc8cfee5bf33b921e396094f625049d13671fea805a0213de04596a9c1503724a131ea6c6f2604ab82cd8488765d8d9542333c6f54cd34ae40a066af89 SHA512 8c5ad62d0cc5ce62ad4c87f723014ac2b6037c8c947e34b9e554e17f69f449d15ed47711d5f69255f68c84be5be3f909e81c0be4dee09e3f483d4fc640a5d698
-EBUILD notmuch-0.30-r1.ebuild 4343 BLAKE2B 7cab0a0c94d9d5743fe16086f2e2d52b6fda2387c4e795a30d08ec68e6cc6422c4126e5bc0191b77f8a8a023b3dbb12dbf62b60d52c8b342f1e5c13c742405ba SHA512 369c528d1daae29466504a67a238f58ac98b67dde87bf2a34d5710f65009fe87910aba401f26cbacde8f73becee714d4efb5123efce8edd5c1ef59df020d1f6b
-EBUILD notmuch-0.31-r2.ebuild 6366 BLAKE2B 3572aa085591ea7f47184fb8449897fa5a6c33e2bd5e1652282c63e09856c1289510958ff47176bbe4908b9f5c82b837f1eb2d86bc061e6b05d6342885a1a9ed SHA512 e4b69653b09c26a5ed8dbacb3b14b2773a4367e7bf4ed849a16e09a86dbfb71464ecbc7ef17c21b4b60031059b97a0861620569799b39f0beaa14fe0ff1a346f
-EBUILD notmuch-0.31.2.ebuild 6340 BLAKE2B 0b13fad7fe76e856d066ef460cb0247103c6f57c2fd1255640f259087beb8edf0b549f335ea4ddd1672dae21f7eef805fe02dcf789170ccb05cda3dc3769f6b0 SHA512 83d494d8a77e1b1543c51e77db21e65c2b291abae3b1ded89d205d52f3e1952008fb14181fc7bd6ea7667a683385b95b0be81500e031ec47117e9a984b178b8e
-EBUILD notmuch-0.31.3.ebuild 6429 BLAKE2B 4974a9db8a5fcfde4f5a357b299bb8bea1602eba958daa187954f01b75d4b26b90b5524dec78bd784329ce0e00a4cbe223007ed7c08bee941c8da15b39cf18c0 SHA512 5cd2a36e83ac60de80f8877014409e6e84b85fb0eb015a9c70c2053dd14cce2617142869b95cafbac05aefcdb990708f55fec3035b527c77fa96b4cb1ab333d7
-EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 4fcb5ea47f923a98238ef7216627196931f7b89c113f46478139b2cc80856c3800a245a2d25de0b27a4e1676bc106f5b0478fcd029e514abe21d359a64d5e5d8 SHA512 6018522ad82cba4b14cd6b0e407ae475b07ab67648829e29e01d17080cfd6faa87ecef27df458e2699ed5ea5d4e400b4491224bfe5eb7e9d5232d3433adda683
+EBUILD notmuch-0.31.3.ebuild 6567 BLAKE2B da414bf69a185cce590907056245ef55dacce54c283575c4b13efb9226cf8fffde3e77e2bd7b4ff3d5815e4cb8b0e5040d4ae5659e6a3f9c6815a88791c02127 SHA512 83e991ded7a36f4925289293d120fa9f17ed3e88ea00ed36d9c042886b6e38f1d1e11aba27d8f27b4731eb02fa3f21ca0830f1a7b622ff83fca8e78f5216fbc6
 MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
diff --git a/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch
deleted file mode 100644
index e47224695953..000000000000
--- a/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
- <aidecoe@aidecoe.name>
-Date: Sun, 7 Jul 2019 11:33:09 +0100
-Subject: [PATCH] Use loopback IP address rather than name
-
----
- test/smtp-dummy.c | 8 ++++----
- test/test-lib.sh  | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
-index a7c1fe4f..822a986a 100644
---- a/test/smtp-dummy.c
-+++ b/test/smtp-dummy.c
-@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
- 	fprintf (peer, "502 not implemented\r\n");
- 	fflush (peer);
-     } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
--	fprintf (peer, "250 localhost\r\n");
-+	fprintf (peer, "250 127.0.0.1\r\n");
- 	fflush (peer);
-     } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
- 	       STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
-@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
-     size_t line_size;
-     ssize_t line_len;
- 
--    fprintf (peer, "220 localhost smtp-dummy\r\n");
-+    fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
-     fflush (peer);
- 
-     while ((line_len = getline (&line, &line_size, peer)) != -1) {
-@@ -183,9 +183,9 @@ main (int argc, char *argv[])
- 	goto DONE;
-     }
- 
--    hostinfo = gethostbyname ("localhost");
-+    hostinfo = gethostbyname ("127.0.0.1");
-     if (hostinfo == NULL) {
--	fprintf (stderr, "Unknown host: localhost\n");
-+	fprintf (stderr, "Unknown host: 127.0.0.1\n");
- 	ret = 1;
- 	goto DONE;
-     }
-diff --git a/test/test-lib.sh b/test/test-lib.sh
-index 616cb674..dd887773 100644
---- a/test/test-lib.sh
-+++ b/test/test-lib.sh
-@@ -336,7 +336,7 @@ emacs_deliver_message ()
-     test_emacs \
- 	"(let ((message-send-mail-function 'message-smtpmail-send-it)
- 	       (mail-host-address \"example.com\")
--	       (smtpmail-smtp-server \"localhost\")
-+	       (smtpmail-smtp-server \"127.0.0.1\")
- 	       (smtpmail-smtp-service \"${smtp_dummy_port}\"))
- 	   (notmuch-mua-mail)
- 	   (message-goto-to)
--- 
-2.19.2
-
diff --git a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
deleted file mode 100644
index 31d62079eee6..000000000000
--- a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_7 )
-
-inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
-	pax-utils readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~ppc64 x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-"
-CDEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.8:=
-	sys-libs/talloc
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${CDEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
-	)
-	valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-DOCS=( AUTHORS NEWS README )
-DOC_CONTENTS="There are a few backward-incompatible changes between
-notmuch version 0.18 < x <= 0.18. Please consult the NEWS file (0.18
-section) before first use."
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch"
-)
-SITEFILE="50${PN}-gentoo.el"
-
-bindings() {
-	local rc=0
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		rc=$?
-		popd || die
-	fi
-	return $rc
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	local _deps=""
-	default
-
-	# Python bindings
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Ensure that a new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	# Override dependencies for 'install' target
-	use doc && _deps="install-info"
-	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Non-autoconf configure
-		append-ldflags -lnsl -lsocket
-	fi
-}
-
-src_configure() {
-	python_setup # For sphinx
-	local _args=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${_args[@]}"
-}
-
-src_compile() {
-	python_setup # For sphinx
-	V=1 default
-	bindings python distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../html/python || die
-			popd || die
-		}
-		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if has_version '<net-mail/notmuch-0.18'; then
-		FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
deleted file mode 100644
index 2e892bb5e51f..000000000000
--- a/net-mail/notmuch/notmuch-0.30-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
-	pax-utils toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-"
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.14:=
-	sys-libs/talloc
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/cffi
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-
-bindings() {
-	local rc=0
-	if use python; then
-		pushd bindings/python-cffi || die
-		${@}
-		rc=${?}
-		popd || die
-
-		# Old deprecated bindings, #736204
-		pushd bindings/python || die
-		${@}
-		rc=${?}
-		popd || die
-	fi
-	return ${rc}
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	local _deps=""
-	default
-
-	# Python bindings
-	bindings distutils-r1_src_prepare
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override dependencies for 'install' target
-	use doc && _deps="install-info"
-	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Non-autoconf configure
-		append-ldflags -lnsl -lsocket
-	fi
-}
-
-src_configure() {
-	python_setup # For sphinx
-	local _args=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${_args[@]}"
-}
-
-src_compile() {
-	python_setup # For sphinx
-	V=1 default
-	bindings distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings distutils-r1_src_install
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild
deleted file mode 100644
index a9071674030d..000000000000
--- a/net-mail/notmuch/notmuch-0.31-r2.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	# NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed)
-	pax-mark -m notmuch
-	NOTMUCH_TEST_SERIALIZE=1 \
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild
deleted file mode 100644
index c95d95a83e49..000000000000
--- a/net-mail/notmuch/notmuch-0.31.2.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-
-	# NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed)
-	NOTMUCH_TEST_SERIALIZE=1 \
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index 57d73612bb36..e6d8d047fd86 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )
@@ -38,7 +38,9 @@ BDEPEND="
 		dev-python/sphinx
 		sys-apps/texinfo
 	)
-	python? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	python? (
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
 "
 
 COMMON_DEPEND="
@@ -115,6 +117,9 @@ src_prepare() {
 
 	# Non-autoconf configure
 	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
 }
 
 src_configure() {
diff --git a/net-mail/notmuch/notmuch-0.31.ebuild b/net-mail/notmuch/notmuch-0.31.ebuild
deleted file mode 100644
index 7e7b6616497b..000000000000
--- a/net-mail/notmuch/notmuch-0.31.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
-	pax-utils toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-"
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	dev-libs/xapian:=
-	sys-libs/talloc
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/cffi
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-
-bindings() {
-	local rc=0
-	if use python; then
-		# CFFI based bindings (recommended)
-		pushd bindings/python-cffi || die
-		${@}
-		rc=${?}
-		popd || die
-
-		# Old deprecated bindings, #736204. These are known to cause
-		# memory loss and other issues. Avoid if at all possible.
-		pushd bindings/python || die
-		${@}
-		rc=${?}
-		popd || die
-	fi
-	return ${rc}
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	local _deps=""
-	default
-
-	# Python bindings
-	bindings distutils-r1_src_prepare
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override dependencies for 'install' target
-	use doc && _deps="install-info"
-	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Non-autoconf configure
-		append-ldflags -lnsl -lsocket
-	fi
-}
-
-src_configure() {
-	python_setup # For sphinx
-	local _args=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${_args[@]}"
-}
-
-src_compile() {
-	python_setup # For sphinx
-	V=1 default
-	bindings distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings distutils-r1_src_install
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}