gentoo resync : 30.09.2020

16 files changed, 324 insertions, 164 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index ac995f1f6273..d58d4d8569b0 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index c73f26645d94..e96343c8460a 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -8,6 +8,7 @@ DIST fetchmail-6.4.11.tar.xz 1302708 BLAKE2B 660f05c54ea9772de2dd3e584d0d2ff9add
 DIST fetchmail-6.4.12.tar.xz 1303532 BLAKE2B d37c020b07b342ef4ba95a4b7f017217515e26ec06512350fea2bd58aa4d848a4865d98b1f9440ead544d9c377221f31f97f02499b7799ffa56c1e7dae7b73cf SHA512 277c324bab528a036f2896909b63baaa68d986b79baa24e2ee5cd8ca1d86082d4cd41ca371114fc8ae150eb0f97af50fd5238e88485ad5c701699b69964fe256
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
 EBUILD fetchmail-6.4.11.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f
+EBUILD fetchmail-6.4.12-r1.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a
 EBUILD fetchmail-6.4.12.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f
 EBUILD fetchmail-6.4.8.ebuild 2511 BLAKE2B ebc8a846792c69dc12b7d8030efbd68994d41e1cab51ec8ef5007ec5b8f036f09ac12a69b5c02efb06fa2eb71e5d24655d844661b50737bb4cad5d8322acf9ec SHA512 03e1eb61afe94c73b103f3a56e016f28eb8ed719c44e2f75cf11d81acec5c911a2485d99a74de8bb6c37710f0e6be0daf55b8a675f98a330d02dceea21b0cea8
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.12-r1.ebuild b/net-mail/fetchmail/fetchmail-6.4.12-r1.ebuild
new file mode 100644
index 000000000000..157b8118f72b
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.12-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="tk"
+
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.1:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	kerberos? (
+		virtual/krb5
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/maildirtree/Manifest b/net-mail/maildirtree/Manifest
deleted file mode 100644
index 4c70df32d587..000000000000
--- a/net-mail/maildirtree/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX maildirtree-0.6-ldflags.patch 554 BLAKE2B 7024bd5632de675fc2de91a9c53b709ae3f77395f35ee844b335a74750ee89ff169cba846084a850c487cf660d009cfe36c6012d1b70f4a7e3d626e9882c4b53 SHA512 7969cdf5887e5030c516ee07de057b33a974df912b457833618925a0c00bffe393de2df80fb67858710690d0ddbc877fe59a2a323b61008a5005b189304e3acc
-DIST maildirtree-0.6.tar.gz 52569 BLAKE2B d2505fe66378ca43c83df7bdef6b8afeb38671cb87ba3797c3ac96cdb6ad0d9b6b59e4fd69fba51e402d3c3318383ef3ad516c51c5c585142ea1ba5c0e5270f1 SHA512 13a897b416308b4da7f6e4cb0a93e201fd873b8c490d77ca4186a373fe101837a2b7ba70706775c2ccd717f4b513ba24efe56a94f3c1075f6c0db5729cec9f2f
-EBUILD maildirtree-0.6-r1.ebuild 527 BLAKE2B 8f540719da35337858c3fe951f8be473d8d016ebeb052ef364a0b24ea2f3426b426bc92b6f750ec97798e6229336f7987579f8a94089d51abcbf31aced3a1280 SHA512 ef1d8d4647f689ea831234411d3af6c06c05b1975cdc1fd5289bd18017c9694ff3b456a70ed7d37b819222d7ad1d0425c9ff7b3242d6ed227e1e8ac9026a08ac
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch b/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch
deleted file mode 100644
index f6e0e17a7277..000000000000
--- a/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 631b3c687fe1558b88556a89838b9f264c2aed42
-Author: Eray Aslan <eras@gentoo.org>
-Date:   Mon Jun 6 22:09:23 2011 +0300
-
-    Respect LDFLAGS - bug #337243
-
-diff --git a/Makefile.in b/Makefile.in
-index 62f0673..b24a609 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -33,7 +33,7 @@ maildirtree.1: $(wildcard maildirtree.1.sgml)
- 	$(DBM) $< > $@
- 
- maildirtree: $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
- 
- maildirtree.o: maildirtree.c config.h maildirtree.h snprintf.h
- snprintf.o: snprintf.c config.h snprintf.h
diff --git a/net-mail/maildirtree/maildirtree-0.6-r1.ebuild b/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
deleted file mode 100644
index d880ea1dc782..000000000000
--- a/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A utility that prints trees of Courier-style Maildirs"
-HOMEPAGE="http://triplehelix.org/~joshk/maildirtree"
-SRC_URI="http://triplehelix.org/~joshk/maildirtree/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/maildirtree-0.6-ldflags.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-	dodoc ChangeLog INSTALL README TODO
-}
diff --git a/net-mail/maildirtree/metadata.xml b/net-mail/maildirtree/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/net-mail/maildirtree/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 44a7d2cbf7f8..0c0430cb871b 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,6 +1,3 @@
-DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f
-DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8
 DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc
