Updating liguros repo21.1.2

author: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-17 23:35:33 +0000
committer: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-17 23:35:33 +0000
commit: 8e8120eabdd28020aa69c7a60505cce2edd20adc (patch)
tree: 061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /net-mail
parent: c16790af2c9b4cbc38e565d4311252193ff85484 (diff)
download: baldeagleos-repo-21.1.2.tar.gz
baldeagleos-repo-21.1.2.tar.xz
baldeagleos-repo-21.1.2.zip
70 files changed, 1461 insertions, 853 deletions
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index a8ac298f32c7..446ac1ad2ef4 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,2 +1,3 @@
-DIST automx2-2019.0.tar.bz2 46670 BLAKE2B 6f62b4429be8046fce18ccba6827879a99627d8fbe9cf7973d8059e87b4968a280b62d5d005aaed3b0e1074053f4a6355c34f2cdce2f06a9afb14c52b4504fb7 SHA512 e494a48ffd3e6d133a89db5afd1dc75116a8efcc41f0571a24271bcbe6074c86d62184ce00bae9ced888a70be7d20f2a3614f28007d4481537d42c680dca4daa
 DIST automx2-2020.1.tar.bz2 49405 BLAKE2B 2c9b26300e32e613f622e0b3a39b7f408d22e22638d61da3c93f5d448fe3ebb325e9a0004e3351abed2c9e427373c42637e3539831c04cda8e65a4d1bba1773e SHA512 823e569eacedcf49d53f8ed623a75455e715e3d49186179927a0e10d3efe9823c336912789bbf3d7d2f9aba3053b601352c99bda4ffcc9a7b78e412c938cd91f
+DIST automx2-2020.2.tar.bz2 50740 BLAKE2B 394d26a06d23efe18a3c147f89660a9dbdde7edba078fd361f188738fdc28d36122aa8182e965bb8e3d69d4cbcd3cb784bc7722dd382d1fbee36213459b91fa1 SHA512 dce790c754fd089a15d0baf023a9cb2e04ebb42a4558fc91b06c2de2105f3e00f3675a555739ff1bc35166c98f6cecec62c95f18f4144e88ac6024eaa6f39abe
+DIST automx2-2021.0.tar.bz2 50912 BLAKE2B de6fe1ea6dd5223518683220ff1210baa68c30e67f9cd3aac1a965759cb0f72c1119427043579fb805f68457ac4062000cf8066b6fa6d7106f3ee7f777346a57 SHA512 3ca632cc71d64a9d9d434a7109ab0f55e23e3babb6c1734689f89e5a83c9daa6666af9ce09cb5a0c14256bd6e19f6c5339bd3b3398db7b2d70ff3c6114ddb428
diff --git a/net-mail/automx2/automx2-2019.0.ebuild b/net-mail/automx2/automx2-2020.2.ebuild
index 785530772821..b90293654c78 100644
--- a/net-mail/automx2/automx2-2019.0.ebuild
+++ b/net-mail/automx2/automx2-2020.2.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~amd64"
 IUSE="doc"
 
 BDEPEND="acct-user/automx2
