diff options
author | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2013-09-14 17:32:35 +0000 |
---|---|---|
committer | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2013-09-14 17:32:35 +0000 |
commit | 43d7eb15723c9a804f8ebda839c2e4d937f09cee (patch) | |
tree | ec68ccd09e5349bcc5b06b6660275b290b50358f /net-mail | |
parent | Removed old, unused patches. (diff) | |
download | gentoo-2-43d7eb15723c9a804f8ebda839c2e4d937f09cee.tar.gz gentoo-2-43d7eb15723c9a804f8ebda839c2e4d937f09cee.tar.bz2 gentoo-2-43d7eb15723c9a804f8ebda839c2e4d937f09cee.zip |
Removed the oldest versions: 0.10 and 0.11.
(Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)
Diffstat (limited to 'net-mail')
-rw-r--r-- | net-mail/notmuch/ChangeLog | 12 | ||||
-rw-r--r-- | net-mail/notmuch/files/0.10.2-build-with-gmime-2.4-only.patch | 12 | ||||
-rw-r--r-- | net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-fix.patch | 56 | ||||
-rw-r--r-- | net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-test.patch | 49 | ||||
-rw-r--r-- | net-mail/notmuch/files/0.10.2-fix-test-build.patch | 104 | ||||
-rw-r--r-- | net-mail/notmuch/files/0.10.2-lib-call-g_mime_init-db-open.patch | 55 | ||||
-rw-r--r-- | net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch | 12 | ||||
-rw-r--r-- | net-mail/notmuch/notmuch-0.10.2-r3.ebuild | 147 | ||||
-rw-r--r-- | net-mail/notmuch/notmuch-0.11.1-r3.ebuild | 143 |
9 files changed, 11 insertions, 579 deletions
diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog index ad01ebce2fd7..22aaacbeab77 100644 --- a/net-mail/notmuch/ChangeLog +++ b/net-mail/notmuch/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-mail/notmuch # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.80 2013/09/14 17:28:42 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.81 2013/09/14 17:32:35 aidecoe Exp $ + + 14 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> + -notmuch-0.10.2-r3.ebuild, -notmuch-0.11.1-r3.ebuild, + -files/0.10.2-build-with-gmime-2.4-only.patch, + -files/0.10.2-emacsui-mml-tags-quoting-fix.patch, + -files/0.10.2-emacsui-mml-tags-quoting-test.patch, + -files/0.10.2-fix-test-build.patch, + -files/0.10.2-lib-call-g_mime_init-db-open.patch, + -files/0.11.1-build-with-gmime-2.4-only.patch: + Removed the oldest versions: 0.10 and 0.11. 14 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> -files/0.15-0001-lib-Makefile.local-depend-on-libs-we-a.patch, diff --git a/net-mail/notmuch/files/0.10.2-build-with-gmime-2.4-only.patch b/net-mail/notmuch/files/0.10.2-build-with-gmime-2.4-only.patch deleted file mode 100644 index 91879509d2b3..000000000000 --- a/net-mail/notmuch/files/0.10.2-build-with-gmime-2.4-only.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur notmuch-0.10.2/configure notmuch-0.10.2.new/configure ---- notmuch-0.10.2/configure 2011-12-06 04:06:50.000000000 +0100 -+++ notmuch-0.10.2.new/configure 2012-04-22 12:04:52.227816674 +0200 -@@ -275,7 +275,7 @@ - - printf "Checking for GMime development files... " - have_gmime=0 --for gmimepc in gmime-2.6 gmime-2.4; do -+for gmimepc in gmime-2.4; do - if pkg-config --exists $gmimepc; then - printf "Yes ($gmimepc).\n" - have_gmime=1 diff --git a/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-fix.patch b/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-fix.patch deleted file mode 100644 index e6d8099f8d4e..000000000000 --- a/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-fix.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 52a5f9e1756a5f69570bf694fe3e384cbef84eb9 Mon Sep 17 00:00:00 2001 -From: Aaron Ecay <aaronecay@gmail.com> -Date: Fri, 3 Feb 2012 11:24:08 +0100 -Subject: [PATCH 2/4] emacs: quote MML tags in replies -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Emacs message-mode uses certain text strings to indicate how to attach -files to outgoing mail. If these are present in the text of an email, -and a user is tricked into replying to the message, the user’s files -could be exposed. - -Edited-by: Pieter Praet <pieter@praet.org>: Rebased to release branch. - -Conflicts: - - NEWS ---- - emacs/notmuch-mua.el | 7 ++++++- - test/emacs | 1 - - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el -index 8824b08..a123c71 100644 ---- a/emacs/notmuch-mua.el -+++ b/emacs/notmuch-mua.el -@@ -109,7 +109,12 @@ list." - (insert body)) - (set-buffer-modified-p nil) - -- (message-goto-body)) -+ (message-goto-body) -+ ;; Original message may contain (malicious) MML tags. We must -+ ;; properly quote them in the reply. Note that using `point-max' -+ ;; instead of `mark' here is wrong. The buffer may include user's -+ ;; signature which should not be MML-quoted. -+ (mml-quote-region (point) (point-max))) - - (defun notmuch-mua-forward-message () - (message-forward) -diff --git a/test/emacs b/test/emacs -index a8f4be4..ad8941c 100755 ---- a/test/emacs -+++ b/test/emacs -@@ -253,7 +253,6 @@ EOF - test_expect_equal_file OUTPUT EXPECTED - - test_begin_subtest "Quote MML tags in reply" --test_subtest_known_broken - message_id='test-emacs-mml-quoting@message.id' - add_message [id]="$message_id" \ - "[subject]='$test_subtest_name'" \ --- -1.7.8.4 - diff --git a/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-test.patch b/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-test.patch deleted file mode 100644 index b293814d1a9e..000000000000 --- a/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-test.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1c34ca30118ee8c7fb08228bfb211ff1a7f4f260 Mon Sep 17 00:00:00 2001 -From: Aaron Ecay <aaronecay@gmail.com> -Date: Fri, 3 Feb 2012 11:24:07 +0100 -Subject: [PATCH 1/4] test: add tests for quoting of MML tags in replies - -The test is broken at this time; the next commit will introduce a fix. - -Edited-by: Pieter Praet <pieter@praet.org>: - Rebased to release branch, moved expected output into the actual test, - and fixed "Fcc:" line. ---- - test/emacs | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -diff --git a/test/emacs b/test/emacs -index 75a0a74..a8f4be4 100755 ---- a/test/emacs -+++ b/test/emacs -@@ -252,6 +252,27 @@ On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> w - EOF - test_expect_equal_file OUTPUT EXPECTED - -+test_begin_subtest "Quote MML tags in reply" -+test_subtest_known_broken -+message_id='test-emacs-mml-quoting@message.id' -+add_message [id]="$message_id" \ -+ "[subject]='$test_subtest_name'" \ -+ '[body]="<#part disposition=inline>"' -+test_emacs "(notmuch-show \"id:$message_id\") -+ (notmuch-show-reply) -+ (test-output)" -+cat <<EOF >EXPECTED -+From: Notmuch Test Suite <test_suite@notmuchmail.org> -+To: -+Subject: Re: Quote MML tags in reply -+In-Reply-To: <test-emacs-mml-quoting@message.id> -+Fcc: ${MAIL_DIR}/sent -+--text follows this line-- -+On Tue, 05 Jan 2001 15:43:57 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote: -+> <#!part disposition=inline> -+EOF -+test_expect_equal_file OUTPUT EXPECTED -+ - test_begin_subtest "Save attachment from within emacs using notmuch-show-save-attachments" - # save as archive to test that Emacs does not re-compress .gz - test_emacs '(let ((standard-input "\"attachment1.gz\"")) --- -1.7.8.4 - diff --git a/net-mail/notmuch/files/0.10.2-fix-test-build.patch b/net-mail/notmuch/files/0.10.2-fix-test-build.patch deleted file mode 100644 index 7b326fb85c61..000000000000 --- a/net-mail/notmuch/files/0.10.2-fix-test-build.patch +++ /dev/null @@ -1,104 +0,0 @@ -From dc1fae07d2896d9eace61989b7c25d9434ee7f3f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Fri, 25 Nov 2011 10:08:47 +0100 -Subject: [PATCH] Build symbol-test with make instead of hardcoding in - symbol-hiding. - -If symbol-test is built in symbol-hiding with hardcoded g++ invokation, it's -not so easy to pass $(srcdir) which is required to find notmuch.h when srcdir -and builddir are separate directories. - -Fixed warnings in symbol-test.cc, btw. ---- - test/.gitignore | 1 + - test/Makefile.local | 5 ++++- - test/basic | 2 +- - test/symbol-hiding | 3 +-- - test/symbol-test.cc | 9 ++++----- - 5 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/test/.gitignore b/test/.gitignore -index 9e97052..7e30e8d 100644 ---- a/test/.gitignore -+++ b/test/.gitignore -@@ -1,4 +1,5 @@ - test-results - corpus.mail - smtp-dummy -+symbol-test - tmp.* -diff --git a/test/Makefile.local b/test/Makefile.local -index 8eb0433..a672fd3 100644 ---- a/test/Makefile.local -+++ b/test/Makefile.local -@@ -11,8 +11,11 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o) - $(dir)/smtp-dummy: $(smtp_dummy_modules) - $(call quiet,CC) $^ -o $@ - -+$(dir)/symbol-test: $(dir)/symbol-test.o -+ $(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian -+ - .PHONY: test check --test: all $(dir)/smtp-dummy -+test: all $(dir)/smtp-dummy $(dir)/symbol-test - @${dir}/notmuch-test $(OPTIONS) - - check: test -diff --git a/test/basic b/test/basic -index 38db2ba..5463bf8 100755 ---- a/test/basic -+++ b/test/basic -@@ -56,7 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort) - available=$(ls -1 $TEST_DIRECTORY/ | \ - sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \ - -e "/^(README|test-lib.sh|test-lib.el|test-results|tmp.*|valgrind|corpus*)/d" \ -- -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc)/d" \ -+ -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc|symbol-test|symbol-test.o)/d" \ - -e "/^(test.expected-output|.*~)/d" \ - -e "/^(gnupg-secret-key.asc)/d" \ - -e "/^(gnupg-secret-key.NOTE)/d" \ -diff --git a/test/symbol-hiding b/test/symbol-hiding -index d0b31ae..f67b653 100755 ---- a/test/symbol-hiding -+++ b/test/symbol-hiding -@@ -12,13 +12,12 @@ test_description='exception symbol hiding' - . ./test-lib.sh - - run_test(){ -- result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib ./symbol-test 2>&1) -+ result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1) - } - - output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian' - caught No chert database found at path \`./nonexistant'" - --g++ -o symbol-test -I$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test.cc -L$TEST_DIRECTORY/../lib -lnotmuch -lxapian - mkdir -p fakedb/.notmuch - test_expect_success 'running test' run_test - test_begin_subtest 'checking output' -diff --git a/test/symbol-test.cc b/test/symbol-test.cc -index 1de06ea..bfbe38f 100644 ---- a/test/symbol-test.cc -+++ b/test/symbol-test.cc -@@ -1,14 +1,13 @@ - #include <stdio.h> - #include <xapian.h> - #include <notmuch.h> --main (int argc, char **argv){ -+int main (){ - -- notmuch_database_t *notmuch -- = notmuch_database_open ("fakedb", -- NOTMUCH_DATABASE_MODE_READ_ONLY); -+ //notmuch_database_t *notmuch = -+ notmuch_database_open ("fakedb", NOTMUCH_DATABASE_MODE_READ_ONLY); - - try{ -- (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN); -+ (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN); - } catch (const Xapian::Error &error) { - printf("caught %s\n",error.get_msg().c_str()); - return 0; --- -1.7.8.rc3 - diff --git a/net-mail/notmuch/files/0.10.2-lib-call-g_mime_init-db-open.patch b/net-mail/notmuch/files/0.10.2-lib-call-g_mime_init-db-open.patch deleted file mode 100644 index 7521e39b0358..000000000000 --- a/net-mail/notmuch/files/0.10.2-lib-call-g_mime_init-db-open.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5f4dad1b12e224f06576e5ed9e71b3f9f16a13f1 Mon Sep 17 00:00:00 2001 -From: Kazuo Teramoto <kaz.rag@gmail.com> -Date: Sat, 31 Dec 2011 02:37:41 -0200 -Subject: [PATCH 3/3] lib: call g_mime_init() from notmuch_database_open() - -As reported in -id:"CAEbOPGyuHnz4BPtDutnTPUHcP3eYcRCRkXhYoJR43RUMw671+g@mail.gmail.com" -sometimes gmime tries to access a NULL pointer, e.g. g_mime_iconv_open() -tries to access iconv_cache that is NULL if g_mime_init() is not called. -This causes notmuch to segfault when calling gmime functions. - -Calling g_mime_init() initializes iconv_cache and others variables needed -by gmime, making sure they are initialized when notmuch calls gmime -functions. ---- - lib/database.cc | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/lib/database.cc b/lib/database.cc -index 98f101e..df6c8d0 100644 ---- a/lib/database.cc -+++ b/lib/database.cc -@@ -28,6 +28,8 @@ - #include <glib.h> /* g_free, GPtrArray, GHashTable */ - #include <glib-object.h> /* g_type_init */ - -+#include <gmime/gmime.h> /* g_mime_init */ -+ - using namespace std; - - #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) -@@ -581,6 +583,7 @@ notmuch_database_open (const char *path, - struct stat st; - int err; - unsigned int i, version; -+ static int initialized = 0; - - if (asprintf (¬much_path, "%s/%s", path, ".notmuch") == -1) { - notmuch_path = NULL; -@@ -604,6 +607,12 @@ notmuch_database_open (const char *path, - /* Initialize the GLib type system and threads */ - g_type_init (); - -+ /* Initialize gmime */ -+ if (! initialized) { -+ g_mime_init (0); -+ initialized = 1; -+ } -+ - notmuch = talloc (NULL, notmuch_database_t); - notmuch->exception_reported = FALSE; - notmuch->path = talloc_strdup (notmuch, path); --- -1.7.8.4 - diff --git a/net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch b/net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch deleted file mode 100644 index 91879509d2b3..000000000000 --- a/net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur notmuch-0.10.2/configure notmuch-0.10.2.new/configure ---- notmuch-0.10.2/configure 2011-12-06 04:06:50.000000000 +0100 -+++ notmuch-0.10.2.new/configure 2012-04-22 12:04:52.227816674 +0200 -@@ -275,7 +275,7 @@ - - printf "Checking for GMime development files... " - have_gmime=0 --for gmimepc in gmime-2.6 gmime-2.4; do -+for gmimepc in gmime-2.4; do - if pkg-config --exists $gmimepc; then - printf "Yes ($gmimepc).\n" - have_gmime=1 diff --git a/net-mail/notmuch/notmuch-0.10.2-r3.ebuild b/net-mail/notmuch/notmuch-0.10.2-r3.ebuild deleted file mode 100644 index 5bccb0920afb..000000000000 --- a/net-mail/notmuch/notmuch-0.10.2-r3.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.10.2-r3.ebuild,v 1.8 2013/09/06 13:06:27 aidecoe Exp $ - -EAPI=4 - -PYTHON_DEPEND="python? 2:2.6" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.[45] 3.*" - -inherit elisp-common eutils pax-utils distutils - -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" -HOMEPAGE="http://notmuchmail.org/" -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -REQUIRED_USE="test? ( crypt emacs python )" -IUSE="bash-completion crypt debug doc emacs nmbug python test vim - zsh-completion" - -CDEPEND=" - >=dev-libs/glib-2.22 - dev-libs/gmime:2.4 - <dev-libs/xapian-1.3 - sys-libs/talloc - debug? ( dev-util/valgrind ) - emacs? ( >=virtual/emacs-23 ) - x86? ( >=dev-libs/xapian-1.2.7-r2 ) - vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) ) - " -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( python? ( dev-python/sphinx ) ) - test? ( app-misc/dtach sys-devel/gdb ) - " -RDEPEND="${CDEPEND} - crypt? ( app-crypt/gnupg ) - nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-PodParser ) - zsh-completion? ( app-shells/zsh ) - " - -PATCHES=( - "${FILESDIR}/${PV}-fix-test-build.patch" - "${FILESDIR}/${PV}-emacsui-mml-tags-quoting-test.patch" - "${FILESDIR}/${PV}-emacsui-mml-tags-quoting-fix.patch" - "${FILESDIR}/${PV}-lib-call-g_mime_init-db-open.patch" - "${FILESDIR}/${PV}-build-with-gmime-2.4-only.patch" - ) -DOCS=( AUTHORS NEWS README TODO ) -SITEFILE="50${PN}-gentoo.el" -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" - -bindings() { - if use $1; then - pushd bindings/$1 || die - shift - $@ - popd || die - fi -} - -pkg_setup() { - if use emacs; then - elisp-need-emacs 23 || die "Emacs version too low" - fi - use python && python_pkg_setup -} - -src_prepare() { - local p - for p in "${PATCHES[@]}"; do - epatch "${p}" - done - default - bindings python distutils_src_prepare -} - -src_configure() { - local myeconfargs=( - --bashcompletiondir="${ROOT}/usr/share/bash-completion" - --emacslispdir="${ROOT}/${SITELISP}/${PN}" - --emacsetcdir="${ROOT}/${SITEETC}/${PN}" - --zshcompletiondir="${ROOT}/usr/share/zsh/site-functions" - $(use_with bash-completion) - $(use_with emacs) - $(use_with zsh-completion) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - bindings python distutils_src_compile - - if use doc; then - pydocs() { - mv README README-python || die - pushd docs || die - emake html - mv 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}" default - pax-mark -ze notmuch -} - -src_install() { - default - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die - fi - - if use nmbug; then - dobin contrib/nmbug - fi - - if use vim; then - insinto /usr/share/vim/vimfiles - doins -r vim/plugin vim/syntax - fi - - DOCS="" bindings python distutils_src_install - - if use doc; then - bindings python dohtml -r python - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && distutils_pkg_postinst -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && distutils_pkg_postrm -} diff --git a/net-mail/notmuch/notmuch-0.11.1-r3.ebuild b/net-mail/notmuch/notmuch-0.11.1-r3.ebuild deleted file mode 100644 index 4f4eccb33381..000000000000 --- a/net-mail/notmuch/notmuch-0.11.1-r3.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.11.1-r3.ebuild,v 1.8 2013/09/06 13:06:27 aidecoe Exp $ - -EAPI=4 - -PYTHON_DEPEND="python? 2:2.6" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.[45] 3.*" - -inherit elisp-common eutils pax-utils distutils - -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" -HOMEPAGE="http://notmuchmail.org/" -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -REQUIRED_USE="test? ( crypt emacs python )" -IUSE="bash-completion crypt debug doc emacs nmbug python test vim - zsh-completion" - -CDEPEND=" - >=dev-libs/glib-2.22 - dev-libs/gmime:2.4 - <dev-libs/xapian-1.3 - sys-libs/talloc - debug? ( dev-util/valgrind ) - emacs? ( >=virtual/emacs-23 ) - x86? ( >=dev-libs/xapian-1.2.7-r2 ) - vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) ) - " -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( python? ( dev-python/sphinx ) ) - test? ( app-misc/dtach sys-devel/gdb ) - " -RDEPEND="${CDEPEND} - crypt? ( app-crypt/gnupg ) - nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-PodParser ) - zsh-completion? ( app-shells/zsh ) - " - -PATCHES=( - "${FILESDIR}/${PV}-build-with-gmime-2.4-only.patch" - ) -DOCS=( AUTHORS NEWS README ) -SITEFILE="50${PN}-gentoo.el" -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" - -bindings() { - if use $1; then - pushd bindings/$1 || die - shift - $@ - popd || die - fi -} - -pkg_setup() { - if use emacs; then - elisp-need-emacs 23 || die "Emacs version too low" - fi - use python && python_pkg_setup -} - -src_prepare() { - local p - for p in "${PATCHES[@]}"; do - epatch "${p}" - done - default - bindings python distutils_src_prepare -} - -src_configure() { - local myeconfargs=( - --bashcompletiondir="${ROOT}/usr/share/bash-completion" - --emacslispdir="${ROOT}/${SITELISP}/${PN}" - --emacsetcdir="${ROOT}/${SITEETC}/${PN}" - --zshcompletiondir="${ROOT}/usr/share/zsh/site-functions" - $(use_with bash-completion) - $(use_with emacs) - $(use_with zsh-completion) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - bindings python distutils_src_compile - - if use doc; then - pydocs() { - mv README README-python || die - pushd docs || die - emake html - mv 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}" default - pax-mark -ze notmuch -} - -src_install() { - default - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die - fi - - if use nmbug; then - dobin contrib/nmbug - fi - - if use vim; then - insinto /usr/share/vim/vimfiles - doins -r vim/plugin vim/syntax - fi - - DOCS="" bindings python distutils_src_install - - if use doc; then - bindings python dohtml -r python - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && distutils_pkg_postinst -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && distutils_pkg_postrm -} |