Version bump.

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

Build fixes
-----------

Update dependencies to avoid problems when building in parallel.

Internal test framework changes
-------------------------------

Adjust Emacs test watchdog mechanism to cope with `process-attributes`
being unimplimented.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

3 files changed, 225 insertions, 9 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 24cd039d04b2..eb5418b5ca6d 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,27 @@
 # 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.69 2013/01/27 14:32:10 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.70 2013/02/17 18:47:02 aidecoe Exp $
+
+*notmuch-0.15.2 (17 Feb 2013)
+
+  17 Feb 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +notmuch-0.15.2.ebuild:
+  Version bump.
+
+  NEWS
+  ~~~~
+  (Extracted headlines from NEWS file. See it for details.)
+
+  Build fixes
+  -----------
+
+  Update dependencies to avoid problems when building in parallel.
+
+  Internal test framework changes
+  -------------------------------
+
+  Adjust Emacs test watchdog mechanism to cope with `process-attributes`
+  being unimplimented.
 
 *notmuch-0.15.1 (27 Jan 2013)
 
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 30da9953f4fd..1cda825c26f2 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -17,6 +17,7 @@ DIST notmuch-0.12.tar.gz 464967 SHA256 1dbbbbba3567df9c67ecc642d1e63269a527952c5
 DIST notmuch-0.13.1.tar.gz 483776 SHA256 cf909876551e3345941e1ed40f5ef851f34b78fe3c93db3bf37789580035ce48 SHA512 110eb54b04c77e75ad8217aa3725802085a604c457014aa1f1b6ee0937f694de9ac36c47d225dcdcea1bb9b5f6d49ce476eafc61deb85c3435106bbc3784e406 WHIRLPOOL cebe7090a52838bcd42119ca360b4a038eb3cfe7d3854183fe71b1f98f222bc8ac16d4a8cf92a0206b5ad8a8f9f552d6cf760c42febdf9fb1755c51b8f6c2e7c
 DIST notmuch-0.14.tar.gz 488310 SHA256 095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753 SHA512 64f277906c085cc391e9ae3283e38905d95a931b0223cc986ca213d2191aa810b5b0f3abdf5fed84f5d6c4e6baacca8ca02574e29cd13537be01ac00e2501ed0 WHIRLPOOL b924cc3a922c209c52ae18446b363b29e81e77cdde3e37c47a99647f1a66dc55daf77db57dc9c9acd0d9953a5456ba1e82014585205bcca869f9fc4d0bd99eb3
 DIST notmuch-0.15.1.tar.gz 560172 SHA256 d917b62141c9d3e5c3bf6ce3b45cad33a0025b53d1c1eec1a6a52e32e3a12918 SHA512 afd221565277d3acb1bab9f15b3df752c3b862ebcfa905f7606d2a21f46d170f65a7fc056500624341b16a524d4f9d2f5c8704135a37cca262f66986e7fbfacf WHIRLPOOL 6f93cd7ffad51c31aebd3158198ed8e439fee72b659a6c93b5c8f58cf2e3e18a08efde1ac028b552f9382fd56d3ba6464cdd9b2f8f9b577fff84437ebacfdbb5
+DIST notmuch-0.15.2.tar.gz 560411 SHA256 a6e8af6382ab6df4a944bbffda9eb22639612c047b94632168b4270f2af59c0d SHA512 c31d147f7a3e464562c720f7884b51b14cee6d482e76a9d413be22493b62609301b50977d8727984f5c41ebf4f893d2607c03f4c51608a65aa843ef18e9e0fa6 WHIRLPOOL 827f94eb2eacc9d2b40effcb17e52a76a4716656b2a67ac7a3b8bc7ac924c421aa421541a45e3485851f3736a5e04a99965e32e267c856483d1af9bffb459b78
 DIST notmuch-0.15.tar.gz 559746 SHA256 1898b7d46cb4bd81d2d5167e6b3f95a7e949b7268eb3edc80ae640d7e541711d SHA512 fc6ef79c5a1b81f32aac40d39ed781e7703b5649291d400fd69f333948ff27c56a30eb1b1bec526d61ea7af1d0a240099b5e899b04e9b716137d9e523bc29c7a WHIRLPOOL ffae2db49373c065e220bc752e3799da76b3096f4b406915a351a9c3289bd30dc720d398a4de8519e3e5a7066335b970340dc56c3ba0e5bb93b4f774520d6cda
 EBUILD notmuch-0.10.2-r3.ebuild 3237 SHA256 eb4a9abdce9e53171f02f3afdcfa7316cb695d36622391287893e7803b8829ce SHA512 c4c7b52147a1bf9b92ed58c44f343c34cf36f0d34d68c4fa87602c0cfefa4603e3ab8a099e5f3255ca43fbac9504d2b66655176bdf647ec30f3ee7a6faedd225 WHIRLPOOL 5784cee87ff9df214963f4e17d4de1634085e9be6357059708dc0a501a2a049f5708d7c34d711334d9632efc0355464df8d7196a34fa4acd2d3ed1f3d5fe06d1
 EBUILD notmuch-0.11.1-r3.ebuild 3021 SHA256 76528ebaaf30fe6abc773a2cce75203f48a4f88e297f90dcaa14b6b3db420041 SHA512 833565272c99a264a88a423e8efe305983141afa567aea2af50939f3addbfa5011d216f0741e37147644eb674ba47b36d308e13ae590f9967eae0dc338e8cbde WHIRLPOOL 9c5162ea6d8b086d09c2fdbf4ccc842c7d61ffc58665af894999c0e90d7e841c74f64660deda43a941360dfdda34dd5e9a7562b00432d7112a0db3e56229b405
