net-mail/notmuch: Version bump to 0.11.1.

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

3 files changed, 175 insertions, 9 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 8497d8ef4868..a483dc9a04db 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,17 @@
 # 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.21 2012/01/25 10:45:40 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.22 2012/02/15 12:45:19 aidecoe Exp $
+
+*notmuch-0.11.1 (15 Feb 2012)
+
+  15 Feb 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +notmuch-0.11.1.ebuild:
+  Version bump.
+
+  NEWS
+  ~~~~
+  - Fix error handling bug in python bindings
+  - Fix vulnerability in emacs reply handling
 
   25 Jan 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
   -files/0.10.1-fix-test-build.patch, -notmuch-0.10.1.ebuild:
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 6f8775563271..05e4b36bf82b 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,19 +4,21 @@ Hash: SHA1
 AUX 0.10.2-fix-test-build.patch 3709 RMD160 3f63fbb83bed50f7a011778a46f4404e63bc8c2a SHA1 30925abc3d463d5d5cf176945def321684fc7645 SHA256 4b7820e537de6f23028b7d02d2482425b4e678522deca29fe70560757f2d4227
 AUX 50notmuch-gentoo.el 291 RMD160 7e036b8700f50cde6c3b27622193ddf08812229b SHA1 cc087fe76f750e84171a6ddef9dc10139b8450cc SHA256 68c0ecfd3d10246fb65ec48b097c1b477ce33f44014f602f903c16b752ba7d3b
 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.11.tar.gz 438168 RMD160 184ba8a7589d499ae18b8ec61c1cc05c1b1b2d1e SHA1 11eb1d967af089ed36f6816f61ebae308bc19339 SHA256 ce062b31db6868babaf3088adee95bfd1030b2691493e815da1730dd262226c0
 EBUILD notmuch-0.10.2.ebuild 3355 RMD160 c5b5cd52302bdcd4b4769f36b8cfeb3316c160cf SHA1 a9ad5265c666ead432e2ec62219fb67a97b88db2 SHA256 c7b398349ef1c3a69d16de460f4c045efe9204507e576ad1e92eb1954721a9d4
+EBUILD notmuch-0.11.1.ebuild 3211 RMD160 d4757a9edff66facca0fe8047941e06a418878d2 SHA1 1dcfc566b7b9216d762a7f3ed23334d12fa62631 SHA256 82a528e18e464ef45fbc49bc01fdcefe6c0b15c037ed4becdcd87ee687b7a8a3
 EBUILD notmuch-0.11.ebuild 3207 RMD160 c6c46d050371be3e4aba37f7b8ca02958ccbfa30 SHA1 145695db84c1c8f976f4b48480bac1cae881abf8 SHA256 56cce5d6fae7772c8b3a715e52379d75b294712bf3250affb5b8e770201aa99f
-MISC ChangeLog 5701 RMD160 bda8b94f7782d85605ee9c5ed0d21a3763d117a9 SHA1 45d8cff5d9a63ab9ad47c57450ca03d1c4c1a6b3 SHA256 aa0c3cfe13079467359802c3a3571465e10b311031e5130788c4f1dc337f73f2
+MISC ChangeLog 5939 RMD160 6e0aa27e2f4fd7aca4d6f7246d23e3e9ea3a9894 SHA1 c57f10218062e6c90232f7cf0d500383b7d88ab0 SHA256 6d6084a8a02b10cd5385185196dfc7fa7b7811859257e4442a576f90f9c35e4a
 MISC metadata.xml 870 RMD160 1ea6d669111c3e30f719c2337bb1fbebe7ab14aa SHA1 49ddae312621716998b7fe205f93536b2c2d20b4 SHA256 37955cc892c0585089e4dfb7ea2a8d1cb819164c4d098ba1be7253929be9890f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPH91ZAAoJEPATRTHh2/q1srUH/31cuzDBHlg4RDZQnr5Ej0pk
