Version bump.

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

General
-------

The `folder:` search prefix now requires an exact match
There is a new `path:` search prefix.
Notmuch database upgrade due to `folder:` and `path:` changes

Library changes
---------------

Support for indexing mbox files has been dropped
Message header parsing changes (from internal GMime)

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

`notmuch dump` now defaults to `batch-tag` format
`notmuch new` has a --quiet option
`notmuch insert` respects maildir.synchronize_flags config option
The commands set consistent exit status codes on failures
Bug fix for checking configured new.tags for invalid tags

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

Init file pointed by new variable `notmuch-init-file`
Changed format for saved searches
The keys of `notmuch-tag-formats` are now regexps
Changed tags are now shown in the buffer
Ido-completing-read initialization in Emacs 23
Bug fix for saved searches with newlines in them
Bug fixes for sender identities
Replies to encrypted messages will be encrypted by default
Reply pushes mark before signature
Message piping uses the originating buffer's working directory

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

3 files changed, 234 insertions, 9 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 38f8b6248fb0..bf0459165015 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.90 2014/03/12 09:29:00 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.91 2014/05/07 19:37:19 aidecoe Exp $
+
+*notmuch-0.18 (07 May 2014)
+
+  07 May 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> +notmuch-0.18.ebuild:
+  Version bump.
+
+  NEWS
+  ~~~~
+  (Extracted headlines from NEWS file. See it for details.)
+
+  General
+  -------
+
+  The `folder:` search prefix now requires an exact match
+  There is a new `path:` search prefix.
+  Notmuch database upgrade due to `folder:` and `path:` changes
+
+  Library changes
+  ---------------
+
+  Support for indexing mbox files has been dropped
+  Message header parsing changes (from internal GMime)
+
+  Command-Line Interface
+  ----------------------
+
+  `notmuch dump` now defaults to `batch-tag` format
+  `notmuch new` has a --quiet option
+  `notmuch insert` respects maildir.synchronize_flags config option
+  The commands set consistent exit status codes on failures
+  Bug fix for checking configured new.tags for invalid tags
+
+  Emacs Interface
+  ---------------
+
+  Init file pointed by new variable `notmuch-init-file`
+  Changed format for saved searches
+  The keys of `notmuch-tag-formats` are now regexps
+  Changed tags are now shown in the buffer
+  Ido-completing-read initialization in Emacs 23
+  Bug fix for saved searches with newlines in them
+  Bug fixes for sender identities
+  Replies to encrypted messages will be encrypted by default
+  Reply pushes mark before signature
+  Message piping uses the originating buffer's working directory
 
   12 Mar 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
   -notmuch-0.15.2.ebuild, metadata.xml:
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 3baf43fcd054..b6318ea3513b 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -10,18 +10,20 @@ AUX 50notmuch-gentoo.el 291 SHA256 68c0ecfd3d10246fb65ec48b097c1b477ce33f44014f6
 AUX 60notmuch-pick-gentoo.el 108 SHA256 5dea2e2113cc3ab74c351f0396ac0a98df9d3eebd14d1e811e6d723cea69d12c SHA512 35da56121a0b13a7c13d5462512277d77dd0b965e0060e58e654056a5a5755e602d3daaf4732673a6a56421fa64e6d0570d655eb1a86fb0ae37af6129a90be16 WHIRLPOOL 52603df04fff71d206fb51d3cea65eb1f403e23495846b90ad8deafeef4d326f08a27c07aa84778bef0f3d962b68d2700c50b31217caeadee9c5f5961a8b9e1c
 DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886ab3836b7e80a6eb6841f344 SHA512 0b00abb32a340d25a6566b453ae086e13bd4f7f3c64a9dd827f0665733a1dc343c7df562282c4d9feb9ce7dff59f9c379daf599d6641156ace33c37f73974143 WHIRLPOOL 065452ead0bdc1f63b46419d7045fd798734e9d34a12e5673362f8302ae8b2d3eada3ca157eb55bcf9c0ec5f5fb3cf37b2ecdf5c9ab15e3a4590808fa0866213
 DIST notmuch-0.17.tar.gz 606710 SHA256 d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95 SHA512 cb649aceba1a3e25d4cff51f212aa85d0efe9907af4bcb9390cd1cf5e29c48d4145d9ecd1b040eaef588c63bfb5296bdfef683c22872841b5631481f5d832c03 WHIRLPOOL 98d4a5c5b72ac6d237b2c77d80481dcaa43be87c4bcd0a53aa55e4d008c70a88738706b92a169fa8b12681cb6e169162d0bfc01a5fbce95d73dccf5c12b267c4