@@ -24,17 +25,18 @@ EBUILD notmuch-0.12.ebuild 2893 SHA256 ad73bd3f908e679351973923fc6005d2aeffb0cdc
 EBUILD notmuch-0.13.1.ebuild 3706 SHA256 0b61b587569fed19ef272083704737011ebde43df4ffe18bb69fc177a48e8b53 SHA512 dfbe04156255919d764f9e6a0bba07bfa53fe960791cec8ed20ad09300409aa9cb763a15914d3ee8a70749369a275a9365b197af06e178ac46fbc6f7c1af935e WHIRLPOOL 7d68ffff43a8af80a24db4ba179afba5388e6023ceca1639322b60441e2dfc5b5d3820a938a3a2f6135c3e04882de81d3927cc353f09f137ebe02cb6e56cd90f
 EBUILD notmuch-0.14-r1.ebuild 3756 SHA256 bc8b08b7a5718e08918dfba316c4ceb54841246ade4dde94ba64d756a19cd18a SHA512 c8fee7c5d8df3186343fa81c9513579fa40731c80dba3c45bf1e17161820eb151d5c4ab8c9f7df3c28f1b434a8b82d82087d195a49a9b9571daab974ced1bd05 WHIRLPOOL 10da69987400fafba84eafdba18f62cf08d407af7c879cb3ee9f6b19def40f984005469c967ef30558deb6d610c5941c4a1aaed5939bee6c7b0f1f0fdd70c4f3
 EBUILD notmuch-0.15.1.ebuild 4431 SHA256 7ed8fa9e76f0028319f38e66acf35bd7ec2e77877a35a14ea1e2da1fbc038079 SHA512 b9ad614b571d84047e0616b52e090dc587f6c9ad739079d1f1a258890c630be84a2a064a4e0419c2b832e0e3896a3189c5a0fecca5e96cda599969c6eb3307c9 WHIRLPOOL 5f111ebd246521f15587890523a27488f0a9cd09726346405a95d65969f9710324bef416c107c249b1221850ba53b31117c72c682593ff14769dbf756fb286d9
+EBUILD notmuch-0.15.2.ebuild 4359 SHA256 38ef7d09c75e3720ef59b83d887f537d5f30e148cf8556d933b1b51f877d6b97 SHA512 edf3537b2dca9fbaabe30e7a956a52801b759617e27b8b977309a8881b75ad1b9236797490dd47ceebae5f3f32845d3cd2bd7b71e601784437b84aafbcf67aad WHIRLPOOL 8d4b2438f0dd0ec6712f96b0755031b9373d8a2cb94dfa67f2f9202fc8b13e272fc575d2ca0462566bfab3cb044a1c5a0cc0e017ee936dbfafecfc540a36fad5
 EBUILD notmuch-0.15.ebuild 4429 SHA256 45ba597ca2cff558b3cefc43349860f9cce515439522d98b42c0f367a619f42e SHA512 24a03c1d5e79b222da95cce83d67e0a7305abca60052be2286cdaf4b9142c22207f9cd227ea0519c571e1ad1092912b61831c25d0fded40e7583da6f5ff69777 WHIRLPOOL 480811d1473c581acacb6fe483d281c7d5b4008e63e6c62febb86466a4969a39ca5748fbeb7d00db31371ad0d8c9bb3882da950d71b03f3be83b299a20249ba5
