gentoo resync : 31.05.2021

27 files changed, 82 insertions, 651 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index acef7c95f5b3..a856013bd9ae 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index fe1690ba1ae1..28bce82750a9 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -21,13 +21,9 @@ AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c
 AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
-DIST courier-imap-5.0.14.tar.bz2 3359363 BLAKE2B 23a734494ee3591b33361f209a465a54f893dd5ed30295fbda4d11707664f9750d5dd422449ff4a159a1fa8130d201bb50cde3fd56051293c45fe53d62c8ed41 SHA512 fa6feb9c6dc04a53e569cb0fdbf34cf4bbccd890cb827a4a0948bd221eb41834033cc7cb7b4c03e8b21c5a59545d73b845865a4da464c1b1b546f70805b18c31
-DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
 DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d
 DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca
-EBUILD courier-imap-4.18.2.ebuild 6787 BLAKE2B d3315cb5d74d86e9096df5823a9f34361a239495551ef52f67749e9fe08a9ddf3437d69da99e804e2a46e44d35e2ec9bd21a8f9881c2c707b146d255565ea1f2 SHA512 428ec41f625200965ef59ddda9b3650dd5f65a41fe1219e33a81c7d2971eb7948b9271fcbc6e45bfecd1442ec59af68195bb39e1e789ae475b8480fa4b2bd5e1
-EBUILD courier-imap-5.0.14.ebuild 7193 BLAKE2B 5b9bd6f0a86e39a1ce3199fd41ada07ccaa7492874ca25a67bddba203c67b7d9d402e5029646758e483d35020724062ffa19e7e93ad1a5c646734b8735cb00c1 SHA512 87b9168db76cb69f9b37336ae5725a277e8799739716fda395f998103b1c9272f65692d0fd76ef8598f6f143e43b435ff13892f6270b735f224ef9cdc7a9fe7e
-EBUILD courier-imap-5.0.7.ebuild 7113 BLAKE2B 0406cf720873e5fad5073091d59b55bec309e37d937556371ed701354363f5fd5323e2dee0b426f16950fd4694bb05ad07b9c56d19c2a5af34b641afd6a212f3 SHA512 9690b253dad1f5adcf3372832054e789677b84ec0def9a03058f01f46b3183cc8964ed45898915d38eef35dedef97081ebb74634f1da1ee97d0d4a1c125ffd88
-EBUILD courier-imap-5.1.2.ebuild 7094 BLAKE2B 28c8ba9b49326a76d0917ea08573f69c3751ac59aa9e072e7d2d5ed3958b89499daf57e9eb145f428958dcb2201b428fcb5021eded8d1903a1ddc88462ee4ec5 SHA512 f95d10f9bf203a0ce021d0e28fea8be700d3737973f6871736bfefa2abd4a7776b14b64533a0b9efa3228d64b2c88564b16d14d1042e1d487c4f6958400f66be
-EBUILD courier-imap-5.1.3.ebuild 7102 BLAKE2B 9db0df8aae46f6ffbdaee4606090f2cb2f1c0996ef30f7d21df48464522a718bbacc80c8794ca9b073ca1ac822ec7c1becaf5ea13f1e2a5b476e1002204b9216 SHA512 37b4b9bbe641b517f1e0fe35ec37cbecdb65725226b87bd2e1c38ff580d18a68d645de34d54ff5daa7fa92f4e41dfa1f2e2f59a74d2ff29446348c15b6d66453
+EBUILD courier-imap-4.18.2.ebuild 6767 BLAKE2B 95b7230c85b591fdbcfc08669db4f44ec7d4864971b44fb1b219f4fe05655cd63764bdfd1bd4b4d4176cdbe2c421d837c71e7f8f290f525bce2236620c1b4e82 SHA512 c2e75d35972f88a17a41ea79db0cdaea7ba6b867c9a5dce806ce5ba0249e155c4d1cdc79f0a7988cc36ff9a3c5895864f42a71b9e0a308f6b9fa1cb44efbbe05
+EBUILD courier-imap-5.1.2.ebuild 7074 BLAKE2B c00c5f5d1ddbe428d90b1edce1869111e4f6f91985cc9714d4d826fa3ab05d6206587b364b74c00372302e8a1b1ac907763c0e78807044c1a9e87a4dcb970ad9 SHA512 c1764aa9f8d32fe9786466c622090c72aaac827e7d001592c7a97f6fb9d620fedc17813d67545349371dd0c81f26d2030803289214051921acad1a8ecf56ee09
+EBUILD courier-imap-5.1.3.ebuild 7082 BLAKE2B 890f4e8a2559db901ccbad905fc0f9957dcbeab86f5dd3afdf0c32563f87edd996c5fe178abbd9193a5fb7ec04ee6edb0e044a15a95823195a01bdad7a6cad39 SHA512 101dff332dce914436c300b6d97331cedc1a2f7270b3c223ebe4f266e9a85d16130731bce889afd48c8b7e7fdc131538a0f8e5ff900ed5b21c6527b249053b0a
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
index fca5172405d8..8b034286d896 100644
--- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -39,7 +39,6 @@ RDEPEND="${CDEPEND}
 # get rid of old style virtual - bug 350792
 RDEPEND="${RDEPEND}
 	!mail-mta/courier
