Version bump. Added site-init file for notmuch-pick by Ulrich Müller

<ulm@gentoo.org> - thanks! :-)

NEWS
~~~~
(Extracted headlines from NEWS file. See it for details.)

General
-------
- Date range search support
- Empty tag names and tags beginning with "-" are deprecated
- New add-on tool: notmuch-pick (installed on 'pick' USE flag)

Command-Line Interface
----------------------

- `notmuch new` no longer chokes on mboxes
- Support for single message mboxes is deprecated
- Fixed `notmuch new` to skip ignored broken symlinks
- New dump/restore format and tagging interface
- Bcc and Reply-To headers are now available in notmuch show json output
- CLI callers can now request a specific output format version
- `notmuch search` has gained a null character separated text output format

Emacs Interface
---------------

- Removal of the deprecated `notmuch-folders` variable
- Visibility of MIME parts can be toggled
- Emacs now buttonizes mid: links
- Handle errors from bodypart insertions
- Emacs now detects version mismatches with the notmuch CLI
- Improved text/calendar content handling
- Disabled coding conversions when reading in
`with-current-notmuch-show-message`
- Fixed errors with HTML email containing images in Emacs 24
- Fixed handling of tags with unusual characters in them
- Fixed buttonization of id: links without quote characters
- `notmuch-hello` refresh point placement improvements
- Automatic tag changes are now unified and customizable
- Support for stashing the thread id in show view

(Portage version: 2.1.11.46/cvs/Linux x86_64, signed Manifest commit with key E1DBFAB5)

4 files changed, 237 insertions, 2 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 8cb5232b2682..1882416010f8 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for net-mail/notmuch
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.65 2012/11/20 20:36:15 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.66 2013/01/20 14:16:53 aidecoe Exp $
+
+*notmuch-0.15 (20 Jan 2013)
+
+  20 Jan 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +files/60notmuch-pick-gentoo.el, +notmuch-0.15.ebuild, metadata.xml:
+  Version bump. Added site-init file for notmuch-pick by Ulrich Müller
+  <ulm@gentoo.org> - thanks! :-)
+
+  NEWS
+  ~~~~
+  (Extracted headlines from NEWS file. See it for details.)
+
+  General
+  -------
+  - Date range search support
+  - Empty tag names and tags beginning with "-" are deprecated
+  - New add-on tool: notmuch-pick (installed on 'pick' USE flag)
+
+  Command-Line Interface
+  ----------------------
+
+  - `notmuch new` no longer chokes on mboxes
+  - Support for single message mboxes is deprecated
+  - Fixed `notmuch new` to skip ignored broken symlinks
+  - New dump/restore format and tagging interface
+  - Bcc and Reply-To headers are now available in notmuch show json output
+  - CLI callers can now request a specific output format version
+  - `notmuch search` has gained a null character separated text output format
+
+  Emacs Interface
+  ---------------
+
+  - Removal of the deprecated `notmuch-folders` variable
+  - Visibility of MIME parts can be toggled
+  - Emacs now buttonizes mid: links
+  - Handle errors from bodypart insertions
+  - Emacs now detects version mismatches with the notmuch CLI
+  - Improved text/calendar content handling
+  - Disabled coding conversions when reading in
+  `with-current-notmuch-show-message`
+  - Fixed errors with HTML email containing images in Emacs 24
+  - Fixed handling of tags with unusual characters in them
+  - Fixed buttonization of id: links without quote characters
+  - `notmuch-hello` refresh point placement improvements
+  - Automatic tag changes are now unified and customizable
+  - Support for stashing the thread id in show view
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> notmuch-0.14-r1.ebuild:
   Stable for x86, wrt bug #441466
diff --git a/net-mail/notmuch/files/60notmuch-pick-gentoo.el b/net-mail/notmuch/files/60notmuch-pick-gentoo.el
new file mode 100644
index 000000000000..84ef4b4d2293
--- /dev/null
+++ b/net-mail/notmuch/files/60notmuch-pick-gentoo.el
@@ -0,0 +1 @@
+(autoload 'notmuch-pick "notmuch-pick" "Run notmuch pick with the given `query' and display the results" t)
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index aaa61627c031..4aa8c42e3b08 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -14,6 +14,8 @@
 		<flag name="nmbug">Install experimental tag sharing /
 			pseudo-bug-tracking script for Notmuch
 			(see http://notmuchmail.org/nmbug/)</flag>
+		<flag name="pick">Experimental threaded message view for the emacs
+			interface</flag>
 		<flag name="vim">Install Vim UI (experimental)</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/net-mail/notmuch/notmuch-0.15.ebuild b/net-mail/notmuch/notmuch-0.15.ebuild
new file mode 100644
index 000000000000..508092c484d7
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.15.ebuild
@@ -0,0 +1,186 @@
+# 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.15.ebuild,v 1.1 2013/01/20 14:16:53 aidecoe Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.6 3:3.2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.1"
+
+inherit elisp-common 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="
+	pick? ( emacs )
+	test? ( crypt emacs python )
+	"
+IUSE="bash-completion crypt debug doc emacs mutt nmbug pick python test vim
+	zsh-completion"
+
+CDEPEND="
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	dev-libs/xapian
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( || ( app-editors/emacs:23 app-editors/emacs:24[libxml2] ) )
+	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 )
+	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-PodParser
+		)
+	zsh-completion? ( app-shells/zsh )
+	"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+SITEFILE_PICK="60${PN}-pick-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() {
+	default
+	bindings python distutils_src_prepare
+
+	if use mutt; then
+		mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+	fi
+
+	if use pick; then
+		mv contrib/notmuch-pick/README contrib/notmuch-pick/README-pick || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="${ROOT}/usr/share/bash-completion"
+		--emacslispdir="${ROOT}/${SITELISP}/${PN}"
+		--emacsetcdir="${ROOT}/${SITEETC}/${PN}"
+		--with-gmime-version=2.6
+		--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 mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+
+	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
+
+		if use pick; then
+			pushd contrib/notmuch-pick || die
+			elisp-install "${PN}" notmuch-pick.el || die
+			dodoc README-pick
+			popd || die
+			elisp-site-file-install "${FILESDIR}/${SITEFILE_PICK}" || die
+		fi
+	fi
+
+	if use nmbug; then
+		dobin contrib/nmbug/nmbug
+	fi
+
+	if use mutt; then
+		[[ -e /etc/mutt/notmuch-mutt.rc ]] && NOTMUCH_MUTT_RC_EXISTS=1
+		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
+
+	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
+
+	if use mutt && [[ ! ${NOTMUCH_MUTT_RC_EXISTS} ]]; 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_postrm() {
+	use emacs && elisp-site-regen
+	use python && distutils_pkg_postrm
+}