-MISC ChangeLog 19002 SHA256 13cde2d0a78073311c2991a5b6701ad6c6627b7dcb405d67afc2ddf79e59922d SHA512 7f317d03ecdc4f06167238f1782ab4505fb98a74a2b1cc910790e2924ee24d05e2a514d1aa5a8388b56cb0eb4f7e43c49da5be026432e3d733334021f668fc27 WHIRLPOOL f9799e82a776c85da75970e686ba3157afaaf8aa20a9e3820d41f0671648cbcf252088f0b975ba72775e56d6f674a8ca2dafb97856fe997de607339de3e28b67
+MISC ChangeLog 19471 SHA256 4337455f4cc260d61d4a06127bace0d1a415ce694cd987d510336236dbc7ce47 SHA512 f9e4bbfade89a145bac86d996ab952a8d6964564c1895db46138d4c21325d94c81cd27bbffc16735a63b41ea5ccf0f2921896454ee24efa56c467b132b38697b WHIRLPOOL f14e622842e4457b57605dfb66ecc31a2887af07e81677b5cbf1b8003dbc5ae81799b816e9da618a917e839cfa1445f9b9f6f6834591a0fefd5d71cf73aba3c4
 MISC metadata.xml 1130 SHA256 bef417ea1ad1a12a2639eb9644e7b8fda664f2c19047e2357aa56c3964bafb7b SHA512 e58811e997cdf258f70a9c2baa526d8c3acb76dfc208b43bc8bff3a4d1433ed08231956f9fbe098fd9ee26d4002bdb35617fbb0e578510489c9671d969b84eef WHIRLPOOL e72970d425eda43b1f635406f2ad04c725373662716ed4e4c1e88366da0d80bc2cb9b90da264a3cbd71d474881984b187fcfff15e78ffda7fdf161663e27b5d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRBTptAAoJEPATRTHh2/q18eoIAIjBhyg4n5cltY2eUORQlCzs
-qRHzfTyKzQJWvqnm9knx4V1/kizp3lwCz5sPbwCxCl5KG/1vE+LDom/NLiybh1wv
-3OUs4r65ySYdCnChlUBaYJ7Titx8DCPMwotO5pYZYW0DbmGEa7ymqVTICddxrzFj
-Du8FR9tptEsZbsjh3ZHNPDlVqMuvrsEy17qwhyY7l/zlEWR5BVczzw0qUVwX8pWi
-PbqXeTy8CmXCwmPFbNop8yG1xWHxnpl1DyVKBBumiYZzUAuIaFNwvkOYR6wHXa1t
-DZunyCrAySk7+tUMMgqVA1wzfFH9q/LToOGnEp7V5cFH6LojAa5ZMfguntYi4Qk=
-=Fq8m
+iQEcBAEBCAAGBQJRISWrAAoJEPATRTHh2/q1PaIIAIP/MhUGOvGMSXx0e9nVbpaW
+uRF2fub5XXD8QsvxE00bl9alnP+tA59Ydo5gLjV16FG8yFBxkBrxOWtr9tUuSgPD
+199pcsgDMgZn8NdCyfGFwQSvgCUIFaPSs7MjB7XYeUet8ifDSKFmxH1UiXhiMjBk
+V0bc5fR04UnMeWKtyV09PeLKK33voYQrdkZhxdpOzjbyhQJRmf5KsdT7rCd0HCTU
+5IIeu5uEtMjIUdVanaze+Ech4G2eju9E2Wm9gYKxJAou8eaF1267cqgafZxBEz//
+97XlMINcOoqT4c29m9wakemzhguCW24MG+bRBRdT6jn1euR7B2vJmjSZ5ojUvbs=
+=NPo3
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/notmuch-0.15.2.ebuild b/net-mail/notmuch/notmuch-0.15.2.ebuild
new file mode 100644
index 000000000000..dae7b96bda1c
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.15.2.ebuild
@@ -0,0 +1,193 @@
+# 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.2.ebuild,v 1.1 2013/02/17 18:47:02 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 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="
+	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? ( >=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 || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) 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 )
+	"
+
+PATCHES=( )
+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() {
+	local p
+	for p in "${PATCHES[@]}"; do
+		epatch "${p}"
+	done
+
+	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
+}