gentoo auto-resync : 23:03:2025 - 00:31:41

6 files changed, 112 insertions, 446 deletions

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index db52391df0df..11022f3d7f73 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,10 +1,8 @@
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
-AUX notmuch-0.37-configure-clang16.patch 703 BLAKE2B 4aa2c3f660021f6e1bf3d354559a3852e173e8a94701b5ac1da67254e9f87c58a309aff9e581a6aa7db8f8241ab38e1faac79e5d8cf99742069dd20fd990c880 SHA512 797139b680a7b02cd79eec9ceb1fdf79f6b4ec0efa3f52f0d297ecbceda2672d0647003b453f961e77e0e8f1f2a0caffb3d5e57d7d0bd11116df274eaa013e18
-AUX notmuch-0.37-python3.12.patch 1068 BLAKE2B 1ceb640ede3e37f209649a8d215f6a068873c0e14d46afc96e8c4ee585bb84d6ac10f9589ed404d88d9847c5224cae5acd1c91fd583d55f3b644432dceb5690d SHA512 ef4a59a377c63f71ff99ace3cedf238cac251aeda0d6bc70d9b05526477fb9ecfe5bb69219366930f34accf73dd2b2a55bd6cd89be25d8a1ecd76b2a987c3a07
+AUX notmuch-0.39-no-compress-man-pages.patch 2938 BLAKE2B 130de5bdee8c62bd30d5fe22a35cea92409a00f78d4a15e23c2ae63cdce5db22d73947b05abf68f6010bcaf37c325247397c63debbd0d7e08c7de22dc8f3878a SHA512 c8cce6c8bc53e656a27c33cf2d65b3d94c10860021cbb05fe2cca4e9be7ed7e9c8fc7f05801ca5dc05d32f03cfca9c628e545053867bb2a8a63dee0267ae3223
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e
 DIST notmuch-0.38.3.tar.xz 805416 BLAKE2B 08f4f5c5732a788a52ca5fb6e6296d7348586796f86cab8273aebf88521e52c52b4515287334d246d030bf3ba0666f24bf0badad843e8b20a1a8bc1da32f6509 SHA512 247f8b365a75b29df719403bc2c9645eb669a7ee6eb4c1e0047dcf55fea4d66c8dcb4899162b952643aa6148ec6e1538ebe3e7e8408376153165e394084aed19
-EBUILD notmuch-0.37-r1.ebuild 7120 BLAKE2B 1b67715c24550826b879451def37db918533fd8454547b67adc3e3a1cce3f1b11526891fa3a8f16949ae5e53f8dbaa1f1a07c95765690d1e3b616e966e7eb86e SHA512 d7bbe76aa68dd44351e9f91e909ec72c8cee6607b3cb6158351361b471b00ec801964697d45281056ed65874039dd23c91a2e30c733504f52c2c52392fcff105
-EBUILD notmuch-0.37-r2.ebuild 7179 BLAKE2B 716546c9ea1a189e8a6070b896bb857bc1bd0d461889b4bb7b0afb68a646b8212a78747be1ac2def9a0285cecf19a70b8e54a1b38909f932acb2d3bbf372dc8a SHA512 48c711a983f8d886690899d7587ee553d5efb3986bc103ca3d89ef1ee1f128c3fb44d97593f8e2ce10f60efe0aebc2e5913f91bd201a3c0565eb2ddefdf236b0
+DIST notmuch-0.39.tar.xz 811448 BLAKE2B 5d9a6fb28f17c45a8310f83c3ae70e63a5263b85565cfebae96f3054cb0b682164fced83d31176a6287cf9e18570dbeb114f50bc2cd4c0db41e744b8d7d1d15d SHA512 a9864a6a8423c723d36df269dcc73c2987be63c6e328b818235d0604cb594e0e91ee7639ee99a4b867be4387a605abc187a3b458aa7b0e4fc3a1744c0c2daa69
 EBUILD notmuch-0.38.3.ebuild 7098 BLAKE2B 9b14cb27c58951d39d2c25259a7dc18d2e52a0ef16d301f6d3208b81ea975284417c53dc684f2b870562f9269ca3473dd2ef4d5a391d588ec65e3d2142092698 SHA512 e0374e2b24ebed10fcd5f49569edb58f292c095be962dcc45ff6d6acd9def215b0ac6bc83ad44b8e22234af182109dd1f34c016adc8121d1df2c9bc3b6ade995
