[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Arthur Zamarin]

commit:     5307eacc5b6fe67fc2177884d5c3af93bf80ff2d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 16:54:53 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 16:54:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5307eacc

net-mail/notmuch: Stabilize 0.37-r1 x86, #896150

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index b981227e0807..f068e7d081e5 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Joonas Niilola]

commit:     b5280994ca2b7a03ba16db5cc14f800184b170d0
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 08:01:56 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 08:01:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5280994

net-mail/notmuch: Stabilize 0.38.3 amd64, #944685

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.38.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.38.3.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild
index 22bc372d8f25..675d82d38915 100644
--- a/net-mail/notmuch/notmuch-0.38.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.38.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	apidoc? ( doc )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Michał Górny]

commit:     68867b3f5ccb9a30fb627a2add5306f070e2b49b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 17:21:21 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 17:21:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68867b3f

net-mail/notmuch: Stabilize 0.38.3 x86, #944685

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.38.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.38.3.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild
index 03b328b0a9dd..22bc372d8f25 100644
--- a/net-mail/notmuch/notmuch-0.38.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.38.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	apidoc? ( doc )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Mike Gilbert]

commit:     fdd2951906366dd2cb85bb8767990f72da0543fd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 21:43:47 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 21:47:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd29519

net-mail/notmuch: fix xz-utils dep

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37-r1.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.37-r2.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.38.3.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index 8656ceca062a..2588b2085d3e 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -28,7 +28,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
+	app-arch/xz-utils[extra-filters(+)]
 	virtual/pkgconfig
 	apidoc? (
 		app-text/doxygen

diff --git a/net-mail/notmuch/notmuch-0.37-r2.ebuild b/net-mail/notmuch/notmuch-0.37-r2.ebuild
index 7a7621ec990b..6735eaaf64e8 100644
--- a/net-mail/notmuch/notmuch-0.37-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r2.ebuild
@@ -29,7 +29,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
+	app-arch/xz-utils[extra-filters(+)]
 	virtual/pkgconfig
 	apidoc? (
 		app-text/doxygen

diff --git a/net-mail/notmuch/notmuch-0.38.3.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild
index 4b36d3821319..efe514b7832b 100644
--- a/net-mail/notmuch/notmuch-0.38.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.38.3.ebuild
@@ -29,7 +29,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
+	app-arch/xz-utils[extra-filters(+)]
 	virtual/pkgconfig
 	apidoc? (
 		app-text/doxygen

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     96d14a111d92f4d1aa3203c55cbc91fc1c31bfed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 20:18:53 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  9 20:19:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96d14a11

net-mail/notmuch: add 0.38.3

Closes: https://bugs.gentoo.org/885031
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.38.3.ebuild | 299 +++++++++++++++++++++++++++++++++
 2 files changed, 300 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 280ff50fa603..4c31c09a6a0f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,2 +1,3 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e
+DIST notmuch-0.38.3.tar.xz 805416 BLAKE2B 08f4f5c5732a788a52ca5fb6e6296d7348586796f86cab8273aebf88521e52c52b4515287334d246d030bf3ba0666f24bf0badad843e8b20a1a8bc1da32f6509 SHA512 247f8b365a75b29df719403bc2c9645eb669a7ee6eb4c1e0047dcf55fea4d66c8dcb4899162b952643aa6148ec6e1538ebe3e7e8408376153165e394084aed19

diff --git a/net-mail/notmuch/notmuch-0.38.3.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild
new file mode 100644
index 000000000000..4b36d3821319
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.38.3.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	apidoc? ( doc )
+	nmbug? ( python )
+	test? ( crypt emacs python )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-text/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? (
+		app-shells/bash
+		sys-process/parallel
+	)
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		dev-debug/gdb[python]
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	# FIXME:
+	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+	# gmime/gpg/scdaemon tries to open usb devices in GMime test
+	# we pretend to allow it, without actually allowing it to read or write.
+	# https://bugs.gentoo.org/821328
+	addpredict /dev/bus/usb
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		emake -C contrib/notmuch-mutt notmuch-mutt.1
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+
+	# we run pytest via eclass phasefunc, so delete upstream launcher
+	use python && { rm -v test/T391-python-cffi.sh || die ; }
+
+	# These both fail because of line wrapping in the output
+	rm test/T315-emacs-tagging.sh test/T310-emacs.sh || die
+
+	LD_LIBRARY_PATH="${S}/lib" nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/notmuch-report
+		dobin devel/nmbug/notmuch-report
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     5ff30ab54f80cb65ce9a9349347371d863dae2d8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 21:28:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  8 21:28:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff30ab5

net-mail/notmuch: stabilize 0.37-r2 for amd64, arm, arm64, x86

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r2.ebuild b/net-mail/notmuch/notmuch-0.37-r2.ebuild
index de653956ff4f..7a7621ec990b 100644
--- a/net-mail/notmuch/notmuch-0.37-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	apidoc? ( doc )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Michał Górny]

commit:     25151232d442bf339577d2f23c5640bcc3dde443
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 09:22:48 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 09:23:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25151232

net-mail/notmuch: Replace virtual/python-cffi dep

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37-r1.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index 91db038408c4..b84ada4a6410 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
@@ -57,7 +57,9 @@ COMMON_DEPEND="
 	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
 	python? (
 		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
 	)
 "
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     c81e426e280085dc4025054fefa2ce2448bde3eb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 00:24:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 14 00:31:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81e426e

net-mail/notmuch: drop 0.32.2-r1, 0.37

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/Manifest                 |   1 -
 net-mail/notmuch/notmuch-0.32.2-r1.ebuild | 290 -----------------------------
 net-mail/notmuch/notmuch-0.37.ebuild      | 298 ------------------------------
 3 files changed, 589 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 501d27e964c0..280ff50fa603 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,2 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
 DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e

diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
deleted file mode 100644
index eac23a06ccea..000000000000
--- a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~ppc64 x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? ( sys-process/parallel )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	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
-		dev-perl/Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.32.1-tests.patch"
-)
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}

diff --git a/net-mail/notmuch/notmuch-0.37.ebuild b/net-mail/notmuch/notmuch-0.37.ebuild
deleted file mode 100644
index 1436e9ca1bc6..000000000000
--- a/net-mail/notmuch/notmuch-0.37.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? (
-		app-shells/bash
-		sys-process/parallel
-	)
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb[python]
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	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
-		dev-perl/Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	# FIXME:
-	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
-	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
-	# gmime/gpg/scdaemon tries to open usb devices in GMime test
-	# we pretend to allow it, without actually allowing it to read or write.
-	# https://bugs.gentoo.org/821328
-	addpredict /dev/bus/usb
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-
-	# we run pytest via eclass phasefunc, so delete upstream launcher
-	use python && { rm -v test/T391-python-cffi.sh || die ; }
-
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/notmuch-report
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     2ea22c2b901b31252ca72dbf08c13ad37319ad6a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 00:28:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 14 00:31:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea22c2b

net-mail/notmuch: drop invalid USE=valgrind flag (for test suite)

We don't, in general, run Valgrind for test suites in Gentoo because it's
not portable enough and gives inconsistent results, especially under sandbox.

Plus it's confusing given USE=valgrind is effectively a global USE flag (even
if it isn't in use.desc yet) for meaning "enable annotations to enable better
debugging under Valgrind", rather than "run tests under it".

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/metadata.xml           | 1 -
 net-mail/notmuch/notmuch-0.37-r1.ebuild | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index ab7d36e4a67a..0ba2d4d8e3f9 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="nmbug">Install experimental tag sharing /
 			pseudo-bug-tracking script for Notmuch
 			(see http://notmuchmail.org/nmbug/)</flag>
-		<flag name="valgrind">Depend on <pkg>dev-util/valgrind</pkg> for test suite</flag>
 	</use>
 	<longdescription lang="en">
 		Notmuch is a system for indexing, searching, reading, and tagging large

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index a22d4d8d2108..91db038408c4 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -22,9 +22,9 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	apidoc? ( doc )
 	nmbug? ( python )
-	test? ( crypt emacs python valgrind )
+	test? ( crypt emacs python )
 "
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+IUSE="apidoc crypt doc emacs mutt nmbug python test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -71,7 +71,6 @@ DEPEND="${COMMON_DEPEND}
 			dev-libs/openssl
 		)
 	)
-	valgrind? ( dev-util/valgrind )
 "
 
 RDEPEND="${COMMON_DEPEND}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     2d8e754c9adc1e70c9f27c3fd44f1cfec0f9d9b2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 13:21:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 06:44:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8e754c

net-mail/notmuch: Require Python unconditionally

python_setup is called unconditionally (in both src_configure and
src_compile...?) for sphinx, so we must have a Python target set.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/30775
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index 0fdb5964d10f..a22d4d8d2108 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -19,9 +19,9 @@ LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	apidoc? ( doc )
 	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( crypt emacs python valgrind )
 "
 IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Ulrich Müller]

commit:     b9dfbbdf3b7fbf5e3e1a98897bf9529418b2e707
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 16:49:34 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 16:50:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9dfbbdf

net-mail/notmuch: Drop redundant NEED_EMACS

The default in elisp-common.eclass is 25.3 now.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.32.2-r1.ebuild | 1 -
 net-mail/notmuch/notmuch-0.37-r1.ebuild   | 1 -
 net-mail/notmuch/notmuch-0.37.ebuild      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
index e95941d04223..eac23a06ccea 100644
--- a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{9..10} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index f068e7d081e5..0fdb5964d10f 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils

diff --git a/net-mail/notmuch/notmuch-0.37.ebuild b/net-mail/notmuch/notmuch-0.37.ebuild
index 496f189cf93b..1436e9ca1bc6 100644
--- a/net-mail/notmuch/notmuch-0.37.ebuild
+++ b/net-mail/notmuch/notmuch-0.37.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Arthur Zamarin]

commit:     ccec4737e48357716b18e092b86255ee07e7d468
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 16:54:49 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 16:54:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccec4737

net-mail/notmuch: Stabilize 0.37-r1 amd64, #896150

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index 7e29e3366dd8..b981227e0807 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Arthur Zamarin]

commit:     ffbef939376f4173f9765c233a7375ade1d6c24f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 16:54:09 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 16:54:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbef939

net-mail/notmuch: Stabilize 0.37-r1 arm64, #896150

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index f5bd81fbe13f..2c77f534aa31 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Arthur Zamarin]

commit:     90bad122a8e6b8a94878a8a8836411680a26a37d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 16:54:12 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 16:54:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90bad122

net-mail/notmuch: Stabilize 0.37-r1 arm, #896150

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index 2c77f534aa31..7e29e3366dd8 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     db35e12907bff2dbdf4e30460a0afa274bc08228
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 06:01:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 06:01:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db35e129

net-mail/notmuch: drop 0.34.2, 0.34.2-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/Manifest                 |   1 -
 net-mail/notmuch/notmuch-0.34.2-r1.ebuild | 302 ------------------------------
 net-mail/notmuch/notmuch-0.34.2.ebuild    | 302 ------------------------------
 3 files changed, 605 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 94e01066b6ac..501d27e964c0 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,3 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
-DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c
 DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e

diff --git a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild b/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
deleted file mode 100644
index 193f0ad1d26f..000000000000
--- a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? (
-		app-shells/bash
-		sys-process/parallel
-	)
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb[python]
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	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
-		dev-perl/Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	# FIXME:
-	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
-	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
-	# gmime/gpg/scdaemon tries to open usb devices in GMime test
-	# we pretend to allow it, without actually allowing it to read or write.
-	# https://bugs.gentoo.org/821328
-	addpredict /dev/bus/usb
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-
-	# we run pytest via eclass phasefunc, so delete upstream launcher
-	use python && { rm -v test/T391-python-cffi.sh || die ; }
-
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}

diff --git a/net-mail/notmuch/notmuch-0.34.2.ebuild b/net-mail/notmuch/notmuch-0.34.2.ebuild
deleted file mode 100644
index c35d6a91e6b8..000000000000
--- a/net-mail/notmuch/notmuch-0.34.2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? (
-		app-shells/bash
-		sys-process/parallel
-	)
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb[python]
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	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
-		dev-perl/Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	# FIXME:
-	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
-	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
-	# gmime/gpg/scdaemon tries to open usb devices in GMime test
-	# we pretend to allow it, without actually allowing it to read or write.
-	# https://bugs.gentoo.org/821328
-	addpredict /dev/bus/usb
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-
-	# we run pytest via eclass phasefunc, so delete upstream launcher
-	use python && { rm -v test/T391-python-cffi.sh || die ; }
-
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     4e0d25e7fc06b82af0a414416f4f5c9e556f1e91
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 06:01:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 06:01:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e0d25e7

net-mail/notmuch: enable py3.11

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.37.ebuild b/net-mail/notmuch/notmuch-0.37.ebuild
index 82de22415b12..718c9f43af36 100644
--- a/net-mail/notmuch/notmuch-0.37.ebuild
+++ b/net-mail/notmuch/notmuch-0.37.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     80d3b2b99abf16781602558dd439dfa5ab3af537
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  1 04:51:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 04:51:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d3b2b9

net-mail/notmuch: don't install removed nmbug

