gentoo resync : 16.09.2020

3 files changed, 220 insertions, 2 deletions

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 809879cb974f..5f6449401217 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -3,6 +3,8 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e
 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
 EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08
-EBUILD notmuch-0.30-r1.ebuild 4345 BLAKE2B fdbb795db2d7e23bb3d299a023501e3b727229903b92d5ce6ff99d26a27f11bb25db5246044a90e62b2cab24a07afbdb7855092ca0bb425a14c99bd4193db505 SHA512 8de4b89d348f83edf1803e2d5781ba632bc20e9b3db28ef5aff6f756e8fc58c1bbe954a1f0de8ae23a1901104d40b265a9124d9e9d29894f150581971b2a7b1e
+EBUILD notmuch-0.30-r1.ebuild 4344 BLAKE2B 7d7e6d4c1d043d1d1d3b35a5332670a741f42d84287c99aa60e95dd355f3cbf23fd6f38eafdd0aa6d96dababbade1382565263ca411bf129673e3471aaa4280b SHA512 598f7cd99b432aa7414bc89e7b865cf638c6d075b0bf304f8c94a03e67f34bf8e454dd18d431250c941f0353171bb6f990be3d482b87bddc7f48ada25b4c692c
+EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 21bea26e7e287937cd45a553abb14cb40420b2bb93886165533f6808d4734e594bd0184fb4b8dd6230b2264dc09f80dd89eeea70f678e7a56981e11f743c1121 SHA512 e12a5c8403c7f7e0ce32a1f002a4e6153b01df9436a517f692b18860a919aac83787a59ae6a00820b2d6fae7661a14a4f822d16b79c2e037f539afddfba04f62
 MISC metadata.xml 1229 BLAKE2B 7a7bc05dd0bd1fbfca066e1041d56068c3e8dfd45359be606d0e7703876c831f0b0a39b0dcea4b44f3ec034a16c906bb1ad703143e244c95487d94d9bf9331b4 SHA512 d100677a61010239386889afd5c0f3444c77f5b42309738668c89409bec8f81f2856eb2e5d00d9d495b94a4111df7209f4cc84b830ef346e57c686e5ccbea24e
diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 87312c1e943d..35f5ab16a29e 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} )
diff --git a/net-mail/notmuch/notmuch-0.31.ebuild b/net-mail/notmuch/notmuch-0.31.ebuild
new file mode 100644
index 000000000000..dc44f4976cc8
--- /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
+}