Version bump.

NEWS
~~~~
- Fix test suite to work with gdb 7.8
- Emacs 24.4 related bug fixes

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

3 files changed, 200 insertions, 9 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 3fa92f44dedc..a95c23929428 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,17 @@
 # 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.104 2014/09/18 19:47:19 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.105 2014/11/01 17:56:21 aidecoe Exp $
+
+*notmuch-0.18.2 (01 Nov 2014)
+
+  01 Nov 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +notmuch-0.18.2.ebuild:
+  Version bump.
+
+  NEWS
+  ~~~~
+  - Fix test suite to work with gdb 7.8
+  - Emacs 24.4 related bug fixes
 
   18 Sep 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
   notmuch-0.16-r1.ebuild, notmuch-0.17.ebuild, notmuch-0.18.1.ebuild:
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index b960b5d97453..6330df3e4b82 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -7,19 +7,21 @@ AUX 60notmuch-pick-gentoo.el 108 SHA256 5dea2e2113cc3ab74c351f0396ac0a98df9d3eeb
 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.1.tar.gz 634691 SHA256 f2d53dc1916283123d008a6084de860340a436631e83b1a41b2d9ced0f4db7dd SHA512 4268a32036b42cbacb0b43d7838f67c83f2c20ad9018e44c51f6112e22f3ffe5847a9f1418527865447a2442ee6ab9e77cf05b61090c2a1f02356dde6eae8ece WHIRLPOOL dc35171b2a1b20acfc5a8de3993335893ea73b236066a2f88b9a7aa2fe3389f88b791e72c8c9f493548ef0fddb19abfabc9f7664b2bd2d404eb964ec67cc2458
+DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
 EBUILD notmuch-0.16-r1.ebuild 4052 SHA256 a8c36b4ef4bb165f4d878439b0cd3e11d676b8a3a7a8232c16604efcb0cfc206 SHA512 a19d9d9d23d00af2c45eb1939508a2748022fe02fe52513c8bb384fb5cfa11b8b4a123af4a7b163fee9896f1a963cd92cf07531ff4fe08313c719e048d1ae660 WHIRLPOOL 856583e3a51457549c96925cc6980aa4e180a07b20333d6b2239ecea9142f848f68afff3760ba2e8adc82205185c2e29f2d1924d24b61470735e4c079b682522
 EBUILD notmuch-0.17.ebuild 3685 SHA256 25ac83e2fc0145393b79a58197b37e2610d6b2b30ea67bdc84fd20964f5bb59b SHA512 5095742bbc1f4dbd758eb84bd0de515d65eff67c80613d7c16eb5f9a8419c3f24a948020987204b355d869d787fec8291cdaa6226e401b8fa010d55196fa9a57 WHIRLPOOL 91d14a975408e53e180c008410ad58d3ebd28cf577838a576d6617ce90a789126652f62dacf19b12b4de029856f02a86c3aeb9428b1f7c1fa30399093e383802
 EBUILD notmuch-0.18.1.ebuild 4048 SHA256 acb639d7f7fe90266073dafbaea360a95478bfc1db596c4fec31836a5d295b76 SHA512 310949387b47945aee82d78605cdd707b7fce6709d6d9af411c3cb13d3c400dd048c961151441229609d7d04c04ed14138e23bd49031261e03d8b6e1fc1a9af9 WHIRLPOOL f474073bada25756be3de302f530b4c563e7fa25172afb891d850ca9b837841cafcbbf324909e05daa3d3479f9911b4aa74057e111c9e6ed6f0493f9dacd4b53
