From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- net-mail/notmuch/Manifest | 4 + ...-Use-loopback-IP-address-rather-than-name.patch | 62 ++++++ .../0002-Fix-jobserver-unavailable-warning.patch | 26 +++ net-mail/notmuch/notmuch-0.28.3.ebuild | 212 +++++++++++++++++++++ 4 files changed, 304 insertions(+) create mode 100644 net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch create mode 100644 net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch create mode 100644 net-mail/notmuch/notmuch-0.28.3.ebuild (limited to 'net-mail/notmuch') diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index 7250aa3ceeaf..601ddb2e61a6 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -1,3 +1,5 @@ +AUX 0001-Use-loopback-IP-address-rather-than-name.patch 2100 BLAKE2B c949840e8f25a7730b895aa4bd71003ddbc239dfaeb28ec20158b48bb8de29babb5d6e3badeeee601a1037f080349a57d0a4da5ac9dfe226234fdfc223e60bff SHA512 35ee1baee61d773f9c21ef8fc8f3703347a9cb7a4bbc9cd3fe733dd91cf5c0b06716f25ced78d3d34d9725f0cbd8916a71e415b5d2cbdd58936546a9d09288ce +AUX 0002-Fix-jobserver-unavailable-warning.patch 813 BLAKE2B 092eaecce7cf8beccb8e314fb818a3af4e5009009ed4d0d1fdfc1a526621f1df386c021d57ec02d6af2b4d98f1738875f054cf32e9a5f4fca310c282f85e6b0d SHA512 f1ffce7811f68e404118ad0147269c8d959d748e2e368d66dfe7eae5e995f1c405daf6ba6f45e9122c7aa249da190e54cd54b7c732a9d122e0c604454a53fce4 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 DIST notmuch-0.23.7.tar.gz 692230 BLAKE2B 79e81bde02546589c867d636fd30453beeecfb2a1e16cd512613de96f60674605765d53b52b8ab7479413b38d5db50d684a182139c62888c9dd0551f6eff8dea SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 @@ -6,10 +8,12 @@ DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8ea DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7 DIST notmuch-0.27.tar.gz 912583 BLAKE2B 75bb13e9666bd2898f58e5ecdd6a180d0da21188665f107857e6729f057525bb7c94832d140de8ff7b3fd31b51e33bcbe5b59d3fc09ba9a854c1c05499df762e SHA512 7c58c6fe5c3b43a979c3a439a24106417120726fd688b456d9084388ddd7c88ab1b6d99cd4676101f085d60bb37099631caa286b76588fcb041bb004ff325515 +DIST notmuch-0.28.3.tar.gz 921920 BLAKE2B 9b96a0cac8188bcaf9efab532721449c655fec4dac77c3eb327e576184cb430aa0fffc9ac74af82ad3ad80097afdda5c8accddbee7e5720d180c071d9dd2ef85 SHA512 dd3931b78cc27540e962f1fca5f4ebb1c04b2637a5761cda023f307fd9be4b5ddc2af26010330868c55200fa96b60b2a11b3b22d4c20d2a4a2d3787421ed85cf EBUILD notmuch-0.23.7.ebuild 4582 BLAKE2B 5e3d91233776f8bea407db340ad5ad083628f0d4d06849934e8dc78385acdb64bf2f9e1d804399636170f1524efc1b3d778a0ed5e4f2e32e01588b111947949f SHA512 abb5e69be4ee2405ec9e59683b040d7e6c2492403f3bff5d103cf2e957e9293a9f91b21a839d847e13f690b531c39b9e8df5eb6bf044e76ef26707800a47765e EBUILD notmuch-0.24.2.ebuild 4770 BLAKE2B 40bb192f400a0114976120b1b15294ce015d36637001e25a354aec5c686316e2045136091c71727ff003264be198780e132f7cce087310e5225a3a584d919a49 SHA512 d2a176d88df335783fcad6a397a44d6726c723f1d70fafafe986dadf138ba1410199a2b1347baf69d6589357c18931c1c9b791eb9437558ffb16afae9de3d654 EBUILD notmuch-0.25.3.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62a1b6d5e8392458982e5d829dada98492cf778d46fe43d0df0618f7748d705d99f1c406683299c16f407b40c0d9 SHA512 76825642fd0d738345f2d9f2043d527c4d60d36b12cb5e44530af3190a9e7c760f1bd840744f8bec59b145a634d5207e7636413671b3914336acd881e0734623 EBUILD notmuch-0.26.1.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2 EBUILD notmuch-0.26.2.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2 EBUILD notmuch-0.27.ebuild 4950 BLAKE2B b7b849221f3938f311063a3c09906e2294a9e6551669666277aa8eddc1aa3573d5559c94ab068d30f63ddbb7fdc3f0ee1e427c8718e6f4dfa53ea03ef6b64d36 SHA512 01dc2372a92c7c7d7fe1bf08265a81dda1794fab5a7657beab11816b0bed8a27277ea2de1e8123f132fe0afba980e60bb6639c61370e402dfdf3c9eda2d0a337 +EBUILD notmuch-0.28.3.ebuild 4958 BLAKE2B b72ec056bf5ba0cd29168617dedb70c5644b165bbd4223d45bd93470119f160d3da3a98e21ef53bd13b326ea60e5e0f8824dce23e529f3664bbd33d5baccb6cb SHA512 c4972a8e6eb1b2cbb4c932cb14a24324ccb69742c9414f89b8258872b02d5364f21a53554ab4c06745e2e713673553807e9bb21600fa14185f2e0c34b87d29f8 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3 diff --git a/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch new file mode 100644 index 000000000000..f7e1d7e05e35 --- /dev/null +++ b/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch @@ -0,0 +1,62 @@ +From 9c15b508819d15d0852d71c2e897550cfaac09ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?= + +Date: Thu, 7 Mar 2019 22:47:55 +0000 +Subject: [PATCH] Use loopback IP address rather than name + +With FEATURES="network-sandbox" 'localhost' name lookup fails. +--- + test/smtp-dummy.c | 8 ++++---- + test/test-lib.sh | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c +index 71992edd..e72ba2d0 100644 +--- a/test/smtp-dummy.c ++++ b/test/smtp-dummy.c +@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command) + fprintf (peer, "502 not implemented\r\n"); + fflush (peer); + } else if (STRNCMP_LITERAL (command, "HELO ") == 0) { +- fprintf (peer, "250 localhost\r\n"); ++ fprintf (peer, "250 127.0.0.1\r\n"); + fflush (peer); + } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 || + STRNCMP_LITERAL (command, "RCPT TO:") == 0) { +@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output) + size_t line_size; + ssize_t line_len; + +- fprintf (peer, "220 localhost smtp-dummy\r\n"); ++ fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n"); + fflush (peer); + + while ((line_len = getline (&line, &line_size, peer)) != -1) { +@@ -182,9 +182,9 @@ main (int argc, char *argv[]) + goto DONE; + } + +- hostinfo = gethostbyname ("localhost"); ++ hostinfo = gethostbyname ("127.0.0.1"); + if (hostinfo == NULL) { +- fprintf (stderr, "Unknown host: localhost\n"); ++ fprintf (stderr, "Unknown host: 127.0.0.1\n"); + ret = 1; + goto DONE; + } +diff --git a/test/test-lib.sh b/test/test-lib.sh +index fca5277d..fa8fd5bd 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -320,7 +320,7 @@ emacs_deliver_message () + test_emacs \ + "(let ((message-send-mail-function 'message-smtpmail-send-it) + (mail-host-address \"example.com\") +- (smtpmail-smtp-server \"localhost\") ++ (smtpmail-smtp-server \"127.0.0.1\") + (smtpmail-smtp-service \"25025\")) + (notmuch-mua-mail) + (message-goto-to) +-- +2.19.2 + diff --git a/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch b/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch new file mode 100644 index 000000000000..85ca4b6d4a52 --- /dev/null +++ b/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch @@ -0,0 +1,26 @@ +From b5e15feee139096720272d2b435ce7c4114fda15 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?= + +Date: Sat, 9 Mar 2019 22:42:21 +0000 +Subject: [PATCH 2/2] Fix "jobserver unavailable" warning + +--- + doc/Makefile.local | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Makefile.local b/doc/Makefile.local +index bab3d0d2..dfe62295 100644 +--- a/doc/Makefile.local ++++ b/doc/Makefile.local +@@ -56,7 +56,7 @@ sphinx-texinfo: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo + + sphinx-info: sphinx-texinfo +- make -C $(DOCBUILDDIR)/texinfo info ++ $(MAKE) -C $(DOCBUILDDIR)/texinfo info + + # Use the man page converter that is available. We should never depend + # on MAN_ROFF_FILES if a converter is not available. +-- +2.19.2 + diff --git a/net-mail/notmuch/notmuch-0.28.3.ebuild b/net-mail/notmuch/notmuch-0.28.3.ebuild new file mode 100644 index 000000000000..445fa176ab44 --- /dev/null +++ b/net-mail/notmuch/notmuch-0.28.3.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) + +inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \ + distutils-r1 toolchain-funcs + +DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" +HOMEPAGE="https://notmuchmail.org/" +SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz + test? ( ${HOMEPAGE%/}/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 ~x86 ~x64-solaris" +REQUIRED_USE=" + nmbug? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( crypt emacs python valgrind ) + " +IUSE="crypt doc emacs mutt nmbug python test valgrind" + +CDEPEND=" + !!=dev-libs/glib-2.22:2 + >=dev-libs/gmime-3.0.3:3.0 + >=dev-libs/xapian-1.4.8:= + dev-python/sphinx[${PYTHON_USEDEP}] + sys-apps/texinfo + >=sys-libs/zlib-1.2.5.2 + sys-libs/talloc + crypt? ( dev-libs/gmime:3.0[crypt] ) + emacs? ( >=virtual/emacs-23 ) + python? ( ${PYTHON_DEPS} ) + " +DEPEND="${CDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2] + >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb + crypt? ( app-crypt/gnupg dev-libs/openssl ) ) + valgrind? ( dev-util/valgrind ) + " +RDEPEND="${CDEPEND} + crypt? ( app-crypt/gnupg ) + nmbug? ( dev-vcs/git ) + 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 + virtual/perl-Pod-Parser ) + " + +DOCS=( AUTHORS NEWS README ) +SITEFILE="50${PN}-gentoo.el" +MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" +PATCHES=( + "${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch + "${FILESDIR}"/0002-Fix-jobserver-unavailable-warning.patch +) + +bindings() { + local ret=0 + + if use $1; then + pushd bindings/$1 || die + shift + "$@" + ret=$? + popd || die + fi + + return $ret +} + +pkg_pretend() { + if has_version '=notmuch-0.18. See NEWS file" + ewarn "(0.18 section) for details before first use!" + ewarn + fi +} + +pkg_setup() { + if use emacs; then + elisp-need-emacs 23 || die "Emacs version too low" + fi +} + +src_unpack() { + unpack "${P}".tar.gz + 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 + + bindings python distutils-r1_src_prepare + bindings python mv README README-python || die + mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die + + # assure that new Makefile.config will be generated + rm -f Makefile.config || die + + sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local + + if use test; then + append-cflags -g + append-cxxflags -g + fi + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket +} + +src_configure() { + local myeconfargs=( + --bashcompletiondir="$(get_bashcompdir)" + --emacslispdir="${EPREFIX}/${SITELISP}/${PN}" + --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}" + --without-desktop + --without-ruby + --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" + $(use_with emacs) + $(use_with doc api-docs) + ) + tc-export CC CXX + econf "${myeconfargs[@]}" +} + +src_compile() { + V=1 default + bindings python distutils-r1_src_compile + + if use mutt; then + pushd contrib/notmuch-mutt || die + emake notmuch-mutt.1 + popd || die + fi + + if use doc; then + pydocs() { + pushd docs || die + emake html + rm -r html/_sources || die + rm html/{objects.inv,.buildinfo} || die + mkdir -p ../html && mv html ../html/python || die + popd || die + } + LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs + fi +} + +src_test() { + pax-mark -m notmuch + LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default + pax-mark -ze notmuch +} + +src_install() { + default + + doman doc/_build/man/man?/*.? + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + fi + + if use nmbug; then + dobin devel/nmbug/nmbug + dobin devel/nmbug/notmuch-report + fi + + if use mutt; then + pushd contrib/notmuch-mutt || die + dobin notmuch-mutt + doman notmuch-mutt.1 + insinto /etc/mutt + doins notmuch-mutt.rc + dodoc README-mutt + popd || die + fi + + DOCS="" bindings python distutils-r1_src_install + use doc && bindings python dodoc -r html +} + +pkg_preinst() { + if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then + elog "To enable notmuch support in mutt, add the following line into" + elog "your mutt config file, please:" + elog "" + elog " source /etc/mutt/notmuch-mutt.rc" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} -- cgit v1.2.3