+DIST notmuch-0.18.tar.gz 632857 SHA256 09eec1954bf1552e2d39dcab99fcd43f1fa12103d69fa2e4b8148aff552c46c5 SHA512 fcf74e15c8dd2bc50b38462a364bc7a5c3db813284b0559b49e5639d87deb652bdb58aae7ac7200ea6b3b840b9b684179c9a0a1b3200bc7666b525a9ec93bcf4 WHIRLPOOL 246ab052fd68d2cba4c5e08181224b43e498ce89881ab9701dd4dcce7e05dc6088db8f4b7286b8f298da4010f48f188f97e578f1187f516aab875fec605f1254
 EBUILD notmuch-0.16-r1.ebuild 4160 SHA256 fb43d30b1fd3f387d191b847f007d7a64c5a628feaceaa3fac7901e75673b9a8 SHA512 0be8f9ac104a2f4f1cdf611f61bf3262a258e9df30b41fab36bd7810ee6cc582fa1c16860906bdf12ed94e8f73e0c1e721c1fc3816004bfb619e6bef9c4434fe WHIRLPOOL 86f0e6fd4e3b652a04d846a59652710e79ed903c727d5ccce988dbee9fdd5d848b2f590d33d75aae4b9cae96f08093ceb7b34d812de9549fb12534e1597aef6d
 EBUILD notmuch-0.17.ebuild 3796 SHA256 d8f92cc04ff9d1fdb4a6aa8ca74bfd9afcc5dd91b9676e0a44b39fe2e7d43dec SHA512 74f18508a0ff0e7211cc2f7f3a970930e8675763a89cfddd205320df205bfee389a769469e4fe4105f231c95c3f38d13df434413eab0e00083787fe147368ac1 WHIRLPOOL 07c54774b3350e24b07b5c0174fc2f049c215a708c494cffabf6a65c7cfcb816aff762a164fe2e7ccdb775b99e7a7c21a1d5b56e03118f1c452b8f844e30e9ce
-MISC ChangeLog 25696 SHA256 eb932027ea512fc1b6e8de2795c7888b4ae89ff5f845163c764c776d121ed3a3 SHA512 c3422504ac2da8ff7eee63b506c513f4e1b88e3d423977e0d945c565440fa9ff6bb2d5ee564d0534fd3017a647463b4e4a019bbe0c61accc949512d05fc34487 WHIRLPOOL 1a3d3978e4623f7983522e8b4f5b7c5b124469b94a88079efaf39ab4e4d46be0371829d889667ef296fe5f31f20c46e3b96749f295ca58be08faa0762dbf4867
+EBUILD notmuch-0.18.ebuild 4119 SHA256 90904a67e0fbce6be6df36154b64b7bcf0b9c3cc7b10a19111a5d4138b816593 SHA512 c161138c46fed7b7d378f8415712ccd9ef1dc7efd8b764e8c901e075f1bccbdf2440e31e24177169f4a3acc70aa68ec1dcd4ebcb93bc04d0b1e2fee4347ece08 WHIRLPOOL 303e842a04bfbe8fedb842c62c32ecae07d1a99ad15a80a398a503e9f9eadc7be22239fbcfb2e24a183156c0318ffbced9ecdc1b4c88671c4b74f148c41de510
+MISC ChangeLog 27075 SHA256 035d247476994f93c5ee00d85e23aac232c067f216d9f3a5c158dbc9cc0fcdb7 SHA512 ada972354cc325a24f0eb2d22f797e4603df3c3833fde613cf5747ab4336a42b60f30e6ef016072e967a04a1c08a6fb32436908865d0e643c1fb0f5c6fab6306 WHIRLPOOL 330916bcdd4be2200af6ab576f7fe338851b739f142cf52db9d7624e3c3ef4983d0df5d440d608dbb88395be51b6583ff584af9b75cd8186ee6b2840fdbb0e06
 MISC metadata.xml 1074 SHA256 d47c3e91da2cbe2009bb0458e3858949883949b0aed2bf03b2dbd7ca7d4c1d14 SHA512 702cd1ad104daddbd22120ec417f2e7459e133d8a1fd2ff26f1485c6663949c63d00335c086fd298f8c251c3633e03d24575a1eb06ec29344577dd9dfea11792 WHIRLPOOL aa65462ae71e101d88b9d4b7eb1c1947c6bf794ea32c215916c41d592166c43334386e4e9196c98daa74b82049d73571b1533089e7319f9c2ca3e75b9ad0b63f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTICjeAAoJEPATRTHh2/q1NC4H/1hmdzg8p56BqiX6VwTIzesR
