From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- net-mail/notmuch/Manifest | 9 +- ...-Use-loopback-IP-address-rather-than-name.patch | 61 ------ ...-Use-loopback-IP-address-rather-than-name.patch | 62 ------ .../0002-Fix-jobserver-unavailable-warning.patch | 26 --- net-mail/notmuch/notmuch-0.28.4.ebuild | 232 -------------------- net-mail/notmuch/notmuch-0.29.2.ebuild | 233 --------------------- net-mail/notmuch/notmuch-0.29.3.ebuild | 2 +- 7 files changed, 2 insertions(+), 623 deletions(-) delete mode 100644 net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch delete mode 100644 net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch delete mode 100644 net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch delete mode 100644 net-mail/notmuch/notmuch-0.28.4.ebuild delete mode 100644 net-mail/notmuch/notmuch-0.29.2.ebuild (limited to 'net-mail/notmuch') diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index 6cccb23ef05f..6558cb1d60f5 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -1,13 +1,6 @@ -AUX 0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541 AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541 -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.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7 -DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65 -EBUILD notmuch-0.28.4.ebuild 5084 BLAKE2B cf95b8e988b47cd8eb83905b201ce07d56a1ec37abd6bdf4e571b0085cca56d7df5b5604eace1acc484229d08fb04d9351c1665110d2bdca4e36875b8651a61f SHA512 c31e331f7e8a32b06b98c00126c33d9ec1bebf70abd66925b395aa7958c3712f57d698d1c3f72f63fcc7ae7399a4dcb50a87d80aab77a5dfdbb40db7a54a6818 -EBUILD notmuch-0.29.2.ebuild 5054 BLAKE2B 7ae1eb18daaad1dde46e7661d790c1341e704f6d620e103921959330cb8334c09bc21d9f16260e52d2b71b0fc5b6b5b0a1fb8f65ce25cc2e97eb19e8be666231 SHA512 ec2e75b01da6ccf2f1180bc11619be6fc1c28c1e49c75337c4a3378bedad8cc73e55709d0e32582062da7bd8f6e95ae36d9ec8a6caa0f64201065e9826090c92 -EBUILD notmuch-0.29.3.ebuild 5054 BLAKE2B 7ae1eb18daaad1dde46e7661d790c1341e704f6d620e103921959330cb8334c09bc21d9f16260e52d2b71b0fc5b6b5b0a1fb8f65ce25cc2e97eb19e8be666231 SHA512 ec2e75b01da6ccf2f1180bc11619be6fc1c28c1e49c75337c4a3378bedad8cc73e55709d0e32582062da7bd8f6e95ae36d9ec8a6caa0f64201065e9826090c92 +EBUILD notmuch-0.29.3.ebuild 5052 BLAKE2B 79c4a122ec1a94cb12e755a1827c3cf968afab31e036fbb3b91c8d03f9b24522a2817aea8ea6a963fc91ec1f33e054eddd23c20bad3837e58899e0ae6af101f9 SHA512 61d4bd24e18eaf523ba4f28c554aeadf0f86dde480b888d2edadf19b67cccdc930d6ec476f8a7816c07527d442303865b7f4d2a95f7efcd2d6b3971cfd690cfd MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3 diff --git a/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch deleted file mode 100644 index e47224695953..000000000000 --- a/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?= - -Date: Sun, 7 Jul 2019 11:33:09 +0100 -Subject: [PATCH] Use loopback IP address rather than name - ---- - 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 a7c1fe4f..822a986a 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) { -@@ -183,9 +183,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 616cb674..dd887773 100644 ---- a/test/test-lib.sh -+++ b/test/test-lib.sh -@@ -336,7 +336,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 \"${smtp_dummy_port}\")) - (notmuch-mua-mail) - (message-goto-to) --- -2.19.2 - 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 deleted file mode 100644 index f7e1d7e05e35..000000000000 --- a/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index 85ca4b6d4a52..000000000000 --- a/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild deleted file mode 100644 index 902126ad2395..000000000000 --- a/net-mail/notmuch/notmuch-0.28.4.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{2_7,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="https://notmuchmail.org/releases/${P}.tar.gz - 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 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" - -RESTRICT="!test? ( test )" - -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? ( >=app-editors/emacs-24.1:* ) - python? ( ${PYTHON_DEPS} ) - " -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-python/mock[${PYTHON_USEDEP}] - ) - test? ( - app-misc/dtach - >=app-editors/emacs-24.1:*[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 ) -NEED_EMACS="24.1" -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() { - use emacs && elisp-check-emacs-version -} - -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() { - python_setup # for sphinx - - 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() { - python_setup # for sphinx - - 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 - - if use doc; then - doman doc/_build/man/man?/*.? - fi - - 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 -} diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild deleted file mode 100644 index b10795cfe09a..000000000000 --- a/net-mail/notmuch/notmuch-0.29.2.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{2_7,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="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 ~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" - -RESTRICT="!test? ( test )" - -CDEPEND=" - !!=dev-libs/glib-2.22:2 - >=dev-libs/gmime-3.0.3:3.0 - >=dev-libs/xapian-1.4.8:= - dev-python/sphinx - sys-apps/texinfo - >=sys-libs/zlib-1.2.5.2 - sys-libs/talloc - crypt? ( dev-libs/gmime:3.0[crypt] ) - emacs? ( >=app-editors/emacs-24.1:* ) - python? ( ${PYTHON_DEPS} ) - " -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-python/mock[${PYTHON_USEDEP}] - ) - test? ( - app-misc/dtach - >=app-editors/emacs-24.1:*[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 ) -NEED_EMACS="24.1" -SITEFILE="50${PN}-gentoo.el" -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" -PATCHES=( - "${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.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() { - 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 - - 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 - - if [[ ${CHOST} == *-solaris* ]] ; then - append-ldflags -lnsl -lsocket # non-autoconf configure - fi -} - -src_configure() { - python_setup # for sphinx - - 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() { - python_setup # for sphinx - - 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 - - if use doc; then - doman doc/_build/man/man?/*.? - fi - - 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 -} diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild index b10795cfe09a..c8ab2a408976 100644 --- a/net-mail/notmuch/notmuch-0.29.3.ebuild +++ b/net-mail/notmuch/notmuch-0.29.3.ebuild @@ -18,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 ~x86 ~x64-solaris" +KEYWORDS="~alpha amd64 x86 ~x64-solaris" REQUIRED_USE=" nmbug? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) -- cgit v1.2.3