diff options
| -rw-r--r-- | net-mail/notmuch/Manifest | 2 | ||||
| -rw-r--r-- | net-mail/notmuch/files/notmuch-assume-modern-gmime.patch | 16 | ||||
| -rw-r--r-- | net-mail/notmuch/metadata.xml | 1 | ||||
| -rw-r--r-- | net-mail/notmuch/notmuch-0.38.3.ebuild (renamed from net-mail/notmuch/notmuch-0.37-r2.ebuild) | 25 |
4 files changed, 20 insertions, 24 deletions
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index 280ff50..0b58477 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.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e +DIST notmuch-0.38.3.tar.xz 805416 BLAKE2B 08f4f5c5732a788a52ca5fb6e6296d7348586796f86cab8273aebf88521e52c52b4515287334d246d030bf3ba0666f24bf0badad843e8b20a1a8bc1da32f6509 SHA512 247f8b365a75b29df719403bc2c9645eb669a7ee6eb4c1e0047dcf55fea4d66c8dcb4899162b952643aa6148ec6e1538ebe3e7e8408376153165e394084aed19 diff --git a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch index 5c9f86a..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 5247e05a..097b2039 100755 --- a/configure +++ b/configure -@@ -490,230 +490,9 @@ 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 5247e05a..097b2039 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 5247e05a..097b2039 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 @@ -186,7 +184,7 @@ index 5247e05a..097b2039 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); @@ -207,7 +205,7 @@ index 5247e05a..097b2039 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 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.37-r2.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild index f9fd203..92fc94f 100644 --- a/net-mail/notmuch/notmuch-0.37-r2.ebuild +++ b/net-mail/notmuch/notmuch-0.38.3.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# 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_{9..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils @@ -17,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 ~riscv x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} apidoc? ( doc ) @@ -31,7 +32,7 @@ BDEPEND=" app-arch/xz-utils[extra-filters(-)] virtual/pkgconfig apidoc? ( - app-doc/doxygen + app-text/doxygen dev-lang/perl ) doc? ( @@ -67,7 +68,7 @@ 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 @@ -81,7 +82,6 @@ RDEPEND="${COMMON_DEPEND} 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,7 +95,6 @@ SITEFILE="50${PN}-gentoo.el" PATCHES=( "${FILESDIR}/notmuch-assume-modern-gmime.patch" - "${FILESDIR}"/${PN}-0.37-configure-clang16.patch ) pkg_setup() { @@ -183,7 +182,7 @@ src_compile() { # 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 + use doc && emake -j1 -C emacs docstring.stamp V=1 fi emake V=1 @@ -191,9 +190,7 @@ src_compile() { 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 + emake -C contrib/notmuch-mutt notmuch-mutt.1 fi } @@ -212,8 +209,10 @@ src_test() { # 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'" ) + # 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 -ze notmuch # both lib and bin needed for testsuite. |