14 files changed, 22 insertions, 69 deletions

diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index f26ad9a0fdb1..96429c780a3a 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.18.2 b/metadata/md5-cache/net-mail/courier-imap-4.18.2
index 1d5443a1f2c4..76b2c68790af 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.18.2
+++ b/metadata/md5-cache/net-mail/courier-imap-4.18.2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.courier-mta.org/imap/
 IUSE=berkdb debug fam +gdbm gnutls ipv6 selinux trashquota
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) >=net-libs/courier-authlib-0.66.4 >=net-libs/courier-unicode-2 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db:= ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd
+RDEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) >=net-libs/courier-authlib-0.66.4 >=net-libs/courier-unicode-2 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db:= ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/cyrus-imapd
 REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.18.2.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5cef994852cc8491c9163c927ec297c8
+_md5_=c19e96681347259fa96a92a8928c5abc
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.0.14 b/metadata/md5-cache/net-mail/courier-imap-5.0.14
deleted file mode 100644
index 74d3d2294795..000000000000
--- a/metadata/md5-cache/net-mail/courier-imap-5.0.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps )
-DESCRIPTION=An IMAP daemon designed specifically for maildirs
-EAPI=7
-HOMEPAGE=https://www.courier-mta.org/imap/
-IUSE=berkdb debug fam +gdbm gnutls ipv6 selinux trashquota
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=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 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd
-REQUIRED_USE=|| ( berkdb gdbm )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/courier-imap-5.0.14.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ba2fb41e568ee49f71e8d5d78683fc13
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.0.7 b/metadata/md5-cache/net-mail/courier-imap-5.0.7
deleted file mode 100644
index 21ffdb75890a..000000000000
--- a/metadata/md5-cache/net-mail/courier-imap-5.0.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps )
-DESCRIPTION=An IMAP daemon designed specifically for maildirs
-EAPI=7
-HOMEPAGE=https://www.courier-mta.org/imap/
-IUSE=berkdb debug fam +gdbm gnutls ipv6 selinux trashquota
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-3
-RDEPEND=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 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd
-REQUIRED_USE=|| ( berkdb gdbm )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/courier-imap-5.0.7.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=51097c0fb6f3f26a3f7c5e3a241dd30d
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.1.2 b/metadata/md5-cache/net-mail/courier-imap-5.1.2
index 73f2d717b0a8..1c87868b7643 100644
--- a/metadata/md5-cache/net-mail/courier-imap-5.1.2
+++ b/metadata/md5-cache/net-mail/courier-imap-5.1.2
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.courier-mta.org/imap/
 IUSE=berkdb debug fam +gdbm gnutls ipv6 selinux trashquota
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
-RDEPEND=gnutls? ( net-libs/gnutls[tools] ) !gnutls? ( dev-libs/openssl:0= ) >=net-libs/courier-authlib-0.71 >=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 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd
+RDEPEND=gnutls? ( net-libs/gnutls[tools] ) !gnutls? ( dev-libs/openssl:0= ) >=net-libs/courier-authlib-0.71 >=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 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/cyrus-imapd
 REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-5.1.2.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=283503ccfa745ef31368aa29a44505ef
+_md5_=bad0746ddc459d6ff4262d1c997e52c1
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.1.3 b/metadata/md5-cache/net-mail/courier-imap-5.1.3
index 338ab1b9e1b7..1efe8877ea1b 100644
--- a/metadata/md5-cache/net-mail/courier-imap-5.1.3
+++ b/metadata/md5-cache/net-mail/courier-imap-5.1.3
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.courier-mta.org/imap/
 IUSE=berkdb debug fam +gdbm gnutls ipv6 selinux trashquota
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=gnutls? ( net-libs/gnutls[tools] ) !gnutls? ( dev-libs/openssl:0= ) >=net-libs/courier-authlib-0.71 >=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 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd
+RDEPEND=gnutls? ( net-libs/gnutls[tools] ) !gnutls? ( dev-libs/openssl:0= ) >=net-libs/courier-authlib-0.71 >=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 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/cyrus-imapd
 REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-5.1.3.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4686db3233f9a3b32d3970f2c89e28cd
+_md5_=72d53ca036c60bb7b7387ae4a8180287
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r4
index 939f39807353..1d9ebbee68f0 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r4
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( mysql postgres )
 SLOT=0
 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmail	b35b6b912311fb36e8fff96eaeb6bcf7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b6344cbd7ff4ea3fb5834f097122c2e
