Version bump.

NEWS
~~~~

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

- New `mimetype:` search prefix.
- Path to gpg is now configurable.

Emacs
-----

- Avoid rendering large text attachements.
- Improved rendering of CID references in HTML.
- Bug fix for marking messages read in `notmuch-tree` mode.

Vim
---

- Vim client now respects excluded tags.

Notmuch-Mutt
------------

- Support messages without Message-IDs.

Library
-------

- Undeprecate single message mboxes.
- New error logging facility.
- Several bug fixes related to stale iterators.
- New status code returning API for n_query_search_{messages,thread}.
- Fix for library `install_name` on Mac OS X.
- Fix for rounding of seconds.

Documentation
-------------

- Improved notmuch-search-terms.7.

nmbug-status
------------
- Various improvements.

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

3 files changed, 251 insertions, 5 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 0632a335c329..18394afec514 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,57 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.116 2015/04/18 15:56:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.117 2015/07/15 07:20:21 aidecoe Exp $
+
+*notmuch-0.20.2 (14 Jul 2015)
+
+  14 Jul 2015; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +notmuch-0.20.2.ebuild:
+  Version bump.
+
+  NEWS
+  ~~~~
+
+  Command-Line Interface
+  ----------------------
+
+  - New `mimetype:` search prefix.
+  - Path to gpg is now configurable.
+
+  Emacs
+  -----
+
+  - Avoid rendering large text attachements.
+  - Improved rendering of CID references in HTML.
+  - Bug fix for marking messages read in `notmuch-tree` mode.
+
+  Vim
+  ---
+
+  - Vim client now respects excluded tags.
+
+  Notmuch-Mutt
+  ------------
+
+  - Support messages without Message-IDs.
+
+  Library
+  -------
+
+  - Undeprecate single message mboxes.
+  - New error logging facility.
+  - Several bug fixes related to stale iterators.
+  - New status code returning API for n_query_search_{messages,thread}.
+  - Fix for library `install_name` on Mac OS X.
+  - Fix for rounding of seconds.
+
+  Documentation
+  -------------
+
+  - Improved notmuch-search-terms.7.
+
+  nmbug-status
+  ------------
+  - Various improvements.
 
   18 Apr 2015; Pacho Ramos <pacho@gentoo.org> notmuch-0.18.2.ebuild:
   x86 stable wrt bug #516756
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 02cfc99e5026..4deab889c380 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -11,16 +11,22 @@ DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886
 DIST notmuch-0.17.tar.gz 606710 SHA256 d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95 SHA512 cb649aceba1a3e25d4cff51f212aa85d0efe9907af4bcb9390cd1cf5e29c48d4145d9ecd1b040eaef588c63bfb5296bdfef683c22872841b5631481f5d832c03 WHIRLPOOL 98d4a5c5b72ac6d237b2c77d80481dcaa43be87c4bcd0a53aa55e4d008c70a88738706b92a169fa8b12681cb6e169162d0bfc01a5fbce95d73dccf5c12b267c4
 DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
+DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
 EBUILD notmuch-0.16-r1.ebuild 4045 SHA256 9fd4d3b628fa8c3314ccf6a3dcedce6ea0b38e9ef1e9695112fc4b07f4fa6438 SHA512 8edb0c5cd2155b371fc3451bac87a92cef193364cc87144c0b25424bcede302f23069a76894b0c60f750919fa76069e8d9bf5bc18dc133dacb4f97b8b178f40a WHIRLPOOL 98ddc7b765940d10f23457c534131100b904373b13d58408b9bab797d55d38c7f3d790dfeee94470e78aa561c114e948c6617afd4d1eb503434281796337678e
 EBUILD notmuch-0.17.ebuild 3681 SHA256 3e42d5fafb4e8e4664f15f186a19ce8aeb8dea808ba32c7f4888efad10e881d7 SHA512 79dcf29aab71906d7751cfcac91b5f9eb9148537ee1142d3435f8165e27a3700a071aeb76eed1f2ebb7c9874863a83603b27cdf157fd4a7a9169dd26676fbae8 WHIRLPOOL 68050a49ab12bf1da61d4ec9f322715766f82ed2ce47f49fd7d0d50c631bf865d6042842ce3e7cbccde7cb804c52010d62e5c3c3b446457bccbb93e41ebf617b
 EBUILD notmuch-0.18.2.ebuild 4039 SHA256 73aa7069d8d29e5cbbc7e86a8f76b565acbee38969aa9e7dc55d3085b2a96591 SHA512 cfa040a833a04c38da61adb5f5c1f13fa483528dba2f2bed3e828567fe9840c7600424997585c006b4cbc2f827a07833bcad815a4398f730df669a19acfbb6cf WHIRLPOOL 6b101380d0685a401e6ec26dd591eb750d2c74995d0a8a112a3bdc4425d467dcae6a0c6ee7671a723038595973af175b552b7d98513805692654dc4f62003b95
 EBUILD notmuch-0.19-r1.ebuild 4458 SHA256 e41da1be43672fb40ee7036b11e1e7d45bb68f866d8181462edf47df7c65ad59 SHA512 2a3d5da4f757079fda2b746abfb8785b9bb84212249d811a4c59b01a7713e90772267de26324a539586052b48e5364d91a7f7aec504bc7d2e67e5a3ba1b0e122 WHIRLPOOL 3dcb5c3ca0c0cad0f990fad9e0dab90dfd302bdc0197a8c8d45190db3abf0651c5940c7c8dbda4920295822701a6ddf04a80b6d4cb737c2da879797a230f9638