-	!net-mail/bincimap
 	!net-mail/cyrus-imapd
 "
 
diff --git a/net-mail/courier-imap/courier-imap-5.0.14.ebuild b/net-mail/courier-imap/courier-imap-5.0.14.ebuild
deleted file mode 100644
index 060bb3b5a84f..000000000000
--- a/net-mail/courier-imap/courier-imap-5.0.14.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# 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 selinux trashquota"
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-	gnutls? ( net-libs/gnutls[tools] )
-	!gnutls? (
-		dev-libs/openssl: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
-"
-
-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
-
-	cd libs/rootcerts & autoupdate
-	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/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
deleted file mode 100644
index 99e07788d575..000000000000
--- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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 selinux trashquota"
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-	gnutls? ( net-libs/gnutls[tools] )
-	!gnutls? (
-		dev-libs/openssl: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
-"
-
-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"
-)
-
-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/courier-imap/courier-imap-5.1.2.ebuild b/net-mail/courier-imap/courier-imap-5.1.2.ebuild
index 3f91d87cd83c..c908d5ac608a 100644
--- a/net-mail/courier-imap/courier-imap-5.1.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.2.ebuild
@@ -40,7 +40,6 @@ RDEPEND="${CDEPEND}
 # get rid of old style virtual - bug 350792
 RDEPEND="${RDEPEND}
 	!mail-mta/courier
-	!net-mail/bincimap
 	!net-mail/cyrus-imapd
 "
 
diff --git a/net-mail/courier-imap/courier-imap-5.1.3.ebuild b/net-mail/courier-imap/courier-imap-5.1.3.ebuild
index 2418f2ded5ef..df153dc82fd5 100644
--- a/net-mail/courier-imap/courier-imap-5.1.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.3.ebuild
@@ -40,7 +40,6 @@ RDEPEND="${CDEPEND}
 # get rid of old style virtual - bug 350792
 RDEPEND="${RDEPEND}
 	!mail-mta/courier
-	!net-mail/bincimap
 	!net-mail/cyrus-imapd
 "
 
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index eed6a0962dc0..6c11e5c705b3 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -1,5 +1,6 @@
+AUX ezmlm-idx-7.0.0-fno-common.patch 1007 BLAKE2B 9de98526ad5411e40a6b38099a4166e1cb24eea6a54f93df8b8aad4ce0e5769d2a9aa77e6f7396fc8d96f692c6b8c6c0115c990034aa66120d9ea626c82f7dce SHA512 dd172c7db7fae8f8278d462eea58e4d2213dc72079a9f021f1ce3ca7ed0923139d27d39d4bc8a2fed3e91a6df2f1145292acf0ebe255a89aa59a712e45043b91
 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
-EBUILD ezmlm-idx-7.0.0-r3.ebuild 1424 BLAKE2B 8ea76be3cc3ce3826ff5c1be24cd660835578acbf544d363a607ac8ab362085b973733dc38ab59d70b375373ba41343687bfe75f450338a15d4ad1f95c990235 SHA512 50fd8d98bf69dd62c1bdebe02247014fc42c3581279846c078ceb5739455c9b07f10f5a50d9e6ed9fb9ae4d9fe6cebdb41fe90ff0061058c0c832eab5f0b4361
+EBUILD ezmlm-idx-7.0.0-r4.ebuild 1480 BLAKE2B 3df36686d435c7b37141497940548b66585579ceaf81f5d9d3e1b4176dd2196a0ed730c72279e82e34c15562a94dfa8ffdb59e2e13bcbc96723bc5846c95a41d SHA512 37b982b59d8dd3583b36817769bf6495774184cf7eff4b69dbf31b6d6ff6bd4ae2b527f8a13242be45c0a67928a93cf114a70321ecf5df3635326e403820388e
 EBUILD ezmlm-idx-7.2.2.ebuild 1505 BLAKE2B da0a1f58d18db96925af3db6f5e968254360ff486650cadd53997b30424224e10aab119df80165a1bcb25ad5234f6681d44cd62ab3641fbeb03e091cfec07513 SHA512 3298e62c2b50dd2b614d82cdb5364069406bf51a636c29202d4b57db0c5194a39d41cde4c69379b20490ed75f686d5e8e2bf2dd87248837f4037c37c69a8fd79
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r4.ebuild
index 7cac1d1df219..0c0c7c20584a 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r4.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
@@ -20,6 +20,8 @@ RDEPEND="${DEPEND}
 	virtual/qmail"
 REQUIRED_USE="?? ( mysql postgres )"
 
+PATCHES=( "${FILESDIR}/${PN}-7.0.0-fno-common.patch" )
+
 src_prepare() {
 	default
 	echo /usr/bin > conf-bin || die
diff --git a/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch b/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch
new file mode 100644
index 000000000000..11e4cb5d3533
--- /dev/null
+++ b/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch
@@ -0,0 +1,40 @@
+fix build with -fno-common
+
+--- a/ezmlm-get.c	2021-05-24 12:07:05.245657000 +0200
++++ b/ezmlm-get.c	2021-05-24 12:07:11.477657000 +0200
+@@ -125,7 +125,7 @@
+ 
+ int act = AC_NONE;		/* Action we do */
+ int flageditor = 0;		/* if we're invoked for within dir/editor */
+-struct stat st;
++static struct stat st;
+ 
+ int flaglocked = 0;		/* if directory is locked */
+ int flagq = 0;			/* don't use 'quoted-printable' */
+@@ -157,7 +157,7 @@
+ substdio ssindex;
+ char indexbuf[1024];
+ 
+-int fdlock;
++static int fdlock;
+ 
+ void lockup(void)
+ /* lock unless locked */
+--- a/idxthread.c	2021-05-24 12:06:55.169657000 +0200
++++ b/idxthread.c	2021-05-24 12:07:09.197657000 +0200
+@@ -39,13 +39,13 @@
+ 
+ static char strnum[FMT_ULONG];
+ 
+-struct stat st;
++static struct stat st;
+ 			/* if no data, these may be the entire table, so */
+ 			/* need to be static */
+ static subentry sdummy;
+ static authentry adummy;
+ 
+-int fdlock;
++static int fdlock;
+ 
+ /* NOTE: These do NOT prevent double locking */
+ static void lockup(void)
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 4c946f23fc3b..b08d10285e6f 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -4,12 +4,10 @@ AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398a
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
-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.16.tar.xz 1316660 BLAKE2B fbe592327c52e9299cb09da9dafbf49e6cbbb2d998929aa30222b879a6c035a653dacda033cf4dec5e31cd90f3ebe4f388b1fd9155e65d29259260f30e658af0 SHA512 5e0d87739d73991c56111222cd84d6e16913b205c4d427feeb9b03d7f330442851f48769e168883ad75afc0a9db9b5267d1ad30e2ca0efe14263befd625dccf0
+DIST fetchmail-6.4.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
-EBUILD fetchmail-6.4.14.ebuild 2395 BLAKE2B a08af64ef0c391c4fb1e170d7981920542def0aaad22647f1954793852acf2b842b7f7b077ba9e5539a3cdf8737ae636e65101f108b8b541c7066de329d6ebc8 SHA512 9a9007af60a28487f6747bed0bbbb1aa8cd17f766a9ae4ef63ccf920eab0edac4ea22872a9dbc0bc1bf0610ca4727280cdd200b8506a3e032cba8b9cd4dc23eb
-EBUILD fetchmail-6.4.15.ebuild 2395 BLAKE2B a08af64ef0c391c4fb1e170d7981920542def0aaad22647f1954793852acf2b842b7f7b077ba9e5539a3cdf8737ae636e65101f108b8b541c7066de329d6ebc8 SHA512 9a9007af60a28487f6747bed0bbbb1aa8cd17f766a9ae4ef63ccf920eab0edac4ea22872a9dbc0bc1bf0610ca4727280cdd200b8506a3e032cba8b9cd4dc23eb
 EBUILD fetchmail-6.4.16.ebuild 2395 BLAKE2B a08af64ef0c391c4fb1e170d7981920542def0aaad22647f1954793852acf2b842b7f7b077ba9e5539a3cdf8737ae636e65101f108b8b541c7066de329d6ebc8 SHA512 9a9007af60a28487f6747bed0bbbb1aa8cd17f766a9ae4ef63ccf920eab0edac4ea22872a9dbc0bc1bf0610ca4727280cdd200b8506a3e032cba8b9cd4dc23eb
+EBUILD fetchmail-6.4.19.ebuild 2395 BLAKE2B a08af64ef0c391c4fb1e170d7981920542def0aaad22647f1954793852acf2b842b7f7b077ba9e5539a3cdf8737ae636e65101f108b8b541c7066de329d6ebc8 SHA512 9a9007af60a28487f6747bed0bbbb1aa8cd17f766a9ae4ef63ccf920eab0edac4ea22872a9dbc0bc1bf0610ca4727280cdd200b8506a3e032cba8b9cd4dc23eb
 EBUILD fetchmail-6.4.8.ebuild 2387 BLAKE2B 898edfe5dd3c8e3bb68103130af2e4fdd0e9c99a0c9fe31d1b5da9c2eb709400eb2aea7a9aacbe4c869e8175b23cd2c1f1635fbb87ee720d48e4fa932f9a25da SHA512 24279e83b1dc8427d9206fdca009f2852410ae00d06f4e8347a6ae530bc1dd58a65b66edb9ca115020322d4a10d69958839012fb6dbefb75334671d9227f7bcb
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.15.ebuild b/net-mail/fetchmail/fetchmail-6.4.15.ebuild
deleted file mode 100644
index f39826489a82..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.15.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="tk"
-
-inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://www.fetchmail.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos tk socks"
-REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acct-user/fetchmail
-	ssl? (
-		>=dev-libs/openssl-1.1.1:=
-	)
-	kerberos? (
-		virtual/krb5
-		>=dev-libs/openssl-1.0.2:=
-	)
-	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.14.ebuild b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
index f39826489a82..f39826489a82 100644
--- a/net-mail/fetchmail/fetchmail-6.4.14.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index f3b0d5791cc4..f0bd683a8097 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -5,6 +5,6 @@ DIST isync-1.4.1.tar.gz 336281 BLAKE2B cb15a8c0dcadbc3db072fcb10a6f0d83ccef0de1c
 EBUILD isync-1.3.1.ebuild 792 BLAKE2B 9756b0b7045fff9aed767adf783385c4824f806575a929a61d4672f2c93a8917b9ea7915a96f8920e7ae0dfafed51650f04e614189b232a18147b042440df627 SHA512 93f724a0665fdd2735e98f0b9ff5324fbb20167c9c35e9dd04365b17cb5ca97032217c9213035e11d665a63c175055ffd6118fae25154b1534624f5bfb578012
 EBUILD isync-1.3.3.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
 EBUILD isync-1.3.5.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
-EBUILD isync-1.4.1.ebuild 803 BLAKE2B 72d29d61f33f16c19657323a192571863aaedadeb040924eba2673cab1fb050ffc32d53eb3e2655eda8e7590fe044995e99ef99345aa6e50beace8fb551c916b SHA512 222fad70a93391470a00b42f2db6ab570e731e7204de7463a0a30b90fc39b23640af0769bb4a1db44d5967f140f6a54f232ebb5f496cf3caeccb84d94a4fcdbb
-EBUILD isync-9999.ebuild 803 BLAKE2B 72d29d61f33f16c19657323a192571863aaedadeb040924eba2673cab1fb050ffc32d53eb3e2655eda8e7590fe044995e99ef99345aa6e50beace8fb551c916b SHA512 222fad70a93391470a00b42f2db6ab570e731e7204de7463a0a30b90fc39b23640af0769bb4a1db44d5967f140f6a54f232ebb5f496cf3caeccb84d94a4fcdbb
-MISC metadata.xml 295 BLAKE2B 018d8692cf8398f0fe616b81594313139e4a2e8d07724fcca621ae325b0ecef76bed8c9142847483240cb5b597c936600152ce92ead3de8ebc66c74e7fd89039 SHA512 74a5fc01fe3cf7826ba041fb90bb6aeb3c1a1e4ba8f3807a17a3defc08d5e2f507f88ac52a458b9707fa5a877dd3f63210227a7637fcd35574c09e073896457f
+EBUILD isync-1.4.1.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
+EBUILD isync-9999.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
+MISC metadata.xml 376 BLAKE2B 80ca8b6998c755cf2138227e2a05f8919dd649879df8fd94a040336c7e3d8c30cedcf10bd85ed056876cd785910e49570308978cdd0cc9a58d307d259adb8527 SHA512 137d80b0d9f99344e1d82cf27a3eb7c92b98b97f84a5353035bdd8c80f0627f2fb1cf8ebe65aa7f4775be79198950a37840b4243d60d72a0555412e11944ff51
diff --git a/net-mail/isync/isync-1.4.1.ebuild b/net-mail/isync/isync-1.4.1.ebuild
index 9525e6613cd8..07b35974fe65 100644
--- a/net-mail/isync/isync-1.4.1.ebuild
+++ b/net-mail/isync/isync-1.4.1.ebuild
@@ -16,10 +16,10 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="sasl ssl zlib"
+IUSE="berkdb sasl ssl zlib"
 
 RDEPEND="
-	>=sys-libs/db-4.2:=
+	berkdb? ( >=sys-libs/db-4.2:= )
 	sasl?	( dev-libs/cyrus-sasl )
 	ssl?	( >=dev-libs/openssl-0.9.6:0= )
 	zlib?	( sys-libs/zlib:0= )
@@ -35,6 +35,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use berkdb || export ac_cv_berkdb4=no
 	econf \
 		$(use_with ssl) \
 		$(use_with sasl) \
diff --git a/net-mail/isync/isync-9999.ebuild b/net-mail/isync/isync-9999.ebuild
index 9525e6613cd8..07b35974fe65 100644
--- a/net-mail/isync/isync-9999.ebuild
+++ b/net-mail/isync/isync-9999.ebuild
@@ -16,10 +16,10 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="sasl ssl zlib"
+IUSE="berkdb sasl ssl zlib"
 
 RDEPEND="
-	>=sys-libs/db-4.2:=
+	berkdb? ( >=sys-libs/db-4.2:= )
 	sasl?	( dev-libs/cyrus-sasl )
 	ssl?	( >=dev-libs/openssl-0.9.6:0= )
 	zlib?	( sys-libs/zlib:0= )
@@ -35,6 +35,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use berkdb || export ac_cv_berkdb4=no
 	econf \
 		$(use_with ssl) \
 		$(use_with sasl) \
diff --git a/net-mail/isync/metadata.xml b/net-mail/isync/metadata.xml
index 6c541c70fc0f..68327845c08e 100644
--- a/net-mail/isync/metadata.xml
+++ b/net-mail/isync/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="person">
 		<email>dilfridge@gentoo.org</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">isync</remote-id>
 	</upstream>
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 9173183d3e5c..aafb2a049458 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -5,5 +5,5 @@ AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36
 AUX mailcap-r1 997 BLAKE2B 1e5dc595de7deb3ac0a5dd688de86f93dd9f0e954da705ece43911c0224f186351e3406c949747f0630fcc8aa35734af2937aa76eba93ee43d3a81c79bf86997 SHA512 1243571e089f781c7469ff5e36b9be2b57de492909e32acaa6dc31d61a0f8b1045d9ea94a6d719cc675d2b09ce4a2bfd12dadca0b5a61c45cb1509e32e2138e8
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
 EBUILD mailbase-1.5-r2.ebuild 937 BLAKE2B 2553e7a535cd094e18c1ef1ed0c18f4c6b4784c9475bc22e70a2681552802455a7004574bd248ca82a62ce621a9ef5318898b343c728ad661303da32e1f91d50 SHA512 610e9c74fee61aa2e1b3275872c062f5a747344ad1f46fbcbb9b9f34120f3ce73b356821330da085d395b40ad24cf9ce1887d3499c40b45b94359ccf8b0bf3f6
-EBUILD mailbase-1.6-r1.ebuild 1060 BLAKE2B 1c1b0e3cb64e9fa19fb435ec8fbe6729c40ab32b87772896e40fbb893259411e7545cca8e71736b6d2ea844f63590d09a24941c37be454be83019fca8a613b9a SHA512 63d52baa7f9cc803c507871937089e69760aae891a88299567dd370b3729897dae780d7b8e7ebcefd20f11f7d2a08b1c53a131e7f5aaa8a5fd9a229819fc0be8
+EBUILD mailbase-1.6-r1.ebuild 1067 BLAKE2B 8b0e1bb0354673371799af1706913328efa0eec527c6687ead3ae9cb3e2a2884680fada30cf2f7d7df2dcac447cfd49b0475e9893b31dc7fb4b92722017ede1a SHA512 a9018ebcccd9209418fbf477393d1188b73b28d2c68a34346f7f52d855a600b0fd263c68a88af153347f444139bf2163613f785cd654414d4c6faa256ee6275a
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/mailbase-1.6-r1.ebuild b/net-mail/mailbase/mailbase-1.6-r1.ebuild
index 2d43e4feac08..542ba478e0c0 100644
--- a/net-mail/mailbase/mailbase-1.6-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.6-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-mail/mailfront/Manifest b/net-mail/mailfront/Manifest
index 800c1bd3f1ac..db336a5959bd 100644
--- a/net-mail/mailfront/Manifest
+++ b/net-mail/mailfront/Manifest
@@ -2,4 +2,4 @@ AUX run-pop3front 269 BLAKE2B 6b5489f24331cc059359c07919efad67759854508e8f544ad5
 AUX run-smtpfront 461 BLAKE2B 6b247811ecb101995a3ba6e7b7a15174020a8a16296e7d5ff93f3e7bb6f4d18998b79ed4aca4135ed3f4dea71dcc681d23e30bb35f493735f47da91e666633b3 SHA512 c8c1301d1972d4a415e549f0b9702e3670b44d258ceca606e868592d36f9cdc15ed587c25d24f17577a4d2934d59a3639a6ec66e11f9f00ed54716bdbd6dc4da
 DIST mailfront-2.22.tar.gz 128355 BLAKE2B 593598c353aee9c264690de4af5d472bb4b965cb14aa774a0be6fdece200e078a1e2dbe1feca8135e05a54dad2e0fd3378a4a5903f9a45ccffa260fbbbd2edb6 SHA512 30e1c561f8836bbaf893897b1e864539c44600c4b605d4c8c51c1156c9227967a4ac9e2e9eb0b48bb1827001aff2c6a94e9f44c59bf10e16b5d98595c6a9f2f6
 EBUILD mailfront-2.22.ebuild 1725 BLAKE2B b521a9750b8bdcebc7f33648ddc64c26cfd85c5e30779c525a9f35ac7984686f6f0798132f181dba873b6c28d6daea7a5bf46cd3cd1ebc184636826cf06cfb69 SHA512 b704f3fad85ec43608a142f47d4a1b0396764b7668761c703ad82825cd372a316920a65fa4d2fd79b73076c03bcda6eac08c13f977850eadf9f098c2bedb7956
-MISC metadata.xml 490 BLAKE2B 1867f6af282bcda6b21c4378e5d3bc117995521daafd19b465d5f34e7291f9db4647c163d658439ddf8268e038866ec87d97bbc6609bd6b277d808b58832fe8b SHA512 efbf524e791763c4aa07477146607524a7f57a8d5a51b98b06aea469cbd6f45a11a8ad2f562459a049a78cc7a6c14c4e3607aa25dec354880b52835ec6a4fc93
+MISC metadata.xml 582 BLAKE2B 101e323c7ca07cb676c5bf8c899eebce98346c7b0df2f07deb36b7702125b24398919936850751af0f2216d01259f411a2602e6fed2d565c5c9dc30f86b9d0e5 SHA512 89d79f9ef31d7630d060b913f9bcdbaddfbf3319e2b05abd56d86ea9269a0f78d38809fba4d6df58dec0a5a935b9e52c034a793c420b518540cee797cbd67703
diff --git a/net-mail/mailfront/metadata.xml b/net-mail/mailfront/metadata.xml
index 29507c232b81..df4f4842e1f0 100644
--- a/net-mail/mailfront/metadata.xml
+++ b/net-mail/mailfront/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-This is mailfront, a package containing customizeable network front-ends
-for mail servers.  It contains complete SMTP, QMQP, QMTP, and POP3
-front-ends as well as an authentication module for IMAP.  The mail
-delivery front-ends also contain internal address filtering features.
-</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		This is mailfront, a package containing customizeable network front-ends
+		for mail servers.  It contains complete SMTP, QMQP, QMTP, and POP3
+		front-ends as well as an authentication module for IMAP.  The mail
+		delivery front-ends also contain internal address filtering features.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">bruceg/mailfront</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 49fdb003e3aa..00e14558ea99 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -16,7 +16,7 @@ DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
 EBUILD mailutils-3.11.1.ebuild 3603 BLAKE2B bfc535bd6cfa518cdf7216f2a13a42f3b79d2d7693db77c6dea31e92dc97730d9220bddaf4a95b36a524335b87a242422d84a5914c47b9eb91a4d8e23b041d4d SHA512 6ce4e9ae45f3e75e1b079b465dd5ba616410f02e92dce0b2f3d7de024b84f9e26e0855fcaccc9b423ecc1d37bc2155c84fc7093911c57a6462c4c8ee9bd52393
-EBUILD mailutils-3.12-r1.ebuild 3659 BLAKE2B b35996dec703365a90a655cc834949ef20c22e77feedf58b9a4628fb55f2a6d5e026fcd6fa36999bb3187d54b174922bc997deb5f46d1e3eadba87a5b94dd633 SHA512 9c4c814630d56060292cf6d545c134da0053ea1d80afddb0bc53d638a66c774b605044d168422d6e3a4e1f82451ff01516988964e42c4e41ea0ea31696df465d
+EBUILD mailutils-3.12-r1.ebuild 3652 BLAKE2B fa988cc38dc08a42302af9c2277f781c54872d256d74a62a72aff4ce1fe3ffdc57fa6ec9e48c66374f94ee4d447943141e3f43443c1add2907894705d68e6686 SHA512 6858b64fa798f4945f71c5d41ad7d47c2b7559f00698d0e21e11239fc7b7ecab8cc8851772b2c6aea8ac2b2c821079db4e67c9db852192f935c92c193c62b390
 EBUILD mailutils-3.12.ebuild 3607 BLAKE2B 956b53415a8d9b9635a94175587386b9971f2ef9b505a614a25468bb02ab0368e68e9b71f7dd322c291a63a8408348d0e82fcee55f9151b9a8bd5d4a31aea71b SHA512 0bc33916fa673d415fb65e4fd0c7e7ee815770822924ff58b06ad5237ba65d442f2bc6319c6251339510fe7b8f82ed731a364d8a34b62c818d07cb4763cf5279
 EBUILD mailutils-3.8.ebuild 3715 BLAKE2B 41672aa3d57539d8b3bc57f6967749a6c1d7ae2db9639fcbb6fb7145588b200819caab9fb25f71adb58d164b0ed99142f58dd7700915202621c5e7035edbefe6 SHA512 95835164f4504c134c808054d32ce918fdeb0a7cd010fa527c81f73cbb5bc92f03090c536ba377d77ba7da1746c548375daeec6e1793947ec2a20936299d659b
 EBUILD mailutils-3.9.ebuild 3727 BLAKE2B 99ae2d238c552a1adb7907d2716020c8ef34ddb65db4d302b99e4bc192aaa30fc7e4ee6d0ff5d22a8c5878f40c6968105f8981062a2a250d46af172849c7b34b SHA512 9a5c17e89d901a9598ff9bb6845a5d6e95055391eebce6b8e0aa3b9f5364adfc2b22946aab77701f211ad4521956630ee924b8467ce808bada320652b11e218c
diff --git a/net-mail/mailutils/mailutils-3.12-r1.ebuild b/net-mail/mailutils/mailutils-3.12-r1.ebuild
index 723c6c00e3b5..15589bb7499f 100644
--- a/net-mail/mailutils/mailutils-3.12-r1.ebuild
+++ b/net-mail/mailutils/mailutils-3.12-r1.ebuild
@@ -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"
+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/notmuch/Manifest b/net-mail/notmuch/Manifest
index e7f808b749ed..6069afb01d89 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,5 +2,5 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e
 AUX notmuch-0.31.3-glib-2.68.patch 1807 BLAKE2B adca6eef581704ccf91bff0206de9bec8925ea26a837a95f57bf905b15c69cb54b06d1a9d775f55a1829291ae2f3bcde9b6f08e3c3e133824e95e490718b8231 SHA512 a48ae1494b5c7960979dd34d33b8b84f26b763f2a5a987b3964b3a5e256143296eb1d777bb500c65e6559e951075ee3a7e5eac2bca376a8527a9dc291437376f
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
-EBUILD notmuch-0.31.3.ebuild 6567 BLAKE2B da414bf69a185cce590907056245ef55dacce54c283575c4b13efb9226cf8fffde3e77e2bd7b4ff3d5815e4cb8b0e5040d4ae5659e6a3f9c6815a88791c02127 SHA512 83e991ded7a36f4925289293d120fa9f17ed3e88ea00ed36d9c042886b6e38f1d1e11aba27d8f27b4731eb02fa3f21ca0830f1a7b622ff83fca8e78f5216fbc6
+EBUILD notmuch-0.31.3.ebuild 6641 BLAKE2B a0c17d112a37b8307196cca220428c838db9bf1f888256eb910b4f9adfdcd3b485a90d225b84960dd350b066bd37887580fb328fa5edef01c6017a40fbca8756 SHA512 b464c82b4d12678b227fa28080fffe95d55a49b3d62f6cc8f2a08ce0b5f487beac8fdc0fd2268f5c9e4e7abdea7107d4f16a8b53cb9941ea96bcc539de37d3ca
 MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index e6d8d047fd86..9e7e89f755bf 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
@@ -39,6 +40,7 @@ BDEPEND="
 		sys-apps/texinfo
 	)
 	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	)
 "
