gentoo resync : 25.08.2020

5 files changed, 71 insertions, 322 deletions

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index b1b70f6601ec..809879cb974f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,7 +2,7 @@ AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45ad
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
-EBUILD notmuch-0.29.3-r1.ebuild 5026 BLAKE2B 015b1cb24b296cf51eae62d5176e72d44c2029e3a85acb69cf72d34027715490ffa704a76ab6a64cca46f089ca28b9688e7357ec309e60ee4366eadb274da883 SHA512 57948e08f46a840d3961936c5249f930ad8604ff43a1235dce954d0b55c307fe5e30234e02c738772a42ae508a689a7cd42b5b70c56a65c1b8d0d790d65fd65c
-EBUILD notmuch-0.29.3-r2.ebuild 5077 BLAKE2B 6e3cbf163abc747d78e23b92484b95ffc2dba4f9048ec36992211a3dbaa2f36b948fd572bce63effd4ad29d6a32fb2d97f90e623eba1f057139f3e18894c1890 SHA512 2eac7bbb29e51d3f3d0af93b328832d0188571b7c70f21c3b183dd7ea7a2b0c1184bc74b0fc0c2da52f4229f6f28b900da7d63074d42c86fceda8fe18e413614
-EBUILD notmuch-0.29.3.ebuild 5048 BLAKE2B cc5a91ae3793d7fa40614dcb67145c48197267ef2f9621b3b1946c8585391c012f5a0eaf7e7b3a281a7e6539fcf8d530922f2c9276bbe1705dbd351d76adcd73 SHA512 ce1a7c577618387b0b8cc80eff4ed6d74bd35062169082c0c22a1e8845d111b8fa161a8b8a2b098a5917006d62681e5d1208d08338fd67b59534ed07df13a84a
-MISC metadata.xml 1228 BLAKE2B 664ab0ca9f5e738137f8c30ce724330907fad02302e3350e9c90eaf2f4470e4bd207352b1bd4e81c9e31177e3d33b979ca3e81d2aaeb6c2d7cb0cd558f093e7a SHA512 f38609954d3924392d98c8a73917d3f896332997f07fac8cca2a1c35693c7080e7cb3d52fcb5478c7b4499cfc60855953a77eda18ac3fd7f9707623f524546ed
+DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
+EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08
+EBUILD notmuch-0.30-r1.ebuild 4345 BLAKE2B fdbb795db2d7e23bb3d299a023501e3b727229903b92d5ce6ff99d26a27f11bb25db5246044a90e62b2cab24a07afbdb7855092ca0bb425a14c99bd4193db505 SHA512 8de4b89d348f83edf1803e2d5781ba632bc20e9b3db28ef5aff6f756e8fc58c1bbe954a1f0de8ae23a1901104d40b265a9124d9e9d29894f150581971b2a7b1e
+MISC metadata.xml 1229 BLAKE2B 7a7bc05dd0bd1fbfca066e1041d56068c3e8dfd45359be606d0e7703876c831f0b0a39b0dcea4b44f3ec034a16c906bb1ad703143e244c95487d94d9bf9331b4 SHA512 d100677a61010239386889afd5c0f3444c77f5b42309738668c89409bec8f81f2856eb2e5d00d9d495b94a4111df7209f4cc84b830ef346e57c686e5ccbea24e
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index e5089957cdab..799fdb5f19ac 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.29.3-r2.ebuild b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
index 7750baa97aef..9d7b13f40a90 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.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
deleted file mode 100644
index 35caf2d27477..000000000000
--- 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
-}
diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 13810a43d49b..87312c1e943d 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
+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/"
@@ -15,48 +16,53 @@ 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
+# 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 ~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 )"
 
-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}
+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
-		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
 	)
 	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
+"
+RDEPEND="${COMMON_DEPEND}
 	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
 	mutt? (
 		dev-perl/File-Which
 		dev-perl/Mail-Box
@@ -68,38 +74,27 @@ RDEPEND="${CDEPEND}
 		virtual/perl-Getopt-Long
 		virtual/perl-Pod-Parser
 	)
-	"
+	nmbug? ( dev-vcs/git )
+"
 
 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=$?
+	local rc=0
+	if use python; then
+		pushd bindings/python-cffi || die
+		${@}
+		rc=${?}
 		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
+		# Old deprecated bindings, #736204
+		pushd bindings/python || die
+		${@}
+		rc=${?}
+		popd || die
 	fi
+	return ${rc}
 }
 
 pkg_setup() {
@@ -115,16 +110,16 @@ src_unpack() {
 }
 
 src_prepare() {
+	local _deps=""
 	default
 
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
+	# Python bindings
+	bindings distutils-r1_src_prepare
 	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
+	# 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
@@ -132,14 +127,14 @@ src_prepare() {
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -lnsl -lsocket   # non-autoconf configure
+		# Non-autoconf configure
+		append-ldflags -lnsl -lsocket
 	fi
 }
 
 src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
+	python_setup # For sphinx
+	local _args=(
 		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
@@ -150,37 +145,24 @@ src_configure() {
 		$(use_with doc api-docs)
 	)
 	tc-export CC CXX
-	econf "${myeconfargs[@]}"
+	econf "${_args[@]}"
 }
 
 src_compile() {
-	python_setup  # for sphinx
-
+	python_setup # For sphinx
 	V=1 default
-	bindings python distutils-r1_src_compile
+	bindings 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
+	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
 	pax-mark -ze notmuch
 }
 
@@ -210,16 +192,16 @@ src_install() {
 		popd || die
 	fi
 
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
+	DOCS="" bindings distutils-r1_src_install
 }
 
 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:"
+	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 /etc/mutt/notmuch-mutt.rc"
+		elog "  source ${_rcfile}"
 	fi
 }