-	>=dev-python/flask-migrate-2.5.2[${PYTHON_USEDEP}]"
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]"
 RDEPEND="${BDEPEND}"
 
 python_prepare_all() {
@@ -27,7 +28,7 @@ python_prepare_all() {
 
 python_test() {
 	export AUTOMX2_CONF="tests/unittest.conf"
-	${EPYTHON} -m unittest discover tests/ || die
+	${EPYTHON} -m unittest discover tests/ || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/net-mail/automx2/automx2-2021.0.ebuild b/net-mail/automx2/automx2-2021.0.ebuild
new file mode 100644
index 000000000000..d062b5cdfa71
--- /dev/null
+++ b/net-mail/automx2/automx2-2021.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Email client autoconfiguration service"
+HOMEPAGE="https://automx.org/"
+SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+BDEPEND="acct-user/automx2
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}"
+
+python_prepare_all() {
+	sed -i -e "/('scripts'/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	export AUTOMX2_CONF="tests/unittest.conf"
+	${EPYTHON} -m unittest discover tests/ || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		DOCS="*.adoc doc/*.adoc contrib/*sample.conf"
+		HTML_DOCS="doc/*.html doc/*.svg"
+	fi
+	sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc
+	newins "${FILESDIR}/conf" "${PN}.conf"
+	distutils-r1_python_install_all
+}
diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml
index c3814416e95f..448b10bbfcda 100644
--- a/net-mail/automx2/metadata.xml
+++ b/net-mail/automx2/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Marc Schiffbauer</name>
 		<description>Proxy</description>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 		automx2 makes configuring a mail account easy. It unites
 		methods for automated mailbox configuration from Apple
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index b1853c18e1ee..ce4bb83c1c39 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qmailadmin/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc s390 sparc x86"
 
 RDEPEND="virtual/qmail"
 PATCHES=(
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
index 431477e2b448..a971fd3d31a0 100644
--- a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/checkpasswd-pam/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 hppa ppc x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc x86"
 
 DEPEND=">=sys-libs/pam-0.75"
 
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
index ac723ca4c9f3..65815d9b39b4 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
index 7942da5f0a0d..a3b6fc0bb173 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
 
 LICENSE="public-domain RSA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="acct-user/cmd5checkpw"
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 042c0a482f06..1fa825dd9b1e 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,4 +1,5 @@
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
 DIST courier-imap-5.0.10.tar.bz2 3324560 BLAKE2B f59034184c6423ba4c8a238e1756e431bc240a5e80db5abc62af10eb776446f7c6afcba2935dfd49a7cf5dfec83087f3cdfe98785b13faa23287b0c6d24a9bd9 SHA512 7b1bd179fb7d9ed99ea4a92414e13d1313d10239bd1d7ddef76d17bb618e6dfd5d51f11d1fdb2fcd6a204a5000e3756ecb30aa2c791c6063ab3991dde65a3590
+DIST courier-imap-5.0.11.tar.bz2 3356907 BLAKE2B 6d4aa2d67ef92b318a87d8c71232d1801d908143c044f03891c9130cb8458958c4c0cbcd214d4f548a2e5e247a37120d1e824469c7b77b8e02d1f75fe2a77e5c SHA512 5fbadfe3a554596a1fdd74648b002964e18d933209f0b832c4782a242c5c76336274756dcd6cc086f55ab66ba4a7292d6d5b9bfe84c0d776f6b3b14d7531bedc
 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
 DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c
diff --git a/net-mail/courier-imap/courier-imap-5.0.11.ebuild b/net-mail/courier-imap/courier-imap-5.0.11.ebuild
new file mode 100644
index 000000000000..efa94a72c726
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-5.0.11.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool readme.gentoo-r1 systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/imap/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+	gnutls? ( net-libs/gnutls[tools] )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=net-libs/courier-authlib-0.66.4
+	>=net-libs/courier-unicode-2
+	>=net-mail/mailbase-0.00-r8
+	net-dns/libidn:=
+	berkdb? ( sys-libs/db:= )
+	fam? ( virtual/fam )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	!mail-mta/courier
+	userland_GNU? ( sys-process/procps )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-courier )
+"
+
+# get rid of old style virtual - bug 350792
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap
+"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+# make check is not supported by this package due to the
+# --enable-workarounds-for-imap-client-bugs option.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
+and remove TLS_DHPARAMS from configuration files or run mkdhparams
+
+For a quick-start howto please refer to
+${PN}-gentoo.readme in /usr/share/doc/${PF}
+
+Please convert maildir to utf8
+and rerun mkdhparams if needed. Location has changed
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
+	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
+)
+
+src_prepare() {
+	default
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
+		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	econf \
+		--with-notice=unicode \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--sysconfdir="/etc/${PN}" \
+		--libexecdir="/usr/$(get_libdir)/${PN}" \
+		--localstatedir="/var/lib/${PN}" \
+		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-certsdir="/etc/courier-imap" \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+}
+
+#src_compile() {
+	# spurious failures with parallel compiles, bug #????
+#	emake -j1
+#}
+
+src_install() {
+	dodir "/var/lib/${PN}" /etc/pam.d
+	keepdir /var/lib/courier-imap
+
+	default
+	rm -r "${D}/etc/pam.d" || die
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	for name in imapd pop3d ; do
+		mv "${D}/usr/sbin/"{,courier-}${name} \
+			|| die "failed to rename ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -e 's/Maildir/${MAILDIR}/' \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR}
+	# to them.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv "${D}/etc/${PN}/${service}"{.dist,} \
+			|| die "failed to rename ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for x in "${D}/usr/sbin"/* ; do
+		if [[ -L "${x}" ]] ; then
+			rm "${x}" || die "failed to remove ${x}"
+		fi
+	done
+
+	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
+	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
+
+	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
+
+	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
+			> "${T}/${initd}" \
+			|| die "initd libdir-sed failed"
+		doinitd "${T}/${initd}"
+	done
+
+	cp "${FILESDIR}"/courier-*-r1.service .
+
+	sed -i \
+		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		courier-*-r1.service \
+		|| die
+
+	systemd_newunit courier-authdaemond-r1.service \
+					courier-authdaemond.service
+	systemd_newunit courier-imapd-ssl-r1.service \
+					courier-imapd-ssl.service
+	systemd_newunit courier-imapd-r1.service \
+					courier-imapd.service
+
+	exeinto "/usr/$(get_libdir)/${PN}"
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
+			> "${T}/${exe}" \
+			|| die "exe libdir-sed failed"
+		doexe "${T}/${exe}"
+	done
+
+	# Avoid a collision with mail-mta/netqmail, bug 482098.
+	mv "${D}/usr/sbin/"{,courier-}maildirmake \
+		|| die "failed to rename maildirmake to courier-maildirmake"
+	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
+		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
+
+	dodoc AUTHORS INSTALL NEWS README ChangeLog
+	readme.gentoo_create_doc
+	dodoc "${FILESDIR}/${PN}-gentoo.readme"
+	docinto imap
+	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
+	docinto maildir
+	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
+	docinto rfc2045
+	dodoc libs/rfc2045/*.html
+	docinto tcpd
+	dodoc libs/tcpd/README* libs/tcpd/*.html
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/${PN}.cron ${PN}
+}
+
+pkg_postinst() {
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
+
+	readme.gentoo_print_elog
+
+	elog ""
+	elog "Courier Imap now run as user mail:mail."
+	elog ""
+	elog "This require you to enable read/write access to the caches:"
+	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index 3487441622a7..fb2128585464 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/dbmail/dbmail-3.2.3-r1.ebuild b/net-mail/dbmail/dbmail-3.2.3-r1.ebuild
deleted file mode 100644
index 2e52e30d3dd4..000000000000
--- a/net-mail/dbmail/dbmail-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator user
-
-DESCRIPTION="Enables storage of mail messages in a relational database"
-HOMEPAGE="https://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap libressl sieve ssl static"
-
-DEPEND="dev-db/libzdb
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	app-text/asciidoc
-	app-text/xmlto
-	app-crypt/mhash
-	sys-libs/zlib
-	dev-libs/gmime:2.6
-	>=dev-libs/glib-2.16
-	dev-libs/libevent
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README.md INSTALL THANKS UPGRADING"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_configure() {
-	econf \
-		--enable-manpages \
-		--sysconfdir=/etc/dbmail \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ldap auth-ldap)
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/sql
-	dodoc -r sql
-	dodoc -r test-scripts
-	dodoc -r contrib
-	## TODO: install other contrib stuff
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf || die
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf || die
-	sed -i -e "s:/var/run:/run/dbmail:" dbmail.conf || die
-
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	# change config path to our default and use the conf.d and init.d files from the contrib dir
-	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
-	# use custom init scripts until updated in upstream contrib
-	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
-	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
-	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
-	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
-	sed -i -e "s:/var/run:/run:" "${D}"/etc/init.d/dbmail-* || die
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	# ldap schema
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/dbmail.schema"
-	fi
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-	fowners dbmail:dbmail /var/lib/dbmail
-	# create this through init-scripts instead of at install time (bug #455002)
-	#keepdir /run/dbmail
-	#fowners dbmail:dbmail /run/dbmail
-}
-
-pkg_postinst() {
-	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-	echo
-	elog "We are now using the init script from upstream."
-	elog "Please edit /etc/conf.d/dbmail to set which services to start"
-	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
-	elog "forget to rc-update del dbmail-* first)"
-	echo
-	elog "Changed pid directory to /run/dbmail (see"
-	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
-	echo
-	ewarn "The database config has changed to support libzdb db URI"
-	ewarn "Please check the documentation (or Bug #479664)"
-	echo
-	ewarn "The database schema has changed since 3.0.x make sure"
-	ewarn "to run the migration script"
-	echo
-	ewarn "Please be aware, that the single init-script for all services"
-	ewarn "has been replaced with seperate init scripts for the individual services."
-	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
-	ewarn "and remove dbmail if you want to take advantage of this change."
-	echo
-}
diff --git a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
index 39d811d7e7c9..ec9329b7b4aa 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ldap libressl sieve ssl"
 
 RDEPEND="
diff --git a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
index 76101afdcc1a..6a92ed70ac15 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 # See bug 97850
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ebe904c9a293..73dcc9006922 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,8 +1,6 @@
 DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4
 DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d
-DIST dovecot-2.3-pigeonhole-0.5.10.tar.gz 1899237 BLAKE2B a308500d6a51d4a9b99ae16b75829f1f799351675a31d91e450c4ea1b095d7719af424534f4b7736559b06819a337e7be0bd44307b77a775c8a54359e41822c1 SHA512 f3d380edba4d25d20ee52db21d2965e3a6b229924e9a04fbf45cfe32e1d25448977ee41b12ba41ad8cf8b795f19bb1dbef1d7d09e775598d782123268f61dc8b
 DIST dovecot-2.3-pigeonhole-0.5.11.tar.gz 1912411 BLAKE2B ed35cbae5ea2c1da24a1a255c1fc943b9a8c35280840ea42c1b5f83ea327872bb83ae8901696abfe3b0d27dfd6c11d3fb1661614fad54eeab9d700b5f0b7b13a SHA512 793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d
-DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60
-DIST dovecot-2.3.10.1.tar.gz 7226958 BLAKE2B 2f9223d9184b3f8809b573ebd5637e1fd32885a377d95284bbf6d0d975b61462e351d42c515ca860a2348e39634ff440cb58dc6894008782a0e7d5a4dead4d77 SHA512 5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06
+DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac546dd9b272b361752c70eed0596bbb743cd8c30d942427d5814ab551bb39eb844c7bd05074bb49b11a6b81747e2fc535b0f9993f14 SHA512 fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3
 DIST dovecot-2.3.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69608cc4ee6081d9eb929d63e7a586ccc0d86fcdbe1aac67aea9f2678ab0e150f053667817b08f4a7246947bb812fdb SHA512 d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb
-DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
+DIST dovecot-2.3.13.tar.gz 7456073 BLAKE2B 6cf3e7d9c6cf90279e0d72782cca88a11617f3f08e3c27da7948f46b8796575e42c776323cd56bc4208474831d4480afcac35ebe0b74d99db40acd4cda2279be SHA512 758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95
diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild
index 1c463e0ac87c..9712daf5d27b 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild
@@ -41,7 +41,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
index 2b42893baff2..8c6836bd9cb4 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
@@ -41,7 +41,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/dovecot/dovecot-2.3.11.3.ebuild b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
index 92349c006ef1..a698c9698b94 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
@@ -41,7 +41,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/dovecot/dovecot-2.3.10.1.ebuild b/net-mail/dovecot/dovecot-2.3.13-r1.ebuild
index d8f21727e299..f236b7cc260f 100644
--- a/net-mail/dovecot/dovecot-2.3.10.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.13-r1.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
@@ -10,7 +10,7 @@ inherit autotools ssl-cert systemd toolchain-funcs
 MY_P="${P/_/.}"
 #MY_S="${PN}-ce-${PV}"
 major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.10"
+sieve_version="0.5.13"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
 else
@@ -28,11 +28,11 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
 
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat unwind"
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
 
 IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
 
@@ -41,13 +41,14 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
 	sqlite? ( dev-db/sqlite:* )
@@ -57,8 +58,8 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	tcpd? ( sys-apps/tcp-wrappers )
 	textcat? ( app-text/libexttextcat )
 	unwind? ( sys-libs/libunwind )
-	vpopmail? ( net-mail/vpopmail )
 	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
 	virtual/libiconv
 	dev-libs/icu:="
 
@@ -69,6 +70,11 @@ RDEPEND="${DEPEND}
 	acct-user/dovenull
 	net-mail/mailbase"
 
+PATCHES=(
+	"${FILESDIR}/${PN}"-unwind-generic.patch
+	"${FILESDIR}/${PN}"-socket-name-too-long.patch
+	)
+
 pkg_setup() {
 	if use managesieve && ! use sieve; then
 		ewarn "managesieve USE flag selected but sieve USE flag unselected"
@@ -79,8 +85,8 @@ pkg_setup() {
 src_prepare() {
 	default
 	# bug 657108
-	elibtoolize
-	#eautoreconf
+	#elibtoolize
+	eautoreconf
 }
 
 src_configure() {
@@ -118,8 +124,8 @@ src_configure() {
 		$( use_with tcpd libwrap ) \
 		$( use_with textcat ) \
 		$( use_with unwind libunwind ) \
-		$( use_with vpopmail ) \
 		$( use_with zlib ) \
+		$( use_with zstd ) \
 		$( use_enable static-libs static ) \
 		${conf}
 
@@ -240,13 +246,6 @@ src_install() {
 			|| die "failed to update ldap settings in 10-auth.conf"
 	fi
 
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
 	if use sieve || use managesieve ; then
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		emake DESTDIR="${ED}" install
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
index dcbc6f0840d2..296043d1df06 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 # do not add a ssl USE flag.  ssl is mandatory
 SSL_DEPS_SKIP=1
-inherit autotools eapi7-ver ssl-cert systemd toolchain-funcs user
+inherit autotools lua-single ssl-cert systemd toolchain-funcs
 
 MY_P="${P/_/.}"
 #MY_S="${PN}-ce-${PV}"
 major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.7.2"
+sieve_version="0.5.13"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
 else
@@ -28,26 +30,29 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
 
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
 
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 DEPEND="argon2? ( dev-libs/libsodium )
 	bzip2? ( app-arch/bzip2 )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( ${LUA_DEPS} )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
 	sqlite? ( dev-db/sqlite:* )
@@ -56,35 +61,38 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	suid? ( acct-group/mail )
 	tcpd? ( sys-apps/tcp-wrappers )
 	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
+	unwind? ( sys-libs/libunwind )
 	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
 	virtual/libiconv
 	dev-libs/icu:="
 
 RDEPEND="${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
 	net-mail/mailbase"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
+	"${FILESDIR}/${PN}"-autoconf-lua-version.patch
+	"${FILESDIR}/${PN}"-unwind-generic.patch
+	"${FILESDIR}/${PN}"-socket-name-too-long.patch
+	)
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use managesieve && ! use sieve; then
 		ewarn "managesieve USE flag selected but sieve USE flag unselected"
 		ewarn "sieve USE flag will be turned on"
 	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
 }
 
 src_prepare() {
 	default
 	# bug 657108
-	elibtoolize
-	#eautoreconf
+	#elibtoolize
+	eautoreconf
 }
 
 src_configure() {
@@ -95,7 +103,7 @@ src_configure() {
 	fi
 
 	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
+	VALGRIND=no LUAPC="${ELUA}" econf \
 		--with-rundir="${EPREFIX}/run/dovecot" \
 		--with-statedir="${EPREFIX}/var/lib/dovecot" \
 		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
@@ -121,8 +129,9 @@ src_configure() {
 		$( use_with solr ) \
 		$( use_with tcpd libwrap ) \
 		$( use_with textcat ) \
-		$( use_with vpopmail ) \
+		$( use_with unwind libunwind ) \
 		$( use_with zlib ) \
+		$( use_with zstd ) \
 		$( use_enable static-libs static ) \
 		${conf}
 
@@ -243,13 +252,6 @@ src_install() {
 			|| die "failed to update ldap settings in 10-auth.conf"
 	fi
 
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
 	if use sieve || use managesieve ; then
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		emake DESTDIR="${ED}" install
diff --git a/net-mail/dovecot/dovecot-2.3.13.ebuild b/net-mail/dovecot/dovecot-2.3.13.ebuild
new file mode 100644
index 000000000000..296043d1df06
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.13.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.13"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	suid? ( acct-group/mail )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	unwind? ( sys-libs/libunwind )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-autoconf-lua-version.patch
+	"${FILESDIR}/${PN}"-unwind-generic.patch
+	"${FILESDIR}/${PN}"-socket-name-too-long.patch
+	)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	#elibtoolize
+	eautoreconf
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no LUAPC="${ELUA}" econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with unwind libunwind ) \
+		$( use_with zlib ) \
+		$( use_with zstd ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install() {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot-autoconf-lua-version.patch b/net-mail/dovecot/files/dovecot-autoconf-lua-version.patch
new file mode 100644
index 000000000000..5572271929ef
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-autoconf-lua-version.patch
@@ -0,0 +1,17 @@
+--- a/m4/want_lua.m4
++++ b/m4/want_lua.m4
+@@ -13,13 +13,12 @@
+   AC_MSG_RESULT([$with_lua])
+ 
+   AS_IF([test "x$with_lua" != "xno"],
+-    [for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
++    [
+        PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
+          AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua])
+          with_lua=yes
+        ], [LUAPC=""]) # otherwise pkg_check will fail
+        if test "x$LUA_LIBS" != "x"; then break; fi
+-     done
+   ])
+ 
+   AS_IF([test "x$with_lua" = "xyes"], [
diff --git a/net-mail/dovecot/files/dovecot-socket-name-too-long.patch b/net-mail/dovecot/files/dovecot-socket-name-too-long.patch
new file mode 100644
index 000000000000..64c17f367b99
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-socket-name-too-long.patch
@@ -0,0 +1,11 @@
+--- a/src/imap/test-imap-client-hibernate.c	2021-01-05 11:42:53.073912808 +0300
++++ b/src/imap/test-imap-client-hibernate.c	2021-01-05 11:43:49.790616213 +0300
+@@ -19,7 +19,7 @@
+ 
+ #include <sys/stat.h>
+ 
+-#define TEMP_DIRNAME ".test-imap-client-hibernate"
++#define TEMP_DIRNAME ".t-ic-h" /* test-imap-client-hibernate */
+ 
+ #define EVILSTR "\t\r\n\001"
+ 
diff --git a/net-mail/eps/eps-1.7-r1.ebuild b/net-mail/eps/eps-1.7-r1.ebuild
index e596283bad15..f94a50607c3b 100644
--- a/net-mail/eps/eps-1.7-r1.ebuild
+++ b/net-mail/eps/eps-1.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,10 +12,8 @@ SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE=""
 
-DEPEND="sys-apps/sed"
-RDEPEND=""
+PATCHES=( "${FILESDIR}"/${P}-static-libs.patch )
 
 src_prepare() {
 	sed -i -e 's:/usr:$(DESTDIR)$(prefix):g' \
diff --git a/net-mail/eps/files/eps-1.7-static-libs.patch b/net-mail/eps/files/eps-1.7-static-libs.patch
new file mode 100644
index 000000000000..06fa8bc82559
--- /dev/null
+++ b/net-mail/eps/files/eps-1.7-static-libs.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ CC = gcc
+ AR = ar
+ STRIP = strip
+-LIB = libeps.a libeps.so
++LIB = libeps.so
+ 
+ AROPTS = -cru
+ RANLIB = ranlib
+@@ -20,10 +20,6 @@ DEFS = -Wall -I.
+ 
+ all: $(LIB)
+ 
+-libeps.a: $(OBJS)
+-	$(AR) $(AROPTS) libeps.a $(OBJS)
+-	$(RANLIB) libeps.a
+-
+ libeps.so: $(OBJS)
+ 	$(CC) -shared -o libeps.so $(OBJS)
+ 
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 0f8c7e98d572..503efebe549a 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -1 +1,2 @@
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
+DIST ezmlm-idx-7.2.2.tar.gz 742451 BLAKE2B fd40b1216d34eba253ef00a53366c8a5f2d19edd9ef20ddea3047a6837263589ac8fc4911820836b49bf4c95b99a1c99d3d2808bc90dd8eb58bc262e6acc74d7 SHA512 4fdd30d6dc254fd0353f34675ea8baa91d95860de1fb23ff5517280c75a8d87405bdd7e180e25eb8f5c0b152a35a11a939f4e7364596e83d81053b1e6019245c
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
index 9e80b3f07c36..ff26cab1effe 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86"
 IUSE="mysql postgres"
 
 DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild
new file mode 100644
index 000000000000..6d5b5f6fa41a
--- /dev/null
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmail toolchain-funcs
+
+DESCRIPTION="Simple yet powerful mailing list manager for qmail"
+HOMEPAGE="https://untroubled.org/ezmlm"
+SRC_URI="https://untroubled.org/ezmlm/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+REQUIRED_USE="?? ( mysql postgres sqlite )"
+
+src_prepare() {
+	default
+	echo /usr/bin > conf-bin || die
+	echo /usr/$(get_libdir)/ezmlm > conf-lib || die
+	echo /etc/ezmlm > conf-etc || die
+	echo /usr/share/man > conf-man || die
+	echo ${QMAIL_HOME} > conf-qmail || die
+
+	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc || die
+	echo $(tc-getCC) ${LDFLAGS} -Wl,-E > conf-ld || die
+
+	# fix DESTDIR and skip cat man-pages
+	sed -e "s:\(/installer\) \(\"\`head\):\1 ${D}\2:" \
+		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
+		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake it man installer
+
+	if use mysql; then
+		emake mysql
+	elif use postgres; then
+		emake pgsql
+	elif use sqlite; then
+		emake sqlite3
+	fi
+}
+
+src_install() {
+	dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
+	default
+}
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 291ee150fc2a..ef0b0e68957e 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,5 +1,3 @@
-DIST fetchmail-6.4.11.tar.xz 1302708 BLAKE2B 660f05c54ea9772de2dd3e584d0d2ff9addfdb7927396330a829f85995a7a2cd818c37762f704030ab73aba6750b62862dc79ad4617d45e948e8a96474fe8258 SHA512 aa7961490e34bffffb571bbc67eccec4bdef046da0a959cb2522e511074c275dbf4d797f9d8d019d7f464baae7ca19194cafeef65b5bc258dbf970d58f2dfd16
-DIST fetchmail-6.4.12.tar.xz 1303532 BLAKE2B d37c020b07b342ef4ba95a4b7f017217515e26ec06512350fea2bd58aa4d848a4865d98b1f9440ead544d9c377221f31f97f02499b7799ffa56c1e7dae7b73cf SHA512 277c324bab528a036f2896909b63baaa68d986b79baa24e2ee5cd8ca1d86082d4cd41ca371114fc8ae150eb0f97af50fd5238e88485ad5c701699b69964fe256
-DIST fetchmail-6.4.13.tar.xz 1308248 BLAKE2B 5efe641d3fc19ed5232fbf959dd09e049e6c5b7419b4bf6fbacb2a24e29916d5dd6209cc7e792e733f59482b4c4aa2983a6d5abe6176dc5a82152b0660042cf4 SHA512 fd55a2a199ec83a863780934481df5ec562f0184adef738d37798aaad7b4eb15dfe0075436907784cc1b87f5c89bdf36a9a4df20f60786f6a185d04ab78ee9a4
 DIST fetchmail-6.4.14.tar.xz 1309352 BLAKE2B d763f4a2fc036ef9c611829fbe5ec9eeed730429c746738203f852d8812609ad91fe179f8c43db1ad819a5430d3bc0a3c9348ab97cef312889cafb05b76a7d5b SHA512 a0295094462abfd6ddeef32772c591f1ec87765f76e116e0bb17af1215c61be965bf1e9f10864fed53b4c072b240a40d43fe51f4287f0ed138795a630be2a276
+DIST fetchmail-6.4.15.tar.xz 1309584 BLAKE2B 8348c345679ae482dfee414863836d5cb4212a09935e7febec7e4f74b9e651eadd298d7cc3b2671429649c777bfebb15d3bd023ee51c369faa7dd6a60193cffe SHA512 9b87aab65c3f102df07df52508bd18ae97ec51e106e238675e3f58c9460050c54fea72550fe33c727aeae723494370f6ea6438a96231ae0eacdbe437552d76e2
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
diff --git a/net-mail/fetchmail/fetchmail-6.4.11.ebuild b/net-mail/fetchmail/fetchmail-6.4.11.ebuild
deleted file mode 100644
index 797dec85cd01..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.11.ebuild
+++ /dev/null
@@ -1,107 +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,8,9,10} )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1 systemd toolchain-funcs autotools
-
-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"
-	systemd_dotmpfilesd "${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/fetchmail/fetchmail-6.4.12-r1.ebuild b/net-mail/fetchmail/fetchmail-6.4.12-r1.ebuild
deleted file mode 100644
index 1a9c5853abdc..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.12-r1.ebuild
+++ /dev/null
@@ -1,107 +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,8,9,10} )
-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/fetchmail/fetchmail-6.4.12.ebuild b/net-mail/fetchmail/fetchmail-6.4.12.ebuild
deleted file mode 100644
index 797dec85cd01..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.12.ebuild
+++ /dev/null
@@ -1,107 +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,8,9,10} )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1 systemd toolchain-funcs autotools
-
-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"
-	systemd_dotmpfilesd "${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/fetchmail/fetchmail-6.4.14.ebuild b/net-mail/fetchmail/fetchmail-6.4.14.ebuild
index 1a9c5853abdc..33dab84b469f 100644
--- a/net-mail/fetchmail/fetchmail-6.4.14.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.14.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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/fetchmail/fetchmail-6.4.13.ebuild b/net-mail/fetchmail/fetchmail-6.4.15.ebuild
index 1a9c5853abdc..33dab84b469f 100644
--- a/net-mail/fetchmail/fetchmail-6.4.13.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.15.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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index 137a43391ff1..817506565018 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 3c49f6960c33..11481bb56e55 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1 +1 @@
-DIST getmail-6.9.tar.gz 184415 BLAKE2B 90c6580391c2d0f038d7011f9873eedce009a50edf44923e78dd6547d86bf00398ac539dedba000925dd4b5f125d7f1ef23e3ca47101d25ad2780f7465bf7e16 SHA512 0ba450135c995adb2ef1b7284dd94db1722f0757cd71ac61482fc2fdb2d04c854d530a5d9e919f276c610a4c7d1227aa26e8aac0f384d0f9149ba5068e3029ce
+DIST getmail-6.13.tar.gz 185130 BLAKE2B c86340baab155da11a9dc208769501c6c9ef77e29e6a5922380b8bc676838d0a9c11a966966062ecfcd10f3108e6d07a196eddcca9a1ccd3d3e8bbea1d9cf891 SHA512 09467cea90b2b0c076a9d68022def311e2659a20e4c5cbc86a94e9c5015c11c148b41a546e3b6b61f40e8940c7d7fc3fa218ef69a04c7774f38cde28ea5ceeef
diff --git a/net-mail/getmail/getmail-6.9.ebuild b/net-mail/getmail/getmail-6.13.ebuild
index ded5dd6e07c6..6ce7cd9e853e 100644
--- a/net-mail/getmail/getmail-6.9.ebuild
+++ b/net-mail/getmail/getmail-6.13.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/getmail/metadata.xml b/net-mail/getmail/metadata.xml
index e2f6e41d0dc1..70a76ec270bb 100644
--- a/net-mail/getmail/metadata.xml
+++ b/net-mail/getmail/metadata.xml
@@ -9,5 +9,13 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <name>Roland Puntaier</name>
+    </maintainer>
+    <bugs-to>https://github.com/getmail6/getmail6/issues</bugs-to>
+    <remote-id type="github">getmail6/getmail6</remote-id>
+    <remote-id type="pypi">getmail</remote-id>
+  </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index aca256c5abf6..406d2d7a76f3 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,3 +1 @@
-DIST imapsync-1.592.tgz 906578 BLAKE2B 8048edddef4a3d9dad751b051c3e0d88eea883cbc57c0b31526ebe13cc818a5996fa07a746801c05aca8ae50429ad2aaee0983d6c4b9cef843a9169824ec293e SHA512 3d41b28396d9b8bf83200b324b2e312c76ef88e42f4ff8993c8d697b18f321400d7a157b1fee2d3ad4eae11400dc2186a18528bde50e370d856eac1b09c28f68
-DIST imapsync-1.836.tar.gz 1741595 BLAKE2B 6502105147cf2f7d13c0af997cab05e3d65a75d54924c8100a82a322da31c8797710e5370a52998384270713ec7ade1c86e5c8c021b7e0937c188dfc1cf178df SHA512 f1ea1ef887ebcfa62c90254b3738602dc78275400a7d8dd5af33bc399c82c28d8567ee42d9ebf85735e7df857bf548608e09f01a06bd146f317faa3b4702cbeb
 DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