-MISC ChangeLog 34049 SHA256 aea2b888a38bc4870b8b8ea840def80e313431ce8b786903ea047a3390527411 SHA512 f01091e777c450d534421ce9bb8fd81a14d641522f22c0b0a080153f28de3a32ef8e751b2014eddf5cf95776cf6edf2d4f2215a026be9fe9fd639ba61150db67 WHIRLPOOL 2abf269ace11631050568d893a7cac5603b5554b75330a5e29d7b422c6932c5de3821f1c16924896a4a512f6abe34904bdadb30c14f8f5aa2de52181cac158d0
+EBUILD notmuch-0.20.2.ebuild 4246 SHA256 89476ce44bd80c8d642d47f86015f01fc884ef1b452c74d6edbd14549ffcd4ec SHA512 ebd2fd7da6ad6d0f39566efde1895ee31f2757cadbb31374d55b8e74f0907d28632f4fabc6acdf1decfb33b0a4cfec847ea957327f29d5e082ec5bcf1d6cad54 WHIRLPOOL d698ec52834b95422c369b7b060ec6916b3044e8c2f224e26be0e5d24a990564a07a46dd6653c35ec46d736d17505ffc7713b9c6355901df490b0af2468dc520
+MISC ChangeLog 35051 SHA256 2d59738e71e8f4275c93c7c9f40c5bfaee5119d8b9b90ec6e986a5347616d308 SHA512 40bf45e0e9265a2298d54fe2c7bcbeadb4deb0659613b6c694416e802f41f42e965040a929fc8c88efec15e37a6a0b556fff04d6c88c4e43e3bd5c1d785a0b67 WHIRLPOOL 4c036cf3e69564985c2eff55a1147eea26698d45749a153ca5b6648ebef66c606eff5ac57d87d300654f23cd865b9d5da53ca260c640d345c332d0c524067191
 MISC metadata.xml 1074 SHA256 d47c3e91da2cbe2009bb0458e3858949883949b0aed2bf03b2dbd7ca7d4c1d14 SHA512 702cd1ad104daddbd22120ec417f2e7459e133d8a1fd2ff26f1485c6663949c63d00335c086fd298f8c251c3633e03d24575a1eb06ec29344577dd9dfea11792 WHIRLPOOL aa65462ae71e101d88b9d4b7eb1c1947c6bf794ea32c215916c41d592166c43334386e4e9196c98daa74b82049d73571b1533089e7319f9c2ca3e75b9ad0b63f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUyfpQACgkQCaWpQKGI+9R0OACZAbK+9yvvKzTAHTv7EqehPtWY
-2q4AniBJqxxHbbSqPkMLuRY4YdXBW6hd
-=0rnJ
+iQEcBAEBCAAGBQJVpgm2AAoJEPATRTHh2/q1Y3MH/jLYbNZwkrAUI/GhClBHB+Hp
+6Eik1/te0/CtNiuEYV9nhOFYx8UU9ow4BxPIgcZHeB2+rII0QGsUqx7jS8FGGVgE
+Vw3PbFCJXfn9PbrBDY5KqyCaNdSl5+sbnaW3ngdq00XDNRoORKOLXQFnELcUpbZL
+eq0JBjkfbk4MbsrVt++Zdkm4UxpnY7EpPd2Eo6sLPWUuhwLowGr/KazEQNmPrzny
+EZT6wIUF1Dnrolsin9Dz9GlYwZWJnaH7q9h+4RTi0PZBP4HJpIYCgo0jfMberB1m
+XVuzLY7DSl7D/dCFF+khz0k47A5mHfZJytLELcnxMoQQ/jOLG2PtMqLdhT24L9k=
+=58Db
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
new file mode 100644
index 000000000000..ee38cc8c4ef8
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.20.2.ebuild,v 1.1 2015/07/15 07:20:21 aidecoe Exp $
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+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="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt debug emacs python )
+	"
+IUSE="crypt debug doc emacs mutt nmbug python test"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	!=dev-libs/gmime-2.6.19
+	<dev-libs/xapian-1.3
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen
+		python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+	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 )
+	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"
+MY_PATCHES=( )
+
+bindings() {
+	local ret=0
+
+	if use $1; then
+		pushd bindings/$1 || die
+		shift
+		"$@"
+		ret=$?
+		popd || die
+	fi
+
+	return $ret
+}
+
+pkg_pretend() {
+	if has_version '<net-mail/notmuch-0.18'; then
+		ewarn
+		ewarn "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=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_prepare() {
+	[[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use debug; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--with-gmime-version=2.6
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+	)
+	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
+			mv html ../python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	emake download-test-databases
+	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 devel/nmbug/nmbug
+		dobin devel/nmbug/nmbug-status
+	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 dohtml -r python
+}
+
+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
+}