Bumping 0.16 to r1 to enforce rebuild for ~arch users. It rels bug #483988.

Stable users should not be affected by the bug.

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

3 files changed, 193 insertions, 9 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 6bf616bee5e6..5fe3a80fbec8 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.76 2013/09/06 13:06:27 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.77 2013/09/06 13:08:44 aidecoe Exp $
+
+*notmuch-0.16-r1 (06 Sep 2013)
+
+  06 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +notmuch-0.16-r1.ebuild:
+  Bumping 0.16 to r1 to enforce rebuild for ~arch users. It rels bug #483988.
+
+  Stable users should not be affected by the bug.
 
   06 Sep 2013; Amadeusz Żołnowski <aidecoe@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 6802d836e04e..3c30e63ca97e 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -24,17 +24,18 @@ EBUILD notmuch-0.12.ebuild 2898 SHA256 1feec7831846faa05c1887ff34ec426c65eb28e32
 EBUILD notmuch-0.13.1.ebuild 3712 SHA256 c1502f70345569a769c721ea65c24a5534e59deb24573f0975da1a2665023410 SHA512 4df346e4c59d118ad1772c7967ba265af37b87c0c6bb94fc31d92945a2e0d9c16810c047a4e49bdf8e571477358abf7fedb89794fbe45e3585fd828e99a25285 WHIRLPOOL 183d9c8f61bd12fddd03789294e9802b3ca87abb986d3d1adf49e709ba1c4560aaaaa56207cb111b6a74d49efd6bdaff940f3ea491c9386e7d8527695750f7e3
 EBUILD notmuch-0.14-r1.ebuild 3765 SHA256 dfa92fc4d19a1707e8104d49d7858e62721a339cf7a3ef23449f819fde5d6133 SHA512 f6cd354513d6d3d8fa65ec6f153a90ecacf0ced19d39027b96d9972139cb39a80bffe72d8bef27623ae269fc56577c357a8a89ab70e6cfec5254716cd560174a WHIRLPOOL 490a8d8759f2bfbb839e401140c5a60ee32beeeada4b6755d76a95dff48eff0ed74d3caa115f06b491de194d362f854ed9230b8b17b4705bd38f33d35f340f56
 EBUILD notmuch-0.15.2.ebuild 4362 SHA256 7e7268d146a39f97c28b157281a3202fd4f8ad62b2ce674876545e00506b053b SHA512 88812049d08abc6d945cb4c7104d44e5bdec0b1856ef240a15d0f97043319419413690286adabac852f0625b344b6ea135c353cc7c13778d19c21e6e0b2162c4 WHIRLPOOL 4a3c27949811390adf60a234e6fad13295dc90cd28df7c072693d766300352815b0bf417c4518ceca4f2fc425d384bbe574540ed4ff74a10fe87ffca38c87e6d
+EBUILD notmuch-0.16-r1.ebuild 4073 SHA256 81c29d35a89a7314c39f15105277e91155364b33b07facb3d7a369f6c61c4642 SHA512 8ed002ec481165c834875a22be1293d040ccae3f954b1e5344593f02ab465782ad3a12b789e711eeaa325b7cdb81155511bce85a86ac17911b8d8f79f4b463bd WHIRLPOOL 6a6d1bc6fe637b8d117a929c64a95595b962224e013a73d02d8d4edb47c181e318aa11b1f39866258883d9b4641826786b10a4d31c603c56e72901e1d585198b
 EBUILD notmuch-0.16.ebuild 4070 SHA256 b40c7407086cf65b0ca4a36f9843f671790e18549d2335e35270e3db9ecd44e0 SHA512 3ab821f80cebd03926af7446989f5086ac7e2b1a4eff90b6a2a4e0a26a3f597e6b108ee3e50c40089b8447322a6a8226ae1238383958b558d07c0c09a4eeea96 WHIRLPOOL 6506589cc6baa5892c9d3294ddf8a102fa23daa1001ff486e84b3af121b0b8981e8bfba412109aeb717a38fdc665617cdbce5c627bba74d390d87a73c7c56127