diff --git a/net-mail/imapsync/imapsync-1.592-r1.ebuild b/net-mail/imapsync/imapsync-1.592-r1.ebuild
deleted file mode 100644
index 3e184b3dfdce..000000000000
--- a/net-mail/imapsync/imapsync-1.592-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
-HOMEPAGE="https://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tee
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.836.ebuild b/net-mail/imapsync/imapsync-1.836.ebuild
deleted file mode 100644
index 01a8689b1150..000000000000
--- a/net-mail/imapsync/imapsync-1.836.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool allowing incremental and recursive IMAP transfers between mailboxes"
-HOMEPAGE="https://ks.lamiral.info/imapsync/ https://github.com/imapsync/imapsync"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	dev-lang/perl"
-
-RDEPEND="
-	${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-INET6
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tee
-	dev-perl/Mail-IMAPClient
-	dev-perl/Readonly
-	dev-perl/Sys-MemInfo
-	dev-perl/TermReadKey
-	dev-perl/Unicode-String
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-
-	default
-}
-
-src_compile() { :; }
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 07b2bf970e6c..ba5c8b54cd8b 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,2 +1 @@
-DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd5cf3e5dea69cad8fa485424a5d8b89d1e2024f34a688bfb018724b05bf8e5e57ab5338c9973b78d203d4b SHA512 c99d8c4549d781252192e07dfb89adbae6daae5a4f4c94de692c4289848ba8599c2b0aeb28bac69313e6828995eac32acf3fbc76b1695c6464c6339236cdb341
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
diff --git a/net-mail/lbdb/lbdb-0.41.ebuild b/net-mail/lbdb/lbdb-0.41.ebuild
deleted file mode 100644
index e0babfc3226f..000000000000
--- a/net-mail/lbdb/lbdb-0.41.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_P=${P/-/_}
-DESCRIPTION="Little Brother database"
-SRC_URI="http://www.spinnaker.de/debian/${MY_P}.tar.gz"
-HOMEPAGE="https://www.spinnaker.de/lbdb/"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-IUSE="pda ldap finger abook crypt evo"
-
-DEPEND="dev-libs/libvformat
-	evo? ( mail-client/evolution )
-	finger? ( net-misc/netkit-fingerd )
-	abook? ( app-misc/abook )
-	crypt? ( app-crypt/gnupg )"
-RDEPEND="${DEPEND}
-	pda? ( dev-perl/Palm )
-	ldap? ( dev-perl/perl-ldap )"
-
-src_configure() {
-	local evoversion
-	local evolution_addressbook_export
-
-	if use evo ; then
-		evoversion=$(best_version mail-client/evolution)
-		evoversion=${evoversion##mail-client/evolution-}
-		evolution_addressbook_export="/usr/libexec/evolution/$(get_version_component_range 1-2 ${evoversion})/evolution-addressbook-export"
-	fi
-
-	econf $(use_with finger) \
-		$(use_with abook) \
-		--without-ypcat \
-		$(use_with crypt gpg) \
-		$(use_with evo evolution-addressbook-export "${evolution_addressbook_export}" ) \
-		--enable-lbdb-dotlock \
-		--without-pgpk --without-pgp \
-		--without-niscat --without-addr-email --with-getent \
-		--libdir=/usr/$(get_libdir)/lbdb
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-	dodoc README TODO debian/changelog
-}
diff --git a/net-mail/lbdb/lbdb-0.47.ebuild b/net-mail/lbdb/lbdb-0.47.ebuild
index 1d0c6752cfca..af873aceae50 100644
--- a/net-mail/lbdb/lbdb-0.47.ebuild
+++ b/net-mail/lbdb/lbdb-0.47.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.spinnaker.de/lbdb/"
 SRC_URI="https://www.spinnaker.de/lbdb/download/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 LICENSE="GPL-2"
 IUSE="abook bbdb crypt evo finger ldap pda test"
 RESTRICT="!test? ( test )"
diff --git a/net-mail/mailbase/files/mailcap-r1 b/net-mail/mailbase/files/mailcap-r1
new file mode 100644
index 000000000000..0ffdcca3783f
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap-r1
@@ -0,0 +1,19 @@
+application/pdf; xdg-open '%s'; needsterminal
+application/postscript; xdg-open '%s'; needsterminal
+application/x-info; info --subnodes -o /dev/stdout -f '%s' 2>/dev/null; copiousoutput; description=GNU Info document
+application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
+application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
+application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
+
+audio/*; xdg-open '%s'; needsterminal
+image/*; xdg-open '%s'; needsterminal
+
+text/html; lynx -dump '%s'; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/troff; man -l '%s'; needsterminal; description=Man page
+text/*; less '%s'; needsterminal
+text/*; gview '%s'; edit=gvim -f '%s'; compose=gvim -f '%s'; test=test "$DISPLAY" != ""
+text/*; view '%s'; edit=vim '%s'; compose=vim '%s'; needsterminal
+text/*; more '%s'; needsterminal
+
+*/*; less '%s'; needsterminal
+*/*; false; print=lpr '%s'
diff --git a/net-mail/mailbase/mailbase-1.6.ebuild b/net-mail/mailbase/mailbase-1.6.ebuild
new file mode 100644
index 000000000000..81158f51db83
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pam"
+
+RDEPEND="
+	acct-group/mail
+	acct-user/mail
+	acct-user/postmaster
+	pam? ( sys-libs/pam )
+	!<net-mail/metamail-2.7.53.3-r2"
+
+S=${WORKDIR}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	newins "${FILESDIR}"/mailcap-r1 mailcap
+	doman "${FILESDIR}"/mailcap.5
+
+	dosym spool/mail /var/mail
+
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
index 5173370716a2..bcdc6ed7c3f7 100644
--- a/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
+++ b/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
@@ -24,10 +24,7 @@ RDEPEND="
 	>=dev-haskell/missingh-1.2
 	>=dev-haskell/tasty-0.8
 	>=dev-haskell/tasty-hunit-0.8
-	|| ( >=dev-lang/ghc-8.0
-		 ( >=dev-lang/ghc-7.10.1
-		   <dev-lang/ghc-8.0
-		   <dev-haskell/semigroups-0.18.2 ) )
+	>=dev-lang/ghc-8.0
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index f1f4bc73b87b..3ac7bcf80043 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,3 +1,5 @@
 DIST mailutils-3.10.tar.xz 3102328 BLAKE2B 49ea417f71816db2ca1e6a514e5f662d7ef66dc72ae93141ebb8ee006d78ad89587f4b09a96985fdb17335b5f58f8eb654cef23d64fc6d994948786e4a4b1410 SHA512 3a74c9a4bb197feecb2e2c4acfdfac6104c723722b1b2026183bc4cdb6872a45563034f82a56374fd3f51a79999b0f1d47e1169c971d1222fdc1f7b67e66550f
+DIST mailutils-3.11.1.tar.xz 3129416 BLAKE2B f7a13bd1c545b051d213656bea52d9df6409baffe8f1d9755826ef306cc5dc2433b9fd57ea56d5a64d299e8c4babc2dfee8b8f2ee8f1537519c0cb2a568a7717 SHA512 6a1f20d6bf9cda9c90d3bd07a4c23a52d78153a18e89b1cb69682b5efc6c450d7791d430855b47ed97e078e0ec175c4b2732317fd7115767ff01dc808f36145e
+DIST mailutils-3.11.tar.xz 3114388 BLAKE2B 69c648c412db8480366a27bdd654fcbac076e42417519eaaf4a30ea1bf87a8bc58ebbf8dd8499ea5fa81bcdbf844f6066644c8f7b0abf678fadfd8c8e6b3208d SHA512 98584c827780405c701afb1d75aab30a1a63be0456e51ff1ecff0f89422b993cad573d4d8559444de73ace738a7899fd491b6778294ecd0c96b279be833b5438
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
diff --git a/net-mail/mailutils/mailutils-3.10.ebuild b/net-mail/mailutils/mailutils-3.10.ebuild
index a9e93b654725..77349d81d548 100644
--- a/net-mail/mailutils/mailutils-3.10.ebuild
+++ b/net-mail/mailutils/mailutils-3.10.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.11.1.ebuild b/net-mail/mailutils/mailutils-3.11.1.ebuild
new file mode 100644
index 000000000000..c7bdc756e031
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.11.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/mailutils/mailutils-3.11.ebuild b/net-mail/mailutils/mailutils-3.11.ebuild
new file mode 100644
index 000000000000..c7bdc756e031
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.11.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index b17c06c21166..b3dce04e7be6 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.9.ebuild b/net-mail/mailutils/mailutils-3.9.ebuild
index 4dc6918de8e8..4de4547c19c3 100644
--- a/net-mail/mailutils/mailutils-3.9.ebuild
+++ b/net-mail/mailutils/mailutils-3.9.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mairix/mairix-0.24.ebuild b/net-mail/mairix/mairix-0.24.ebuild
index e22eb7b5b6b3..2613f9944f2f 100644
--- a/net-mail/mairix/mairix-0.24.ebuild
+++ b/net-mail/mairix/mairix-0.24.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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-macos"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="zlib bzip2"
 
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
index 51c1b2eeac99..6765178e24bf 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-libs/ncurses
diff --git a/net-mail/mlmmj/mlmmj-1.3.0.ebuild b/net-mail/mlmmj/mlmmj-1.3.0.ebuild
index b2a94cc23343..6fbeb6ac141a 100644
--- a/net-mail/mlmmj/mlmmj-1.3.0.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.3.0.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=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://mlmmj.org/"
 SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 DEPEND="virtual/mta"
 S="${WORKDIR}/${MY_P}"
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 1d103ca7eca7..5b54cfba18e8 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,3 +1,2 @@
-DIST mu-1.4.10.tar.gz 2309459 BLAKE2B 38aa09e1efd788f1ed0d490dfba04bf4f3fccf1eb40d22d2d205934ab6d71ec8739d1baa019ba4c9a0593a0d9487533a46048f71be042178bd33bde6130cbb80 SHA512 59c06e1a0bc893c7dcf5e758dad15be80667be8bb914e97f16158709ebfd50ca29b3a27934bc2df29cc378ce17a3778c5c44738703aa77f5bde21050abb6eb0c
-DIST mu-1.4.12.tar.gz 2309385 BLAKE2B 4f1b7c520a38e5f17471c2a9dc814decc019a4afce89d642ecbaee988752bc20a7f525809a6d911cbc46dadbbeb5db126f7d01465e3dc18ffb099ad1159d3839 SHA512 7e376a58fed80ed1110ad342e3578a427779d4fd715990ce5b87d50b6c2488774b47f9b151dca80bb8723eee8db99699f97df975d199dae0d75576f5c2ebc35a
 DIST mu-1.4.13.tar.gz 2309545 BLAKE2B 9a83e86ab73e325617694f01877a11a93a5bd701cedc776640563f0a5e61946064e201d3f5da2110e1f9583dde9a73e401dd2f018161380435f48f132b2df103 SHA512 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc
+DIST mu-1.4.14.tar.gz 2309663 BLAKE2B 0c043596f6570f9749aba647054a7da78229fcaef03fc0f480c9381e057e34f15872f8e536f1754fdf30f22489cc9acfb83b301eb9f2fab8847b4fcc7f4863d1 SHA512 c51b9e1b8539349116cbd0e62741b3500ed51d12ada99bb3cde39a3e99b93d4a4f487795d56a31ae8189bf349003fe2fbfd95fa652c29231411bda04d9a6d06b
diff --git a/net-mail/mu/mu-1.4.12.ebuild b/net-mail/mu/mu-1.4.12.ebuild
deleted file mode 100644
index 99919703af77..000000000000
--- a/net-mail/mu/mu-1.4.12.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs guile mug"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4
-	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.2 )
-	mug? (
-		net-libs/webkit-gtk:4
-		x11-libs/gtk+:3
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable mug gtk)
-		$(use_enable mug webkit)
-		$(use_enable guile)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	dobin mu/mu
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		doinfo mu4e/mu4e.info
-	fi
-
-	doman man/mu-*.*
-
-	if use guile; then
-		  doinfo guile/mu-guile.info
-	fi
-
-	if use mug; then
-		  dobin toys/mug/mug
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.4.10.ebuild b/net-mail/mu/mu-1.4.14.ebuild
index fe038e53b674..ab29acf0a6fd 100644
--- a/net-mail/mu/mu-1.4.10.ebuild
+++ b/net-mail/mu/mu-1.4.14.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
@@ -11,18 +11,18 @@ SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
 IUSE="emacs guile mug"
 
 DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4
+	dev-libs/glib:2=
+	dev-libs/gmime:3.0=
+	>=dev-libs/xapian-1.4:=
 	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.2 )
+	guile? ( >=dev-scheme/guile-2.2:* )
 	mug? (
-		net-libs/webkit-gtk:4
-		x11-libs/gtk+:3
+		net-libs/webkit-gtk:4=
+		x11-libs/gtk+:3=
 	)"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -65,10 +65,6 @@ src_install() {
 	fi
 }
 
-src_test() {
-	emake check
-}
-
 pkg_preinst() {
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog "After upgrading from an old major version, you should"
@@ -81,9 +77,9 @@ pkg_postinst() {
 		einfo "To use mu4e you need to configure it in your .emacs file"
 		einfo "See the manual for more information:"
 		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
 
-	use emacs && elisp-site-regen
+		elisp-site-regen
+	fi
 }
 
 pkg_postrm() {
diff --git a/net-mail/muchsync/Manifest b/net-mail/muchsync/Manifest
index 4a06ac11f670..97dcfd4da55a 100644
--- a/net-mail/muchsync/Manifest
+++ b/net-mail/muchsync/Manifest
@@ -1 +1,2 @@
 DIST muchsync-5.tar.gz 134107 BLAKE2B cc706aa650b7a2884df0b40c206e9c58f2d633d51e5b465bd11db0cda6ce32a959db045b468c38ab88179e4e8508631b488f869e7dbf4b2038a4e882e14bc7ae SHA512 0b892a145def56712a95a7212850b01f35be2ff434aa07a43badbb298194e8219efb28525063c66a3a53fabc109891631eb653fcb1b8934d5e9ef5480cb4ee4b
+DIST muchsync-6.tar.gz 137023 BLAKE2B b2a60a26bd3a2918b52ea50a98223f828a60c1ba172f349cc350ab8cf224e114623bfb5775a9c05347311f21dbeed14744becd11022fbf8310608faf2a0146f9 SHA512 620e398f7e3973d915c32b1c244e2b1d5ed7c65dfc2a51958e62c229f14f8cf7fe794868930aaddc2d95145795a5affc0f50fc012d2d0b4bf2884930da3eec89
diff --git a/net-mail/muchsync/muchsync-6.ebuild b/net-mail/muchsync/muchsync-6.ebuild
new file mode 100644
index 000000000000..e4fa9876a885
--- /dev/null
+++ b/net-mail/muchsync/muchsync-6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Synchronizes mail messages and notmuch tags across machines"
+HOMEPAGE="https://www.muchsync.org/"
+SRC_URI="http://www.muchsync.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-db/sqlite:3
+	dev-libs/openssl:0=
+	dev-libs/xapian:=
+	net-mail/notmuch:=
+"
+RDEPEND="${DEPEND}
+	net-misc/openssh
+"
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 9456c2345c87..7b8d75a5a022 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 000000000000..578a8a715d10
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -0,0 +1,276 @@
+# 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_{6,7,8,9,10} 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 ~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="
+	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 "${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/qmhandle/qmhandle-1.3.2.ebuild b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
index e9968d7e5227..271127c548e9 100644
--- a/net-mail/qmhandle/qmhandle-1.3.2.ebuild
+++ b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/qmhandle/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="virtual/qmail
diff --git a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
index 382bbeff8302..f0dcf8d43797 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
 
 LICENSE="all-rights-reserved public-domain" # includes code from qmail
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
 RESTRICT="mirror bindist"
 
 PDEPEND="virtual/qmail"
diff --git a/net-mail/ripole/ripole-0.2.2.ebuild b/net-mail/ripole/ripole-0.2.2.ebuild
index bb3374beaeef..f8d627172378 100644
--- a/net-mail/ripole/ripole-0.2.2.ebuild
+++ b/net-mail/ripole/ripole-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pldaniels.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.0-ldflags.patch
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 90fbdbd02a1e..2a94bb32561a 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,3 +1 @@
-DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
-DIST rss2email-3.12.1.tar.gz 73942 BLAKE2B be522ec88b4bbc7831713681dbd157b27c0c410bd6a960d80c72169ed2931346b83fc74f7ded663b13ea92f0dd1f5720647208f425bb4de32081579f6c5e3c51 SHA512 8b62a149172cf13c9b03841191f3b214cd1bc2c071f75150a76dacee3edf8a21e0a083a46eba8fabea695cb5077eb84aa4262a709e4aae1e15facee4bbecd1d6
 DIST rss2email-3.12.2.tar.gz 74096 BLAKE2B 5b7d6808d5741795de805e49bb955694a39a087e1dd64820303243227bf4b12ff9ee9354008c4f6cce415a8a8f84266266f8a677d6fed4eefa69713e5f664de9 SHA512 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888
diff --git a/net-mail/rss2email/rss2email-3.11-r1.ebuild b/net-mail/rss2email/rss2email-3.11-r1.ebuild
deleted file mode 100644
index 7026d0a7ff10..000000000000
--- a/net-mail/rss2email/rss2email-3.11-r1.ebuild
+++ /dev/null
@@ -1,27 +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,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="https://github.com/rss2email/rss2email"
-SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
diff --git a/net-mail/rss2email/rss2email-3.12.1.ebuild b/net-mail/rss2email/rss2email-3.12.1.ebuild
deleted file mode 100644
index 0e583d819441..000000000000
--- a/net-mail/rss2email/rss2email-3.12.1.ebuild
+++ /dev/null
@@ -1,27 +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,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="https://github.com/rss2email/rss2email"
-SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
diff --git a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
index ddcb822d258a..ea829ce42cac 100644
--- a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
 
 RDEPEND="!net-mail/qtools"
 PATCHES=(
author	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-17 23:35:33 +0000
committer	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-17 23:35:33 +0000
commit	8e8120eabdd28020aa69c7a60505cce2edd20adc (patch)
tree	061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /net-mail
parent	c16790af2c9b4cbc38e565d4311252193ff85484 (diff)
download	baldeagleos-repo-21.1.2.tar.gz baldeagleos-repo-21.1.2.tar.xz baldeagleos-repo-21.1.2.zip