+_md5_=424e1d1ab97fe4d207dd1e2856efc804
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.14 b/metadata/md5-cache/net-mail/fetchmail-6.4.14
deleted file mode 100644
index 1dd9bc8e372f..000000000000
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
-DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
-EAPI=7
-HOMEPAGE=https://www.fetchmail.info/
-IUSE=ssl nls kerberos tk socks python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-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
-LICENSE=GPL-2 public-domain
-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_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
-REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.14.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0d8b15c24e2bc42617839208efbfd54c
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.15 b/metadata/md5-cache/net-mail/fetchmail-6.4.19
index 5d69c6d810e7..243347c61974 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.15
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.19
@@ -10,6 +10,6 @@ LICENSE=GPL-2 public-domain
 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_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
 REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.15.tar.xz
+SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.19.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0d8b15c24e2bc42617839208efbfd54c
diff --git a/metadata/md5-cache/net-mail/isync-1.4.1 b/metadata/md5-cache/net-mail/isync-1.4.1
index 3439f2baa58d..8d8366ca19ee 100644
--- a/metadata/md5-cache/net-mail/isync-1.4.1
+++ b/metadata/md5-cache/net-mail/isync-1.4.1
@@ -1,13 +1,13 @@
 BDEPEND=dev-lang/perl
 DEFINED_PHASES=configure prepare
-DEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
+DEPEND=berkdb? ( >=sys-libs/db-4.2:= ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
 DESCRIPTION=MailDir mailbox synchronizer
 EAPI=7
 HOMEPAGE=http://isync.sourceforge.net/
-IUSE=sasl ssl zlib
+IUSE=berkdb sasl ssl zlib
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
+RDEPEND=berkdb? ( >=sys-libs/db-4.2:= ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/isync/isync/1.4.1/isync-1.4.1.tar.gz
-_md5_=4601f982f706e2304241829797409b88
+_md5_=b2eb7b5b186b6456e99b1af49cddbb3b
diff --git a/metadata/md5-cache/net-mail/isync-9999 b/metadata/md5-cache/net-mail/isync-9999
index ce25df06f816..a3f4373dda15 100644
--- a/metadata/md5-cache/net-mail/isync-9999
+++ b/metadata/md5-cache/net-mail/isync-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-lang/perl >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare unpack
-DEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
+DEPEND=berkdb? ( >=sys-libs/db-4.2:= ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
 DESCRIPTION=MailDir mailbox synchronizer
 EAPI=7
 HOMEPAGE=http://isync.sourceforge.net/
-IUSE=sasl ssl zlib
+IUSE=berkdb sasl ssl zlib
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
+RDEPEND=berkdb? ( >=sys-libs/db-4.2:= ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
 SLOT=0
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4601f982f706e2304241829797409b88
+_md5_=b2eb7b5b186b6456e99b1af49cddbb3b
diff --git a/metadata/md5-cache/net-mail/mailbase-1.6-r1 b/metadata/md5-cache/net-mail/mailbase-1.6-r1
index 400475ef5c4d..4daa43ca80b7 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.6-r1
+++ b/metadata/md5-cache/net-mail/mailbase-1.6-r1
@@ -3,9 +3,9 @@ DESCRIPTION=MTA layout package
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=pam
-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
 LICENSE=GPL-2
 RDEPEND=acct-group/mail acct-user/mail acct-user/postmaster pam? ( sys-libs/pam ) !<net-mail/metamail-2.7.53.3-r2
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e672c219ada54043ebf25d6244620009
+_md5_=bf552019c513e03b74f32a4be8adb2fc
diff --git a/metadata/md5-cache/net-mail/mailutils-3.12-r1 b/metadata/md5-cache/net-mail/mailutils-3.12-r1
index 8cf22400d416..2de75d4a39f3 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.12-r1
+++ b/metadata/md5-cache/net-mail/mailutils-3.12-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://mailutils.org/
 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 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-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
 LICENSE=GPL-2 LGPL-2.1
 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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.12.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eaf628ad2ab3e5997ffe96c48f041d3e
+_md5_=2852d4d61eb56ab9edd9c8ff6ba86266
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.3 b/metadata/md5-cache/net-mail/notmuch-0.31.3
index 9d3aab58ce62..65cdc213e36f 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig apidoc? ( app-doc/doxygen dev-lang/perl ) doc? ( dev-python/sphinx sys-apps/texinfo ) python? ( test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) )
+BDEPEND=virtual/pkgconfig apidoc? ( app-doc/doxygen dev-lang/perl ) doc? ( dev-python/sphinx sys-apps/texinfo ) python? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 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-24.1:* ) python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=app-editors/emacs-24.1:*[libxml2] app-misc/dtach sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	f0ca511df3fddd316b783632b804e8fb	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfba08bf38a8463d850b5dc1834b6801
+_md5_=cc654f1d5517d78a62680fd72876bf41