+EBUILD notmuch-0.39.ebuild 5936 BLAKE2B 4de4acc7c29cc9c7543776f829fc3e692038c1e4ba243d913f873c00eeed0de62def8700c96225e3b65feebb7e538b3632933a2d88413c594e5ad350a2209fc1 SHA512 0484317770acab28403fb795d79f69eb66a3ab87de874ee0e0f65b7ddc72b3e729bab3d026a8fe9560173e2fcad0505a94051a0e1086f0f6f77caf4741586cd2
 MISC metadata.xml 1022 BLAKE2B 2db358d4a174ce71a88af110d028cec634126a174982f14d061613a4edc5e828be353fc67607fcfb17dd2d941f3c79fa016ed8f42295b229a7ab5225b401671e SHA512 71db42211df1dbfe37314400d41e8b31366ed5ae3e25b4a2fd324b6ddb1378b341765c40c5c65152a2bfcd071930c57f5e20ec153b80c370a8c4f49586d05b6c
diff --git a/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch
deleted file mode 100644
index 42c108337771..000000000000
--- a/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/879739
-https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu
-
-Probe for strcasestr using the C++ compiler
-
-The C++ compiler may define _GNU_SOURCE, causing <string.h> to
-declare strcasestr, while the C compiler does not.  As a result,
-the probe may fail, resulting in an incompatible declaration
-of strcasestr in compat/compat.h.
-
-Upstream discussion:
-
-  [PATCH] compat/strcasestr: Include correct header file
-  <https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu>
-
---- a/compat/have_strcasestr.c
-+++ b/compat/have_strcasestr.c
-@@ -1,4 +1,5 @@
- #define _GNU_SOURCE
-+#include <string.h>
- #include <strings.h>
- 
- int
-
diff --git a/net-mail/notmuch/files/notmuch-0.37-python3.12.patch b/net-mail/notmuch/files/notmuch-0.37-python3.12.patch
deleted file mode 100644
index b8b668ebcae6..000000000000
--- a/net-mail/notmuch/files/notmuch-0.37-python3.12.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/929716
-https://github.com/notmuch/notmuch/commit/3771832b013012e408696897215fd0edde7dce37
-
-From 3771832b013012e408696897215fd0edde7dce37 Mon Sep 17 00:00:00 2001
-From: Michael J Gruber <git@grubix.eu>
-Date: Fri, 16 Jun 2023 13:19:26 +0200
-Subject: [PATCH] python: adjust legacy bindings to py 3.12
-
-Py 3.12 finally pulled the plug on the `SafeConfigParser` class which
-has been deprecated since py 3.2.
-
-We use it in the legacy bindings only, so take the easy route of
-importing `ConfigParser` as `SafeConfigParser` and monkey-patching so
-that the class has the expected interface.
---- a/bindings/python/notmuch/compat.py
-+++ b/bindings/python/notmuch/compat.py
-@@ -47,7 +47,10 @@ def encode_utf8(value):
- 
-         return value
- else:
--    from configparser import SafeConfigParser
-+    from configparser import ConfigParser as SafeConfigParser
-+
-+    if not hasattr(SafeConfigParser, 'readfp'):   # py >= 3.12
-+        SafeConfigParser.readfp = SafeConfigParser.read_file
- 
-     class Python3StringMixIn(object):
-         def __str__(self):
-
diff --git a/net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch b/net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch
new file mode 100644
index 000000000000..29595450438f
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch
@@ -0,0 +1,67 @@
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -25,8 +25,6 @@ MAN5_ROFF := $(patsubst $(srcdir)/doc/%,$(DOCBUILDDIR)/man/%,$(MAN5_RST:.rst=.5)
+ MAN7_ROFF := $(patsubst $(srcdir)/doc/%,$(DOCBUILDDIR)/man/%,$(MAN7_RST:.rst=.7))
+ MAN_ROFF_FILES := $(MAN1_ROFF) $(MAN5_ROFF) $(MAN7_ROFF)
+ 
+-MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES})
+-
+ MAN1_TEXI := $(patsubst $(srcdir)/doc/man1/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN1_RST))
+ MAN5_TEXI := $(patsubst $(srcdir)/doc/man5/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN5_RST))
+ MAN7_TEXI := $(patsubst $(srcdir)/doc/man7/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN7_RST))
+@@ -42,9 +40,6 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) $(COPY_INFO1)
+ 
+ .PHONY: install-man build-man apidocs install-apidocs
+ 
+-%.gz: %
+-	rm -f $@ && gzip --no-name --stdout $^ > $@
+-
+ ifeq ($(WITH_EMACS),1)
+ $(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.texi.stamp : docstring.stamp
+ endif
+@@ -97,11 +92,11 @@ endif
+ install-man: install-apidocs
+ 
+ ifeq ($(HAVE_DOXYGEN),1)
+-MAN_GZIP_FILES += ${APIMAN}.gz
++MAN_ROFF_FILES += ${APIMAN}
+ apidocs: $(APIMAN)
+-install-apidocs: ${APIMAN}.gz
++install-apidocs: ${APIMAN}
+ 	mkdir -p "$(DESTDIR)$(mandir)/man3"
+-	install -m0644 $(filter %.3.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man3
++	install -m0644 $(filter %.3,$(MAN_ROFF_FILES)) $(DESTDIR)/$(mandir)/man3
+ 
+ $(APIMAN): $(dir)/config.dox $(srcdir)/$(dir)/doxygen.cfg $(srcdir)/lib/notmuch.h
+ 	mkdir -p $(DOCBUILDDIR)/man/man3
+@@ -123,16 +118,16 @@ else
+ 
+ # it should be safe to depend on the stamp file, because it is created
+ # after all roff files are moved into place.
+-${MAN_GZIP_FILES}: ${DOCBUILDDIR}/.roff.stamp
++${MAN_ROFF_FILES}: ${DOCBUILDDIR}/.roff.stamp
+ 
+-build-man: ${MAN_GZIP_FILES}
+-install-man: ${MAN_GZIP_FILES}
++build-man: ${MAN_ROFF_FILES}
++install-man: ${MAN_ROFF_FILES}
+ 	mkdir -m0755 -p "$(DESTDIR)$(mandir)/man1"
+ 	mkdir -m0755 -p "$(DESTDIR)$(mandir)/man5"
+ 	mkdir -m0755 -p "$(DESTDIR)$(mandir)/man7"
+-	install -m0644 $(filter %.1.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man1
+-	install -m0644 $(filter %.5.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man5
+-	install -m0644 $(filter %.7.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man7
++	install -m0644 $(filter %.1,$(MAN_ROFF_FILES)) $(DESTDIR)/$(mandir)/man1
++	install -m0644 $(filter %.5,$(MAN_ROFF_FILES)) $(DESTDIR)/$(mandir)/man5
++	install -m0644 $(filter %.7,$(MAN_ROFF_FILES)) $(DESTDIR)/$(mandir)/man7
+ endif
+ 
+ ifneq ($(HAVE_SPHINX)$(HAVE_MAKEINFO),11)
+@@ -158,6 +153,6 @@ $(dir)/config.dox: version.stamp
+ 
+ CLEAN := $(CLEAN) $(DOCBUILDDIR) $(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.texi.stamp
+ CLEAN := $(CLEAN) $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.info.stamp
+-CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES) $(dir)/conf.pyc $(dir)/config.dox
++CLEAN := $(CLEAN) $(MAN_ROFF_FILES) $(MAN_ROFF_FILES) $(dir)/conf.pyc $(dir)/config.dox
+ 
+ CLEAN := $(CLEAN) $(dir)/__pycache__
diff --git a/net-mail/notmuch/notmuch-0.37-r2.ebuild b/net-mail/notmuch/notmuch-0.37-r2.ebuild
deleted file mode 100644
index 6735eaaf64e8..000000000000
--- a/net-mail/notmuch/notmuch-0.37-r2.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} 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 ~riscv x86 ~x64-macos"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	apidoc? ( doc )
-	nmbug? ( python )
-	test? ( crypt emacs python )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(+)]
-	virtual/pkgconfig
-	apidoc? (
-		app-text/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? (
-		app-shells/bash
-		sys-process/parallel
-	)
-"
-
-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}
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		dev-debug/gdb[python]
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-"
-
-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
-		dev-perl/Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.37-configure-clang16.patch
-	"${FILESDIR}"/${PN}-0.37-python3.12.patch
-)
-
-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'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-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)
-	)
-
-	# FIXME:
-	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
-	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
-	# gmime/gpg/scdaemon tries to open usb devices in GMime test
-	# we pretend to allow it, without actually allowing it to read or write.
-	# https://bugs.gentoo.org/821328
-	addpredict /dev/bus/usb
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	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
-
-	# we run pytest via eclass phasefunc, so delete upstream launcher
-	use python && { rm -v test/T391-python-cffi.sh || die ; }
-
-	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
-		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/notmuch-report
-		dobin devel/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 "${EROOT}"${_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.37-r1.ebuild b/net-mail/notmuch/notmuch-0.39.ebuild
index 2588b2085d3e..3414e1775fc6 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.39.ebuild
@@ -1,45 +1,46 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 
 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 )"
+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 ~riscv x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	apidoc? ( doc )
 	nmbug? ( python )
 	test? ( crypt emacs python )
 "
-IUSE="apidoc crypt doc emacs mutt nmbug python test"
+IUSE="apidoc crypt emacs mutt nmbug python test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	app-arch/xz-utils[extra-filters(+)]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	sys-apps/texinfo
 	virtual/pkgconfig
 	apidoc? (
 		app-text/doxygen
 		dev-lang/perl
 	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		sys-apps/texinfo
-	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		${DISTUTILS_DEPS}
 		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	)
 	test? (
@@ -47,7 +48,6 @@ BDEPEND="
 		sys-process/parallel
 	)
 "
-
 COMMON_DEPEND="
 	dev-libs/glib
 	dev-libs/gmime:3.0[crypt]
@@ -62,8 +62,8 @@ COMMON_DEPEND="
 		' 'python*')
 	)
 "
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	test? (
 		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
 		app-misc/dtach
@@ -75,13 +75,13 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 
-RDEPEND="${COMMON_DEPEND}
+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
@@ -94,7 +94,7 @@ RDEPEND="${COMMON_DEPEND}
 SITEFILE="50${PN}-gentoo.el"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.37-configure-clang16.patch
+	"${FILESDIR}"/${PN}-0.39-no-compress-man-pages.patch
 )
 
 pkg_setup() {
@@ -103,6 +103,7 @@ pkg_setup() {
 
 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
@@ -114,18 +115,11 @@ src_prepare() {
 
 	use python && distutils-r1_src_prepare
 
+	rm bindings/python-cffi/tox.ini || die
 	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'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
 }
 
 src_configure() {
@@ -139,9 +133,9 @@ src_configure() {
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
 		--without-desktop
 		--without-ruby
+		--with-docs # man pages, info pages
 		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
 		$(use_with apidoc api-docs)
-		$(use_with doc docs)
 		$(use_with emacs)
 	)
 
@@ -159,92 +153,62 @@ src_configure() {
 python_compile() {
 	pushd bindings/python-cffi > /dev/null || die
 	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	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
+	use mutt && emake -C contrib/notmuch-mutt notmuch-mutt.1
 }
 
 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}"
+	rm -rf notmuch2 || die
+	epytest tests || die -n
 	popd > /dev/null || die
 }
 
 src_test() {
 	local test_failures=()
-	pax-mark -m notmuch
 
-	# we run pytest via eclass phasefunc, so delete upstream launcher
-	use python && { rm -v test/T391-python-cffi.sh || die ; }
+	# We run pytest via eclass phasefunc, so delete upstream launcher
+	rm test/T391-python-cffi.sh || die
 
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	# These both fail because of line wrapping in the output
+	rm test/T315-emacs-tagging.sh test/T310-emacs.sh || die
+
+	pax-mark -m notmuch
+	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.
+	# 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[@]}"
+	[[ ${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
-		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?/*.?
+	use python && distutils-r1_src_install
+
+	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
 
 	if use emacs; then
@@ -261,7 +225,7 @@ src_install() {
 	if use mutt; then
 		pushd contrib/notmuch-mutt > /dev/null || die
 		dobin notmuch-mutt
-		# this manpage is built by pod2man
+		# This manpage is built by pod2man
 		doman notmuch-mutt.1
 		insinto /etc/mutt
 		doins notmuch-mutt.rc
@@ -271,11 +235,6 @@ src_install() {
 
 	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() {