-B/1OFbssMUgmE0Fg4Oip0jDNfF1vyk3DrYId2IIXd/kBQs5Qf4FbsPsHfmKFwSBy
-XgGCIwNUNE0gLG0q+RnDyxn4cQGOzuPHyBxTnm6LGLgK9MbhsxErB98qrukTEHZX
-DOFNte4hzqixPQF1sTAPKOvAziuuUyp6SXSAcug3gn7hfyoG2vXqCKbZWc9Y5f0V
-ph7VVJ8OsvLi//t7ECIeC4+DwrU5u9ff/ZfD8STsbnPjC/vY/26sFa2zkjJIab/C
-Og1XJ9e9HBwTCJdAu7UwktET3xjPx4arQTrGunqdPh9tZ62UREAgHiUYj6YnkQc=
-=Glbf
+iQEcBAEBCAAGBQJTaotwAAoJEPATRTHh2/q1up0IAICRc5WSU8hF1mfuxOu6c2A8
+h99/cBPShFnCHqDmOdwPvGYsiTCDzB1Kwy/lAcPUYE5WcgmfTMUrKuj0jAYq1KcY
+m26TYKihIFLc3jQ7IWR3lfDo6HK15M0BW63P+AOmuu5DBqEY5GHyhtd++DA3DFKk
+Ga2zSkHX7yYefc+XOVEPX7fDWAj+VLXwYtjRgT8FTRtuRe+Zb8F92o+Yw/6JgiXM
+mP0jly5zSq+iUkPXgTUVmZMoe9/jYFGbitY0vp28UBTT/md4Vg25mydJbNTTcjCw
+kQ/TWt7cMewSf1cHC3iCQK2P72RYjSeYg2CrZTMZiu1tJFuCwrU3WRcwVA+Fp58=
+=QJmy
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/notmuch-0.18.ebuild b/net-mail/notmuch/notmuch-0.18.ebuild
new file mode 100644
index 000000000000..f70b571283c1
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.18.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.ebuild,v 1.1 2014/05/07 19:37:19 aidecoe Exp $
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit elisp-common eutils 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="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python )
+	"
+IUSE="bash-completion crypt debug doc emacs mutt nmbug python test
+	zsh-completion"
+
+CDEPEND="
+	>=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? ( 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}
+	bash-completion? ( >=app-shells/bash-completion-1.9 )
+	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"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+
+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 "Notmuch 0.18 comes with few not backward compatible changes."
+		ewarn "See NEWS file 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() {
+	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
+}
+
+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)
+	)
+	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
+	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
+		[[ -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
+
+	DOCS="" bindings python distutils-r1_src_install
+	use doc && bindings python dohtml -r python
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	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
+}