-EBUILD mailman-3.3.0.ebuild 1742 BLAKE2B b528851e4d73acdcf459b0eae5224d3ef0ba14a7c13c3f9b92ab53e089dcc0ea2d23ce87fafd6aa1c4d5149d581e751010f0ace2ec1037d567027da13a18c416 SHA512 495fe29c164075fd7a4b85cba712115ea3e9193212a6e048febaf2b5ce1a719a765e99efeb17984659a03c3a93dc7c20a48df5c10a1e6a01667aaa6bb623c64a
-EBUILD mailman-3.3.1.ebuild 1474 BLAKE2B ff1f4e9c30bb04449413f387c37d0e3dabf62895ce8bdba42208ca2f85d0071e4320df2cae180ca1f62d880a6a3f67f5fa846de4534704369cedfa5b5adc89fe SHA512 afe16caa2ec32a4ded2acc05063393884c0409071a82505bc2efaff15941c8cbd03bb43a81a572a2cc7fc15ddd92cc1a86ac9bbdb2101a449dd1830c694871b7
+EBUILD mailman-3.3.1-r1.ebuild 1474 BLAKE2B 8a2fee127292f2d41fb76b328bb8426fcf4b137f92d8c8d1dca1715eaad95d2f52b7485bd84045ecbf458825d856fbe0cf21676ca7315d2bb94df79913fe621f SHA512 e72cc0b8c7bd17ec5776c0962153933ad494e1d1432bbeac271ed75eb4241ce1d2a5ca1b0c0a9c6dae6beda6baf92d87440b112ecfadd1201e4d98499b031546
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-3.3.0.ebuild b/net-mail/mailman/mailman-3.3.0.ebuild
deleted file mode 100644
index 2e2bf2af6d84..000000000000
--- a/net-mail/mailman/mailman-3.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~hanno/distfiles/${P}-importlib_resources-fix.diff.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-#KEYWORDS="~amd64 ~ppc ~x86"
-KEYWORDS=""  # nothing til this is finished
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
-	dev-python/flufl-bounce[${PYTHON_USEDEP}]
-	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	dev-python/lazr-config[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-configuration[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-
-# Make it compatible with python 3.7 and 3.6, see
-# https://gitlab.com/mailman/mailman/-/issues/690
-PATCHES=( "${WORKDIR}/mailman-3.3.0-importlib_resources-fix.diff" )
diff --git a/net-mail/mailman/mailman-3.3.1.ebuild b/net-mail/mailman/mailman-3.3.1-r1.ebuild
index f995b8d5bf69..f2b0f734e408 100644
--- a/net-mail/mailman/mailman-3.3.1.ebuild
+++ b/net-mail/mailman/mailman-3.3.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.list.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-SLOT="0"
+SLOT="3"
 #KEYWORDS="~amd64 ~ppc ~x86"
 KEYWORDS=""  # nothing til this is finished
 IUSE=""
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 196358c21bae..cf5ca6ca88e4 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,5 +6,6 @@ DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff
 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 4343 BLAKE2B f53eff50b205bffdb6016118997a5b5176a88ca704999e2b4f3bef4f107a79e7e89e68010fc35bd756aa8cbbe168f73700eba9b33ec8f1ce32a676b1b592e5da SHA512 bde0d770ca18d3c55c79be0b4e6fb360f61bf0f404397448fb311c1cf107b07b5f9633643a04a0e6615acd61934635845d1a2a47283795e3fd69c050939858b1
+EBUILD notmuch-0.31-r1.ebuild 4444 BLAKE2B 3bfc5bf340d8af0f4e351394d41d38de8b73cf959fee108de8ec53690e9b42ecedf0125f90ae2413384d65197f926beac1ced7a8120d2da48e20b85ef1289be0 SHA512 53854173c8b326d9d7e1c7ad826f2f77b61fc605bab54fa9084e41025a91ea14a671bfeaf036ba861b71ceeb83bc0661cd610600e4e9a971c9265ac7d6008c2f
 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.31-r1.ebuild b/net-mail/notmuch/notmuch-0.31-r1.ebuild
new file mode 100644
index 000000000000..f5fd2cc5cf82
--- /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-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/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index f41f219520cb..949f91345903 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,4 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r1.ebuild 712 BLAKE2B 869ab7d7dac0a90708da400c680d206fe619d1798b0e23841922d4d8bb17cba3f8af7552dcccfce09a8c5935663c8a0e25a0d52c926f75b2f40f2bb34698dafb SHA512 ea2eae4c33583966571da8647761f80e6457f5110e1c81f3ac04f31dd4bf093977a456e5ee616c962edc0f107360d645cfc40b0795dee285a56e15cb018d5aed
 EBUILD queue-repair-0.9.0-r2.ebuild 816 BLAKE2B 947aff25964509108987b359546164b7fc8a8d43eac898ef0eda9ceb440e11a9057be5bf6dede3d1942ede7862cf4a53b6f0b182e0ec723764ae5e59c48048e6 SHA512 9b8bfd9c40480adce979a32d16b492cbe9ca27cb29173e44ffe3c8f6b30b64ad2ad7975d0e26dde2a41b49538679c0357d28b7f9ac97f3850754323e8947fcf5
 MISC metadata.xml 490 BLAKE2B 8ec4d8e23a4956f5679a0b5291b03262a4474f3d0d97a5fc3286189f5623c75d859ce8103708dfe3ed1e4e3721165a764b121364f06121289aff047cd60db281 SHA512 bf57215deceddaa74691029e05f52940c0bd1d9262c865980c35786f487d08351e24287c50685ef85514a1e7cc7cb68d527259b369a34d6d06bf8fd4474285b1
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
deleted file mode 100644
index 25cd37ddd1f8..000000000000
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A toolkit for dealing with the qmail queue directory structure"
-HOMEPAGE="http://pyropus.ca/software/queue-repair/"
-SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-DOCS=( BLURB TODO CHANGELOG )
-
-src_install() {
-	python_newscript queue_repair.py queue-repair.py
-	dosym queue-repair.py /usr/bin/queue-repair
-	einstalldocs
-}
diff --git a/net-mail/sendEmail/Manifest b/net-mail/sendEmail/Manifest
index c0c83b498c5e..1efa5a7cf411 100644
--- a/net-mail/sendEmail/Manifest
+++ b/net-mail/sendEmail/Manifest
@@ -1,6 +1,5 @@
 AUX 1.56-overzealous-verify-mode-check.patch 683 BLAKE2B b3b6de3432516007c7c6c8410d99bf51faa36d21b25b60217c1fc5302a21706980cc90e0b0d4f9d12aac3d03850a329cbedb1bf972d49f4972518ebc3063ff7b SHA512 472843ceaf90fb427d626abc4b8484b279d8613ccd39a57a72f689da2f73615a3080a22322ad5cd95d7a8ae10eede7fdb7b51246d810ad066a52b6d2f1498cd0
 AUX 1.56-overzealous-version-check.patch 668 BLAKE2B c05d17287b8b8960022d495769cb459a01af66f09b39ccdcab3a21f5b22f1a2fd78f65643d435614d0a3a5fc87c9ab94d3b5c53c6c45ddc4c22aee5a1cccae18 SHA512 51d43760d0f6bf8905a0c82a5e0a44035246a332e00ae472e3b37725e29fe461beb808f4d74542659e1a7998fbde30c24d4156770058d914b1c08934d5d6884c
 DIST sendEmail-v1.56.tar.gz 29740 BLAKE2B 443e80e0dcc500f8fed843749a504a0064f3cec9845cbb6d40e6c49d5a29dbf1874e2e03bbfaf6d511049addd9b3ed26170143dea966087575ad0ab61874c50b SHA512 0ee208857d6ffa4b9e0eecea0a94decf6d3935041fad23a084fba195f2016a18f3409086eefa8c35fb5dd01697eb29e4af0607754bf1c52bef727b8b670242fd
-EBUILD sendEmail-1.56-r1.ebuild 626 BLAKE2B fdf6f94ba202217a5cde09328fb66172db6d5021904700248ff5a7755065139f809316f1414d895c44ae5eef887707f985306b56767525e366ae7352c3f126f8 SHA512 2202dcf199c12594e4b8bf77a3e4e7eeb8ca24075249d8f16fca6e6bfa99f5e3382e799c100c4eda0d6b0874a20ec50c0f22e4c93d0ebe199e8f80be3dd1865c
 EBUILD sendEmail-1.56-r2.ebuild 685 BLAKE2B 2c545aec355b5630b954b901c274c7bc60819a7e3ea695e01f55424839aba4ede354f1bf2ca061ed4a3e9d67074788600a9418d71fc31505c729fc0f2753327b SHA512 a6a295c2e1d232e8fbbe9a73b3b3235c1f75a89aa8aa395fbd7b8fda3c4b8e8b21bd28727a590f4fe22b6a19edfd3824bc046aeb044ac82139793ecaefd0b4c3
 MISC metadata.xml 689 BLAKE2B db187f3a6d6dcedcaa0663b47292173ba69945905800205b7a9e9b468e2313c9ce1c69f36ceb6ad838d47073158d5781b5836f4b3f5b42f3fb7200c957c461cf SHA512 61fa434f59304fa18e844d02a363c5fa68e33755108523f9dc27ee9cb7199bcc69113c37d1fb3c5e6503dc36614b75d00aa38a20aec46a39d0577e4965352ea7
diff --git a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
deleted file mode 100644
index acc2cc71391d..000000000000
--- a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P="${PN}-v${PV}"
-
-inherit base
-
-DESCRIPTION="Command line based, SMTP email agent"
-HOMEPAGE="http://caspian.dotconf.net/menu/Software/SendEmail/"
-SRC_URI="http://caspian.dotconf.net/menu/Software/SendEmail/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="ssl"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" )
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	dobin sendEmail
-	dodoc CHANGELOG  README  TODO
-}