-MISC ChangeLog 30503 SHA256 c24d49900e4b92d5fd0e3d19685d4f9b40177f08ebe2081e798b68b384398608 SHA512 18ec4ed4e45f39ffc8de29ef21a41d4d3f7f1f73bf9d14517902f608e86abd5bcfe244641665f0d486f161b63b3494789bb2c523b637bc3b6cfb1df73be28b7a WHIRLPOOL e2538982bc1d64cc44227e69f8bc09a287257fc37edd5ea9f1c913d48af7ca7f91b48fd9a3ba894d2c34212884832dbe4a3942a0ea4daf75ff23d361a07dd166
+EBUILD notmuch-0.18.2.ebuild 4043 SHA256 ac065e0ec8b34ba5ba274b5c4699a7389d1f2fe4c4e7cab00ed353606f066214 SHA512 a3fecdcc176afae26aa09613c65272b4a64da440e9bea0f2e298a7e4b311be00b3d98517f8cb65623a1f90cfc02c7675bc0aeb20b4f526e6f799946c593bbf94 WHIRLPOOL 27d3b9418375dcf7b32a76db573690c0d5a4e82c2526be49dda5bb7d5947f905dbaae13d8cd3583120c31bfe15794036cc51d11e44476955606d71770da08a40
+MISC ChangeLog 30722 SHA256 4e9a02011f0f1731329b01c9f685f66b3756c9f81e0b9e0ba509e4c38c7716d9 SHA512 3b485cc4173535549c5e4c659723f31e8ca671a02a16e1f1babc2db695cc80b588c10d419bd1d59c75170cd80426c7750fea958a64080f9acbc1091d8bb55eb3 WHIRLPOOL c819dd7aa9983ef0fd028fbdc1f5ee53a838f7d160d663ba15737ad3fdef4da6f77637a6968cf054bc03d9578c895e76b9a99519acabe772320b8ee8b27e0e28
 MISC metadata.xml 1074 SHA256 d47c3e91da2cbe2009bb0458e3858949883949b0aed2bf03b2dbd7ca7d4c1d14 SHA512 702cd1ad104daddbd22120ec417f2e7459e133d8a1fd2ff26f1485c6663949c63d00335c086fd298f8c251c3633e03d24575a1eb06ec29344577dd9dfea11792 WHIRLPOOL aa65462ae71e101d88b9d4b7eb1c1947c6bf794ea32c215916c41d592166c43334386e4e9196c98daa74b82049d73571b1533089e7319f9c2ca3e75b9ad0b63f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUGzbJAAoJEPATRTHh2/q1e5wIAKGP2RncP3/n8VfC/nvvMo/d
-qo9p88EuwL8YoC/DNj18VGzZlTGb7uz08zIWBWZ0G0fLwijSRyPLwMLGxbC8cNJq
-qHU9xA0f1vYrpN18BgeMw2/TewWkLSAstxe5RTDi0J3upTzOZEkPzBNhoKzFJwpc
-+lAS7OjWF69vmdU3bdp2lqGcNTN8yYqEKqDs3S/BfmzV5ftfWllOVm0AfVniLkNC
-6jCpiDHX4KqpdF6KXg6LkRjRKUjNN2h1F6uJMCud7zh/glAzjwVqfDgO6+O6Be/l
-IXOiPJMU9QltwOYgDJyw8Fmd4sW+T/gNGYPoH4N+BINvTMUdH5eetZ3nSLSy+Po=
-=F4Fk
+iQEcBAEBCAAGBQJUVR7GAAoJEPATRTHh2/q1f9MH/0pS/+E+nwfcyOcETgeRpoKP
+FeMxjKkWmla2YgqU0KBolHDSKZe8PeuIsO7NCNVeuqAleZEPp3GbbhipxJflZ67x
+q4fIPYgNhajDPLzpdxUNFzGSt7R6OSNL/d96DDcuegybZXYCJLCp6orerCYPkAru
+FIb96xTYalG/upi8U5kHb94iOp9rwCEh6P7loYJR5cR/6BVv+/xuNwVw0kRQA1o3
+Rs3KPBRtVcpfYgyQCK23GCIhbtKQ+5cwXxE1mpvRcAPZeqtrWHKYhjqr5CH93Em2
++6v5QzaGdCY79eQPkMA522cCTN6yIGpz1Pz5ilqFOqcYjyuULFac4vT6R4oAoIA=
+=MByD
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/notmuch-0.18.2.ebuild b/net-mail/notmuch/notmuch-0.18.2.ebuild
new file mode 100644
index 000000000000..4789811d237b
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.18.2.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.2.ebuild,v 1.1 2014/11/01 17:56:21 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="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? ( 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 virtual/perl-File-Temp virtual/perl-Pod-Parser )
+	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 "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() {
+	[[ "${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
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="${EPREFIX}/usr/share/bash-completion"
+		--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
+}