-MISC ChangeLog 21545 SHA256 edf983665fb9dff44b9b78c8a26174ea9d7bfc6aa12c0d3c7884ee933fcde999 SHA512 3122b73e25975a744f45337f63a60e69736648659c1dc3db09caeabd021ea9fd25e6f47a4ae8880b5898bc05689bc8bfe81efe82daaee33ba340a9321835c6b1 WHIRLPOOL 8df60a8702aa3914155c291de5d0c79200a4606240c9f6b1ea5e5483597072ab95ad1d0436fcefdd0703e53cfdf220d56af79253e98c4b691320c2c764c70e0d
+MISC ChangeLog 21791 SHA256 230e2dd00b21cb2556e0a90b90dcab3c70f6f2c7cbfae7adf9878210ea5c589e SHA512 fb21daccf766222b66266ddf3e5e8a7b93c916de41f020c438a5ba4edc8f5c344b366db52321ee2d8377382296c263978b9f8272033c6415e2e73ec4c184c948 WHIRLPOOL 9c726e35c4198b3a8866eaf5f73a53f4059a7f0706d6431cfa7796f2cfcae884473446eb67bf2e73ae74f28971fb377251afb322ce575e81ce647b7cc377e76e
 MISC metadata.xml 1130 SHA256 bef417ea1ad1a12a2639eb9644e7b8fda664f2c19047e2357aa56c3964bafb7b SHA512 e58811e997cdf258f70a9c2baa526d8c3acb76dfc208b43bc8bff3a4d1433ed08231956f9fbe098fd9ee26d4002bdb35617fbb0e578510489c9671d969b84eef WHIRLPOOL e72970d425eda43b1f635406f2ad04c725373662716ed4e4c1e88366da0d80bc2cb9b90da264a3cbd71d474881984b187fcfff15e78ffda7fdf161663e27b5d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSKdNVAAoJEPATRTHh2/q1aVcIAI522WIYAZjXm/rWQcmOqfXu
-qDoa9PdKYqqDTAmgCAl6lYR7L901PtKm72Qy7lc2xeIET4f6sZxvY4h/hCeejaMq
-2fGmeUOYDE9TWIiZ3xoEoJTbnnx4hn7JAjkInvQJv16f+Jy1JWbenG9iP9QGFW/5
-/gY0g0vNdseTg5VgHc+63a5UaXXp/hbmMoKOB2BcZJB5ejt4dZzER4urIcuNKvQr
-+v4MR0JAXGJN1wxxZTVdY3v14kwjFUG54c/Yz1NfgXjtz2OOXEJvelmgWu7jFRXq
-BUxbqx8qkveTrhHb0eJnNz5fhvnZ5VGahnimWu18lFzs5S6d351n2Bvc06krD7Q=
-=GHtK
+iQEcBAEBCAAGBQJSKdPdAAoJEPATRTHh2/q1BG4H/0v1igT246em/l+CApzJrLUt
+IKTRb9us4XanzMOZOLCh9aE7QN0gpZSXEw+C6TJupXR35H6LFv6BkOY8+zw1Zcz6
+d1ILkiLypQzegwxnDiMWBzWnasEoCN0XqrgEi2DX2y8fZcX/qsRiw2w3Wjh9knUa
+wO2Tm/fzqV8MVgnHmMzsVkSUHeQch01733tnlSBU/U/ePnMyzStgoEOtl4DQw58t
+nlbv3cxzXNlsUpoXAGS6TcPtXf+l2cnTA9US6Z0QIlOt80uFfkQ1yO5eZ9ICtCnn
+jVXQpd7a1hCyVuyV6OxCU6YhKrfauD7ujhdviG+8cGmtrwHHzp5nmw1WSqnIjKI=
+=XsYN
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/notmuch-0.16-r1.ebuild b/net-mail/notmuch/notmuch-0.16-r1.ebuild
new file mode 100644
index 000000000000..bfee3092b608
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.16-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.16-r1.ebuild,v 1.1 2013/09/06 13:08:44 aidecoe Exp $
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit elisp-common pax-utils distutils-r1
+
+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="
+	pick? ( emacs )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python )
+	"
+IUSE="bash-completion crypt debug doc emacs mutt nmbug pick python test
+	zsh-completion"
+
+CDEPEND="
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	<dev-libs/xapian-1.3
+	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-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"
+SITEFILE_PICK="60${PN}-pick-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_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
+	mv contrib/notmuch-pick/README contrib/notmuch-pick/README-pick || 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)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	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
+
+		if use pick; then
+			pushd contrib/notmuch-pick || die
+			elisp-install "${PN}" notmuch-pick.el || die
+			dodoc README-pick
+			popd || die
+			elisp-site-file-install "${FILESDIR}/${SITEFILE_PICK}" || die
+		fi
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/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
+
+	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
+}