Version bump.

Package-Manager: portage-2.1.10.59/cvs/Linux x86_64

4 files changed, 222 insertions, 3 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 4b39ccfe2de7..4d45c8332437 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,34 @@
 # 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.52 2012/05/03 04:18:37 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.53 2012/05/16 21:40:18 aidecoe Exp $
+
+*notmuch-0.13 (16 May 2012)
+
+  16 May 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> +notmuch-0.13.ebuild,
+  metadata.xml:
+  Version bump.
+
+  NEWS
+  ~~~~
+  (Extracted headlines from NEWS file. See it for details.)
+
+  Command-Line Interface
+  - JSON reply format
+  - Tag exclusion (as an option in the config file)
+  - Raw show format changes
+  - Listing configuration items (new "config list" command)
+
+  Emacs Interface
+  - Changes to tagging interface (breaks compatibility with old tagging
+  functions)
+  - Reply improvement using the JSON format
+
+  New add-on tool: notmuch-mutt
+
+  Library changes
+
+  The API changes break binary and source compatibility, so libnotmuch has been
+  bumped to version 3.0.0.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> notmuch-0.10.2-r3.ebuild,
   notmuch-0.11.1-r3.ebuild, notmuch-0.12.ebuild:
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 34a5d4b34ddf..8c6791d8522b 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.10.2-build-with-gmime-2.4-only.patch 443 RMD160 fdd0d61b9adb2cec545e81a29aff4e88099f8226 SHA1 7623ca0ebe9d77215db75f5a3760051d2400f8f2 SHA256 c9476070f21708f9813e9123445166fb1806d1924c15552e223f164818793c6f
 AUX 0.10.2-emacsui-mml-tags-quoting-fix.patch 1741 RMD160 0650c8f427f1138f76af6f0921f38386df01db1f SHA1 32252fa4e8f26da37e1f27d92756a8bef18fd3e9 SHA256 acaedefdc6ecbdf921c146ed6e110416cd7cfff09cf985376a0ee94755075306
 AUX 0.10.2-emacsui-mml-tags-quoting-test.patch 1737 RMD160 9f88c67c2ab2e5d5360da77ae19d3901bcc5958e SHA1 e6a8d7d1c9186b652916996176ef0c462b0f8af4 SHA256 e5eaecf2a794f9239d47a021d84a4726de458ca93f04ff27bb9b20c5c8773a9c
@@ -8,8 +11,21 @@ AUX 50notmuch-gentoo.el 291 RMD160 7e036b8700f50cde6c3b27622193ddf08812229b SHA1
 DIST notmuch-0.10.2.tar.gz 408872 RMD160 82a3fb751340d8c58bd5e32110cfd77d273c46f6 SHA1 3064c1722d30c71f287e1ab63ac13a5847e20c14 SHA256 2ba5ba9b32e62180d7d5f2bc3f89360aede72319e57962ffeffa98cd1c37f0f7
 DIST notmuch-0.11.1.tar.gz 439099 RMD160 2b525ccb0c4919da36aeed3d645be173eb8d867a SHA1 05694ae8762076bf91d63b199e72a12e5ce012b0 SHA256 d9896ae295fd8e5471c49b0ba39872ccfdfc3488a8e7ba6fd68ba1686bc52706
 DIST notmuch-0.12.tar.gz 464967 RMD160 7ed35f09121f6a60cc42c604ce935186bba31170 SHA1 93effc7f8993c7b29b854adf8a2662b50a187819 SHA256 1dbbbbba3567df9c67ecc642d1e63269a527952c557f6b0c8bafcd4e37893992
+DIST notmuch-0.13.tar.gz 483563 RMD160 0644a565ee23c530937db82d0ba39980cae36c60 SHA1 c65bd28b2091c81720e6f4e685892b919a7aa581 SHA256 cddce4bf3f1a0a9318279d7d876350403bc412010cb0c446972e565a4dd1212f
 EBUILD notmuch-0.10.2-r3.ebuild 3236 RMD160 36035c683298ced2dac52134eb017052944394eb SHA1 7ba19fc279d80ed26b420b5e89aa7421012f2a90 SHA256 06f57092d04acc35f130e87a29d0cd507127ec16b0af81393623eb2b301fbfb0
 EBUILD notmuch-0.11.1-r3.ebuild 3020 RMD160 5949280434fbf29e0c0dff66ca65acd98badd877 SHA1 19b118fdf517af5b06dc449616a99474e396c625 SHA256 2ee62cad0134cc8986b515477fcad47ac19c28f848469abe8d7e278ff95a5c30
 EBUILD notmuch-0.12.ebuild 2891 RMD160 d062dcac02daa0673d0d7d49af2259a0ada7202d SHA1 a7cace37fcdb2cd5f4a44eacc2417bb02b58aed9 SHA256 574b8220943850a69de4d589a8dadd7006e726e264939b8b60647039a2491cd6
