From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- net-mail/notmuch/Manifest | 7 +- .../notmuch/files/notmuch-0.31.3-glib-2.68.patch | 60 ----- net-mail/notmuch/notmuch-0.31.3-r1.ebuild | 288 -------------------- net-mail/notmuch/notmuch-0.32.1-r1.ebuild | 292 -------------------- net-mail/notmuch/notmuch-0.33.2.ebuild | 295 +++++++++++++++++++++ 5 files changed, 297 insertions(+), 645 deletions(-) delete mode 100644 net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch delete mode 100644 net-mail/notmuch/notmuch-0.31.3-r1.ebuild delete mode 100644 net-mail/notmuch/notmuch-0.32.1-r1.ebuild create mode 100644 net-mail/notmuch/notmuch-0.33.2.ebuild (limited to 'net-mail/notmuch') diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index d9a327b9f66e..b359a64b5d01 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -1,11 +1,8 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b -AUX notmuch-0.31.3-glib-2.68.patch 1807 BLAKE2B adca6eef581704ccf91bff0206de9bec8925ea26a837a95f57bf905b15c69cb54b06d1a9d775f55a1829291ae2f3bcde9b6f08e3c3e133824e95e490718b8231 SHA512 a48ae1494b5c7960979dd34d33b8b84f26b763f2a5a987b3964b3a5e256143296eb1d777bb500c65e6559e951075ee3a7e5eac2bca376a8527a9dc291437376f AUX notmuch-0.32.1-tests.patch 4674 BLAKE2B c2eff70dcbf18a3276a97b3a9058f2a51647fddd6ef28ede2b1878aeb3ec3f6c5bfa5ac250c10f7cba3923031af3c4665a06190ab78b481448d9234e63e67594 SHA512 7870b5381b257cd9acc31c67f2654ecc711ddfde36c5f4a9969e43051eb43c1f0b716f926a85da4a8ec6c726bff1543cdcee9520e9b25eba2f8730bf206add5d DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 -DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44 -DIST notmuch-0.32.1.tar.xz 725196 BLAKE2B 6163f512e88f1b9415b93f7c4a146dc1af6e41bacdbbd29bdb48706af4af4822b626a719d50146f0cfe4d35508d8aa767b0e75eadebf9d619912f3ee6ba0e59e SHA512 c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf -EBUILD notmuch-0.31.3-r1.ebuild 6674 BLAKE2B b61220991036bded267852e04044eb26d08f558b5b60b4f4a511e7e61b23a911b48576b5d2dd9a0628647f5d9baa230a4392a6e20b0e3c4ef854ca18171beb89 SHA512 edf47ff836d921f1be92e888b29446fbb354da8d3294bbc9bf26db4e74a8ac108b0393dfba51008d4da824e03c853f65a3272f6564fbaafbd12c51b252e815a4 -EBUILD notmuch-0.32.1-r1.ebuild 6721 BLAKE2B 469644b9f9305a64e63d52c5a0bff1700d1bd61b52a3aafd3d67459d974b4a72138a0a2d280154b81005ad45229e48fdfe5705251ff8d318db339d9a2632d4b2 SHA512 2b85da32d4ee30c130840a2ff805fe9795504e1a5beb868e6c37181bcb5d60d27565b67a6ebe648b4a4cbfe95a326655c4eabf5dd92d556eda6b036801ac1c96 +DIST notmuch-0.33.2.tar.xz 733228 BLAKE2B e0a206695944bd57ab3ba1488bbff10c6744b57126eddeead45653a20df8edde21e0c618f9b4af5731e41bb469538883770ef61da4b28e2fd7dc108d994a7433 SHA512 15f4ecbd991df3a64c2b89aeb6bf7649e76ff2010f80120a15c10c9c5e913a90696ef6a760cbea24bbc9a3ca8cae18fada13d80e69c848cc142d355f2a513f5d EBUILD notmuch-0.32.2-r1.ebuild 6727 BLAKE2B 51f07469163bbad95fd87ddae50f137920171185fda318fe2fd0b6b7cb09cd67cb43d73a0eaa320b9b1e401d009ee8b17efe0d66edfc56b8cfc0549efc846f3c SHA512 d307f3f52b3041953c5c5f42ff35710ad9089769100525f49acc7c4e51951c7468f67b0a621b0968a3cf5b3572ec4d683545fad5aaf5338003a84156d1b590ff +EBUILD notmuch-0.33.2.ebuild 6835 BLAKE2B 9539f6facdbf906454b0a79861dcf049c6016b5b25731bd26037fe1f786eaf4b0bd5c45b496d22b21f1e92d19094dd5c62ec0ebd4bbd055513f4eaf58be923c2 SHA512 9c7dc4eeebfde3c6672fb50830309a9d906cbf23c955ee36d4f787477552197d0e391712ebfc2661945f903cf147c42a02bf5159e2821c2beac765b52dc0c2fd MISC metadata.xml 1303 BLAKE2B 0efb03056bdd6b69e5a34feda715557fa94ae797ece1ac650d7ed3719a439069c9fcaf8308fb893048021dbf9b0691ea01096f7219fa5b9367cbb16c261c3372 SHA512 9eb0041d9336fb9778532e4947f37af4ec4272c5fbd24dd0cf26c8779e2e609a7198f107b2538b2e6c2b20cf29e2c648a59275725c00cad8ef550ab9bcab355b diff --git a/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch deleted file mode 100644 index 19f00391093e..000000000000 --- a/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://bugs.gentoo.org/777663 - -From: David Bremner -Date: Mon, 15 Feb 2021 20:43:50 +0000 (-0400) -Subject: fix build failure with glib 2.67 -X-Git-Tag: archive/debian/0.31.4-1~6 -X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6db8b422d91a75b7c16f013f10f41d1109ce5866;hp=1692fe7aa8b137d02817bb11f248d204d6ab4048 - -fix build failure with glib 2.67 - -Based on a patch from Michael J Gruber [1]. As of glib 2.67 (more -specifically [2]), including "gmime-extra.h" inside an extern "C" -block causes build failures, because glib is using C++ features. - -Observing that "gmime-extra.h" is no longer needed in -notmuch-private.h, which can simply delete that include, but -we have to correspondingly move the includes which might include -it (in particular crypto.h) out of the extern "C" block also. - -This seems less fragile than only moving gmime-extra, and relying on -preprocessor sentinels to keep the deeper includes from happening. - -Move to the include to the outside of the extern block. - -[1]: id:aee618a3d41f7889a7449aa16893e992325a909a.1613055071.git.git@grubix.eu -[2]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715 ---- - -diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h -index 57ec7f72..41aff342 100644 ---- a/lib/notmuch-private.h -+++ b/lib/notmuch-private.h -@@ -31,6 +31,12 @@ - - #include "notmuch.h" - -+#include "xutil.h" -+#include "error_util.h" -+#include "string-util.h" -+#include "crypto.h" -+#include "repair.h" -+ - NOTMUCH_BEGIN_DECLS - - #include -@@ -47,14 +53,6 @@ NOTMUCH_BEGIN_DECLS - - #include - --#include "gmime-extra.h" -- --#include "xutil.h" --#include "error_util.h" --#include "string-util.h" --#include "crypto.h" --#include "repair.h" -- - #ifdef DEBUG - # define DEBUG_DATABASE_SANITY 1 - # define DEBUG_THREADING 1 diff --git a/net-mail/notmuch/notmuch-0.31.3-r1.ebuild b/net-mail/notmuch/notmuch-0.31.3-r1.ebuild deleted file mode 100644 index ae71b74055bb..000000000000 --- a/net-mail/notmuch/notmuch-0.31.3-r1.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_SETUPTOOLS=manual -NEED_EMACS="24.1" -PYTHON_COMPAT=( python3_{7,8,9} 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 x86 ~x64-macos" -REQUIRED_USE=" - apidoc? ( doc ) - nmbug? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( crypt emacs python valgrind ) -" -IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils[extra-filters(-)] - virtual/pkgconfig - apidoc? ( - app-doc/doxygen - dev-lang/perl - ) - doc? ( - dev-python/sphinx - sys-apps/texinfo - ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) - ) -" - -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} - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -DEPEND="${COMMON_DEPEND} - test? ( - >=app-editors/emacs-${NEED_EMACS}:*[libxml2] - app-misc/dtach - sys-devel/gdb - crypt? ( - app-crypt/gnupg - dev-libs/openssl - ) - ) - valgrind? ( dev-util/valgrind ) -" - -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}"/${P}-glib-2.68.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) - ) - - econf "${myconf[@]}" -} - -python_compile() { - pushd bindings/python-cffi > /dev/null || die - distutils-r1_python_compile - 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=() - # NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed) - pax-mark -m notmuch - NOTMUCH_TEST_SERIALIZE=1 \ - 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 - 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?/*.? - 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/{nmbug,notmuch-report} - dobin devel/nmbug/{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.32.1-r1.ebuild b/net-mail/notmuch/notmuch-0.32.1-r1.ebuild deleted file mode 100644 index 78bf6a0ccc8b..000000000000 --- a/net-mail/notmuch/notmuch-0.32.1-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_SETUPTOOLS=manual -NEED_EMACS="24.1" -PYTHON_COMPAT=( python3_{7,8,9} 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 x86 ~x64-macos" -REQUIRED_USE=" - apidoc? ( doc ) - nmbug? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( crypt emacs python valgrind ) -" -IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils[extra-filters(-)] - virtual/pkgconfig - apidoc? ( - app-doc/doxygen - dev-lang/perl - ) - doc? ( - dev-python/sphinx - sys-apps/texinfo - ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) - ) - test? ( 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} - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -DEPEND="${COMMON_DEPEND} - test? ( - >=app-editors/emacs-${NEED_EMACS}:*[libxml2] - app-misc/dtach - sys-devel/gdb - crypt? ( - app-crypt/gnupg - dev-libs/openssl - ) - ) - valgrind? ( dev-util/valgrind ) -" - -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}/${P}-tests.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) - ) - - 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 - 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 - 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?/*.? - 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/{nmbug,notmuch-report} - dobin devel/nmbug/{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.33.2.ebuild b/net-mail/notmuch/notmuch-0.33.2.ebuild new file mode 100644 index 000000000000..4cc225e3c559 --- /dev/null +++ b/net-mail/notmuch/notmuch-0.33.2.ebuild @@ -0,0 +1,295 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS=manual +NEED_EMACS="24.1" +PYTHON_COMPAT=( python3_{7,8,9} 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 ~x86 ~x64-macos" +REQUIRED_USE=" + apidoc? ( doc ) + nmbug? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( crypt emacs python valgrind ) +" +IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/xz-utils[extra-filters(-)] + virtual/pkgconfig + apidoc? ( + app-doc/doxygen + dev-lang/perl + ) + doc? ( + dev-python/sphinx + 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} + virtual/python-cffi[${PYTHON_USEDEP}] + ) +" + +DEPEND="${COMMON_DEPEND} + test? ( + >=app-editors/emacs-${NEED_EMACS}:*[libxml2] + app-misc/dtach + sys-devel/gdb[python] + crypt? ( + app-crypt/gnupg + dev-libs/openssl + ) + ) + valgrind? ( dev-util/valgrind ) +" + +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" + +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) + ) + + 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 + 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?/*.? + 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/{nmbug,notmuch-report} + dobin devel/nmbug/{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 +} -- cgit v1.2.3