diff options
| -rw-r--r-- | net-mail/notmuch/Manifest | 2 | ||||
| -rw-r--r-- | net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch | 24 | ||||
| -rw-r--r-- | net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch | 67 | ||||
| -rw-r--r-- | net-mail/notmuch/files/notmuch-0.39-test-skip-debug-symbols.patch | 11 | ||||
| -rw-r--r-- | net-mail/notmuch/notmuch-0.39.ebuild (renamed from net-mail/notmuch/notmuch-0.38.3.ebuild) | 105 |
5 files changed, 114 insertions, 95 deletions
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index 0b58477..693d01a 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -1,2 +1,2 @@ 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.37-configure-clang16.patch b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch deleted file mode 100644 index 42c1083..0000000 --- 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.39-no-compress-man-pages.patch b/net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch new file mode 100644 index 0000000..2959545 --- /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/files/notmuch-0.39-test-skip-debug-symbols.patch b/net-mail/notmuch/files/notmuch-0.39-test-skip-debug-symbols.patch new file mode 100644 index 0000000..f5a052e --- /dev/null +++ b/net-mail/notmuch/files/notmuch-0.39-test-skip-debug-symbols.patch @@ -0,0 +1,11 @@ +--- a/test/T000-basic.sh ++++ b/test/T000-basic.sh +@@ -71,8 +71,4 @@ test_expect_equal \ + "$(dirname ${TEST_DIRECTORY})" \ + "$(echo $PATH|cut -f1 -d: | sed -e 's,/test/valgrind/bin$,,')" + +-test_begin_subtest 'notmuch is compiled with debugging symbols' +-readelf --sections $(command -v notmuch) | grep \.debug +-test_expect_equal 0 $? +- + test_done diff --git a/net-mail/notmuch/notmuch-0.38.3.ebuild b/net-mail/notmuch/notmuch-0.39.ebuild index 92fc94f..b3b454d 100644 --- a/net-mail/notmuch/notmuch-0.38.3.ebuild +++ b/net-mail/notmuch/notmuch-0.39.ebuild @@ -1,18 +1,21 @@ -# 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..13} pypy3 ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..14} 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 @@ -29,7 +32,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test" RESTRICT="!test? ( test )" BDEPEND=" - app-arch/xz-utils[extra-filters(-)] + app-arch/xz-utils[extra-filters(+)] virtual/pkgconfig apidoc? ( app-text/doxygen @@ -40,7 +43,7 @@ BDEPEND=" sys-apps/texinfo ) python? ( - dev-python/setuptools[${PYTHON_USEDEP}] + ${DISTUTILS_DEPS} test? ( dev-python/pytest[${PYTHON_USEDEP}] ) ) test? ( @@ -63,8 +66,8 @@ COMMON_DEPEND=" ' 'python*') ) " - -DEPEND="${COMMON_DEPEND} +DEPEND=" + ${COMMON_DEPEND} test? ( >=app-editors/emacs-${NEED_EMACS}:*[libxml2] app-misc/dtach @@ -76,7 +79,8 @@ DEPEND="${COMMON_DEPEND} ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${COMMON_DEPEND} crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which @@ -94,6 +98,8 @@ RDEPEND="${COMMON_DEPEND} SITEFILE="50${PN}-gentoo.el" PATCHES=( + "${FILESDIR}"/${PN}-0.39-no-compress-man-pages.patch + "${FILESDIR}"/${PN}-0.39-test-skip-debug-symbols.patch "${FILESDIR}/notmuch-assume-modern-gmime.patch" ) @@ -103,6 +109,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 +121,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() { @@ -159,92 +159,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 - fi - emake V=1 - use python && distutils-r1_src_compile - - if use mutt; then - emake -C contrib/notmuch-mutt notmuch-mutt.1 - 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 # These both fail because of line wrapping in the output rm test/T315-emacs-tagging.sh test/T310-emacs.sh || die - LD_LIBRARY_PATH="${S}/lib" nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" ) + 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 +231,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 +241,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() { |