-MISC ChangeLog 13296 RMD160 4caeed834e311f4c97fcc922b0954a3d12ef49e7 SHA1 a28e9572bad87a49f8028e4ae4682f060cbbb8c3 SHA256 c468477831ef815f1f32251e6073102ed2a4d3767b21e4ee2f3608b0b6d66868
-MISC metadata.xml 1003 RMD160 12fa19220fd58eade62c7aafc6a3c2bf5adb6ca5 SHA1 8be789b19b3140dc24694d5c535a7d8a4e8c4b0a SHA256 48f0e1b14cf9bd31f53f6bb481570ec1f067308e067913edbcea50a986b875bc
+EBUILD notmuch-0.13.ebuild 3800 RMD160 c3df4d6b413f85d7f0d5b868eec21fa6aa2cf192 SHA1 e35e8e50d9418c4fef64b787532ff2c9f7d50c37 SHA256 c66fdb32cfe84163834c67ed58e04946f068bf2901641cae2911e6be009a1ae8
+MISC ChangeLog 14009 RMD160 0ce50194601a98b72c02e1458c9709579401297e SHA1 bbf5702ffa5ead86f3847e0429640769031ef26d SHA256 2da5cfbc5977de3569ee3a58ec8a4e9dfe48c764ffca715bdd1ffa9b2c3e9dfb
+MISC metadata.xml 1061 RMD160 4c97216071a895b36e84f08e59ea6ede166222c5 SHA1 3414c83e6d3be3e5c50d05f8c92d1ab1374e6443 SHA256 bda3a51a7cdf2790cf433da147b8a8614dc1e68fb121e984c5f929ffef38e66d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPtB7IAAoJEPATRTHh2/q1h9cH/3sRqdD89k4f6bObXJnzLYDK
+oPnUsFLruTEot22jm7nM6wYrLX9tgUZhV+/VWi3V7XeUu6ywvstCLHxAkCmWoxIQ
+UDOTRo/rbHNphWRPOmiIDJ7YSsSGemRhF9J5HmhB5BBpQzVEeYOm3xiXUnv/Y6cm
+E/trpUBXq/sAwm8Af7pmPmlip2PnfpaRsimhKTRN7EANigKah7EubvNdkWg0t34E
+Ugkd3EsNMjyDukrCuETcVNE+R7uHcpN9k2msl0r/AYxGEqmZHYugyONVYknmoivh
+k8LaB2RdDNZfC+NENY6/ORmLXHjetPWOOsm6MIBQhMUx0Cce0AwklOs3Iiae7aw=
+=aTX8
+-----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index f6acb7d04b1b..d2ae0c0c0868 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="crypt">Support decryption and verification of PGP/MIME
 			messages and in Emacs UI - encryption</flag>
 		<flag name="emacs">Install Notmuch client for Emacs (main client)</flag>
+		<flag name="mutt">Install helper script for Mutt</flag>
 		<flag name="nmbug">Install Experimental Tag Sharing /
 			Pseudo-Bug-Tracking for Notmuch
 			(http://notmuchmail.org/nmbug/)</flag>
diff --git a/net-mail/notmuch/notmuch-0.13.ebuild b/net-mail/notmuch/notmuch-0.13.ebuild
new file mode 100644
index 000000000000..1b69da6d32aa
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.13.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.13.ebuild,v 1.1 2012/05/16 21:40:18 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="test? ( crypt emacs python )"
+IUSE="bash-completion crypt debug doc emacs nmbug mutt python test vim
+	zsh-completion"
+
+CDEPEND="
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	dev-libs/xapian
+	doc? ( python? ( dev-python/sphinx ) )
+	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
+	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/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu 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() {
+	if use $1; then
+		pushd bindings/$1 || die
+		shift
+		$@
+		popd || die
+	fi
+}
+
+nm_mutt() {
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		$@
+		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
+}
+
+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
+		mv README README-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
+	fi
+
+	if use nmbug; then
+		dobin contrib/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
+}