summaryrefslogtreecommitdiff
path: root/net-mail
diff options
context:
space:
mode:
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/notmuch/Manifest2
-rw-r--r--net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch67
-rw-r--r--net-mail/notmuch/files/notmuch-0.39-test-skip-debug-symbols.patch11
-rw-r--r--net-mail/notmuch/files/notmuch-assume-modern-gmime.patch50
-rw-r--r--net-mail/notmuch/metadata.xml1
-rw-r--r--net-mail/notmuch/notmuch-0.39.ebuild (renamed from net-mail/notmuch/notmuch-0.34.2-r1.ebuild)143
6 files changed, 163 insertions, 111 deletions
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 4b4310e..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.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c
+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 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/files/notmuch-assume-modern-gmime.patch b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
index 6e3c8d3..a138814 100644
--- a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
+++ b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
@@ -1,8 +1,6 @@
-diff --git a/configure b/configure
-index 6c3a38f1..39d1f8c6 100755
--- a/configure
+++ b/configure
-@@ -464,215 +464,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+@@ -502,230 +502,9 @@
gmime_cflags=$(pkg-config --cflags gmime-3.0)
gmime_ldflags=$(pkg-config --libs gmime-3.0)
@@ -41,9 +39,9 @@ index 6c3a38f1..39d1f8c6 100755
- printf 'No.\nCould not make tempdir for testing session-key support.\n'
- errors=$((errors + 1))
- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
-- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \
- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
-- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- && [ $SESSION_KEY = 9:496A0B6D15A5E7BA762FB8E5FE6DEE421D4D9BBFCEAD1CDD0CCF636D07ADE621 ]
- then
- printf "OK.\n"
- else
@@ -57,8 +55,8 @@ index 6c3a38f1..39d1f8c6 100755
-Please try to rebuild your version of GMime against a more recent
-version of GPGME (at least GPGME 1.8.0).
-EOF
-- if command -v gpgme-config >/dev/null; then
-- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- if GPGME_VERS="$(pkg-config --modversion gpgme || gpgme-config --version)"; then
+- printf 'Your current GPGME development version is: %s\n' "$GPGME_VERS"
- else
- printf 'You do not have the GPGME development libraries installed.\n'
- fi
@@ -68,11 +66,7 @@ index 6c3a38f1..39d1f8c6 100755
- rm -rf "$TEMP_GPG"
- fi
-
-- # see https://github.com/jstedfast/gmime/pull/90
-- # should be fixed in GMime in 3.2.7, but some distros might patch
-- printf "Checking for GMime X.509 certificate validity... "
--
-- cat > _check_x509_validity.c <<EOF
+- cat > _check_gmime_cert.c <<EOF
-#include <stdio.h>
-#include <gmime/gmime.h>
-
@@ -84,7 +78,6 @@ index 6c3a38f1..39d1f8c6 100755
- GMimeSignature *sig = NULL;
- GMimeCertificate *cert = NULL;
- GMimeObject *output = NULL;
-- GMimeValidity validity = GMIME_VALIDITY_UNKNOWN;
- int len;
-
- g_mime_init ();
@@ -105,16 +98,27 @@ index 6c3a38f1..39d1f8c6 100755
- if (sig == NULL) return !! fprintf (stderr, "no GMimeSignature found at position 0\n");
- cert = g_mime_signature_get_certificate (sig);
- if (cert == NULL) return !! fprintf (stderr, "no GMimeCertificate found\n");
-- validity = g_mime_certificate_get_id_validity (cert);
+-#ifdef CHECK_VALIDITY
+- GMimeValidity validity = g_mime_certificate_get_id_validity (cert);
- if (validity != GMIME_VALIDITY_FULL) return !! fprintf (stderr, "Got validity %d, expected %d\n", validity, GMIME_VALIDITY_FULL);
--
+-#endif
+-#ifdef CHECK_EMAIL
+- const char *email = g_mime_certificate_get_email (cert);
+- if (! email) return !! fprintf (stderr, "no email returned");
+- if (email[0] == '<') return 2;
+-#endif
- return 0;
-}
-EOF
+-
+- # see https://github.com/jstedfast/gmime/pull/90
+- # should be fixed in GMime in 3.2.7, but some distros might patch
+- printf "Checking for GMime X.509 certificate validity... "
+-
- if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
- printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
- errors=$((errors + 1))
-- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \
+- elif ${CC} -DCHECK_VALIDITY ${CFLAGS} ${gmime_cflags} _check_gmime_cert.c ${gmime_ldflags} -o _check_x509_validity \
- && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
- && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
- && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
@@ -136,6 +140,15 @@ index 6c3a38f1..39d1f8c6 100755
- errors=$((errors + 1))
- fi
- fi
+- printf "Checking whether GMime emits email addresses with angle brackets... "
+- if ${CC} -DCHECK_EMAIL ${CFLAGS} ${gmime_cflags} _check_gmime_cert.c ${gmime_ldflags} -o _check_email &&
+- GNUPGHOME=${TEMP_GPG} ./_check_email; then
+- gmime_emits_angle_brackets=0
+- printf "No.\n"
+- else
+- gmime_emits_angle_brackets=1
+- printf "Yes.\n"
+- fi
- else
- printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
- errors=$((errors + 1))
@@ -171,7 +184,7 @@ index 6c3a38f1..39d1f8c6 100755
- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
- if (body == NULL) return !! fprintf (stderr, "did not find a multipart/encrypted message\n");
-
-- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_NONE, "9:13607E4217515A70EC8DF9DBC16C5327B94577561D98AD1246FA8756659C7899", &result, &error);
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_NONE, "9:9E1CDF53BBF794EA34F894B5B68E1E56FB015EA69F81D2A5EAB7F96C7B65783E", &result, &error);
- if (error || output == NULL) return !! fprintf (stderr, "decrypt failed\n");
-
- sig_list = g_mime_decrypt_result_get_signatures (result);
@@ -192,7 +205,7 @@ index 6c3a38f1..39d1f8c6 100755
- printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
- errors=$((errors + 1))
- elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
-- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \
- && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
- then
- if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
@@ -217,6 +230,7 @@ index 6c3a38f1..39d1f8c6 100755
- fi
+ gmime_x509_cert_validity=1
+ gmime_verify_with_session_key=1
++ gmime_emits_angle_brackets=0
else
have_gmime=0
printf "No.\n"
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index e186496..cf5cb52 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -12,7 +12,6 @@
<flag name="nmbug">Install experimental tag sharing /
pseudo-bug-tracking script for Notmuch
(see http://notmuchmail.org/nmbug/)</flag>
- <flag name="valgrind">Depend on dev-util/valgrind for test suite</flag>
</use>
<longdescription lang="en">
Notmuch is a system for indexing, searching, reading, and tagging large
diff --git a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild b/net-mail/notmuch/notmuch-0.39.ebuild
index ec0bf11..b3b454d 100644
--- a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.39.ebuild
@@ -1,47 +1,49 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+DISTUTILS_EXT=1
DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7..10} 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
# meant to be binary backward compatible.
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
apidoc? ( doc )
nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
+ test? ( crypt emacs python )
"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+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-doc/doxygen
+ app-text/doxygen
dev-lang/perl
)
doc? (
- dev-python/sphinx
+ dev-python/sphinx[${PYTHON_USEDEP}]
sys-apps/texinfo
)
python? (
- dev-python/setuptools[${PYTHON_USEDEP}]
+ ${DISTUTILS_DEPS}
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
)
test? (
@@ -59,30 +61,31 @@ COMMON_DEPEND="
emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
python? (
${PYTHON_DEPS}
- virtual/python-cffi[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/cffi[${PYTHON_USEDEP}]
+ ' 'python*')
)
"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+ ${COMMON_DEPEND}
test? (
>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
app-misc/dtach
- sys-devel/gdb[python]
+ dev-debug/gdb[python]
crypt? (
app-crypt/gnupg
dev-libs/openssl
)
)
- valgrind? ( dev-util/valgrind )
"
-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
@@ -95,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"
)
@@ -104,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
@@ -115,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() {
@@ -160,95 +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 #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
- 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?/*.?
+ 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
@@ -258,14 +224,14 @@ src_install() {
if use nmbug; then
# TODO: those guys need proper deps
- python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
- dobin devel/nmbug/{nmbug,notmuch-report}
+ 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
+ # This manpage is built by pod2man
doman notmuch-mutt.1
insinto /etc/mutt
doins notmuch-mutt.rc
@@ -275,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() {
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-09-14 04:26:16 +0000