diff --git a/net-mail/sendEmail/Manifest b/net-mail/sendEmail/Manifest
index 736615111fe6..4d024142075b 100644
--- a/net-mail/sendEmail/Manifest
+++ b/net-mail/sendEmail/Manifest
@@ -2,4 +2,4 @@ AUX 1.56-overzealous-verify-mode-check.patch 615 BLAKE2B 5913c808221114005129188
 AUX 1.56-overzealous-version-check.patch 596 BLAKE2B 278ca2f062e1b96b72fb29fcb4de616e57c26a5531852ca18d8b95b54ba8982b2748d9a27eac36ca7883d84f2578f406024eb00ce6771b433a13fb96a854ba42 SHA512 7a66db3114d229611b8c4c3e29ce5b30d8252efaac1a03223cd82733fbded4e21ba67d6690feff16b814f9327c672a1b307a77b630fc1d5ad33e8426dc4107fc
 DIST sendEmail-v1.56.tar.gz 29740 BLAKE2B 443e80e0dcc500f8fed843749a504a0064f3cec9845cbb6d40e6c49d5a29dbf1874e2e03bbfaf6d511049addd9b3ed26170143dea966087575ad0ab61874c50b SHA512 0ee208857d6ffa4b9e0eecea0a94decf6d3935041fad23a084fba195f2016a18f3409086eefa8c35fb5dd01697eb29e4af0607754bf1c52bef727b8b670242fd
 EBUILD sendEmail-1.56-r2.ebuild 658 BLAKE2B 8302920f04a684a482295da0d08cf42489704a3b4612f73c807c98378ea952d9b1865b4b37590b648ed17731366fed517fba6a96599e221058bb0863ade96c5c SHA512 39eac56bdbde00e3511b1560fdb482f2f07d469d009361ff627f0b728099ff533afb717a462de11e198cc66fcf40cfeba95419c633f8f9beebb6b662655b4d5a