-tPPBHRlB6HnlXJnpx5lz2sOf0pWQxVVREy32QRXYeZknnuR6Ek4hsFZ+m7VIstlc
-ynOPVoaAU3Rm5wG0u1FUNawcHbTP9IKZknq25C+kmswiO0eDNXOEjF+rqkhvq5cA
-9i6NGjAW+J7x6rBadHqm3ao/lv216vScWWpDFdicI9vL7v9LS7yE/Ia85EmTBblT
-/iQQpoM6xC+757mwM5BiJ6DijQxaoK5geTDaKz8LmH2KnKnP+TbyUOlMlPgxNy/x
-RTnuyVMbFDdIv8N7OG/NOlzXtQsN8yMAAcJjH5Qd85LHurUn9QDlSQ36FRmHUao=
-=+hqD
+iQEcBAEBAgAGBQJPO6jlAAoJEPATRTHh2/q1E7kH/0SA29/DhadxLhKusYVchpwu
+tVTSobuxWhqBz+ORVepQu8d2W3tiybddsqiH4Q5d39qEdNSmgwAhoRqriT048V+N
+U9EzQu5JTiED7pRNeg1dk9hb+q7hBRAIed8zDkWskaq9/Imj0CHUNufZ8RspjvUD
+x5CTWk9ShwWUTpFqMdbhdBdY2AfMCUCkCMzcYQKexmxGAo3mYliwodPaapz54mDz
+wa7PcVkU8gEzjmKM/VbTjAbnZY6XB0uEbdRQGrYFmvCI16T1/s4hUgMqAFKz7eZl
+j621tiBVdkJeR4QZBuA7biMQgDTjwI2sL3O8xTr4/DwjmI7tj2kWCjE+M43XxbU=
+=8/vd
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/notmuch-0.11.1.ebuild b/net-mail/notmuch/notmuch-0.11.1.ebuild
new file mode 100644
index 000000000000..82530e3dadc4
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.11.1.ebuild
@@ -0,0 +1,153 @@
+# 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.11.1.ebuild,v 1.1 2012/02/15 12:45:19 aidecoe Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.*"
+RUBY="/usr/bin/ruby18"
+RDOC="/usr/bin/rdoc18"
+
+inherit elisp-common distutils
+
+DESCRIPTION="The mail indexer"
+HOMEPAGE="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="test? ( crypt emacs )"
+IUSE="bash-completion crypt debug doc emacs python ruby test vim zsh-completion"
+
+CDEPEND="
+	>=dev-libs/glib-2.14
+	dev-libs/gmime:2.4
+	dev-libs/xapian
+	doc? ( python? ( dev-python/sphinx ) )
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	ruby? ( dev-lang/ruby:1.8 )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
+	vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) )
+	"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	test? ( app-misc/dtach sys-devel/gdb )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	zsh-completion? ( app-shells/zsh )
+	"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+
+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() {
+	default
+	bindings python distutils_src_prepare
+
+	r_fix() {
+		local pattern="\(find_library('notmuch', '[^']*', '\)\([^']*\)\(')\)"
+		local replace="\1${WORKDIR}/${PF}_build/lib\3"
+
+		sed -i "s|$pattern|$replace|" extconf.rb || die
+	}
+	bindings ruby r_fix
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="${ROOT}/usr/share/bash-completion"
+		--emacslispdir="${ROOT}/${SITELISP}/${PN}"
+		--emacsetcdir="${ROOT}/${SITEETC}/${PN}"
+		--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
+
+	r_make() {
+		${RUBY} extconf.rb || die
+		emake
+	}
+	bindings ruby r_make
+
+	if use doc; then
+		pydocs() {
+			pushd docs || die
+			emake html
+			mv html ../python || die
+			popd || die
+		}
+
+		rdocs() {
+			${RDOC} --main 'Notmuch' --title 'Notmuch Ruby API' --op ruby *.c
+		}
+
+		LD_LIBRARY_PATH="${WORKDIR}/${PF}_build/lib" bindings python pydocs
+		bindings ruby rdocs
+	fi
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles
+		doins -r vim/plugin vim/syntax
+	fi
+
+	DOCS="" bindings python distutils_src_install
+	bindings ruby emake DESTDIR="'${D}'" install
+
+	if use doc; then
+		bindings python dohtml -r python
+		bindings ruby dohtml -r ruby
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && distutils_pkg_postinst
+
+	if use python; then
+		echo
+		elog "Python API documentation is also available online at:"
+		elog "  http://packages.python.org/notmuch/"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && distutils_pkg_postrm
+}