Closes: https://bugs.gentoo.org/873421
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.37.ebuild b/net-mail/notmuch/notmuch-0.37.ebuild
index 67c45dcc26f7..82de22415b12 100644
--- a/net-mail/notmuch/notmuch-0.37.ebuild
+++ b/net-mail/notmuch/notmuch-0.37.ebuild
@@ -250,8 +250,8 @@ src_install() {
 
 	if use nmbug; then
 		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
+		python_fix_shebang devel/nmbug/notmuch-report
+		dobin devel/nmbug/notmuch-report
 	fi
 
 	if use mutt; then

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     cba3e865aef60dc06fc919cc7040bf7c82caadd1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 22:46:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 22:46:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba3e865

net-mail/notmuch: fix USE=doc

Closes: https://bugs.gentoo.org/869926
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.37.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.37.ebuild b/net-mail/notmuch/notmuch-0.37.ebuild
index d3b3da07aebf..67c45dcc26f7 100644
--- a/net-mail/notmuch/notmuch-0.37.ebuild
+++ b/net-mail/notmuch/notmuch-0.37.ebuild
@@ -235,9 +235,6 @@ src_install() {
 	default
 
 	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
 		if use apidoc; then
 			# rename overly generic manpage to avoid clashes
 			mv doc/_build/man/man3/deprecated.3 \

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     00dc570410286ad60250c21756b88e69b0622670
Author:     Austin Ray <austin <AT> austinray <DOT> io>
AuthorDate: Sat Jul 30 02:14:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 19:45:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00dc5704

net-mail/notmuch: add 0.36

Closes: https://bugs.gentoo.org/841215
Signed-off-by: Austin Ray <austin <AT> austinray.io>
Closes: https://github.com/gentoo/gentoo/pull/26659
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/notmuch-0.36.ebuild | 302 +++++++++++++++++++++++++++++++++++
 2 files changed, 303 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a56e679e8dd3..30c467b34d9b 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
 DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c
+DIST notmuch-0.36.tar.xz 761260 BLAKE2B e5928d316427c0805821be5f3d21c8764fbfd895524954c0bf41593c9c8f72d4c142e8b2a9aacfb36df332f7a1cd9cc16854eabd599db35962fdf5d11746852a SHA512 00f89e46467cad1cb8135644ed6655e88c93edcba553ced503c21e53f048eb49a333127649ea69bd30e164e8322a3e1dd0fcd672b93e087a8b470e60a6e838fa

diff --git a/net-mail/notmuch/notmuch-0.36.ebuild b/net-mail/notmuch/notmuch-0.36.ebuild
new file mode 100644
index 000000000000..166ca13c6c01
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.36.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? (
+		app-shells/bash
+		sys-process/parallel
+	)
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb[python]
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	# FIXME:
+	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+	# gmime/gpg/scdaemon tries to open usb devices in GMime test
+	# we pretend to allow it, without actually allowing it to read or write.
+	# https://bugs.gentoo.org/821328
+	addpredict /dev/bus/usb
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+
+	# we run pytest via eclass phasefunc, so delete upstream launcher
+	use python && { rm -v test/T391-python-cffi.sh || die ; }
+
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     9aa5fb541a6e3522a5f6146f5f7d7b1e5d1905e8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 19:48:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 19:48:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa5fb54

net-mail/notmuch: add 0.37, drop 0.36

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/Manifest                                     | 2 +-
 net-mail/notmuch/{notmuch-0.36.ebuild => notmuch-0.37.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 30c467b34d9b..94e01066b6ac 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,4 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
 DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c
-DIST notmuch-0.36.tar.xz 761260 BLAKE2B e5928d316427c0805821be5f3d21c8764fbfd895524954c0bf41593c9c8f72d4c142e8b2a9aacfb36df332f7a1cd9cc16854eabd599db35962fdf5d11746852a SHA512 00f89e46467cad1cb8135644ed6655e88c93edcba553ced503c21e53f048eb49a333127649ea69bd30e164e8322a3e1dd0fcd672b93e087a8b470e60a6e838fa
+DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e

diff --git a/net-mail/notmuch/notmuch-0.36.ebuild b/net-mail/notmuch/notmuch-0.37.ebuild
similarity index 99%
rename from net-mail/notmuch/notmuch-0.36.ebuild
rename to net-mail/notmuch/notmuch-0.37.ebuild
index 166ca13c6c01..d3b3da07aebf 100644
--- a/net-mail/notmuch/notmuch-0.36.ebuild
+++ b/net-mail/notmuch/notmuch-0.37.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
 		dev-lang/perl
 	)
 	doc? (
-		dev-python/sphinx
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		sys-apps/texinfo
 	)
 	python? (

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     07fd9cde32eb83dd60c1b69a34dbacf114b5271e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 18:27:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:34:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07fd9cde

net-mail/notmuch: fix Sphinx dep

python_check_deps doesn't do anything w/ distutils-r1,
so we settle for the slight over-dep (note that
the configure script imports, so we need the [${PYTHON_USEDEP}])

Bug: https://bugs.gentoo.org/856628
Closes: https://bugs.gentoo.org/866117
Fixes: 8e4a0100e36949f4c4887f00f7dd438dd5a1be75
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.34.2-r1.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild b/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
index f375e69ff53c..193f0ad1d26f 100644
--- a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
 		dev-lang/perl
 	)
 	doc? (
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		sys-apps/texinfo
 	)
 	python? (
@@ -93,10 +93,6 @@ RDEPEND="${COMMON_DEPEND}
 
 SITEFILE="50${PN}-gentoo.el"
 
-python_check_deps() {
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
 pkg_setup() {
 	use emacs && elisp-check-emacs-version
 }

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     8e4a0100e36949f4c4887f00f7dd438dd5a1be75
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 05:28:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 05:28:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4a0100

net-mail/notmuch: use python_check_deps for Sphinx

The configure script tries to import Sphinx so we need
Sphinx to be installed for the same Python.

Either we need python_setup in the ebuild because it actually tries to import
sphinx or something (then we need check_deps), or we don't need it at all
and we can simply BDEPEND on it.

And it does try to actually import Sphinx, at least for a configure
test: https://github.com/notmuch/notmuch/blob/master/configure#L935.

Closes: https://bugs.gentoo.org/856628
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.34.2-r1.ebuild | 306 ++++++++++++++++++++++++++++++
 1 file changed, 306 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild b/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
new file mode 100644
index 000000000000..f375e69ff53c
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? (
+		app-shells/bash
+		sys-process/parallel
+	)
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb[python]
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	# FIXME:
+	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+	# gmime/gpg/scdaemon tries to open usb devices in GMime test
+	# we pretend to allow it, without actually allowing it to read or write.
+	# https://bugs.gentoo.org/821328
+	addpredict /dev/bus/usb
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+
+	# we run pytest via eclass phasefunc, so delete upstream launcher
+	use python && { rm -v test/T391-python-cffi.sh || die ; }
+
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Yixun Lan]

commit:     502d2379ab21749f33e3286e1a52ebb4c5dfd460
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 14:45:17 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 15:14:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502d2379

net-mail/notmuch: keyword ~riscv

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.34.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.34.2.ebuild b/net-mail/notmuch/notmuch-0.34.2.ebuild
index d056fb61c403..c35d6a91e6b8 100644
--- a/net-mail/notmuch/notmuch-0.34.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.34.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Michał Górny]

commit:     02b6c8bb32372b6c4047de7dab58fda1dd963b3c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 18:39:14 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 18:40:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b6c8bb

net-mail/notmuch: Remove DISTUTILS_USE_SETUPTOOLS

DISTUTILS_USE_SETUPTOOLS is not used with DISTUTILS_OPTIONAL, and now it
triggers a QA warning.  Remove it.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.32.2-r1.ebuild | 3 +--
 net-mail/notmuch/notmuch-0.34.2.ebuild    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
index d99d63cef1d2..788bd1925968 100644
--- a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
 

diff --git a/net-mail/notmuch/notmuch-0.34.2.ebuild b/net-mail/notmuch/notmuch-0.34.2.ebuild
index d7b1744e55c7..d056fb61c403 100644
--- a/net-mail/notmuch/notmuch-0.34.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.34.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     d5719d86bf576ff6730c59a86e672a1bace7447a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 21 04:20:19 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 04:20:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5719d86

net-mail/notmuch: drop 0.34.1

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 -
 net-mail/notmuch/notmuch-0.34.1.ebuild | 303 ---------------------------------
 2 files changed, 304 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a53e1acf6fcc..a56e679e8dd3 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,3 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
-DIST notmuch-0.34.1.tar.xz 748444 BLAKE2B f8e2d8041082a95832d0b5bf600b92b5de93e606d99ffdf38ad13bbd80205688780d64a4c64f1db3783eaa56b34f5fef1839430faf058aa5b92053026de06326 SHA512 ef1423e049a83f81fb6b5a75f9a35efc0381c661bbe00007dabd6b385df829ac4195137ccef3fa1ec652df8eb4566e3d9d30880a4c74497a9668cb3ca240fb88
 DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c

diff --git a/net-mail/notmuch/notmuch-0.34.1.ebuild b/net-mail/notmuch/notmuch-0.34.1.ebuild
deleted file mode 100644
index d7b1744e55c7..000000000000
--- a/net-mail/notmuch/notmuch-0.34.1.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? (
-		app-shells/bash
-		sys-process/parallel
-	)
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb[python]
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	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
-		dev-perl/Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	# FIXME:
-	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
-	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
-	# gmime/gpg/scdaemon tries to open usb devices in GMime test
-	# we pretend to allow it, without actually allowing it to read or write.
-	# https://bugs.gentoo.org/821328
-	addpredict /dev/bus/usb
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-
-	# we run pytest via eclass phasefunc, so delete upstream launcher
-	use python && { rm -v test/T391-python-cffi.sh || die ; }
-
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     6bce6b664fa170f0069c1ccae90934c9ec201eb4
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 21 04:19:31 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 04:19:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bce6b66

net-mail/notmuch: enable py3.10

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.32.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
index ba302f77adb9..d99d63cef1d2 100644
--- a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     7750aefc9a88435bafbf86135980884126b94828
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 21 04:16:14 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 04:16:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7750aefc

net-mail/notmuch: add 0.34.2

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.34.2.ebuild | 303 +++++++++++++++++++++++++++++++++
 2 files changed, 304 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 8f1c189ad144..a53e1acf6fcc 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
 DIST notmuch-0.34.1.tar.xz 748444 BLAKE2B f8e2d8041082a95832d0b5bf600b92b5de93e606d99ffdf38ad13bbd80205688780d64a4c64f1db3783eaa56b34f5fef1839430faf058aa5b92053026de06326 SHA512 ef1423e049a83f81fb6b5a75f9a35efc0381c661bbe00007dabd6b385df829ac4195137ccef3fa1ec652df8eb4566e3d9d30880a4c74497a9668cb3ca240fb88
+DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c

diff --git a/net-mail/notmuch/notmuch-0.34.2.ebuild b/net-mail/notmuch/notmuch-0.34.2.ebuild
new file mode 100644
index 000000000000..d7b1744e55c7
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.34.2.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? (
+		app-shells/bash
+		sys-process/parallel
+	)
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb[python]
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	# FIXME:
+	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+	# gmime/gpg/scdaemon tries to open usb devices in GMime test
+	# we pretend to allow it, without actually allowing it to read or write.
+	# https://bugs.gentoo.org/821328
+	addpredict /dev/bus/usb
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+
+	# we run pytest via eclass phasefunc, so delete upstream launcher
+	use python && { rm -v test/T391-python-cffi.sh || die ; }
+
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     03be079d5ec70c44f8e3da3b43d7f23cd0fc53c4
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 05:25:37 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 05:25:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03be079d

net-mail/notmuch: add 0.34.1, drop 0.34

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/Manifest                                       | 2 +-
 net-mail/notmuch/{notmuch-0.34.ebuild => notmuch-0.34.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 2c7d6243648b..8f1c189ad144 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,3 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
-DIST notmuch-0.34.tar.xz 748232 BLAKE2B 161fc1bd047b5489a4f2fd64f4843e73fd82cf6a408ef04ab1bab34df0995fd4199585cf8fa12980a4fdab054d03437323ed366ca87f2f6dad2d006900cad352 SHA512 c7c802ee6fc056cb626611e3403541e404c628d238983299faf877e7eca9dfb94bd643c399e6a6cda53b051d2ad837ad03b124a1f44e17c7637a9c9b23e33c73
+DIST notmuch-0.34.1.tar.xz 748444 BLAKE2B f8e2d8041082a95832d0b5bf600b92b5de93e606d99ffdf38ad13bbd80205688780d64a4c64f1db3783eaa56b34f5fef1839430faf058aa5b92053026de06326 SHA512 ef1423e049a83f81fb6b5a75f9a35efc0381c661bbe00007dabd6b385df829ac4195137ccef3fa1ec652df8eb4566e3d9d30880a4c74497a9668cb3ca240fb88

diff --git a/net-mail/notmuch/notmuch-0.34.ebuild b/net-mail/notmuch/notmuch-0.34.1.ebuild
similarity index 100%
rename from net-mail/notmuch/notmuch-0.34.ebuild
rename to net-mail/notmuch/notmuch-0.34.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     6ee446b03ae65d3c683137e2da3add8d08dbc3a5
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 02:59:39 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 02:59:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee446b0

net-mail/notmuch: drop 0.33.2

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 -
 net-mail/notmuch/notmuch-0.33.2.ebuild | 303 ---------------------------------
 2 files changed, 304 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 0b59f5adc3c..2c7d6243648 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,3 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
-DIST notmuch-0.33.2.tar.xz 733228 BLAKE2B e0a206695944bd57ab3ba1488bbff10c6744b57126eddeead45653a20df8edde21e0c618f9b4af5731e41bb469538883770ef61da4b28e2fd7dc108d994a7433 SHA512 15f4ecbd991df3a64c2b89aeb6bf7649e76ff2010f80120a15c10c9c5e913a90696ef6a760cbea24bbc9a3ca8cae18fada13d80e69c848cc142d355f2a513f5d
 DIST notmuch-0.34.tar.xz 748232 BLAKE2B 161fc1bd047b5489a4f2fd64f4843e73fd82cf6a408ef04ab1bab34df0995fd4199585cf8fa12980a4fdab054d03437323ed366ca87f2f6dad2d006900cad352 SHA512 c7c802ee6fc056cb626611e3403541e404c628d238983299faf877e7eca9dfb94bd643c399e6a6cda53b051d2ad837ad03b124a1f44e17c7637a9c9b23e33c73

diff --git a/net-mail/notmuch/notmuch-0.33.2.ebuild b/net-mail/notmuch/notmuch-0.33.2.ebuild
deleted file mode 100644
index 873e974b815..00000000000
--- a/net-mail/notmuch/notmuch-0.33.2.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? (
-		app-shells/bash
-		sys-process/parallel
-	)
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb[python]
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	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
-		dev-perl/Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	# FIXME:
-	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
-	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
-	# gmime/gpg/scdaemon tries to open usb devices in GMime test
-	# we pretend to allow it, without actually allowing it to read or write.
-	# https://bugs.gentoo.org/821328
-	addpredict /dev/bus/usb
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-
-	# we run pytest via eclass phasefunc, so delete upstream launcher
-	use python && { rm -v test/T391-python-cffi.sh || die ; }
-
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     5da936cda8b81399d86208a16466257a57c8e75e
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 02:52:17 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 02:58:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5da936cd

net-mail/notmuch: add 0.34, enable py3.10

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/notmuch-0.34.ebuild | 303 +++++++++++++++++++++++++++++++++++
 2 files changed, 304 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index f96fdcb75b4..0b59f5adc3c 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
 DIST notmuch-0.33.2.tar.xz 733228 BLAKE2B e0a206695944bd57ab3ba1488bbff10c6744b57126eddeead45653a20df8edde21e0c618f9b4af5731e41bb469538883770ef61da4b28e2fd7dc108d994a7433 SHA512 15f4ecbd991df3a64c2b89aeb6bf7649e76ff2010f80120a15c10c9c5e913a90696ef6a760cbea24bbc9a3ca8cae18fada13d80e69c848cc142d355f2a513f5d
+DIST notmuch-0.34.tar.xz 748232 BLAKE2B 161fc1bd047b5489a4f2fd64f4843e73fd82cf6a408ef04ab1bab34df0995fd4199585cf8fa12980a4fdab054d03437323ed366ca87f2f6dad2d006900cad352 SHA512 c7c802ee6fc056cb626611e3403541e404c628d238983299faf877e7eca9dfb94bd643c399e6a6cda53b051d2ad837ad03b124a1f44e17c7637a9c9b23e33c73

diff --git a/net-mail/notmuch/notmuch-0.34.ebuild b/net-mail/notmuch/notmuch-0.34.ebuild
new file mode 100644
index 00000000000..d7b1744e55c
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.34.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? (
+		app-shells/bash
+		sys-process/parallel
+	)
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb[python]
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	# FIXME:
+	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+	# gmime/gpg/scdaemon tries to open usb devices in GMime test
+	# we pretend to allow it, without actually allowing it to read or write.
+	# https://bugs.gentoo.org/821328
+	addpredict /dev/bus/usb
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+
+	# we run pytest via eclass phasefunc, so delete upstream launcher
+	use python && { rm -v test/T391-python-cffi.sh || die ; }
+
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     678a6fa4106e18456ed9dadb6814a673de81fb32
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 02:48:44 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 02:49:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678a6fa4

net-mail/notmuch: add GMime sandbox violation workaround

 Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
 notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
 gmime/gpg/scdaemon tries to open usb devices in GMime test
 we pretend to allow it, without actually allowing it to read or write.
Bug: https://bugs.gentoo.org/821328
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.33.2.ebuild | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.33.2.ebuild b/net-mail/notmuch/notmuch-0.33.2.ebuild
index 4cc225e3c55..873e974b815 100644
--- a/net-mail/notmuch/notmuch-0.33.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.33.2.ebuild
@@ -142,6 +142,14 @@ src_configure() {
 		$(use_with emacs)
 	)
 
+	# FIXME:
+	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+	# gmime/gpg/scdaemon tries to open usb devices in GMime test
+	# we pretend to allow it, without actually allowing it to read or write.
+	# https://bugs.gentoo.org/821328
+	addpredict /dev/bus/usb
+
 	econf "${myconf[@]}"
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     3fbc535f74f5ce0d5dd52c22cbc65447559b8e2a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 13:38:06 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 13:39:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fbc535f

net-mail/notmuch: add 0.33.2

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.33.2.ebuild | 295 +++++++++++++++++++++++++++++++++
 2 files changed, 296 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 06ca7dc2a96..eac9ca13c4e 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,3 +2,4 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b404677
 DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
 DIST notmuch-0.32.1.tar.xz 725196 BLAKE2B 6163f512e88f1b9415b93f7c4a146dc1af6e41bacdbbd29bdb48706af4af4822b626a719d50146f0cfe4d35508d8aa767b0e75eadebf9d619912f3ee6ba0e59e SHA512 c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
+DIST notmuch-0.33.2.tar.xz 733228 BLAKE2B e0a206695944bd57ab3ba1488bbff10c6744b57126eddeead45653a20df8edde21e0c618f9b4af5731e41bb469538883770ef61da4b28e2fd7dc108d994a7433 SHA512 15f4ecbd991df3a64c2b89aeb6bf7649e76ff2010f80120a15c10c9c5e913a90696ef6a760cbea24bbc9a3ca8cae18fada13d80e69c848cc142d355f2a513f5d

diff --git a/net-mail/notmuch/notmuch-0.33.2.ebuild b/net-mail/notmuch/notmuch-0.33.2.ebuild
new file mode 100644
index 00000000000..4cc225e3c55
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.33.2.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? (
+		app-shells/bash
+		sys-process/parallel
+	)
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb[python]
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+
+	# we run pytest via eclass phasefunc, so delete upstream launcher
+	use python && { rm -v test/T391-python-cffi.sh || die ; }
+
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     f36396c4c6ed023f7ff5a46a0ad46bd2fa6dd9c4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 00:08:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 00:08:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36396c4

net-mail/notmuch: Stabilize 0.32.2-r1 arm, #803104

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.32.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
index b06900e9e77..ba302f77adb 100644
--- a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ppc64 x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     0908cfa1b9de099202c39bee71d8beeff3df736c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 26 07:29:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 07:29:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0908cfa1

net-mail/notmuch: Stabilize 0.32.2-r1 arm64, #803104

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.32.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
index 5a0146cb8cf..b06900e9e77 100644
--- a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Andreas K. Hüttel]

commit:     f8bbb24b87fff28c79c8c783989746c1392ff0ea
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 19:34:57 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 19:34:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8bbb24b

net-mail/notmuch: virtual/perl-Pod-Parser -> dev-perl/Pod-Parser

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 net-mail/notmuch/{notmuch-0.31.3.ebuild => notmuch-0.31.3-r1.ebuild} | 2 +-
 net-mail/notmuch/{notmuch-0.32.1.ebuild => notmuch-0.32.1-r1.ebuild} | 2 +-
 net-mail/notmuch/{notmuch-0.32.2.ebuild => notmuch-0.32.2-r1.ebuild} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3-r1.ebuild
similarity index 99%
rename from net-mail/notmuch/notmuch-0.31.3.ebuild
rename to net-mail/notmuch/notmuch-0.31.3-r1.ebuild
index 70e772471e1..ae71b74055b 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3-r1.ebuild
@@ -83,7 +83,7 @@ RDEPEND="${COMMON_DEPEND}
 		virtual/perl-Digest-SHA
 		virtual/perl-File-Path
 		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
+		dev-perl/Pod-Parser
 	)
 	nmbug? ( dev-vcs/git )
 "

diff --git a/net-mail/notmuch/notmuch-0.32.1.ebuild b/net-mail/notmuch/notmuch-0.32.1-r1.ebuild
similarity index 99%
rename from net-mail/notmuch/notmuch-0.32.1.ebuild
rename to net-mail/notmuch/notmuch-0.32.1-r1.ebuild
index 2382baa059e..78bf6a0ccc8 100644
--- a/net-mail/notmuch/notmuch-0.32.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.1-r1.ebuild
@@ -84,7 +84,7 @@ RDEPEND="${COMMON_DEPEND}
 		virtual/perl-Digest-SHA
 		virtual/perl-File-Path
 		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
+		dev-perl/Pod-Parser
 	)
 	nmbug? ( dev-vcs/git )
 "

diff --git a/net-mail/notmuch/notmuch-0.32.2.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
similarity index 99%
rename from net-mail/notmuch/notmuch-0.32.2.ebuild
rename to net-mail/notmuch/notmuch-0.32.2-r1.ebuild
index 2c5173f19db..5a0146cb8cf 100644
--- a/net-mail/notmuch/notmuch-0.32.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -84,7 +84,7 @@ RDEPEND="${COMMON_DEPEND}
 		virtual/perl-Digest-SHA
 		virtual/perl-File-Path
 		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
+		dev-perl/Pod-Parser
 	)
 	nmbug? ( dev-vcs/git )
 "

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     45048aa34b393539dca583fc557ab9e76a655819
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 29 15:39:54 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 15:40:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45048aa3

net-mail/notmuch: add 0.32.2

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.32.2.ebuild | 292 +++++++++++++++++++++++++++++++++
 2 files changed, 293 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a3ebf895d3a..06ca7dc2a96 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
 DIST notmuch-0.32.1.tar.xz 725196 BLAKE2B 6163f512e88f1b9415b93f7c4a146dc1af6e41bacdbbd29bdb48706af4af4822b626a719d50146f0cfe4d35508d8aa767b0e75eadebf9d619912f3ee6ba0e59e SHA512 c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36
+DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf

diff --git a/net-mail/notmuch/notmuch-0.32.2.ebuild b/net-mail/notmuch/notmuch-0.32.2.ebuild
new file mode 100644
index 00000000000..2c5173f19db
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.32.2.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? ( sys-process/parallel )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.32.1-tests.patch"
+)
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     b302352ba6c27571abf97dc259df2e49ced3cd41
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 20:44:08 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 20:44:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b302352b

net-mail/notmuch: bdepend on app-arch/xz-utils[extra-filters(-)]

Closes: https://bugs.gentoo.org/798465
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.3.ebuild | 1 +
 net-mail/notmuch/notmuch-0.32.1.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index 9e7e89f755b..70e772471e1 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -30,6 +30,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
 	virtual/pkgconfig
 	apidoc? (
 		app-doc/doxygen

diff --git a/net-mail/notmuch/notmuch-0.32.1.ebuild b/net-mail/notmuch/notmuch-0.32.1.ebuild
index 26acc520cdb..2382baa059e 100644
--- a/net-mail/notmuch/notmuch-0.32.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.1.ebuild
@@ -30,6 +30,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
 	virtual/pkgconfig
 	apidoc? (
 		app-doc/doxygen

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     ebe5bb74574a84a4d7b795183d6c1185a7d19827
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 18:10:38 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue May 25 18:10:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe5bb74

net-mail/notmuch: QA fix DISTUTILS_USE_SETUPTOOLS warning

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.3.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index e6d8d047fd8..9e7e89f755b 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
@@ -39,6 +40,7 @@ BDEPEND="
 		sys-apps/texinfo
 	)
 	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	)
 "

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     4c8699592530829a23cce78c61136a333713e47b
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 06:00:22 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon May 17 06:00:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c869959

net-mail/notmuch: unlock sphinx dep

Closes: https://bugs.gentoo.org/789492
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.3.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index 946fb55ae69..e6d8d047fd8 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -35,10 +35,12 @@ BDEPEND="
 		dev-lang/perl
 	)
 	doc? (
-		<dev-python/sphinx-4
+		dev-python/sphinx
 		sys-apps/texinfo
 	)
