From 9aa5fb541a6e3522a5f6146f5f7d7b1e5d1905e8 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Mon, 12 Sep 2022 20:48:18 +0100
Subject: net-mail/notmuch: add 0.37, drop 0.36

Signed-off-by: Sam James <sam@gentoo.org>
---
 net-mail/notmuch/Manifest            |   2 +-
 net-mail/notmuch/notmuch-0.36.ebuild | 302 -----------------------------------
 net-mail/notmuch/notmuch-0.37.ebuild | 302 +++++++++++++++++++++++++++++++++++
 3 files changed, 303 insertions(+), 303 deletions(-)
 delete mode 100644 net-mail/notmuch/notmuch-0.36.ebuild
 create mode 100644 net-mail/notmuch/notmuch-0.37.ebuild

(limited to 'net-mail/notmuch')

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.36.ebuild
deleted file mode 100644
index 166ca13c6c01..000000000000
--- a/net-mail/notmuch/notmuch-0.36.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# 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
-}
diff --git a/net-mail/notmuch/notmuch-0.37.ebuild b/net-mail/notmuch/notmuch-0.37.ebuild
new file mode 100644
index 000000000000..d3b3da07aebf
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.37.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[${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
+}
-- 
cgit v1.2.3-65-gdbad