-MISC metadata.xml 689 BLAKE2B db187f3a6d6dcedcaa0663b47292173ba69945905800205b7a9e9b468e2313c9ce1c69f36ceb6ad838d47073158d5781b5836f4b3f5b42f3fb7200c957c461cf SHA512 61fa434f59304fa18e844d02a363c5fa68e33755108523f9dc27ee9cb7199bcc69113c37d1fb3c5e6503dc36614b75d00aa38a20aec46a39d0577e4965352ea7
+MISC metadata.xml 638 BLAKE2B d4f4c240da41222c2930d5ba7740de862a1d6f5d9ae9412df33edd3b927a1c7c471ba0f6a27743342e2d927e8778d9b00dd472dba15ff7804d84ecb48ae5c138 SHA512 73c0bed43ba51b21e49a757cb5720d67b899a3ddd92919d4398640082dbb5f4a45a70d88a135e78c535dcff570ffe4149dd1dd0ec421ccbeccef7412e5190a7a
diff --git a/net-mail/sendEmail/metadata.xml b/net-mail/sendEmail/metadata.xml
index f89710e387f0..d07b735579d1 100644
--- a/net-mail/sendEmail/metadata.xml
+++ b/net-mail/sendEmail/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription> SendEmail is a lightweight, completely command line based, 
 SMTP email agent. If you have the need to send email from a command prompt 
 this tool is perfect. It was designed to be used in bash scripts, Perl