-	python? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	python? (
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
 "
 
 COMMON_DEPEND="
@@ -115,6 +117,9 @@ src_prepare() {
 
 	# Non-autoconf configure
 	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     a47cabe36a218eccf3f6cc499eac853313f2ed65
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 01:59:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 17 01:59:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47cabe3

net-mail/notmuch: Stabilize 0.31.3 x86, #787695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index 8deec498a21..946fb55ae69 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     110462b4b9dd782e91b8c7b19486d0608f1839cc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 01:19:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 17 01:19:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110462b4

net-mail/notmuch: Stabilize 0.31.3 amd64, #787695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index b1be4d8f3e5..8deec498a21 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     dcf68c68c3e842a8d55fefb218474ec5b03b10b3
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue May 11 19:18:26 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue May 11 19:19:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf68c68

net-mail/notmuch: require older sphinx

Bug: https://bugs.gentoo.org/789492
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index 57d73612bb3..b1be4d8f3e5 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 		dev-lang/perl
 	)
 	doc? (
-		dev-python/sphinx
+		<dev-python/sphinx-4
 		sys-apps/texinfo
 	)
 	python? ( dev-python/pytest[${PYTHON_USEDEP}] )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     d4116cf2637e10b8f6f37c3c6dda7935d3b2f30a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 20:47:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 20:57:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4116cf2

net-mail/notmuch: add Python 3.9 to stable

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.30-r1.ebuild | 4 ++--
 net-mail/notmuch/notmuch-0.31-r2.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.31.ebuild    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 5bc0909030c..2e892bb5e51 100644
--- a/net-mail/notmuch/notmuch-0.30-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
 	pax-utils toolchain-funcs

diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild
index fc743453f79..cc1c03f51da 100644
--- a/net-mail/notmuch/notmuch-0.31-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/net-mail/notmuch/notmuch-0.31.ebuild b/net-mail/notmuch/notmuch-0.31.ebuild
index 03f24db64a5..7e7b6616497 100644
--- a/net-mail/notmuch/notmuch-0.31.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
 	pax-utils toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     db32ab134c3da5bfbe8a580873acda6f8dea3dfb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 22:34:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 22:35:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db32ab13

net-mail/notmuch: ROOT -> EROOT

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index 5f806e985b5..b769f25d217 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -253,7 +253,7 @@ src_install() {
 
 pkg_preinst() {
 	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
 		elog "To enable notmuch support in mutt, add the following line"
 		elog "to your mutt config file:"
 		elog ""

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     4a34d1bb2561b8da03f2f6b9759ccf2bc2ed73df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 22:15:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 22:15:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a34d1bb

net-mail/notmuch: restore dropped ~x64-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index 88f4451fc0b..5f806e985b5 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     1e109f6216fcf48bf701224b4dd81e1db657a180
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Sun Dec 27 21:43:28 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 22:14:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e109f62

net-mail/notmuch: Bump to version 0.31.3

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/18846
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.31.3.ebuild | 276 +++++++++++++++++++++++++++++++++
 2 files changed, 277 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 9456c2345c8..7b8d75a5a02 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,4 +2,5 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b404677
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
 DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
 DIST notmuch-0.31.2.tar.xz 713388 BLAKE2B 20029f55206b66e7956316fca2d16ae53a49fc196ea2e730ae5ebd96ce893fa2065b7eee9b625629bbb0d3816a70d98e8943920cf8895ef81a97a1d8dc59dd62 SHA512 b134ef79648cb6fe9f17b2f1b600d651d57359ae9fa576c808b794aa64a09955f0597a624cc3c498da4ef56e44bca6bb485bc402c2dff48cd000959f9a9ceeaa
+DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
 DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
new file mode 100644
index 00000000000..88f4451fc0b
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	# NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed)
+	pax-mark -m notmuch
+	NOTMUCH_TEST_SERIALIZE=1 \
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     5e4caa3b49c02fd9d38ac09cad3cb0e35ac6663b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 09:14:32 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 09:38:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e4caa3b

net-mail/notmuch: ~x64-macos keyworded

Package-Manager: Portage-3.0.10.2-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild
index 75002126583..26c459bf4d0 100644
--- a/net-mail/notmuch/notmuch-0.31.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Thomas Deutschmann]

commit:     e12f42318b802301c7073da9b9a7ebbe65fe9036
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 23:53:24 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 23:53:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12f4231

net-mail/notmuch: x86 stable (bug #747643)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild
index bf63e1d7f55..75002126583 100644
--- a/net-mail/notmuch/notmuch-0.31.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 x86"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     023537dc0c603d0811825c38407c415e137adcfd
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  9 01:05:06 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 01:06:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023537dc

net-mail/notmuch: bump to 0.31.2

crypt tests fixed

Bug: https://bugs.gentoo.org/749969
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.31.2.ebuild | 277 +++++++++++++++++++++++++++++++++
 2 files changed, 278 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 734ae5657a7..9456c2345c8 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,5 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
 DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
+DIST notmuch-0.31.2.tar.xz 713388 BLAKE2B 20029f55206b66e7956316fca2d16ae53a49fc196ea2e730ae5ebd96ce893fa2065b7eee9b625629bbb0d3816a70d98e8943920cf8895ef81a97a1d8dc59dd62 SHA512 b134ef79648cb6fe9f17b2f1b600d651d57359ae9fa576c808b794aa64a09955f0597a624cc3c498da4ef56e44bca6bb485bc402c2dff48cd000959f9a9ceeaa
 DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5

diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild
new file mode 100644
index 00000000000..bf63e1d7f55
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31.2.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+
+	# NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed)
+	NOTMUCH_TEST_SERIALIZE=1 \
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     bd3fdbaac0e87a731c9c30a97518a2af32885331
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 17:54:00 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 17:56:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3fdbaa

net-mail/notmuch: fix doc installation with USE=mutt

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31-r2.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild
index bd9a233912c..88f4451fc0b 100644
--- a/net-mail/notmuch/notmuch-0.31-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31-r2.ebuild
@@ -83,7 +83,6 @@ RDEPEND="${COMMON_DEPEND}
 	nmbug? ( dev-vcs/git )
 "
 
-DOCS=( AUTHORS NEWS README )
 SITEFILE="50${PN}-gentoo.el"
 
 pkg_setup() {
@@ -209,8 +208,6 @@ python_install() {
 src_install() {
 	default
 
-	local DOCS=( README{,.rst} INSTALL NEWS )
-
 	if use doc; then
 		pushd doc/_build/man/man1 > /dev/null || die
 		ln notmuch.1 notmuch-setup.1 || die
@@ -241,10 +238,11 @@ src_install() {
 		doman notmuch-mutt.1
 		insinto /etc/mutt
 		doins notmuch-mutt.rc
-		DOCS+=( README-mutt )
+		dodoc README-mutt
 		popd > /dev/null || die
 	fi
 
+	local DOCS=( README{,.rst} INSTALL NEWS )
 	einstalldocs
 
 	if use python; then

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     4f258f9568e49252afc2d91a65d14a205fc513ef
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 12:00:53 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 12:01:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f258f95

net-mail/notmuch: fix whitespace

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild
index f9466e5398c..bd9a233912c 100644
--- a/net-mail/notmuch/notmuch-0.31-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31-r2.ebuild
@@ -223,7 +223,6 @@ src_install() {
 		doman doc/_build/man/man?/*.?
 	fi
 
-
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 		domenu emacs/notmuch-emacs-mua.desktop

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     eea839184e207cb2cf161cae0b5e25085bd33328
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 11:25:22 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 11:49:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea83918

net-mail/notmuch: add myself to metadata.xml, remove proxy-maint

this is very high-profile package was in a bad state.
Take over from proxy-maint for maintenance.

Bug: https://bugs.gentoo.org/751535
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/metadata.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index 9c4dc0d6dd2..457dfaca90f 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="apidoc">Provide doxygen generated API docs</flag>
 		<flag name="doc">Install API documentation</flag>

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     539a232d6c9d5faca4e067bcf9c96cccac3acdc7
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 05:59:13 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 11:49:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539a232d

net-mail/notmuch: QA revbump: fix multiple issues

add apidoc flag, which depends on doxygen
split doxygen dep under apidoc flag
apidoc depends on doc, add required_use
add py3.9 and pypy3 support (all tests pass)
switch to cffi virtual
add missing PYTHON_USEDEP to cffi
add desktop file installation for emacs
regen desktop database if required
add python tests and pytest dep
remove mock dep, works fine with stdlib one
add perl dep where appropriate for some scripts
add missing subslot on zlib
use standard python subphase functions instead of bindings()
fix makefile target sed
use more standard funtion calls instead of hard to read hacks
work around a Makefile race emacs doc generation, it needs -j1
add python documentation installation
add basic docs, switch to einstalldocs
prevent automagic dependency on gnu parallel in tests
make tests more verbose
prevent automagic dependency on sphinx (bug #751535)
fix manpage installation
fix manpage compression
fix texinfo file installation
fix missing manpage symlink
fix overly generic manpage name
fix nmbug & friends shebangs
silence pushd/popd calls
move around some deps
misc style changes

TODO: more cleanup needed. nmbug need python dependencies.
TODO: remove old bindings to fix setuptools warning.
TODO: crypto tests fail ( probably #749969 )

Bug: https://bugs.gentoo.org/751535
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/metadata.xml           |   1 +
 net-mail/notmuch/notmuch-0.31-r1.ebuild | 213 ------------------------
 net-mail/notmuch/notmuch-0.31-r2.ebuild | 279 ++++++++++++++++++++++++++++++++
 3 files changed, 280 insertions(+), 213 deletions(-)

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index 799fdb5f19a..9c4dc0d6dd2 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="apidoc">Provide doxygen generated API docs</flag>
 		<flag name="doc">Install API documentation</flag>
 		<flag name="crypt">Support decryption and verification of PGP/MIME
 			messages and in Emacs UI - encryption; support also S/MIME

diff --git a/net-mail/notmuch/notmuch-0.31-r1.ebuild b/net-mail/notmuch/notmuch-0.31-r1.ebuild
deleted file mode 100644
index 07472ca4b03..00000000000
--- a/net-mail/notmuch/notmuch-0.31-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
-	pax-utils toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-"
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/cffi
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	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
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-
-bindings() {
-	local rc=0
-	if use python; then
-		# CFFI based bindings (recommended)
-		pushd bindings/python-cffi || die
-		${@}
-		rc=${?}
-		popd || die
-
-		# Old deprecated bindings, #736204. These are known to cause
-		# memory loss and other issues. Avoid if at all possible.
-		pushd bindings/python || die
-		${@}
-		rc=${?}
-		popd || die
-	fi
-	return ${rc}
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	local _deps=""
-	default
-
-	# Python bindings
-	bindings distutils-r1_src_prepare
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override dependencies for 'install' target
-	use doc && _deps="install-info"
-	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Non-autoconf configure
-		append-ldflags -lnsl -lsocket
-	fi
-}
-
-src_configure() {
-	python_setup # For sphinx
-	local _args=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${_args[@]}"
-}
-
-src_compile() {
-	python_setup # For sphinx
-	V=1 default
-	bindings distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-	doman doc/_build/man/man?/*.?
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	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 distutils-r1_src_install
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild
new file mode 100644
index 00000000000..f9466e5398c
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31-r2.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	# NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed)
+	pax-mark -m notmuch
+	NOTMUCH_TEST_SERIALIZE=1 \
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		DOCS+=( README-mutt )
+		popd > /dev/null || die
+	fi
+
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     7cb1220db1121d31b4fbf02462e7b160ccfb15ed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 23:25:39 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 23:25:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb1220d

net-mail/notmuch: Keyword 0.31-r1 arm, #751022

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31-r1.ebuild b/net-mail/notmuch/notmuch-0.31-r1.ebuild
index f5fd2cc5cf8..07472ca4b03 100644
--- a/net-mail/notmuch/notmuch-0.31-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.31-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     5322b12b01353ee81cc4ecc7c6da151f287c4fa9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 02:19:30 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 02:22:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5322b12b

net-mail/notmuch: tighten xapian dep in 0.31

I can't reproduce this *but* upstream state [0][1]
we need >=dev-libs/xapian-1.4.0, so let's
require it, although most people should be fine
in ~.

[0] https://git.notmuchmail.org/git?p=notmuch;a=commit;h=00cdfe10717020423870fdaf56e973db9aba9f5a
[1] https://git.notmuchmail.org/git?p=notmuch;a=commit;h=2c7b3d3a80d40c25e2991e2659c6a6006b50fb08

Closes: https://bugs.gentoo.org/744136
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31-r1.ebuild b/net-mail/notmuch/notmuch-0.31-r1.ebuild
index bd42a123206..f5fd2cc5cf8 100644
--- a/net-mail/notmuch/notmuch-0.31-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.31-r1.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 COMMON_DEPEND="
 	dev-libs/glib
 	dev-libs/gmime:3.0[crypt]
-	dev-libs/xapian:=
+	>=dev-libs/xapian-1.4.0:=
 	sys-libs/talloc
 	sys-libs/zlib
 	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     2fecb2f18a2d2fb688fafb288972326f320d6813
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Mon Sep 14 00:04:11 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 02:10:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fecb2f1

net-mail/notmuch: Unconditionally install man-pages

Installation of man-pages no longer depends on the "doc" use flag.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/17533
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31-r1.ebuild | 213 ++++++++++++++++++++++++++++++++
 1 file changed, 213 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.31-r1.ebuild b/net-mail/notmuch/notmuch-0.31-r1.ebuild
new file mode 100644
index 00000000000..bd42a123206
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
+	pax-utils toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+"
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	dev-libs/xapian:=
+	sys-libs/talloc
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cffi
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+
+bindings() {
+	local rc=0
+	if use python; then
+		# CFFI based bindings (recommended)
+		pushd bindings/python-cffi || die
+		${@}
+		rc=${?}
+		popd || die
+
+		# Old deprecated bindings, #736204. These are known to cause
+		# memory loss and other issues. Avoid if at all possible.
+		pushd bindings/python || die
+		${@}
+		rc=${?}
+		popd || die
+	fi
+	return ${rc}
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	local _deps=""
+	default
+
+	# Python bindings
+	bindings distutils-r1_src_prepare
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override dependencies for 'install' target
+	use doc && _deps="install-info"
+	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Non-autoconf configure
+		append-ldflags -lnsl -lsocket
+	fi
+}
+
+src_configure() {
+	python_setup # For sphinx
+	local _args=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${_args[@]}"
+}
+
+src_compile() {
+	python_setup # For sphinx
+	V=1 default
+	bindings distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+	doman doc/_build/man/man?/*.?
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	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 distutils-r1_src_install
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     cd3176afc4436be504ab422edd186ad29abd6091
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 17:33:39 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 17:33:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd3176af

net-mail/notmuch: Stabilize 0.30-r1 amd64, #737522

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.30-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 35f5ab16a29..36c6213ab65 100644
--- a/net-mail/notmuch/notmuch-0.30-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     7e4b6ac81db837203050d528fd4788138ce1f602
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 23:20:23 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 23:20:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4b6ac8

net-mail/notmuch: subscribe to xapian subslot again

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.31.ebuild b/net-mail/notmuch/notmuch-0.31.ebuild
index 86e0349ec42..dc44f4976cc 100644
--- a/net-mail/notmuch/notmuch-0.31.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 COMMON_DEPEND="
 	dev-libs/glib
 	dev-libs/gmime:3.0[crypt]
-	dev-libs/xapian
+	dev-libs/xapian:=
 	sys-libs/talloc
 	sys-libs/zlib
 	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     641e4e1496f112179178b3edc28e022186988ccd
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Sun Sep  6 16:08:12 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 23:20:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641e4e14

net-mail/notmuch: Bump to version 0.31

Technical changes in release 0.31 include support for Emacs 27.1
and Xapian 1.5 (the current development version)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/17441
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/notmuch-0.31.ebuild | 216 +++++++++++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a3c78e6376f..734ae5657a7 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
 DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
+DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5

diff --git a/net-mail/notmuch/notmuch-0.31.ebuild b/net-mail/notmuch/notmuch-0.31.ebuild
new file mode 100644
index 00000000000..86e0349ec42
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
+	pax-utils toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+"
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	dev-libs/xapian
+	sys-libs/talloc
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cffi
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+
+bindings() {
+	local rc=0
+	if use python; then
+		# CFFI based bindings (recommended)
+		pushd bindings/python-cffi || die
+		${@}
+		rc=${?}
+		popd || die
+
+		# Old deprecated bindings, #736204. These are known to cause
+		# memory loss and other issues. Avoid if at all possible.
+		pushd bindings/python || die
+		${@}
+		rc=${?}
+		popd || die
+	fi
+	return ${rc}
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	local _deps=""
+	default
+
+	# Python bindings
+	bindings distutils-r1_src_prepare
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override dependencies for 'install' target
+	use doc && _deps="install-info"
+	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Non-autoconf configure
+		append-ldflags -lnsl -lsocket
+	fi
+}
+
+src_configure() {
+	python_setup # For sphinx
+	local _args=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${_args[@]}"
+}
+
+src_compile() {
+	python_setup # For sphinx
+	V=1 default
+	bindings distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	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 distutils-r1_src_install
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Thomas Deutschmann]

commit:     5327a451d9fe34f670bc2401b13648451535a36f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 14:25:33 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 14:25:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5327a451

net-mail/notmuch: x86 stable (bug #737522)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.30-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 87312c1e943..35f5ab16a29 100644
--- a/net-mail/notmuch/notmuch-0.30-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     69df55e0f867f3bf3f62f36b9ee59b7ee52268f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 01:48:12 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 01:48:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69df55e0

net-mail/notmuch: arm64 keyworded (bug #734840)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.30-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 2806d20a9ff..87312c1e943 100644
--- a/net-mail/notmuch/notmuch-0.30-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Joonas Niilola]

commit:     924742c75fda580701838e7af38d6a7af0db6da3
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 06:44:39 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 07:13:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924742c7

net-mail/notmuch: install deprecated python bindings on 0.30

 - There are still some packages in ::gentoo repo that depend on
   the deprecated 'notmuch' python modules. As other major
   distributions still provide these bindings, we should enable them
   too and give some extra time for other upstreams to update into
   using 'notmuch2'.

Closes: https://bugs.gentoo.org/736204
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-mail/notmuch/{notmuch-0.30.ebuild => notmuch-0.30-r1.ebuild} | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.30.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
similarity index 97%
rename from net-mail/notmuch/notmuch-0.30.ebuild
rename to net-mail/notmuch/notmuch-0.30-r1.ebuild
index 9ef69706432..2806d20a9ff 100644
--- a/net-mail/notmuch/notmuch-0.30.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -87,6 +87,12 @@ bindings() {
 		${@}
 		rc=${?}
 		popd || die
+
+		# Old deprecated bindings, #736204
+		pushd bindings/python || die
+		${@}
+		rc=${?}
+		popd || die
 	fi
 	return ${rc}
 }

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Kent Fredric]

commit:     afa01ace9947762238a58f98abf526df092a8cbb
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 11:57:09 2020 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 12:46:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa01ace

net-mail/notmuch: Drop x64-solaris re bug #690140

Depends:
- dev-perl/String-ShellQuote

Bug: https://bugs.gentoo.org/690140
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3-r2.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.30.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
index f5584225048..9d7b13f40a9 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~ppc64 x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~ppc64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

diff --git a/net-mail/notmuch/notmuch-0.30.ebuild b/net-mail/notmuch/notmuch-0.30.ebuild
index 290ff14631b..9ef69706432 100644
--- a/net-mail/notmuch/notmuch-0.30.ebuild
+++ b/net-mail/notmuch/notmuch-0.30.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     aeaee14b3c12795a02cbd143574e982ab692a334
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Mon Jul 20 22:46:36 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 23:30:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeaee14b

net-mail/notmuch: Post-stabilisation cleanup

Remove obsolete ebuilds.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/16754
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3-r1.ebuild | 232 -----------------------------
 net-mail/notmuch/notmuch-0.29.3.ebuild    | 233 ------------------------------
 2 files changed, 465 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
deleted file mode 100644
index 13810a43d49..00000000000
--- a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-3.0.3:3.0[crypt]
-	>=dev-libs/xapian-1.4.8:=
-	dev-python/sphinx
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	emacs? ( >=app-editors/emacs-24.1:* )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	test? (
-		app-misc/dtach
-		>=app-editors/emacs-24.1:*[libxml2]
-		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
-	)
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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 )
-NEED_EMACS="24.1"
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
-	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -lnsl -lsocket   # non-autoconf configure
-	fi
-}
-
-src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_setup  # for sphinx
-
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
deleted file mode 100644
index 35caf2d2747..00000000000
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-3.0.3:3.0
-	>=dev-libs/xapian-1.4.8:=
-	dev-python/sphinx
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-24.1:* )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	test? (
-		app-misc/dtach
-		>=app-editors/emacs-24.1:*[libxml2]
-		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
-	)
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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 )
-NEED_EMACS="24.1"
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
-	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -lnsl -lsocket   # non-autoconf configure
-	fi
-}
-
-src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_setup  # for sphinx
-
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     3b42ba6e0fb70161812f637bac2b50832ad161fe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 21:48:50 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 21:48:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b42ba6e

net-mail/notmuch: x86 stable (bug #732238)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
index ed8634d1ae0..f5584225048 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~ppc64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~ppc64 x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Sam James]

commit:     f237d8aed699bc33c38fa1dde3959c4978bbb548
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 21:48:06 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 21:48:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f237d8ae

net-mail/notmuch: amd64 stable (bug #732238)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
index 7750baa97ae..ed8634d1ae0 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~ppc64 ~x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Joonas Niilola]

commit:     a1a1d15c423ca60bfc83e559a3efd82e05bc1f26
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Sat Jul 11 18:21:28 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 09:39:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1a1d15c

net-mail/notmuch: Bump to version 0.30

Feature release 0.30, see https://notmuchmail.org/news/ .
This ebuild adds support for Python 3.8 and for the new
Python CFFI bindings (package name "notmuch2").

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/16668
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/metadata.xml        |   2 +-
 net-mail/notmuch/notmuch-0.30.ebuild | 208 +++++++++++++++++++++++++++++++++++
 3 files changed, 210 insertions(+), 1 deletion(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index f0b08dea803..a3c78e6376f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,2 +1,3 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
+DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index e5089957cda..799fdb5f19a 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -19,7 +19,7 @@
 		<flag name="nmbug">Install experimental tag sharing /
 			pseudo-bug-tracking script for Notmuch
 			(see http://notmuchmail.org/nmbug/)</flag>
-		<flag name="valgrind">Depend on dev-util/vagrind for test suite</flag>
+		<flag name="valgrind">Depend on dev-util/valgrind for test suite</flag>
 	</use>
 	<longdescription lang="en">
 		Notmuch is a system for indexing, searching, reading, and tagging large

diff --git a/net-mail/notmuch/notmuch-0.30.ebuild b/net-mail/notmuch/notmuch-0.30.ebuild
new file mode 100644
index 00000000000..290ff14631b
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.30.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
+	pax-utils toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+"
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.14:=
+	sys-libs/talloc
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cffi
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+
+bindings() {
+	local rc=0
+	if use python; then
+		pushd bindings/python-cffi || die
+		${@}
+		rc=${?}
+		popd || die
+	fi
+	return ${rc}
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	local _deps=""
+	default
+
+	# Python bindings
+	bindings distutils-r1_src_prepare
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override dependencies for 'install' target
+	use doc && _deps="install-info"
+	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Non-autoconf configure
+		append-ldflags -lnsl -lsocket
+	fi
+}
+
+src_configure() {
+	python_setup # For sphinx
+	local _args=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${_args[@]}"
+}
+
+src_compile() {
+	python_setup # For sphinx
+	V=1 default
+	bindings distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	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 distutils-r1_src_install
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Andreas K. Hüttel]

commit:     76371e7a6fe33fc8ebd38b56d5ac45eed4af1e52
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Fri May 22 16:37:45 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 23 13:45:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76371e7a

net-mail/notmuch: Fix runtime dependencies

* Updated ebuild for EAPI 7.

* Fix: Earlier ebuild versions had unconditional dependencies on Sphinx
  and Texinfo even at runtime. Moved dependencies to BDEPEND and tied
  them to USE=doc.

* Fix: Install Texinfo documentation only when USE=doc is specified.

Closes: https://bugs.gentoo.org/711052
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/15918
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3-r2.ebuild | 230 ++++++++++++++++++++++++++++++
 1 file changed, 230 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
new file mode 100644
index 00000000000..7750baa97ae
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
+	pax-utils readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+"
+CDEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.8:=
+	sys-libs/talloc
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${CDEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
+	valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	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
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+DOCS=( AUTHORS NEWS README )
+DOC_CONTENTS="There are a few backward-incompatible changes between
+notmuch version 0.18 < x <= 0.18. Please consult the NEWS file (0.18
+section) before first use."
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch"
+)
+SITEFILE="50${PN}-gentoo.el"
+
+bindings() {
+	local rc=0
+	if use $1; then
+		pushd bindings/$1 || die
+		shift
+		"$@"
+		rc=$?
+		popd || die
+	fi
+	return $rc
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	local _deps=""
+	default
+
+	# Python bindings
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Ensure that a new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	# Override dependencies for 'install' target
+	use doc && _deps="install-info"
+	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Non-autoconf configure
+		append-ldflags -lnsl -lsocket
+	fi
+}
+
+src_configure() {
+	python_setup # For sphinx
+	local _args=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${_args[@]}"
+}
+
+src_compile() {
+	python_setup # For sphinx
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	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 dodoc -r html
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if has_version '<net-mail/notmuch-0.18'; then
+		FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Georgy Yakovlev]

commit:     c57dfa733c3f42d3d5f5fade77fbcbe50c4212e2
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 05:50:11 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed May 20 05:50:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57dfa73

net-mail/notmuch: add ~ppc64 keyword

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
index d2dc1e110e9..13810a43d49 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     013081aec337ae1d013edc2566bff5dcb0248c7b
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Mon May 11 15:52:56 2020 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon May 11 21:30:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013081ae

net-mail/notmuch: Add myself as maintainer

As discussed on the gentoo-dev mailing list.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>

 net-mail/notmuch/metadata.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index f865390fdc3..e5089957cda 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="doc">Install API documentation</flag>
 		<flag name="crypt">Support decryption and verification of PGP/MIME

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Michał Górny]

commit:     69cc53791baf45c652ebc53461a02191467b4366
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  7 15:12:18 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May  7 15:12:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cc5379

net-mail/notmuch: Remove py2.7

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
index d43493b3fad..d2dc1e110e9 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     68ee1bf682140f439186c5e6bdcaedcbf19f7444
Author:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 22:15:12 2020 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Mar  4 22:17:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ee1bf6

net-mail/notmuch: Fix error on configure with 'crypt' flag disabled

Bug: https://bugs.gentoo.org/707656
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3-r1.ebuild | 232 ++++++++++++++++++++++++++++++
 1 file changed, 232 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
new file mode 100644
index 00000000000..d43493b3fad
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-3.0.3:3.0[crypt]
+	>=dev-libs/xapian-1.4.8:=
+	dev-python/sphinx
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	emacs? ( >=app-editors/emacs-24.1:* )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		>=app-editors/emacs-24.1:*[libxml2]
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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 )
+NEED_EMACS="24.1"
+SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+PATCHES=(
+	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
+)
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+	fi
+}
+
+src_configure() {
+	python_setup  # for sphinx
+
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_setup  # for sphinx
+
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Michał Górny]

commit:     e9adb96dcd2416ae8ac8038506209b0ea48829c6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 12:05:48 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 12:16:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9adb96d

net-mail/notmuch: Remove py2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index c8ab2a40897..35caf2d2747 100644
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     891cd13de918bb2d0b5b0dcf43e2ee0d452a969b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 12:14:29 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 12:14:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891cd13d

net-mail/notmuch: x86 stable wrt bug #701350

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index c583ca34020..c8ab2a40897 100644
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     8e5eee205bdd41635d11cfafd955f8401cd9f83b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 10:09:38 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 10:09:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e5eee20

net-mail/notmuch: amd64 stable wrt bug #701350

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index b10795cfe09..c583ca34020 100644
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Ulrich Müller]

commit:     46f58b50d48de2d1d751ae1a3e6111cc0d8e0887
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 11:22:41 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 11:26:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f58b50

net-mail/notmuch: Update for elisp-common.eclass changes.

Function elisp-need-emacs is deprecated, replace it by assigning
NEED_EMACS and calling elisp-check-emacs-version in pkg_setup.

Require emacs-24.1 as minimum version, because it is the first version
with libxml2 support.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.28.4.ebuild | 9 ++++-----
 net-mail/notmuch/notmuch-0.29.2.ebuild | 9 ++++-----
 net-mail/notmuch/notmuch-0.29.3.ebuild | 9 ++++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index 2856cf698a2..c43123227e0 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -104,9 +105,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {

diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
index f848c35df5e..4ee535926dd 100644
--- a/net-mail/notmuch/notmuch-0.29.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.2.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -103,9 +104,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {

diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index f848c35df5e..4ee535926dd 100644
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -103,9 +104,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Ulrich Müller]

commit:     ad20ea8677774c90b303cdb20da3bcb36e7fcd99
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 16:27:15 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 22:48:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad20ea86

net-mail/notmuch: Update virtual/emacs dependency.

The virtual is deprecated, depend on app-editors/emacs instead.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.28.4.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.29.2.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.29.3.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index 578ec430d1c..2856cf698a2 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}

diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
index e845830282d..f848c35df5e 100644
--- a/net-mail/notmuch/notmuch-0.29.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.2.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}

diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index e845830282d..f848c35df5e 100644
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Mikle Kolyada]

commit:     333f05948c39e7176a3c745977cd814c1c2c6d1a
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 14:02:42 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 14:02:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333f0594

net-mail/notmuch: RESTRICT="!test? ( test )" force

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.28.4.ebuild    | 2 ++
 net-mail/notmuch/notmuch-0.29.2-r1.ebuild | 2 ++
 net-mail/notmuch/notmuch-0.29.2.ebuild    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index fa6fbf55ee1..578ec430d1c 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -26,6 +26,8 @@ REQUIRED_USE="
 	"
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="
 	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2

diff --git a/net-mail/notmuch/notmuch-0.29.2-r1.ebuild b/net-mail/notmuch/notmuch-0.29.2-r1.ebuild
index afeb087aa58..6edb84f72d2 100644
--- a/net-mail/notmuch/notmuch-0.29.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.2-r1.ebuild
@@ -26,6 +26,8 @@ REQUIRED_USE="
 	"
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="
 	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2

diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
index f96e581b17a..e845830282d 100644
--- a/net-mail/notmuch/notmuch-0.29.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.2.ebuild
@@ -26,6 +26,8 @@ REQUIRED_USE="
 	"
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="
 	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     073f70bdf380eacce235a413fe75127033915578
Author:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 19:11:46 2019 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 19:12:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073f70bd

net-mail/notmuch: Bump version

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.29.2.ebuild | 232 +++++++++++++++++++++++++++++++++
 2 files changed, 233 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 88efb8a8c36..5fccb1523e7 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
 DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8
+DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3

diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
new file mode 100644
index 00000000000..f96e581b17a
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-3.0.3:3.0
+	>=dev-libs/xapian-1.4.8:=
+	dev-python/sphinx
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( dev-libs/gmime:3.0[crypt] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+PATCHES=(
+	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
+)
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+	fi
+}
+
+src_configure() {
+	python_setup  # for sphinx
+
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_setup  # for sphinx
+
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Fabian Groffen]

commit:     4179ca5f4cc167dc98e71db943584b2f307d7e90
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 07:21:18 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 07:21:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4179ca5f

net-mail/notmuch: drop gpgme hack, it's a dep problem

Bug: https://bugs.gentoo.org/692098
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.1-r1.ebuild | 5 -----
 net-mail/notmuch/notmuch-0.29.1.ebuild    | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
index 0124be3ef9a..f96e581b17a 100644
--- a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
@@ -133,11 +133,6 @@ src_prepare() {
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		append-ldflags -lnsl -lsocket   # non-autoconf configure
-		# disable gpgme test using too old gpg-key
-		sed -i \
-			-e '/GNUPGHOME=/d' \
-			-e '/SESSION_KEY =/c|| false ;' \
-			configure || die
 	fi
 }
 

diff --git a/net-mail/notmuch/notmuch-0.29.1.ebuild b/net-mail/notmuch/notmuch-0.29.1.ebuild
index 4984cf17d69..951f0faad9e 100644
--- a/net-mail/notmuch/notmuch-0.29.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.1.ebuild
@@ -133,11 +133,6 @@ src_prepare() {
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		append-ldflags -lnsl -lsocket   # non-autoconf configure
-		# disable gpgme test using too old gpg-key
-		sed -i \
-			-e '/GNUPGHOME=/d' \
-			-e '/SESSION_KEY =/c|| false ;' \
-			configure || die
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     84d5212b8d6c871de600388f92903ea5b0a5abc1
Author:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 21:53:32 2019 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 21:54:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d5212b

net-mail/notmuch: Don't require sphinx to have specific python target

Sphinx is used as a tool, not a library. We do not care about its
PYTHON_TARGETS.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.1-r1.ebuild | 237 ++++++++++++++++++++++++++++++
 1 file changed, 237 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
new file mode 100644
index 00000000000..0124be3ef9a
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-3.0.3:3.0
+	>=dev-libs/xapian-1.4.8:=
+	dev-python/sphinx
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( dev-libs/gmime:3.0[crypt] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+PATCHES=(
+	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
+)
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+		# disable gpgme test using too old gpg-key
+		sed -i \
+			-e '/GNUPGHOME=/d' \
+			-e '/SESSION_KEY =/c|| false ;' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	python_setup  # for sphinx
+
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_setup  # for sphinx
+
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Fabian Groffen]

commit:     c254be0749ca0792ec1c68417bd59ff8f725878a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 13:12:31 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 13:12:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c254be07

net-mail/notmuch: correct gpgme detection on Solaris

Bug: https://bugs.gentoo.org/692098
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.29.1.ebuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.29.1.ebuild b/net-mail/notmuch/notmuch-0.29.1.ebuild
index ffa74708369..4984cf17d69 100644
--- a/net-mail/notmuch/notmuch-0.29.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.1.ebuild
@@ -131,7 +131,14 @@ src_prepare() {
 		append-cxxflags -g
 	fi
 
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+		# disable gpgme test using too old gpg-key
+		sed -i \
+			-e '/GNUPGHOME=/d' \
+			-e '/SESSION_KEY =/c|| false ;' \
+			configure || die
+	fi
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     b385144f462b05745a380bc5ca9304b6e06a55e1
Author:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 22:05:05 2019 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 22:05:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b385144f

net-mail/notmuch: Remove older stable versions

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   2 -
 net-mail/notmuch/notmuch-0.23.7.ebuild | 200 --------------------------------
 net-mail/notmuch/notmuch-0.24.2.ebuild | 206 ---------------------------------
 3 files changed, 408 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 2b02ae8e539..88efb8a8c36 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,5 +1,3 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.23.7.tar.gz 692230 BLAKE2B 79e81bde02546589c867d636fd30453beeecfb2a1e16cd512613de96f60674605765d53b52b8ab7479413b38d5db50d684a182139c62888c9dd0551f6eff8dea SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522
-DIST notmuch-0.24.2.tar.gz 709272 BLAKE2B 25ef9db21a9fb009db89e472e06d871e92efc5223ef3edd91716db2a7edb5b8d39df000f540aa30762fe64e05fff221158040b2869fb618c89f9fa36cbe1757f SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
 DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8

diff --git a/net-mail/notmuch/notmuch-0.23.7.ebuild b/net-mail/notmuch/notmuch-0.23.7.ebuild
deleted file mode 100644
index a6bf7055ece..00000000000
--- a/net-mail/notmuch/notmuch-0.23.7.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha amd64 x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

diff --git a/net-mail/notmuch/notmuch-0.24.2.ebuild b/net-mail/notmuch/notmuch-0.24.2.ebuild
deleted file mode 100644
index 2c35142be76..00000000000
--- a/net-mail/notmuch/notmuch-0.24.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha amd64 x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     f4e93d77cec2cc57d17a98aea8e7b0554bf72ae9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 15:24:17 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 15:24:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e93d77

net-mail/notmuch: x86 stable wrt bug #689520

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 net-mail/notmuch/notmuch-0.28.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index 94ee48c3ce0..fa6fbf55ee1 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     7a557231590ee3397253ff6bc4cc88c8c4dd0d6f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 11:46:33 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 11:46:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a557231

net-mail/notmuch: amd64 stable wrt bug #689520

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-mail/notmuch/notmuch-0.28.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index 95e5689f032..94ee48c3ce0 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     ad29d5a7889c2d6312b3aba7ad25a2eb90c27b6f
Author:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  8 21:36:02 2019 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Jul  8 21:36:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad29d5a7

net-mail/notmuch: Remove old testing versions

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>
Gentoo-Bug: https://bugs.gentoo.org/670854

 net-mail/notmuch/Manifest              |   5 -
 net-mail/notmuch/notmuch-0.25.3.ebuild | 208 -----------------------------
 net-mail/notmuch/notmuch-0.26.1.ebuild | 208 -----------------------------
 net-mail/notmuch/notmuch-0.26.2.ebuild | 208 -----------------------------
 net-mail/notmuch/notmuch-0.27.ebuild   | 215 ------------------------------
 net-mail/notmuch/notmuch-0.28.3.ebuild | 231 ---------------------------------
 6 files changed, 1075 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 32f46df03f9..2b02ae8e539 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,10 +1,5 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.23.7.tar.gz 692230 BLAKE2B 79e81bde02546589c867d636fd30453beeecfb2a1e16cd512613de96f60674605765d53b52b8ab7479413b38d5db50d684a182139c62888c9dd0551f6eff8dea SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522
 DIST notmuch-0.24.2.tar.gz 709272 BLAKE2B 25ef9db21a9fb009db89e472e06d871e92efc5223ef3edd91716db2a7edb5b8d39df000f540aa30762fe64e05fff221158040b2869fb618c89f9fa36cbe1757f SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc
-DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8eabf23245ba4aa4c936d4c5d868d9e6d5b0d626f16ce6087245a293cf1acd8bb2e2dd0639729af4b92d558c78051 SHA512 1c0fcfdeb7a7eddcd10a8175676679ef6985407732d5bcc15edd327d9985017696cef3287c0398c628a604ae3fbab5d222d71537e37265cf6a594b4914e4599a
-DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd
-DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7
-DIST notmuch-0.27.tar.gz 912583 BLAKE2B 75bb13e9666bd2898f58e5ecdd6a180d0da21188665f107857e6729f057525bb7c94832d140de8ff7b3fd31b51e33bcbe5b59d3fc09ba9a854c1c05499df762e SHA512 7c58c6fe5c3b43a979c3a439a24106417120726fd688b456d9084388ddd7c88ab1b6d99cd4676101f085d60bb37099631caa286b76588fcb041bb004ff325515
-DIST notmuch-0.28.3.tar.gz 921920 BLAKE2B 9b96a0cac8188bcaf9efab532721449c655fec4dac77c3eb327e576184cb430aa0fffc9ac74af82ad3ad80097afdda5c8accddbee7e5720d180c071d9dd2ef85 SHA512 dd3931b78cc27540e962f1fca5f4ebb1c04b2637a5761cda023f307fd9be4b5ddc2af26010330868c55200fa96b60b2a11b3b22d4c20d2a4a2d3787421ed85cf
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
 DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8

diff --git a/net-mail/notmuch/notmuch-0.25.3.ebuild b/net-mail/notmuch/notmuch-0.25.3.ebuild
deleted file mode 100644
index 96cc26fe756..00000000000
--- a/net-mail/notmuch/notmuch-0.25.3.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/net-mail/notmuch/notmuch-0.26.1.ebuild b/net-mail/notmuch/notmuch-0.26.1.ebuild
deleted file mode 100644
index dba91fb9d2f..00000000000
--- a/net-mail/notmuch/notmuch-0.26.1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.21:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.21:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/net-mail/notmuch/notmuch-0.26.2.ebuild b/net-mail/notmuch/notmuch-0.26.2.ebuild
deleted file mode 100644
index dba91fb9d2f..00000000000
--- a/net-mail/notmuch/notmuch-0.26.2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.21:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.21:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/net-mail/notmuch/notmuch-0.27.ebuild b/net-mail/notmuch/notmuch-0.27.ebuild
deleted file mode 100644
index 0f3d94a5325..00000000000
--- a/net-mail/notmuch/notmuch-0.27.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	|| (
-		>=dev-libs/gmime-3.0.3:3.0
-		>=dev-libs/gmime-2.6.21:2.6
-	)
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( || (
-		>=dev-libs/gmime-3.0.3:3.0[crypt]
-		>=dev-libs/gmime-2.6.21:2.6[smime]
-	) )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/net-mail/notmuch/notmuch-0.28.3.ebuild b/net-mail/notmuch/notmuch-0.28.3.ebuild
deleted file mode 100644
index 95e5689f032..00000000000
--- a/net-mail/notmuch/notmuch-0.28.3.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-3.0.3:3.0
-	>=dev-libs/xapian-1.4.8:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	test? (
-		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
-		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
-	)
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-PATCHES=(
-	"${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch
-	"${FILESDIR}"/0002-Fix-jobserver-unavailable-warning.patch
-)
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_setup  # for sphinx
-
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     a1014c9da67e10cd5838516087185511afb596e3
Author:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 20:45:07 2019 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun May 12 20:46:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1014c9d

net-mail/notmuch: Bump version

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.28.4.ebuild | 231 +++++++++++++++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 598baf92cf0..353a9c085dc 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,3 +6,4 @@ DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119
 DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7
 DIST notmuch-0.27.tar.gz 912583 BLAKE2B 75bb13e9666bd2898f58e5ecdd6a180d0da21188665f107857e6729f057525bb7c94832d140de8ff7b3fd31b51e33bcbe5b59d3fc09ba9a854c1c05499df762e SHA512 7c58c6fe5c3b43a979c3a439a24106417120726fd688b456d9084388ddd7c88ab1b6d99cd4676101f085d60bb37099631caa286b76588fcb041bb004ff325515
 DIST notmuch-0.28.3.tar.gz 921920 BLAKE2B 9b96a0cac8188bcaf9efab532721449c655fec4dac77c3eb327e576184cb430aa0fffc9ac74af82ad3ad80097afdda5c8accddbee7e5720d180c071d9dd2ef85 SHA512 dd3931b78cc27540e962f1fca5f4ebb1c04b2637a5761cda023f307fd9be4b5ddc2af26010330868c55200fa96b60b2a11b3b22d4c20d2a4a2d3787421ed85cf
+DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7

diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
new file mode 100644
index 00000000000..95e5689f032
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-3.0.3:3.0
+	>=dev-libs/xapian-1.4.8:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( dev-libs/gmime:3.0[crypt] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+PATCHES=(
+	"${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch
+	"${FILESDIR}"/0002-Fix-jobserver-unavailable-warning.patch
+)
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+}
+
+src_configure() {
+	python_setup  # for sphinx
+
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_setup  # for sphinx
+
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     9652dac95bc06aa348abdde630c2026782fde984
Author:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 22:12:18 2019 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 22:14:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9652dac9

net-mail/notmuch: Setup python for Sphinx (to build docs)

Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.28.3.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.28.3.ebuild b/net-mail/notmuch/notmuch-0.28.3.ebuild
index 9a03251ba48..3ed0b7768a8 100644
--- a/net-mail/notmuch/notmuch-0.28.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.3.ebuild
@@ -136,6 +136,8 @@ src_prepare() {
 }
 
 src_configure() {
+	python_setup  # for sphinx
+
 	local myeconfargs=(
 		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
@@ -151,6 +153,8 @@ src_configure() {
 }
 
 src_compile() {
+	python_setup  # for sphinx
+
 	V=1 default
 	bindings python distutils-r1_src_compile
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Robin H. Johnson]

commit:     1ded2ac69bd0fcf0edca8a4ee073e6a41dc9bbe4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 05:48:56 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 05:50:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ded2ac6

net-mail/notmuch: manpages need USE=doc & mock

Manpages are not built without USE=doc, which needs unittest.mock.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.28.3.ebuild | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.28.3.ebuild b/net-mail/notmuch/notmuch-0.28.3.ebuild
index 445fa176ab4..9a03251ba48 100644
--- a/net-mail/notmuch/notmuch-0.28.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.3.ebuild
@@ -41,19 +41,32 @@ CDEPEND="
 	"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
 	valgrind? ( dev-util/valgrind )
 	"
 RDEPEND="${CDEPEND}
 	crypt? ( app-crypt/gnupg )
 	nmbug? ( dev-vcs/git )
-	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 )
+	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 )
@@ -169,7 +182,9 @@ src_test() {
 src_install() {
 	default
 
-	doman doc/_build/man/man?/*.?
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
 
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Patrice Clement]

commit:     80396435b9be409748c0d04803e5e72de2cbd5e6
Author:     Paweł Tomak <pawel <AT> tomak <DOT> eu>
AuthorDate: Mon Jan 21 13:50:53 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Feb  5 22:34:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80396435

net-mail/notmuch: add Python 3.7 to supported versions.

Signed-off-by: Paweł Tomak <pawel <AT> tomak.eu>
Closes: https://github.com/gentoo/gentoo/pull/10881
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.27.ebuild b/net-mail/notmuch/notmuch-0.27.ebuild
index 84ffe93ca8d..1a4cee2643a 100644
--- a/net-mail/notmuch/notmuch-0.27.ebuild
+++ b/net-mail/notmuch/notmuch-0.27.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     2981b70e3f59b439407bad559c53069d9fb19a81
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 22:36:14 2018 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 22:36:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2981b70e

net-mail/notmuch: Remove older version of 0.25 branch

 net-mail/notmuch/Manifest              |   3 -
 net-mail/notmuch/notmuch-0.25.1.ebuild | 206 --------------------------------
 net-mail/notmuch/notmuch-0.25.2.ebuild | 208 ---------------------------------
 net-mail/notmuch/notmuch-0.25.ebuild   | 208 ---------------------------------
 4 files changed, 625 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 1875daaf322..af2d00725b0 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,10 +1,7 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.23.7.tar.gz 692230 BLAKE2B 79e81bde02546589c867d636fd30453beeecfb2a1e16cd512613de96f60674605765d53b52b8ab7479413b38d5db50d684a182139c62888c9dd0551f6eff8dea SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522
 DIST notmuch-0.24.2.tar.gz 709272 BLAKE2B 25ef9db21a9fb009db89e472e06d871e92efc5223ef3edd91716db2a7edb5b8d39df000f540aa30762fe64e05fff221158040b2869fb618c89f9fa36cbe1757f SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc
-DIST notmuch-0.25.1.tar.gz 882141 BLAKE2B dfc6c9e62012280e1c72378b39d6b8af3cefa701ed8d147a758864bccfd596ebf464e608daa6e5ce049114d5ad13a6737f4376f6f9d5cf4c5cf115b633b4b57d SHA512 989acc5eda7d2f9512741c8ae850e34c6fbbdd5fa5fa23f25a6096250d414919007c5cfda68d6f48606c0a024692e082a28cb358e6d3fc2afc0502b5bcbf5f54
-DIST notmuch-0.25.2.tar.gz 882672 BLAKE2B 8bd90b87cf60a1eac8c331c4d67cfc511db91b5009c051fdf7d2612560ffaf11f1c51ca171f12f1cd9145ffa25ef402a5b2c72ad8efc4c22d68107ad31bb7d16 SHA512 5ee7bded69cbcc980e23f1e1562bf0cc9294c20bddcc3e442030c4f29373ecbbaef79144ad38470bfc97dac87f8dfb3bc7aee2d7eb974f6998f933369aa46006
 DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8eabf23245ba4aa4c936d4c5d868d9e6d5b0d626f16ce6087245a293cf1acd8bb2e2dd0639729af4b92d558c78051 SHA512 1c0fcfdeb7a7eddcd10a8175676679ef6985407732d5bcc15edd327d9985017696cef3287c0398c628a604ae3fbab5d222d71537e37265cf6a594b4914e4599a
-DIST notmuch-0.25.tar.gz 882093 BLAKE2B ea0f5568ec0bf6a1d2c177468f4ec25fabfd416162c01a0d861e78164f15f2cc0176e1a012250a2a6bb45a6c7c2f6ffa651ad15776d44fed8ec191026b0f04c7 SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5
 DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd
 DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7
 DIST notmuch-0.27.tar.gz 912583 BLAKE2B 75bb13e9666bd2898f58e5ecdd6a180d0da21188665f107857e6729f057525bb7c94832d140de8ff7b3fd31b51e33bcbe5b59d3fc09ba9a854c1c05499df762e SHA512 7c58c6fe5c3b43a979c3a439a24106417120726fd688b456d9084388ddd7c88ab1b6d99cd4676101f085d60bb37099631caa286b76588fcb041bb004ff325515

diff --git a/net-mail/notmuch/notmuch-0.25.1.ebuild b/net-mail/notmuch/notmuch-0.25.1.ebuild
deleted file mode 100644
index 9561513c251..00000000000
--- a/net-mail/notmuch/notmuch-0.25.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/net-mail/notmuch/notmuch-0.25.2.ebuild b/net-mail/notmuch/notmuch-0.25.2.ebuild
deleted file mode 100644
index 13c9eda4da8..00000000000
--- a/net-mail/notmuch/notmuch-0.25.2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/net-mail/notmuch/notmuch-0.25.ebuild b/net-mail/notmuch/notmuch-0.25.ebuild
deleted file mode 100644
index 13c9eda4da8..00000000000
--- a/net-mail/notmuch/notmuch-0.25.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     0710463545023d0d2979c80dd51572d923d2ee77
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 22:33:07 2018 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 22:34:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07104635

net-mail/notmuch: Bump version

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/notmuch-0.27.ebuild | 215 +++++++++++++++++++++++++++++++++++
 2 files changed, 216 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 68c90ff0c56..1875daaf322 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -7,3 +7,4 @@ DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8ea
 DIST notmuch-0.25.tar.gz 882093 BLAKE2B ea0f5568ec0bf6a1d2c177468f4ec25fabfd416162c01a0d861e78164f15f2cc0176e1a012250a2a6bb45a6c7c2f6ffa651ad15776d44fed8ec191026b0f04c7 SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5
 DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd
 DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7
+DIST notmuch-0.27.tar.gz 912583 BLAKE2B 75bb13e9666bd2898f58e5ecdd6a180d0da21188665f107857e6729f057525bb7c94832d140de8ff7b3fd31b51e33bcbe5b59d3fc09ba9a854c1c05499df762e SHA512 7c58c6fe5c3b43a979c3a439a24106417120726fd688b456d9084388ddd7c88ab1b6d99cd4676101f085d60bb37099631caa286b76588fcb041bb004ff325515

diff --git a/net-mail/notmuch/notmuch-0.27.ebuild b/net-mail/notmuch/notmuch-0.27.ebuild
new file mode 100644
index 00000000000..84ffe93ca8d
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.27.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	|| (
+		>=dev-libs/gmime-3.0.3:3.0
+		>=dev-libs/gmime-2.6.21:2.6
+	)
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( || (
+		>=dev-libs/gmime-3.0.3:3.0[crypt]
+		>=dev-libs/gmime-2.6.21:2.6[smime]
+	) )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     d70f0297b3be78b1a57c6f34a5170b0a738b3391
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 19 22:43:18 2018 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 22:45:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70f0297

net-mail/notmuch: Bump version

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.26.2.ebuild | 208 +++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index b4ff35c43f8..68c90ff0c56 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,3 +6,4 @@ DIST notmuch-0.25.2.tar.gz 882672 BLAKE2B 8bd90b87cf60a1eac8c331c4d67cfc511db91b
 DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8eabf23245ba4aa4c936d4c5d868d9e6d5b0d626f16ce6087245a293cf1acd8bb2e2dd0639729af4b92d558c78051 SHA512 1c0fcfdeb7a7eddcd10a8175676679ef6985407732d5bcc15edd327d9985017696cef3287c0398c628a604ae3fbab5d222d71537e37265cf6a594b4914e4599a
 DIST notmuch-0.25.tar.gz 882093 BLAKE2B ea0f5568ec0bf6a1d2c177468f4ec25fabfd416162c01a0d861e78164f15f2cc0176e1a012250a2a6bb45a6c7c2f6ffa651ad15776d44fed8ec191026b0f04c7 SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5
 DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd
+DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7

diff --git a/net-mail/notmuch/notmuch-0.26.2.ebuild b/net-mail/notmuch/notmuch-0.26.2.ebuild
new file mode 100644
index 00000000000..bcf492e422d
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.26.2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.21:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.21:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     512d556664ea8d0caa7728c16e719b112e6b570b
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 21:13:11 2018 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 21:25:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512d5566

net-mail/notmuch: Bump version

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.26.1.ebuild | 208 +++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 3a40e4fcdc0..b4ff35c43f8 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -5,3 +5,4 @@ DIST notmuch-0.25.1.tar.gz 882141 BLAKE2B dfc6c9e62012280e1c72378b39d6b8af3cefa7
 DIST notmuch-0.25.2.tar.gz 882672 BLAKE2B 8bd90b87cf60a1eac8c331c4d67cfc511db91b5009c051fdf7d2612560ffaf11f1c51ca171f12f1cd9145ffa25ef402a5b2c72ad8efc4c22d68107ad31bb7d16 SHA512 5ee7bded69cbcc980e23f1e1562bf0cc9294c20bddcc3e442030c4f29373ecbbaef79144ad38470bfc97dac87f8dfb3bc7aee2d7eb974f6998f933369aa46006
 DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8eabf23245ba4aa4c936d4c5d868d9e6d5b0d626f16ce6087245a293cf1acd8bb2e2dd0639729af4b92d558c78051 SHA512 1c0fcfdeb7a7eddcd10a8175676679ef6985407732d5bcc15edd327d9985017696cef3287c0398c628a604ae3fbab5d222d71537e37265cf6a594b4914e4599a
 DIST notmuch-0.25.tar.gz 882093 BLAKE2B ea0f5568ec0bf6a1d2c177468f4ec25fabfd416162c01a0d861e78164f15f2cc0176e1a012250a2a6bb45a6c7c2f6ffa651ad15776d44fed8ec191026b0f04c7 SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5
+DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd

diff --git a/net-mail/notmuch/notmuch-0.26.1.ebuild b/net-mail/notmuch/notmuch-0.26.1.ebuild
new file mode 100644
index 00000000000..bcf492e422d
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.26.1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.21:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.21:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Aaron Bauman]

commit:     beb37ceafc9812a6a0ce54b9c0db5eae429bf4b3
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Mar 26 18:14:12 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 18:40:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb37cea

net-mail/notmuch: use HTTPS

 net-mail/notmuch/notmuch-0.23.7.ebuild | 4 ++--
 net-mail/notmuch/notmuch-0.24.2.ebuild | 4 ++--
 net-mail/notmuch/notmuch-0.25.1.ebuild | 4 ++--
 net-mail/notmuch/notmuch-0.25.2.ebuild | 4 ++--
 net-mail/notmuch/notmuch-0.25.3.ebuild | 4 ++--
 net-mail/notmuch/notmuch-0.25.ebuild   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.23.7.ebuild b/net-mail/notmuch/notmuch-0.23.7.ebuild
index 4f46e03f46a..3e83fd65e55 100644
--- a/net-mail/notmuch/notmuch-0.23.7.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
+HOMEPAGE="https://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
 	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
 

diff --git a/net-mail/notmuch/notmuch-0.24.2.ebuild b/net-mail/notmuch/notmuch-0.24.2.ebuild
index a16042a37e0..170d21be5c9 100644
--- a/net-mail/notmuch/notmuch-0.24.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
+HOMEPAGE="https://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
 	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
 

diff --git a/net-mail/notmuch/notmuch-0.25.1.ebuild b/net-mail/notmuch/notmuch-0.25.1.ebuild
index a40a43dd00f..9561513c251 100644
--- a/net-mail/notmuch/notmuch-0.25.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.25.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
+HOMEPAGE="https://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
 	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
 

diff --git a/net-mail/notmuch/notmuch-0.25.2.ebuild b/net-mail/notmuch/notmuch-0.25.2.ebuild
index 5c7f9d0860e..13c9eda4da8 100644
--- a/net-mail/notmuch/notmuch-0.25.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.25.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
+HOMEPAGE="https://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
 	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
 

diff --git a/net-mail/notmuch/notmuch-0.25.3.ebuild b/net-mail/notmuch/notmuch-0.25.3.ebuild
index 5c7f9d0860e..13c9eda4da8 100644
--- a/net-mail/notmuch/notmuch-0.25.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.25.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
+HOMEPAGE="https://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
 	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
 

diff --git a/net-mail/notmuch/notmuch-0.25.ebuild b/net-mail/notmuch/notmuch-0.25.ebuild
index 5c7f9d0860e..13c9eda4da8 100644
--- a/net-mail/notmuch/notmuch-0.25.ebuild
+++ b/net-mail/notmuch/notmuch-0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
+HOMEPAGE="https://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
 	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     f3472dd789f9403fe71a1bb8dbea1aa8f5ff3ea5
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Tue Dec 12 18:47:37 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 21:12:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3472dd7

net-mail/notmuch: Add version bump 0.25.3

Package-Manager: Portage-2.3.16, Repoman-2.3.6

Closes: https://bugs.gentoo.org/640850

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.25.3.ebuild | 208 +++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index fc7a646da86..3a40e4fcdc0 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -3,4 +3,5 @@ DIST notmuch-0.23.7.tar.gz 692230 BLAKE2B 79e81bde02546589c867d636fd30453beeecfb
 DIST notmuch-0.24.2.tar.gz 709272 BLAKE2B 25ef9db21a9fb009db89e472e06d871e92efc5223ef3edd91716db2a7edb5b8d39df000f540aa30762fe64e05fff221158040b2869fb618c89f9fa36cbe1757f SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc
 DIST notmuch-0.25.1.tar.gz 882141 BLAKE2B dfc6c9e62012280e1c72378b39d6b8af3cefa701ed8d147a758864bccfd596ebf464e608daa6e5ce049114d5ad13a6737f4376f6f9d5cf4c5cf115b633b4b57d SHA512 989acc5eda7d2f9512741c8ae850e34c6fbbdd5fa5fa23f25a6096250d414919007c5cfda68d6f48606c0a024692e082a28cb358e6d3fc2afc0502b5bcbf5f54
 DIST notmuch-0.25.2.tar.gz 882672 BLAKE2B 8bd90b87cf60a1eac8c331c4d67cfc511db91b5009c051fdf7d2612560ffaf11f1c51ca171f12f1cd9145ffa25ef402a5b2c72ad8efc4c22d68107ad31bb7d16 SHA512 5ee7bded69cbcc980e23f1e1562bf0cc9294c20bddcc3e442030c4f29373ecbbaef79144ad38470bfc97dac87f8dfb3bc7aee2d7eb974f6998f933369aa46006
+DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8eabf23245ba4aa4c936d4c5d868d9e6d5b0d626f16ce6087245a293cf1acd8bb2e2dd0639729af4b92d558c78051 SHA512 1c0fcfdeb7a7eddcd10a8175676679ef6985407732d5bcc15edd327d9985017696cef3287c0398c628a604ae3fbab5d222d71537e37265cf6a594b4914e4599a
 DIST notmuch-0.25.tar.gz 882093 BLAKE2B ea0f5568ec0bf6a1d2c177468f4ec25fabfd416162c01a0d861e78164f15f2cc0176e1a012250a2a6bb45a6c7c2f6ffa651ad15776d44fed8ec191026b0f04c7 SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5

diff --git a/net-mail/notmuch/notmuch-0.25.3.ebuild b/net-mail/notmuch/notmuch-0.25.3.ebuild
new file mode 100644
index 00000000000..5c7f9d0860e
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.25.3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     3cccb3a52e307cee68eeb2966132b6393f71bd2c
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  6 21:51:58 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Nov  6 21:51:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cccb3a5

net-mail/notmuch: Bump version

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.25.2.ebuild | 208 +++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index bc3ae38b179..a3346fb4486 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,4 +2,5 @@ DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe9685968
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
 DIST notmuch-0.24.2.tar.gz 709272 SHA256 aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51 SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc WHIRLPOOL 679094ca2bd57a3b2f0f4ae5f2022c8bd1922e55fb095780b67de13c75758b4daa5892843e187405f294ed406ce47922bd6b854759984c5518bad8dc058236a6
 DIST notmuch-0.25.1.tar.gz 882141 SHA256 b4bf09ec9b7b64180704faa26d66cad5f911a5a00ef812da34cb02c3f8872831 SHA512 989acc5eda7d2f9512741c8ae850e34c6fbbdd5fa5fa23f25a6096250d414919007c5cfda68d6f48606c0a024692e082a28cb358e6d3fc2afc0502b5bcbf5f54 WHIRLPOOL 391d0bc17e55967ed6e4c2d9a7876eea93e992b190e083343e488c153697053284cee8d01687c0a23e1063de29d933f358acb6bc723c3307eeb01706e920f79b
+DIST notmuch-0.25.2.tar.gz 882672 SHA256 e4b6ba9d4016b10249a4acc24e063d23e0c52ed6f8c1cbe4f98e7f9ef4da262a SHA512 5ee7bded69cbcc980e23f1e1562bf0cc9294c20bddcc3e442030c4f29373ecbbaef79144ad38470bfc97dac87f8dfb3bc7aee2d7eb974f6998f933369aa46006 WHIRLPOOL 4ceda3a3424f1d3dcf298883fab2f6b5449fbc75a81dcff8d267c6d0ceddf048c7e2568f922ff70f6786a86e50c3dc531f46baaf71adc120abbc9c39f7b20a39
 DIST notmuch-0.25.tar.gz 882093 SHA256 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5 WHIRLPOOL 94ec2cb30c92b8c88da9b66f2a8afa7c01977671cdc018113a1716414a8555a9bec7d77b933df6dd4c3c339e3a2dfd46319f86725f1b84b608e7066c60b91f1c

diff --git a/net-mail/notmuch/notmuch-0.25.2.ebuild b/net-mail/notmuch/notmuch-0.25.2.ebuild
new file mode 100644
index 00000000000..5c7f9d0860e
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.25.2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     22421e3ae4d42d9259e51725a34b15fcae3d1582
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 13:56:00 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 13:56:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22421e3a

net-mail/notmuch: Bump version

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.25.1.ebuild | 206 +++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 32a679b7829..bc3ae38b179 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,5 @@
 DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
 DIST notmuch-0.24.2.tar.gz 709272 SHA256 aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51 SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc WHIRLPOOL 679094ca2bd57a3b2f0f4ae5f2022c8bd1922e55fb095780b67de13c75758b4daa5892843e187405f294ed406ce47922bd6b854759984c5518bad8dc058236a6
+DIST notmuch-0.25.1.tar.gz 882141 SHA256 b4bf09ec9b7b64180704faa26d66cad5f911a5a00ef812da34cb02c3f8872831 SHA512 989acc5eda7d2f9512741c8ae850e34c6fbbdd5fa5fa23f25a6096250d414919007c5cfda68d6f48606c0a024692e082a28cb358e6d3fc2afc0502b5bcbf5f54 WHIRLPOOL 391d0bc17e55967ed6e4c2d9a7876eea93e992b190e083343e488c153697053284cee8d01687c0a23e1063de29d933f358acb6bc723c3307eeb01706e920f79b
 DIST notmuch-0.25.tar.gz 882093 SHA256 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5 WHIRLPOOL 94ec2cb30c92b8c88da9b66f2a8afa7c01977671cdc018113a1716414a8555a9bec7d77b933df6dd4c3c339e3a2dfd46319f86725f1b84b608e7066c60b91f1c

diff --git a/net-mail/notmuch/notmuch-0.25.1.ebuild b/net-mail/notmuch/notmuch-0.25.1.ebuild
new file mode 100644
index 00000000000..a40a43dd00f
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.25.1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     1225799cb0ce178809d9142dcd37fd12f29405d3
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 20:23:51 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 20:24:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1225799c

net-mail/notmuch: Remove older minor version

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 net-mail/notmuch/Manifest              |   1 -
 net-mail/notmuch/notmuch-0.24.1.ebuild | 206 ---------------------------------
 2 files changed, 207 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 97358714fc1..32a679b7829 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,5 +1,4 @@
 DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
-DIST notmuch-0.24.1.tar.gz 709190 SHA256 fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3 SHA512 e2014380de68de3e1a3fd3058a441c6771a92bfffe07c0bd2b374802dd8b2539eddbbb91074738f58f48452a936f2f9427fadca825a165c61a27fe0c3e1fe7fc WHIRLPOOL 75904127fb33ce011aaa22a1c86ac58375c1f8881a1cf384254d5adb7c13316c28436d622c760d8dec150b7442ded475b6f80c5991c5654ca418cd875e9a743b
 DIST notmuch-0.24.2.tar.gz 709272 SHA256 aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51 SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc WHIRLPOOL 679094ca2bd57a3b2f0f4ae5f2022c8bd1922e55fb095780b67de13c75758b4daa5892843e187405f294ed406ce47922bd6b854759984c5518bad8dc058236a6
 DIST notmuch-0.25.tar.gz 882093 SHA256 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5 WHIRLPOOL 94ec2cb30c92b8c88da9b66f2a8afa7c01977671cdc018113a1716414a8555a9bec7d77b933df6dd4c3c339e3a2dfd46319f86725f1b84b608e7066c60b91f1c

diff --git a/net-mail/notmuch/notmuch-0.24.1.ebuild b/net-mail/notmuch/notmuch-0.24.1.ebuild
deleted file mode 100644
index 3ab5365e4a9..00000000000
--- a/net-mail/notmuch/notmuch-0.24.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     40e420de0e057ccf087ae3e5e7079c91d326e95d
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 22:31:56 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 22:31:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e420de

net-mail/notmuch: Bump version

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/notmuch-0.25.ebuild | 206 +++++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 9e2791f4b31..97358714fc1 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,3 +2,4 @@ DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe9685968
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
 DIST notmuch-0.24.1.tar.gz 709190 SHA256 fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3 SHA512 e2014380de68de3e1a3fd3058a441c6771a92bfffe07c0bd2b374802dd8b2539eddbbb91074738f58f48452a936f2f9427fadca825a165c61a27fe0c3e1fe7fc WHIRLPOOL 75904127fb33ce011aaa22a1c86ac58375c1f8881a1cf384254d5adb7c13316c28436d622c760d8dec150b7442ded475b6f80c5991c5654ca418cd875e9a743b
 DIST notmuch-0.24.2.tar.gz 709272 SHA256 aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51 SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc WHIRLPOOL 679094ca2bd57a3b2f0f4ae5f2022c8bd1922e55fb095780b67de13c75758b4daa5892843e187405f294ed406ce47922bd6b854759984c5518bad8dc058236a6
+DIST notmuch-0.25.tar.gz 882093 SHA256 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5 WHIRLPOOL 94ec2cb30c92b8c88da9b66f2a8afa7c01977671cdc018113a1716414a8555a9bec7d77b933df6dd4c3c339e3a2dfd46319f86725f1b84b608e7066c60b91f1c

diff --git a/net-mail/notmuch/notmuch-0.25.ebuild b/net-mail/notmuch/notmuch-0.25.ebuild
new file mode 100644
index 00000000000..a40a43dd00f
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.25.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Pacho Ramos]

commit:     819f4c26a81c3139c662b98d60cec1061202c3b0
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 09:25:30 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 09:39:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819f4c26

net-mail/notmuch: amd64/x86 stable, bug #618876

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-mail/notmuch/notmuch-0.24.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.24.2.ebuild b/net-mail/notmuch/notmuch-0.24.2.ebuild
index 3ab5365e4a9..a16042a37e0 100644
--- a/net-mail/notmuch/notmuch-0.24.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.24.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha amd64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     f7e598f907afaecd03fe0f46eecb51350697a6cc
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 20:17:30 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 20:17:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e598f9

net-mail/notmuch: Bump version

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.24.2.ebuild | 206 +++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 37aa54914f0..9e2791f4b31 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
 DIST notmuch-0.24.1.tar.gz 709190 SHA256 fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3 SHA512 e2014380de68de3e1a3fd3058a441c6771a92bfffe07c0bd2b374802dd8b2539eddbbb91074738f58f48452a936f2f9427fadca825a165c61a27fe0c3e1fe7fc WHIRLPOOL 75904127fb33ce011aaa22a1c86ac58375c1f8881a1cf384254d5adb7c13316c28436d622c760d8dec150b7442ded475b6f80c5991c5654ca418cd875e9a743b
+DIST notmuch-0.24.2.tar.gz 709272 SHA256 aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51 SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc WHIRLPOOL 679094ca2bd57a3b2f0f4ae5f2022c8bd1922e55fb095780b67de13c75758b4daa5892843e187405f294ed406ce47922bd6b854759984c5518bad8dc058236a6

diff --git a/net-mail/notmuch/notmuch-0.24.2.ebuild b/net-mail/notmuch/notmuch-0.24.2.ebuild
new file mode 100644
index 00000000000..3ab5365e4a9
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.24.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     f8848184cfb03274da4144b3b9f263af12d76218
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 22:01:38 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat May 27 22:02:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8848184

net-mail/notmuch: Some features require Xapian 1.4+

Inform user that "Regular expression searches supported for from: and
subject:" require at >=dev-libs/xapian-1.4.

Gentoo-Bug: 613818
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/notmuch/notmuch-0.24.1.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.24.1.ebuild b/net-mail/notmuch/notmuch-0.24.1.ebuild
index de47cbb850d..3ab5365e4a9 100644
--- a/net-mail/notmuch/notmuch-0.24.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.24.1.ebuild
@@ -194,6 +194,11 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
 }
 
 pkg_postrm() {

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     efc5a07b76d6b8cd8b22051b81f99d878ef0d6cc
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 21:12:35 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu May 18 21:12:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc5a07b

net-mail/notmuch: Remove older testing version

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/notmuch/Manifest            |   1 -
 net-mail/notmuch/notmuch-0.24.ebuild | 201 -----------------------------------
 2 files changed, 202 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index c5ffaddfb29..37aa54914f0 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,3 @@
 DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
 DIST notmuch-0.24.1.tar.gz 709190 SHA256 fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3 SHA512 e2014380de68de3e1a3fd3058a441c6771a92bfffe07c0bd2b374802dd8b2539eddbbb91074738f58f48452a936f2f9427fadca825a165c61a27fe0c3e1fe7fc WHIRLPOOL 75904127fb33ce011aaa22a1c86ac58375c1f8881a1cf384254d5adb7c13316c28436d622c760d8dec150b7442ded475b6f80c5991c5654ca418cd875e9a743b
-DIST notmuch-0.24.tar.gz 708243 SHA256 f7e44cf67630669d3537c4febd7685ca27d62a134e42f9a5db90d5a6ed4c75fc SHA512 f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5 WHIRLPOOL a64643461bb3f4e97459b76c43700cce5f69d4e9df99c9eadd424f9d8e1fe2f3b8d33cfd19cb2945050bc5018d2a2dabe484723d68fb247084e729f0b778908b

diff --git a/net-mail/notmuch/notmuch-0.24.ebuild b/net-mail/notmuch/notmuch-0.24.ebuild
deleted file mode 100644
index de47cbb850d..00000000000
--- a/net-mail/notmuch/notmuch-0.24.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     a392d24703ad182cecba728b3abcdad398e5de66
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 21:06:30 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu May 18 21:06:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a392d247

net-mail/notmuch: Remove version affected by bug 587676

Gentoo-Bug: 587676
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/notmuch/Manifest            |   1 -
 net-mail/notmuch/notmuch-0.21.ebuild | 191 -----------------------------------
 2 files changed, 192 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 1f186eafd11..c5ffaddfb29 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,5 +1,4 @@
 DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
-DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
 DIST notmuch-0.24.1.tar.gz 709190 SHA256 fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3 SHA512 e2014380de68de3e1a3fd3058a441c6771a92bfffe07c0bd2b374802dd8b2539eddbbb91074738f58f48452a936f2f9427fadca825a165c61a27fe0c3e1fe7fc WHIRLPOOL 75904127fb33ce011aaa22a1c86ac58375c1f8881a1cf384254d5adb7c13316c28436d622c760d8dec150b7442ded475b6f80c5991c5654ca418cd875e9a743b
 DIST notmuch-0.24.tar.gz 708243 SHA256 f7e44cf67630669d3537c4febd7685ca27d62a134e42f9a5db90d5a6ed4c75fc SHA512 f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5 WHIRLPOOL a64643461bb3f4e97459b76c43700cce5f69d4e9df99c9eadd424f9d8e1fe2f3b8d33cfd19cb2945050bc5018d2a2dabe484723d68fb247084e729f0b778908b

diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
deleted file mode 100644
index a5a6dd6ff30..00000000000
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt debug 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
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=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? ( app-doc/doxygen )
-	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 )
-	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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) 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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use debug; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--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}" V=1 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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     e8f699a64684549b159a4c9f0e99250110bdca16
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 19:46:19 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 19:46:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f699a6

net-mail/notmuch: Bump version to 0.24.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.24.1.ebuild | 201 +++++++++++++++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 89bd5e96083..1f186eafd11 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,5 @@
 DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
+DIST notmuch-0.24.1.tar.gz 709190 SHA256 fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3 SHA512 e2014380de68de3e1a3fd3058a441c6771a92bfffe07c0bd2b374802dd8b2539eddbbb91074738f58f48452a936f2f9427fadca825a165c61a27fe0c3e1fe7fc WHIRLPOOL 75904127fb33ce011aaa22a1c86ac58375c1f8881a1cf384254d5adb7c13316c28436d622c760d8dec150b7442ded475b6f80c5991c5654ca418cd875e9a743b
 DIST notmuch-0.24.tar.gz 708243 SHA256 f7e44cf67630669d3537c4febd7685ca27d62a134e42f9a5db90d5a6ed4c75fc SHA512 f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5 WHIRLPOOL a64643461bb3f4e97459b76c43700cce5f69d4e9df99c9eadd424f9d8e1fe2f3b8d33cfd19cb2945050bc5018d2a2dabe484723d68fb247084e729f0b778908b

diff --git a/net-mail/notmuch/notmuch-0.24.1.ebuild b/net-mail/notmuch/notmuch-0.24.1.ebuild
new file mode 100644
index 00000000000..de47cbb850d
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.24.1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     5b3a053f15877ce2549801d2e42af171dbc3f811
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 16:04:46 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 16:04:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3a053f

net-mail/notmuch: x86 stable wrt bug #612952

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.23.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.23.7.ebuild b/net-mail/notmuch/notmuch-0.23.7.ebuild
index 3e7e3be0f4d..4f46e03f46a 100644
--- a/net-mail/notmuch/notmuch-0.23.7.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.7.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~x86"
+KEYWORDS="~alpha amd64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     032ff3da89a2daa4dd055b133d8eddd4a9b48f69
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 12:08:52 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 12:08:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032ff3da

net-mail/notmuch: amd64 stable wrt bug #612952

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.23.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.23.7.ebuild b/net-mail/notmuch/notmuch-0.23.7.ebuild
index fe38f1121c8..3e7e3be0f4d 100644
--- a/net-mail/notmuch/notmuch-0.23.7.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.7.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha amd64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     c9c1d8f87aff362a3b132488131f4cf05a0d9d3e
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 10:33:29 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 10:33:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c1d8f8

net-mail/notmuch: Follow guidlines for completion files

Gentoo-Bug: 613828
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/notmuch/notmuch-0.21.ebuild   | 2 +-
 net-mail/notmuch/notmuch-0.23.3.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.23.7.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.24.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
index c124076b915..a5a6dd6ff30 100644
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 IUSE="crypt debug doc emacs mutt nmbug python test"
 
 CDEPEND="
-	>=app-shells/bash-completion-1.9
+	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22
 	>=dev-libs/gmime-2.6.7
 	!=dev-libs/gmime-2.6.19

diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
index 7b4c95b389f..f084e405278 100644
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
 CDEPEND="
-	>=app-shells/bash-completion-1.9
+	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
 	>=dev-libs/gmime-2.6.20-r2:2.6
 	>=dev-libs/xapian-1.2.7-r2:=

diff --git a/net-mail/notmuch/notmuch-0.23.7.ebuild b/net-mail/notmuch/notmuch-0.23.7.ebuild
index a9dc94ccfb9..fe38f1121c8 100644
--- a/net-mail/notmuch/notmuch-0.23.7.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.7.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
 CDEPEND="
-	>=app-shells/bash-completion-1.9
+	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
 	>=dev-libs/gmime-2.6.20-r2:2.6
 	>=dev-libs/xapian-1.2.7-r2:=

diff --git a/net-mail/notmuch/notmuch-0.24.ebuild b/net-mail/notmuch/notmuch-0.24.ebuild
index 72518763a22..de47cbb850d 100644
--- a/net-mail/notmuch/notmuch-0.24.ebuild
+++ b/net-mail/notmuch/notmuch-0.24.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
 CDEPEND="
-	>=app-shells/bash-completion-1.9
+	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
 	>=dev-libs/gmime-2.6.20-r2:2.6
 	>=dev-libs/xapian-1.2.7-r2:=

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     ccccf2284218768a668fcf24fba1e594f513d0ba
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 10:12:03 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 10:16:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccccf228

net-mail/notmuch: Don't overwrite system mimeinfo.cache

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/notmuch/notmuch-0.24.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-mail/notmuch/notmuch-0.24.ebuild b/net-mail/notmuch/notmuch-0.24.ebuild
index ba3769544f5..72518763a22 100644
--- a/net-mail/notmuch/notmuch-0.24.ebuild
+++ b/net-mail/notmuch/notmuch-0.24.ebuild
@@ -118,6 +118,7 @@ src_configure() {
 		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
 		--without-ruby
 		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
 		$(use_with emacs)

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     7f80c933b8a339847e394179b6e8055953c5f510
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 08:53:02 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 08:56:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f80c933

net-mail/notmuch: Remove older minor version

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-mail/notmuch/Manifest              |   1 -
 net-mail/notmuch/notmuch-0.23.5.ebuild | 201 ---------------------------------
 2 files changed, 202 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index cbf1d665bb9..199ea9c1eb5 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,6 +2,5 @@ DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe9685968
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
-DIST notmuch-0.23.5.tar.gz 691921 SHA256 c62694b3c5f04db48ed3bbf37a801ea2a03439826c6be318e23b34de749ac267 SHA512 703b685737c779008484a1a5064a0a6b4c93d0c20c48a9c417e0a471b8807f5ee3151a67f0161eb6b376dce56ab42a285dd80532ec9ff79451e982a7c0f25fa1 WHIRLPOOL 687fa8939970124b21cb0725681f2a98c326ee803bf38f0d38d8d8ec1f0e40e99f7be1f72c3bdb721deb4ccc2fecb32bef2067a5baa7b0572a9de2c7d80c51aa
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
 DIST notmuch-0.24.tar.gz 708243 SHA256 f7e44cf67630669d3537c4febd7685ca27d62a134e42f9a5db90d5a6ed4c75fc SHA512 f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5 WHIRLPOOL a64643461bb3f4e97459b76c43700cce5f69d4e9df99c9eadd424f9d8e1fe2f3b8d33cfd19cb2945050bc5018d2a2dabe484723d68fb247084e729f0b778908b

diff --git a/net-mail/notmuch/notmuch-0.23.5.ebuild b/net-mail/notmuch/notmuch-0.23.5.ebuild
deleted file mode 100644
index c5ea1b03fe8..00000000000
--- a/net-mail/notmuch/notmuch-0.23.5.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	>=app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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 )
-PATCHES=( "${FILESDIR}/fix-gpg-tests.patch" )
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     d92250de2dd9a3200954370f653aaf1a3582837f
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 08:51:35 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 08:56:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d92250de

net-mail/notmuch: Bump version to 0.24

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/notmuch-0.24.ebuild | 200 +++++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index b521731e46c..cbf1d665bb9 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,3 +4,4 @@ DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a3
 DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
 DIST notmuch-0.23.5.tar.gz 691921 SHA256 c62694b3c5f04db48ed3bbf37a801ea2a03439826c6be318e23b34de749ac267 SHA512 703b685737c779008484a1a5064a0a6b4c93d0c20c48a9c417e0a471b8807f5ee3151a67f0161eb6b376dce56ab42a285dd80532ec9ff79451e982a7c0f25fa1 WHIRLPOOL 687fa8939970124b21cb0725681f2a98c326ee803bf38f0d38d8d8ec1f0e40e99f7be1f72c3bdb721deb4ccc2fecb32bef2067a5baa7b0572a9de2c7d80c51aa
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
+DIST notmuch-0.24.tar.gz 708243 SHA256 f7e44cf67630669d3537c4febd7685ca27d62a134e42f9a5db90d5a6ed4c75fc SHA512 f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5 WHIRLPOOL a64643461bb3f4e97459b76c43700cce5f69d4e9df99c9eadd424f9d8e1fe2f3b8d33cfd19cb2945050bc5018d2a2dabe484723d68fb247084e729f0b778908b

diff --git a/net-mail/notmuch/notmuch-0.24.ebuild b/net-mail/notmuch/notmuch-0.24.ebuild
new file mode 100644
index 00000000000..a9dc94ccfb9
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.24.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     1a14b3f635980bbeb8bdf2ed1118844eee40570b
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 08:56:01 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 08:56:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a14b3f6

net-mail/notmuch: Remove older testing version

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-mail/notmuch/Manifest                 |   1 -
 net-mail/notmuch/notmuch-0.22.2-r1.ebuild | 199 ------------------------------
 2 files changed, 200 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 199ea9c1eb5..becee24f955 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,6 +1,5 @@
 DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
-DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
 DIST notmuch-0.24.tar.gz 708243 SHA256 f7e44cf67630669d3537c4febd7685ca27d62a134e42f9a5db90d5a6ed4c75fc SHA512 f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5 WHIRLPOOL a64643461bb3f4e97459b76c43700cce5f69d4e9df99c9eadd424f9d8e1fe2f3b8d33cfd19cb2945050bc5018d2a2dabe484723d68fb247084e729f0b778908b

diff --git a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
deleted file mode 100644
index f91a2240ed3..00000000000
--- a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	>=app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     e7ccfcce11b9e96038962ac8235b60f908a3aeec
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 08:55:19 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 08:56:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ccfcce

net-mail/notmuch: Try with newer version of Python

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-mail/notmuch/notmuch-0.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.24.ebuild b/net-mail/notmuch/notmuch-0.24.ebuild
index a9dc94ccfb9..ba3769544f5 100644
--- a/net-mail/notmuch/notmuch-0.24.ebuild
+++ b/net-mail/notmuch/notmuch-0.24.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     3abbe89890a336947111c31ee8d799df320da1eb
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 20:41:16 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 20:52:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3abbe898

net-mail/notmuch: Bump version to 0.23.7

It includes the fix for gpg-agent configuration, so the patch
fix-gpg-tests.patch introduced in 0.23.5 can be dropped.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.23.7.ebuild | 201 +++++++++++++++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index e5fb63dba17..b521731e46c 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -3,3 +3,4 @@ DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
 DIST notmuch-0.23.5.tar.gz 691921 SHA256 c62694b3c5f04db48ed3bbf37a801ea2a03439826c6be318e23b34de749ac267 SHA512 703b685737c779008484a1a5064a0a6b4c93d0c20c48a9c417e0a471b8807f5ee3151a67f0161eb6b376dce56ab42a285dd80532ec9ff79451e982a7c0f25fa1 WHIRLPOOL 687fa8939970124b21cb0725681f2a98c326ee803bf38f0d38d8d8ec1f0e40e99f7be1f72c3bdb721deb4ccc2fecb32bef2067a5baa7b0572a9de2c7d80c51aa
+DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851

diff --git a/net-mail/notmuch/notmuch-0.23.7.ebuild b/net-mail/notmuch/notmuch-0.23.7.ebuild
new file mode 100644
index 00000000000..b448318b125
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.23.7.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     31feae51923c224e818eb1e3601817a08bcf6a13
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 10:30:55 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 11:17:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31feae51

net-mail/notmuch: Remove older patch version

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-mail/notmuch/Manifest              |   1 -
 net-mail/notmuch/notmuch-0.23.4.ebuild | 201 ---------------------------------
 2 files changed, 202 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index b43ef2d..e5fb63d 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,5 +2,4 @@ DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe9685968
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
-DIST notmuch-0.23.4.tar.gz 691851 SHA256 106dd6e39c4955871a49a84488d06394c1cecf66c1542b11834f8e8d5c66453b SHA512 a90dcb822a01c1a8e07a3fce6c63f210af482e34cbf329fd56db3ea4934e7950ec641c060104729373fc3fc0b42eb1e2937f653f3a42ddae7e7e15e9927c3dff WHIRLPOOL 3f916356896f1e23a286d8c4207c869ded9b766781fd625ad90c1a24d0fcb8f15bb5c09013424080e382afa69ba59443f394878346696c4f6ff0e91fcdf2cbd1
 DIST notmuch-0.23.5.tar.gz 691921 SHA256 c62694b3c5f04db48ed3bbf37a801ea2a03439826c6be318e23b34de749ac267 SHA512 703b685737c779008484a1a5064a0a6b4c93d0c20c48a9c417e0a471b8807f5ee3151a67f0161eb6b376dce56ab42a285dd80532ec9ff79451e982a7c0f25fa1 WHIRLPOOL 687fa8939970124b21cb0725681f2a98c326ee803bf38f0d38d8d8ec1f0e40e99f7be1f72c3bdb721deb4ccc2fecb32bef2067a5baa7b0572a9de2c7d80c51aa

diff --git a/net-mail/notmuch/notmuch-0.23.4.ebuild b/net-mail/notmuch/notmuch-0.23.4.ebuild
deleted file mode 100644
index b448318..00000000
--- a/net-mail/notmuch/notmuch-0.23.4.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	>=app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     41d30ed6f8183a2cad60508a354e68054c8279c0
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Tue Jan 10 10:45:00 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 16:18:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d30ed6

net-mail/notmuch: Add version bump 0.23.5

Add version bump 0.23.5

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.23.5.ebuild | 201 +++++++++++++++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 6ae6054..3ad9bd6 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,3 +6,4 @@ DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
 DIST notmuch-0.23.4.tar.gz 691851 SHA256 106dd6e39c4955871a49a84488d06394c1cecf66c1542b11834f8e8d5c66453b SHA512 a90dcb822a01c1a8e07a3fce6c63f210af482e34cbf329fd56db3ea4934e7950ec641c060104729373fc3fc0b42eb1e2937f653f3a42ddae7e7e15e9927c3dff WHIRLPOOL 3f916356896f1e23a286d8c4207c869ded9b766781fd625ad90c1a24d0fcb8f15bb5c09013424080e382afa69ba59443f394878346696c4f6ff0e91fcdf2cbd1
+DIST notmuch-0.23.5.tar.gz 691921 SHA256 c62694b3c5f04db48ed3bbf37a801ea2a03439826c6be318e23b34de749ac267 SHA512 703b685737c779008484a1a5064a0a6b4c93d0c20c48a9c417e0a471b8807f5ee3151a67f0161eb6b376dce56ab42a285dd80532ec9ff79451e982a7c0f25fa1 WHIRLPOOL 687fa8939970124b21cb0725681f2a98c326ee803bf38f0d38d8d8ec1f0e40e99f7be1f72c3bdb721deb4ccc2fecb32bef2067a5baa7b0572a9de2c7d80c51aa

diff --git a/net-mail/notmuch/notmuch-0.23.5.ebuild b/net-mail/notmuch/notmuch-0.23.5.ebuild
new file mode 100644
index 00000000..b448318
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.23.5.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     4fd6364c4202c79f6a3b7702a99f6788cf0c718f
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 15:08:44 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 15:09:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd6364c

net-mail/notmuch: die if Makefile.config could not be removed

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-mail/notmuch/notmuch-0.19-r1.ebuild   | 5 +++--
 net-mail/notmuch/notmuch-0.20.2.ebuild    | 5 +++--
 net-mail/notmuch/notmuch-0.21.ebuild      | 5 +++--
 net-mail/notmuch/notmuch-0.22.2-r1.ebuild | 5 +++--
 net-mail/notmuch/notmuch-0.23.3.ebuild    | 5 +++--
 net-mail/notmuch/notmuch-0.23.4.ebuild    | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.19-r1.ebuild b/net-mail/notmuch/notmuch-0.19-r1.ebuild
index 34efaee..c31a9fa 100644
--- a/net-mail/notmuch/notmuch-0.19-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -102,7 +102,8 @@ src_prepare() {
 	bindings python mv README README-python || die
 	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-	rm -f Makefile.config # assure that new Makefile.config will be generated
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
 
 	if use debug; then
 		append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
index 71b6680..66ecf2e 100644
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -98,7 +98,8 @@ src_prepare() {
 	bindings python mv README README-python || die
 	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-	rm -f Makefile.config # assure that new Makefile.config will be generated
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
 
 	if use debug; then
 		append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
index 1facfdf..6cbb13a 100644
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -98,7 +98,8 @@ src_prepare() {
 	bindings python mv README README-python || die
 	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-	rm -f Makefile.config # assure that new Makefile.config will be generated
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
 
 	if use debug; then
 		append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
index e699bdb..7f0ade7 100644
--- a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -105,7 +105,8 @@ src_prepare() {
 	bindings python mv README README-python || die
 	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-	rm -f Makefile.config # assure that new Makefile.config will be generated
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
 
 	if use test; then
 		append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
index d2276a4..8a372a9 100644
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -105,7 +105,8 @@ src_prepare() {
 	bindings python mv README README-python || die
 	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-	rm -f Makefile.config # assure that new Makefile.config will be generated
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
 
 	if use test; then
 		append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.23.4.ebuild b/net-mail/notmuch/notmuch-0.23.4.ebuild
index 49aefbf..b448318 100644
--- a/net-mail/notmuch/notmuch-0.23.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -105,7 +105,8 @@ src_prepare() {
 	bindings python mv README README-python || die
 	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-	rm -f Makefile.config # assure that new Makefile.config will be generated
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
 
 	if use test; then
 		append-cflags -g

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     54a1603ee7801fd1251b80531bd375c8c41336aa
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 21:38:01 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 21:38:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a1603e

net-mail/notmuch: Bump version

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.23.4.ebuild | 200 +++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index e69e076..6ae6054 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -5,3 +5,4 @@ DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
+DIST notmuch-0.23.4.tar.gz 691851 SHA256 106dd6e39c4955871a49a84488d06394c1cecf66c1542b11834f8e8d5c66453b SHA512 a90dcb822a01c1a8e07a3fce6c63f210af482e34cbf329fd56db3ea4934e7950ec641c060104729373fc3fc0b42eb1e2937f653f3a42ddae7e7e15e9927c3dff WHIRLPOOL 3f916356896f1e23a286d8c4207c869ded9b766781fd625ad90c1a24d0fcb8f15bb5c09013424080e382afa69ba59443f394878346696c4f6ff0e91fcdf2cbd1

diff --git a/net-mail/notmuch/notmuch-0.23.4.ebuild b/net-mail/notmuch/notmuch-0.23.4.ebuild
new file mode 100644
index 00000000..49aefbf
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.23.4.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     d8a30b9a7a095ddbca375fc60ab73663837a8c00
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 10:18:02 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 10:18:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a30b9a

net-mail/notmuch: x86 stable wrt bug #603384

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.23.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
index 6f18afc..d2276a4 100644
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~x86"
+KEYWORDS="~alpha amd64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Tobias Klausmann]

commit:     27e65e00433872b8f4ddce4e32bc53bf27e5faf9
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 15:09:55 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:09:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e65e00

net-mail/notmuch-0.23.3-r0: stable on amd64

Gentoo-Bug: 599544

 net-mail/notmuch/notmuch-0.23.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
index 49aefbf..6f18afc 100644
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha amd64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Tobias Klausmann]

commit:     84e2fb28fad1b42dee55e5a89f571ae197815d3d
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 11:10:22 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 11:28:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e2fb28

net-mail/notmuch-0.23.1-r0: stable on amd64

Gentoo-Bug: 599544

 net-mail/notmuch/notmuch-0.23.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.23.1.ebuild b/net-mail/notmuch/notmuch-0.23.1.ebuild
index 49aefbf..6f18afc 100644
--- a/net-mail/notmuch/notmuch-0.23.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha amd64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     f94b0cbbcedf52aab4e940123fd56dd67eac8de8
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 22:49:51 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 23:11:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94b0cbb

net-mail/notmuch: Bump version to 0.23.3

Package-Manager: portage-2.3.2

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.23.3.ebuild | 200 +++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 938e005..56ecce2 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,3 +6,4 @@ DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.1.tar.gz 690069 SHA256 e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180 SHA512 e19bdc525090abcd4d476e4fd77d22e43001dee9b9202c45877b40d8c76bb9f522df61c19448ca42f6812e23e590e9241bda354c28205f479da50fb3ebd7bbb1 WHIRLPOOL b6f34bfa23aa2ed4d970696d5eedbc9d96f754bc88370bd777a9bafac835caf795df7e7f81e28892a014861bcb1512fd5bbb5ce225058f0cdec1858a167e6668
 DIST notmuch-0.23.2.tar.gz 690833 SHA256 edfd7528d43bf1e1ab2620607f9fdcf772603455a61c2eb49978619c352c97bc SHA512 487f70ef613962275dc81532cea62f287933bdb7a695466ce5ce0c5913ce06597abb152bac7126457997da710bbd716d30cee408a83b6bad4343407a5a9a202e WHIRLPOOL e5057e4490d949462e7f08530176a0b3c32a31e92402210cd02e11cb18c87f33d3e9705edd84284d0622e25a043d35a2d093bd0a0a9007123e87196ab699a885
+DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff

diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
new file mode 100644
index 00000000..49aefbf
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     97517b9744a5d2ee0962278de452ba18e5cdf156
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 14:10:30 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 14:47:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97517b97

net-mail/notmuch: Bump version

Package-Manager: portage-2.3.2

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.23.2.ebuild | 200 +++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index c0f1452..938e005 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -5,3 +5,4 @@ DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.1.tar.gz 690069 SHA256 e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180 SHA512 e19bdc525090abcd4d476e4fd77d22e43001dee9b9202c45877b40d8c76bb9f522df61c19448ca42f6812e23e590e9241bda354c28205f479da50fb3ebd7bbb1 WHIRLPOOL b6f34bfa23aa2ed4d970696d5eedbc9d96f754bc88370bd777a9bafac835caf795df7e7f81e28892a014861bcb1512fd5bbb5ce225058f0cdec1858a167e6668
+DIST notmuch-0.23.2.tar.gz 690833 SHA256 edfd7528d43bf1e1ab2620607f9fdcf772603455a61c2eb49978619c352c97bc SHA512 487f70ef613962275dc81532cea62f287933bdb7a695466ce5ce0c5913ce06597abb152bac7126457997da710bbd716d30cee408a83b6bad4343407a5a9a202e WHIRLPOOL e5057e4490d949462e7f08530176a0b3c32a31e92402210cd02e11cb18c87f33d3e9705edd84284d0622e25a043d35a2d093bd0a0a9007123e87196ab699a885

diff --git a/net-mail/notmuch/notmuch-0.23.2.ebuild b/net-mail/notmuch/notmuch-0.23.2.ebuild
new file mode 100644
index 00000000..49aefbf
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.23.2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     8737d559bd87e85911747765436dab8224123228
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 20:58:32 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 20:58:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8737d559

net-mail/notmuch: Remove 0.23* ebuilds superseded by 0.23.1

Package-Manager: portage-2.3.2

 net-mail/notmuch/Manifest               |   1 -
 net-mail/notmuch/notmuch-0.23-r1.ebuild | 204 --------------------------------
 net-mail/notmuch/notmuch-0.23.ebuild    | 200 -------------------------------
 3 files changed, 405 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 4ff668c..c0f1452 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -5,4 +5,3 @@ DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.23.1.tar.gz 690069 SHA256 e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180 SHA512 e19bdc525090abcd4d476e4fd77d22e43001dee9b9202c45877b40d8c76bb9f522df61c19448ca42f6812e23e590e9241bda354c28205f479da50fb3ebd7bbb1 WHIRLPOOL b6f34bfa23aa2ed4d970696d5eedbc9d96f754bc88370bd777a9bafac835caf795df7e7f81e28892a014861bcb1512fd5bbb5ce225058f0cdec1858a167e6668
-DIST notmuch-0.23.tar.gz 689540 SHA256 c5e75b658ee2b58c5ac7a79e34d2449d37ddfa5c9e67a736454ec296c9a0a1b8 SHA512 87e3bb97035cc2d48b5b1cfdebf49576de96498d54192f7a58976e495b8b77672037a9702af194d882e9eb1e0252daeb01f49df90709434ff04d2b3db236a039 WHIRLPOOL 256d43ccf43d7c83a83ceb1fb55b223e47b1b339a938dfeeb77feae2a3bff60e0449b7bfdf155a2afbd9d10c3416e7fe6e1ed7b7f22d305aef727473d63b77fb

diff --git a/net-mail/notmuch/notmuch-0.23-r1.ebuild b/net-mail/notmuch/notmuch-0.23-r1.ebuild
deleted file mode 100644
index 2f4c8d4..00000000
--- a/net-mail/notmuch/notmuch-0.23-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	>=app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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 )
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-emacs-id-buttonization.patch"
-	"${FILESDIR}/${PV}-0002-emacs-search-face-bugfix.patch"
-	)
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	rm -f Makefile.config # assure that new Makefile.config will be generated
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

diff --git a/net-mail/notmuch/notmuch-0.23.ebuild b/net-mail/notmuch/notmuch-0.23.ebuild
deleted file mode 100644
index 66c7df9..00000000
--- a/net-mail/notmuch/notmuch-0.23.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	>=app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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"
-
-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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	rm -f Makefile.config # assure that new Makefile.config will be generated
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	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
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
-	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 dodoc -r html
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     7193f477bfb664ce14ce76c694128e301955d960
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 20:53:09 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 20:53:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7193f477

net-mail/notmuch: Bump version to 0.23.1

Package-Manager: portage-2.3.2

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.23.1.ebuild | 200 +++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index e1a3eb1..4ff668c 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,4 +4,5 @@ DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
+DIST notmuch-0.23.1.tar.gz 690069 SHA256 e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180 SHA512 e19bdc525090abcd4d476e4fd77d22e43001dee9b9202c45877b40d8c76bb9f522df61c19448ca42f6812e23e590e9241bda354c28205f479da50fb3ebd7bbb1 WHIRLPOOL b6f34bfa23aa2ed4d970696d5eedbc9d96f754bc88370bd777a9bafac835caf795df7e7f81e28892a014861bcb1512fd5bbb5ce225058f0cdec1858a167e6668
 DIST notmuch-0.23.tar.gz 689540 SHA256 c5e75b658ee2b58c5ac7a79e34d2449d37ddfa5c9e67a736454ec296c9a0a1b8 SHA512 87e3bb97035cc2d48b5b1cfdebf49576de96498d54192f7a58976e495b8b77672037a9702af194d882e9eb1e0252daeb01f49df90709434ff04d2b3db236a039 WHIRLPOOL 256d43ccf43d7c83a83ceb1fb55b223e47b1b339a938dfeeb77feae2a3bff60e0449b7bfdf155a2afbd9d10c3416e7fe6e1ed7b7f22d305aef727473d63b77fb

diff --git a/net-mail/notmuch/notmuch-0.23.1.ebuild b/net-mail/notmuch/notmuch-0.23.1.ebuild
new file mode 100644
index 00000000..66c7df9
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.23.1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     aec8fc565b34c9dadbfd5c8eb54dc0f9a83f480e
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 21:32:45 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 21:33:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec8fc56

net-mail/notmuch: Bump version to 0.23

Package-Manager: portage-2.3.1

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/metadata.xml        |   2 +-
 net-mail/notmuch/notmuch-0.23.ebuild | 200 +++++++++++++++++++++++++++++++++++
 3 files changed, 202 insertions(+), 1 deletion(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 5334138..e1a3eb1 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,3 +4,4 @@ DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
+DIST notmuch-0.23.tar.gz 689540 SHA256 c5e75b658ee2b58c5ac7a79e34d2449d37ddfa5c9e67a736454ec296c9a0a1b8 SHA512 87e3bb97035cc2d48b5b1cfdebf49576de96498d54192f7a58976e495b8b77672037a9702af194d882e9eb1e0252daeb01f49df90709434ff04d2b3db236a039 WHIRLPOOL 256d43ccf43d7c83a83ceb1fb55b223e47b1b339a938dfeeb77feae2a3bff60e0449b7bfdf155a2afbd9d10c3416e7fe6e1ed7b7f22d305aef727473d63b77fb

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index 332a3c0..c91b250 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
 	<use>
-		<flag name="doc">Install API documentation for enabled bindings</flag>
+		<flag name="doc">Install API documentation</flag>
 		<flag name="crypt">Support decryption and verification of PGP/MIME
 			messages and in Emacs UI - encryption; support also S/MIME
 			signature verification since version 0.22</flag>

diff --git a/net-mail/notmuch/notmuch-0.23.ebuild b/net-mail/notmuch/notmuch-0.23.ebuild
new file mode 100644
index 00000000..66c7df9
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.23.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     a8f3b2c79b740e907c7e312b8f6c47fe4ec0f52e
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 20:16:00 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 20:35:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f3b2c7

net-mail/notmuch: Remove older versions

0.22.2 contains bugfixes and supersedes 0.22 and 0.22.1.

Package-Manager: portage-2.3.1

 net-mail/notmuch/Manifest               |   2 -
 net-mail/notmuch/notmuch-0.22-r2.ebuild | 198 --------------------------------
 net-mail/notmuch/notmuch-0.22.1.ebuild  | 198 --------------------------------
 net-mail/notmuch/notmuch-0.22.ebuild    | 189 ------------------------------
 4 files changed, 587 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a0c243b..5334138 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -3,6 +3,4 @@ DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
-DIST notmuch-0.22.1.tar.gz 683286 SHA256 e739457794f3c2b363beffa3ed9e8a2786921031c80672f5b06d0880876a974b SHA512 b28ee8aa5af7172664ebc4d50c8830e645ad3e4945f5d162e44b627f3344de71b7525a444ae08f1c0650a7f94071f54cebcf3494214df80452b6ca954818deb9 WHIRLPOOL 85f95c9156a93e7b31d3d80e5b31f7e0a7678ff14e7c803abf9baf21a38edf4512c576ddbe540028aa45691260b0d230bf84c8c87c6eb18071d4f5f29c444a43
 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
-DIST notmuch-0.22.tar.gz 682458 SHA256 d64118ef926ba06fba814a89a75d20b0c8c8ec07dd65e41bb9f1e9db0dcfb99a SHA512 0fd3860b4bce0fbf2648046a68b92d23d73604e82e05ee1b5913fc82985e67225b0f3a0977f71ad5251e7714a7111e8fd84ae0347f33475dddd8eb8d00fd2ed6 WHIRLPOOL 56e3ebbbf53092a6683b0c6ca945ed634f2e01b63625279a69221688905d0da688689ccc7a68d0af43c7ed9b48e696d85a6cb17a8d01c6e0facb27255ac00d3e

diff --git a/net-mail/notmuch/notmuch-0.22-r2.ebuild b/net-mail/notmuch/notmuch-0.22-r2.ebuild
deleted file mode 100644
index 5748091..00000000
--- a/net-mail/notmuch/notmuch-0.22-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	>=app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	rm -f Makefile.config # assure that new Makefile.config will be generated
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--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
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 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/notmuch-report
-	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
-}

diff --git a/net-mail/notmuch/notmuch-0.22.1.ebuild b/net-mail/notmuch/notmuch-0.22.1.ebuild
deleted file mode 100644
index 5748091..00000000
--- a/net-mail/notmuch/notmuch-0.22.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	>=app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	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
-
-	rm -f Makefile.config # assure that new Makefile.config will be generated
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--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
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 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/notmuch-report
-	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
-}

diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild
deleted file mode 100644
index 3c6dfdd..00000000
--- a/net-mail/notmuch/notmuch-0.22.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic 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"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt debug emacs python )
-	"
-IUSE="crypt debug doc emacs mutt nmbug python test"
-
-CDEPEND="
-	>=app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	debug? ( dev-util/valgrind )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	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 )
-	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 "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) 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
-
-	rm -f Makefile.config # assure that new Makefile.config will be generated
-
-	if use debug; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--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}" V=1 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/notmuch-report
-	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
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     b6380cc6c2c4efb6583351c45df4a291c0875a6c
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 11:35:03 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 14:37:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6380cc6

net-mail/notmuch: Bump EAPI to 6 in latest version

Support user patches. Install HTML docs with dodoc. It needed extra
steps to reproduce behaviour of dohtml.

Package-Manager: portage-2.3.0

 net-mail/notmuch/notmuch-0.22.2-r1.ebuild | 199 ++++++++++++++++++++++++++++++
 1 file changed, 199 insertions(+)

diff --git a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
new file mode 100644
index 00000000..33e8ce3
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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"
+
+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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--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
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../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}" V=1 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/notmuch-report
+	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 dodoc -r html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     b67bebc43c002e029809b6ae4368a587fd5daec3
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 21:35:33 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 21:35:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67bebc4

net-mail/notmuch: Bump version to 0.22.2

Package-Manager: portage-2.3.0

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.22.2.ebuild | 198 +++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 64f4ee6..a0c243b 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,4 +4,5 @@ DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.1.tar.gz 683286 SHA256 e739457794f3c2b363beffa3ed9e8a2786921031c80672f5b06d0880876a974b SHA512 b28ee8aa5af7172664ebc4d50c8830e645ad3e4945f5d162e44b627f3344de71b7525a444ae08f1c0650a7f94071f54cebcf3494214df80452b6ca954818deb9 WHIRLPOOL 85f95c9156a93e7b31d3d80e5b31f7e0a7678ff14e7c803abf9baf21a38edf4512c576ddbe540028aa45691260b0d230bf84c8c87c6eb18071d4f5f29c444a43
+DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.22.tar.gz 682458 SHA256 d64118ef926ba06fba814a89a75d20b0c8c8ec07dd65e41bb9f1e9db0dcfb99a SHA512 0fd3860b4bce0fbf2648046a68b92d23d73604e82e05ee1b5913fc82985e67225b0f3a0977f71ad5251e7714a7111e8fd84ae0347f33475dddd8eb8d00fd2ed6 WHIRLPOOL 56e3ebbbf53092a6683b0c6ca945ed634f2e01b63625279a69221688905d0da688689ccc7a68d0af43c7ed9b48e696d85a6cb17a8d01c6e0facb27255ac00d3e

diff --git a/net-mail/notmuch/notmuch-0.22.2.ebuild b/net-mail/notmuch/notmuch-0.22.2.ebuild
new file mode 100644
index 00000000..5748091
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.22.2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--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
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 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/notmuch-report
+	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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     ee16faa3b2fcadb880251f1c4045d7abf4ba8ca4
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 20:53:11 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 20:53:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee16faa3

net-mail/notmuch: Don't die on unpack

Copy test database only for test.

Package-Manager: portage-2.3.0

 net-mail/notmuch/notmuch-0.22-r2.ebuild | 6 ++++--
 net-mail/notmuch/notmuch-0.22.1.ebuild  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.22-r2.ebuild b/net-mail/notmuch/notmuch-0.22-r2.ebuild
index 28aab24..5748091 100644
--- a/net-mail/notmuch/notmuch-0.22-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.22-r2.ebuild
@@ -93,8 +93,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack "${P}".tar.gz
-	mkdir -p "${S}"/test/test-databases || die
-	cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
 }
 
 src_prepare() {

diff --git a/net-mail/notmuch/notmuch-0.22.1.ebuild b/net-mail/notmuch/notmuch-0.22.1.ebuild
index 28aab24..5748091 100644
--- a/net-mail/notmuch/notmuch-0.22.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.1.ebuild
@@ -93,8 +93,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack "${P}".tar.gz
-	mkdir -p "${S}"/test/test-databases || die
-	cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     9021f6412d0b9254e381dc72f07556ebce2e7bda
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 20:19:27 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 20:21:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9021f641

net-mail/notmuch: Put database to correct directory

Package-Manager: portage-2.3.0

 net-mail/notmuch/notmuch-0.22-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.22-r2.ebuild b/net-mail/notmuch/notmuch-0.22-r2.ebuild
index 73a9881..28aab24 100644
--- a/net-mail/notmuch/notmuch-0.22-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.22-r2.ebuild
@@ -93,7 +93,8 @@ pkg_setup() {
 
 src_unpack() {
 	unpack "${P}".tar.gz
-	cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test-databases/
+	mkdir -p "${S}"/test/test-databases || die
+	cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     7addb30ca0464cda5f843b317041838897f18b41
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 20:21:11 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 20:21:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7addb30c

net-mail/notmuch: Bump version to 0.22.1

Package-Manager: portage-2.3.0

 net-mail/notmuch/Manifest              |   1 +
 net-mail/notmuch/notmuch-0.22.1.ebuild | 196 +++++++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 8933e71..64f4ee6 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -3,4 +3,5 @@ DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
+DIST notmuch-0.22.1.tar.gz 683286 SHA256 e739457794f3c2b363beffa3ed9e8a2786921031c80672f5b06d0880876a974b SHA512 b28ee8aa5af7172664ebc4d50c8830e645ad3e4945f5d162e44b627f3344de71b7525a444ae08f1c0650a7f94071f54cebcf3494214df80452b6ca954818deb9 WHIRLPOOL 85f95c9156a93e7b31d3d80e5b31f7e0a7678ff14e7c803abf9baf21a38edf4512c576ddbe540028aa45691260b0d230bf84c8c87c6eb18071d4f5f29c444a43
 DIST notmuch-0.22.tar.gz 682458 SHA256 d64118ef926ba06fba814a89a75d20b0c8c8ec07dd65e41bb9f1e9db0dcfb99a SHA512 0fd3860b4bce0fbf2648046a68b92d23d73604e82e05ee1b5913fc82985e67225b0f3a0977f71ad5251e7714a7111e8fd84ae0347f33475dddd8eb8d00fd2ed6 WHIRLPOOL 56e3ebbbf53092a6683b0c6ca945ed634f2e01b63625279a69221688905d0da688689ccc7a68d0af43c7ed9b48e696d85a6cb17a8d01c6e0facb27255ac00d3e

diff --git a/net-mail/notmuch/notmuch-0.22.1.ebuild b/net-mail/notmuch/notmuch-0.22.1.ebuild
new file mode 100644
index 0000000..28aab24
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.22.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	mkdir -p "${S}"/test/test-databases || die
+	cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+}
+
+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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--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
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 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/notmuch-report
+	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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Tobias Klausmann]

commit:     f8a5c1122b88024e2ea4b3616ed9317da0f9a007
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 17:01:38 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 17:01:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a5c112

net-mail/notmuch-0.22-r2: add ~alpha keyword

Gentoo-Bug: 587560

 net-mail/notmuch/notmuch-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.22-r2.ebuild b/net-mail/notmuch/notmuch-0.22-r2.ebuild
index 6ef3939..73a9881 100644
--- a/net-mail/notmuch/notmuch-0.22-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.22-r2.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     44b228d869e892525c0957ec42f35b654e28582f
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 16:16:17 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 16:16:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b228d8

net-mail/notmuch: Make tests verbose in stable ebuilds as well

Package-Manager: portage-2.3.0

 net-mail/notmuch/notmuch-0.18.2.ebuild  | 4 ++--
 net-mail/notmuch/notmuch-0.19-r1.ebuild | 4 ++--
 net-mail/notmuch/notmuch-0.20.2.ebuild  | 4 ++--
 net-mail/notmuch/notmuch-0.21.ebuild    | 4 ++--
 net-mail/notmuch/notmuch-0.22.ebuild    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.18.2.ebuild b/net-mail/notmuch/notmuch-0.18.2.ebuild
index 9651014..a0070f8 100644
--- a/net-mail/notmuch/notmuch-0.18.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -133,7 +133,7 @@ src_compile() {
 src_test() {
 	pax-mark -m notmuch
 	emake download-test-databases
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
 	pax-mark -ze notmuch
 }
 

diff --git a/net-mail/notmuch/notmuch-0.19-r1.ebuild b/net-mail/notmuch/notmuch-0.19-r1.ebuild
index 656236c..7e0b38c 100644
--- a/net-mail/notmuch/notmuch-0.19-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -147,7 +147,7 @@ src_compile() {
 src_test() {
 	pax-mark -m notmuch
 	emake download-test-databases
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
 	pax-mark -ze notmuch
 }
 

diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
index 2979688..8b88dd9 100644
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -143,7 +143,7 @@ src_compile() {
 src_test() {
 	pax-mark -m notmuch
 	emake download-test-databases
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
 	pax-mark -ze notmuch
 }
 

diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
index 896f474..211a70e 100644
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -143,7 +143,7 @@ src_compile() {
 src_test() {
 	pax-mark -m notmuch
 	emake download-test-databases
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
 	pax-mark -ze notmuch
 }
 

diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild
index 1cf92ce..3c6dfdd 100644
--- a/net-mail/notmuch/notmuch-0.22.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.ebuild
@@ -141,7 +141,7 @@ src_compile() {
 src_test() {
 	pax-mark -m notmuch
 	emake download-test-databases
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
 	pax-mark -ze notmuch
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     76a5c44143763c31f2fab5efaef913bba4fe51db
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 16:10:59 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 16:11:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a5c441

net-mail/notmuch: Let package manager download test database

Put test notmuch database into SRC_URI and copy it to test directory
rather than downloading it in src_test phase.

Package-Manager: portage-2.3.0

 net-mail/notmuch/Manifest               | 1 +
 net-mail/notmuch/notmuch-0.22-r2.ebuild | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 64dc7b3..8933e71 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
+DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
 DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc

diff --git a/net-mail/notmuch/notmuch-0.22-r2.ebuild b/net-mail/notmuch/notmuch-0.22-r2.ebuild
index 3b36766..6ef3939 100644
--- a/net-mail/notmuch/notmuch-0.22-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.22-r2.ebuild
@@ -12,7 +12,8 @@ inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
 
 LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
@@ -90,6 +91,11 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack "${P}".tar.gz
+	cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test-databases/
+}
+
 src_prepare() {
 	[[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
 
@@ -141,7 +147,6 @@ src_compile() {
 
 src_test() {
 	pax-mark -m notmuch
-	emake download-test-databases
 	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
 	pax-mark -ze notmuch
 }

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     f6489a7a70061cde87b035b4523f20ecaf7bbb8c
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 16:06:24 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 16:11:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6489a7a

net-mail/notmuch: Make tests verbose

 net-mail/notmuch/notmuch-0.22-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.22-r2.ebuild b/net-mail/notmuch/notmuch-0.22-r2.ebuild
index 6f415c8..3b36766 100644
--- a/net-mail/notmuch/notmuch-0.22-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.22-r2.ebuild
@@ -142,7 +142,7 @@ src_compile() {
 src_test() {
 	pax-mark -m notmuch
 	emake download-test-databases
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
 	pax-mark -ze notmuch
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     67d71e92930ef8716512c0111c30d796e01a0880
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 09:27:20 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 16:11:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d71e92

net-mail/notmuch: Rename debug flag to valgrind (in testing ebuild only)

Require valgrind only for build. 'debug' flag was actually misused.

Gentoo-Bug: 587560

Package-Manager: portage-2.3.0

 net-mail/notmuch/metadata.xml           | 1 +
 net-mail/notmuch/notmuch-0.22-r2.ebuild | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index d476d72..332a3c0 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="nmbug">Install experimental tag sharing /
 			pseudo-bug-tracking script for Notmuch
 			(see http://notmuchmail.org/nmbug/)</flag>
+		<flag name="valgrind">Depend on dev-util/vagrind for test suite</flag>
 	</use>
 	<longdescription lang="en">
 		Notmuch is a system for indexing, searching, reading, and tagging large

diff --git a/net-mail/notmuch/notmuch-0.22-r2.ebuild b/net-mail/notmuch/notmuch-0.22-r2.ebuild
index 41765a4..6f415c8 100644
--- a/net-mail/notmuch/notmuch-0.22-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.22-r2.ebuild
@@ -22,9 +22,9 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt debug emacs python )
+	test? ( crypt emacs python valgrind )
 	"
-IUSE="crypt debug doc emacs mutt nmbug python test"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
 CDEPEND="
 	>=app-shells/bash-completion-1.9
@@ -35,7 +35,6 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
 	python? ( ${PYTHON_DEPS} )
 	"
@@ -45,6 +44,7 @@ DEPEND="${CDEPEND}
 	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
 		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
 	"
 RDEPEND="${CDEPEND}
 	crypt? ( app-crypt/gnupg )
@@ -99,7 +99,7 @@ src_prepare() {
 
 	rm -f Makefile.config # assure that new Makefile.config will be generated
 
-	if use debug; then
+	if use test; then
 		append-cflags -g
 		append-cxxflags -g
 	fi

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     2ba58f85d7005cbcd997f1a3be246cf4009c261c
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 21:27:47 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 21:30:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba58f85

net-mail/notmuch: Don't block app-crypt/gnupg and dev-libs/gmime[smime]

Test fails if GnuPG is installed and GMime is compiled without S/MIME.
This could occur when 'crypt' flag is disabled but GnuPG is installed
anyway. Although test requires 'crypt', therefore this doesn't occur and
blocking anything when particular feature is disabled is not needed.

Package-Manager: portage-2.3.0_rc1

 net-mail/notmuch/notmuch-0.22-r1.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.22-r1.ebuild b/net-mail/notmuch/notmuch-0.22-r1.ebuild
index 9357a32..41765a4 100644
--- a/net-mail/notmuch/notmuch-0.22-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.22-r1.ebuild
@@ -35,7 +35,6 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	!crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[-smime] )
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
 	python? ( ${PYTHON_DEPS} )
@@ -45,17 +44,15 @@ DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
 		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( dev-libs/openssl ) )
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
 	"
 RDEPEND="${CDEPEND}
 	crypt? ( app-crypt/gnupg )
-	!crypt? ( !app-crypt/gnupg )
 	nmbug? ( dev-vcs/git )
 	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
-		)
+		virtual/perl-Pod-Parser )
 	"
 
 DOCS=( AUTHORS NEWS README )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     06b74ca54c3d020f2881377f66ec203aa258166d
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 21:32:19 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 21:32:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b74ca5

net-mail/notmuch: Bump revision

Bump revision for commit "Don't block app-crypt/gnupg and
dev-libs/gmime[smime]".

Package-Manager: portage-2.3.0_rc1

 net-mail/notmuch/{notmuch-0.22-r1.ebuild => notmuch-0.22-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.22-r1.ebuild b/net-mail/notmuch/notmuch-0.22-r2.ebuild
similarity index 100%
rename from net-mail/notmuch/notmuch-0.22-r1.ebuild
rename to net-mail/notmuch/notmuch-0.22-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     3247f5002cd9eaebaf830bbbac6ec386a2b27305
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 06:18:42 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 06:25:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3247f500

net-mail/notmuch: Apply changes in dependencies only in new rev

Revert changes in notmuch-0.22.ebuild in commit
9cdfbeb940dabdd1d2088752b761e12c605e6efa and reapply changes to
newly bumped notmuch-0.22-r1.ebuild only. Changes in dependencies are
not so trivial, so better have a backup option for users.

Package-Manager: portage-2.3.0_rc1

 net-mail/notmuch/{notmuch-0.22.ebuild => notmuch-0.22-r1.ebuild} | 0
 net-mail/notmuch/notmuch-0.22.ebuild                             | 8 ++------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22-r1.ebuild
similarity index 100%
copy from net-mail/notmuch/notmuch-0.22.ebuild
copy to net-mail/notmuch/notmuch-0.22-r1.ebuild

diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild
index 9357a32..1cf92ce 100644
--- a/net-mail/notmuch/notmuch-0.22.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.ebuild
@@ -29,13 +29,11 @@ IUSE="crypt debug doc emacs mutt nmbug python test"
 CDEPEND="
 	>=app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/gmime-2.6.20:2.6
 	>=dev-libs/xapian-1.2.7-r2:=
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	!crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[-smime] )
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
 	python? ( ${PYTHON_DEPS} )
@@ -44,12 +42,10 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( dev-libs/openssl ) )
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
 	"
 RDEPEND="${CDEPEND}
 	crypt? ( app-crypt/gnupg )
-	!crypt? ( !app-crypt/gnupg )
 	nmbug? ( dev-vcs/git )
 	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
 		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     9cdfbeb940dabdd1d2088752b761e12c605e6efa
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 21:29:22 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue May 31 22:10:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdfbeb9

net-mail/notmuch: Correct dependencies related to S/MIME support

gnupg must be installed only if crypt flag is enabled, because crypt
related tests are run when this gnupg commands can be found. The same
applies to smime flag of gmime which pulls gnupg.

Package-Manager: portage-2.3.0_rc1

 net-mail/notmuch/metadata.xml        | 3 ++-
 net-mail/notmuch/notmuch-0.22.ebuild | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index 564970f..d476d72 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -8,7 +8,8 @@
 	<use>
 		<flag name="doc">Install API documentation for enabled bindings</flag>
 		<flag name="crypt">Support decryption and verification of PGP/MIME
-			messages and in Emacs UI - encryption</flag>
+			messages and in Emacs UI - encryption; support also S/MIME
+			signature verification since version 0.22</flag>
 		<flag name="emacs">Install Emacs UI (the main one)</flag>
 		<flag name="mutt">Install helper script for Mutt</flag>
 		<flag name="nmbug">Install experimental tag sharing /

diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild
index 1cf92ce..9357a32 100644
--- a/net-mail/notmuch/notmuch-0.22.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.ebuild
@@ -29,11 +29,13 @@ IUSE="crypt debug doc emacs mutt nmbug python test"
 CDEPEND="
 	>=app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20:2.6
+	>=dev-libs/gmime-2.6.20-r2:2.6
 	>=dev-libs/xapian-1.2.7-r2:=
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	!crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[-smime] )
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
 	python? ( ${PYTHON_DEPS} )
@@ -42,10 +44,12 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( dev-libs/openssl ) )
 	"
 RDEPEND="${CDEPEND}
 	crypt? ( app-crypt/gnupg )
+	!crypt? ( !app-crypt/gnupg )
 	nmbug? ( dev-vcs/git )
 	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
 		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     74250c7279e6f8ff909fe6c1fbba31e8bb993bcd
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 17:30:19 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu May  5 17:30:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74250c72

net-mail/notmuch: Install notmuch-report instead of nmbug-status

nmbug-status has been renamed to notmuch-report.

Package-Manager: portage-2.2.28

 net-mail/notmuch/notmuch-0.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild
index 2004166..1cf92ce 100644
--- a/net-mail/notmuch/notmuch-0.22.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.ebuild
@@ -154,7 +154,7 @@ src_install() {
 
 	if use nmbug; then
 		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/nmbug-status
+		dobin devel/nmbug/notmuch-report
 	fi
 
 	if use mutt; then

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     ea17c8f92456f6726f15f7aa63064c84694ae842
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 22:07:02 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun May  1 21:33:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea17c8f9

net-mail/notmuch: Bump version

Simplify deps. Use slots and subslots.

Package-Manager: portage-2.2.28

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/notmuch-0.22.ebuild | 189 +++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 1636fc8..64dc7b3 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,3 +2,4 @@ DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
+DIST notmuch-0.22.tar.gz 682458 SHA256 d64118ef926ba06fba814a89a75d20b0c8c8ec07dd65e41bb9f1e9db0dcfb99a SHA512 0fd3860b4bce0fbf2648046a68b92d23d73604e82e05ee1b5913fc82985e67225b0f3a0977f71ad5251e7714a7111e8fd84ae0347f33475dddd8eb8d00fd2ed6 WHIRLPOOL 56e3ebbbf53092a6683b0c6ca945ed634f2e01b63625279a69221688905d0da688689ccc7a68d0af43c7ed9b48e696d85a6cb17a8d01c6e0facb27255ac00d3e

diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild
new file mode 100644
index 0000000..2004166
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.22.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt debug emacs python )
+	"
+IUSE="crypt debug doc emacs mutt nmbug python test"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	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 )
+	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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) 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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use debug; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     c8bc4635241611279486e702703e8b30d4ef1a30
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 16:58:27 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 16:59:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8bc4635

net-mail/notmuch: amd64 stable wrt bug #572014

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/notmuch/notmuch-0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
index 92ee3ff..8fe5d33 100644
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     311ea17d50f9c80e645109629210477c3928ad14
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 19:10:43 2015 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 19:39:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=311ea17d

net-mail/notmuch: Depend on dev-python/sphinx unconditionally

dev-python/sphinx used to be used only to generate docs for Python
bindings, but now it is also used instead of rst2man to generate man
pages.

 net-mail/notmuch/notmuch-0.20.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
index 844d9d8..2979688 100644
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -32,6 +32,7 @@ CDEPEND="
 	>=dev-libs/gmime-2.6.7
 	!=dev-libs/gmime-2.6.19
 	<dev-libs/xapian-1.3
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
@@ -41,8 +42,7 @@ CDEPEND="
 	"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+	doc? ( app-doc/doxygen )
 	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
 		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
 	"

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Piotr Żołnowski]

commit:     51d66f53a94883f26aa9837971dfa6e0522fc090
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 19:13:54 2015 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 19:39:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d66f53

net-mail/notmuch: Bump version to 0.21

Gentoo-Bug: 565522
Package-Manager: portage-2.2.23

 net-mail/notmuch/Manifest            |   1 +
 net-mail/notmuch/notmuch-0.21.ebuild | 191 +++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index e9ddfc4..1636fc8 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
+DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0

diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
new file mode 100644
index 0000000..92ee3ff
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic 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"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt debug 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
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=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? ( app-doc/doxygen )
+	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 )
+	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 "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) 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
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use debug; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--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
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Agostino Sarubbo]

commit:     b6749a597371f6b74bccef7f2798074e47470b38
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 10:43:39 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 10:43:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6749a59

net-mail/notmuch: amd64 stable wrt bug #557918

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 net-mail/notmuch/notmuch-0.20.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
index 3c6b77c..58d27d9 100644
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Żołnowski]

commit:     f6686f845478057742afe0b00b0933db7e9394e5
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 14:39:09 2015 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 14:39:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6686f84

net-mail/notmuch: Add sub-slots "3" and "4" to stable versions

Nothing depends directly on libnotmuch.so therefore I skip revision
bump.

Package-Manager: portage-2.2.20.1

 net-mail/notmuch/notmuch-0.18.2.ebuild  | 4 +++-
 net-mail/notmuch/notmuch-0.19-r1.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.18.2.ebuild b/net-mail/notmuch/notmuch-0.18.2.ebuild
index f8d0eb4..9651014 100644
--- a/net-mail/notmuch/notmuch-0.18.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.18.2.ebuild
@@ -15,7 +15,9 @@ HOMEPAGE="http://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/3"
 KEYWORDS="amd64 x86"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )

diff --git a/net-mail/notmuch/notmuch-0.19-r1.ebuild b/net-mail/notmuch/notmuch-0.19-r1.ebuild
index 5ae253c..656236c 100644
--- a/net-mail/notmuch/notmuch-0.19-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.19-r1.ebuild
@@ -15,7 +15,9 @@ HOMEPAGE="http://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
 KEYWORDS="amd64 x86"
 REQUIRED_USE="
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Żołnowski]

commit:     21c7314e27862f8e565422b4ade62d13fd689e42
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 11:35:46 2015 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 11:35:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c7314e

net-mail/notmuch: Add sub-slot "4"

Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y
is meant to be binary backward compatible.

Nothing depends directly on libnotmuch.so therefore I skip revision
bump.

Package-Manager: portage-2.2.20.1

 net-mail/notmuch/notmuch-0.20.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
index af45fa8..3c6b77c 100644
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -15,7 +15,9 @@ HOMEPAGE="http://notmuchmail.org/"
 SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="
 	nmbug? ( python )

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

[Amadeusz Żołnowski]

commit:     daf4abd9bde6828ebfff643f026475cccee2558d
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 12:04:12 2015 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 12:04:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf4abd9

net-mail/notmuch: Remove oldest versions

Package-Manager: portage-2.2.20.1

 net-mail/notmuch/Manifest               |   2 -
 net-mail/notmuch/metadata.xml           |   2 -
 net-mail/notmuch/notmuch-0.16-r1.ebuild | 172 --------------------------------
 net-mail/notmuch/notmuch-0.17.ebuild    | 163 ------------------------------
 4 files changed, 339 deletions(-)

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a3d4413..e9ddfc4 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,5 +1,3 @@
-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.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index 1de81c8..7972cdf 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -14,8 +14,6 @@
 		<flag name="nmbug">Install experimental tag sharing /
 			pseudo-bug-tracking script for Notmuch
 			(see http://notmuchmail.org/nmbug/)</flag>
-		<flag name="pick">Experimental threaded message view for the emacs
-			interface</flag>
 	</use>
 	<longdescription lang="en">
 		Notmuch is a system for indexing, searching, reading, and tagging large

diff --git a/net-mail/notmuch/notmuch-0.16-r1.ebuild b/net-mail/notmuch/notmuch-0.16-r1.ebuild
deleted file mode 100644
index 9e9351d..0000000
--- a/net-mail/notmuch/notmuch-0.16-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit bash-completion-r1 elisp-common eutils 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="crypt debug doc emacs mutt nmbug pick python test"
-
-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-7.8 )
-	"
-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"
-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() {
-	epatch "${FILESDIR}/${PV}-0001-test-exit-with-nonzero-value-when-not-.patch"
-	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="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--with-gmime-version=2.6
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-	)
-	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
-
-		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
-}

diff --git a/net-mail/notmuch/notmuch-0.17.ebuild b/net-mail/notmuch/notmuch-0.17.ebuild
deleted file mode 100644
index c7db833..0000000
--- a/net-mail/notmuch/notmuch-0.17.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit bash-completion-r1 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="
-	>=dev-libs/glib-2.22
-	>=dev-libs/gmime-2.6.7
-	!=dev-libs/gmime-2.6.19
-	<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-7.8 )
-	"
-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"
-
-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
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--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
-	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
-	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
-}