commit: 4cdbd9df0773979ca57319490c97ee84a959bdec Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 22 20:55:52 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 22 21:13:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cdbd9df
net-mail/notmuch: add 0.39 * Switch to PEP517 * Use `die -n` with epytest so we don't ignore Python bindings failures * Drop legacy Python bindings (just keep cffi ones); 0.39 upstream finally dropped these * Install man pages and info pages unconditionally per QA policy Bug: https://bugs.gentoo.org/948351 Closes: https://bugs.gentoo.org/751517 Closes: https://bugs.gentoo.org/910004 Closes: https://bugs.gentoo.org/951046 Signed-off-by: Sam James <sam <AT> gentoo.org> net-mail/notmuch/Manifest | 1 + .../files/notmuch-0.39-no-compress-man-pages.patch | 67 ++++++ net-mail/notmuch/notmuch-0.39.ebuild | 262 +++++++++++++++++++++ 3 files changed, 330 insertions(+) diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index 0b58477751b7..159b0feeb589 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -1,2 +1,3 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 DIST notmuch-0.38.3.tar.xz 805416 BLAKE2B 08f4f5c5732a788a52ca5fb6e6296d7348586796f86cab8273aebf88521e52c52b4515287334d246d030bf3ba0666f24bf0badad843e8b20a1a8bc1da32f6509 SHA512 247f8b365a75b29df719403bc2c9645eb669a7ee6eb4c1e0047dcf55fea4d66c8dcb4899162b952643aa6148ec6e1538ebe3e7e8408376153165e394084aed19 +DIST notmuch-0.39.tar.xz 811448 BLAKE2B 5d9a6fb28f17c45a8310f83c3ae70e63a5263b85565cfebae96f3054cb0b682164fced83d31176a6287cf9e18570dbeb114f50bc2cd4c0db41e744b8d7d1d15d SHA512 a9864a6a8423c723d36df269dcc73c2987be63c6e328b818235d0604cb594e0e91ee7639ee99a4b867be4387a605abc187a3b458aa7b0e4fc3a1744c0c2daa69 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.39.ebuild b/net-mail/notmuch/notmuch-0.39.ebuild new file mode 100644 index 000000000000..3414e1775fc6 --- /dev/null +++ b/net-mail/notmuch/notmuch-0.39.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +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 ) +" + +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} + nmbug? ( python ) + test? ( crypt emacs python ) +" +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 + ) + python? ( + ${DISTUTILS_DEPS} + 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/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.39-no-compress-man-pages.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 + + rm bindings/python-cffi/tox.ini || die + mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die + + # 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 + --with-docs # man pages, info pages + --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" + $(use_with apidoc api-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 + popd > /dev/null || die +} + +src_compile() { + emake V=1 + use python && distutils-r1_src_compile + use mutt && emake -C contrib/notmuch-mutt notmuch-mutt.1 +} + +python_test() { + pushd bindings/python-cffi > /dev/null || die + rm -rf notmuch2 || die + epytest tests || die -n + popd > /dev/null || die +} + +src_test() { + local test_failures=() + + # We run pytest via eclass phasefunc, so delete upstream launcher + rm test/T391-python-cffi.sh || die + + # 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 + 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 +} + +src_install() { + default + + 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 + 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 +} + +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 +}
