gentoo resync : 13.06.2020

22 files changed, 62 insertions, 24 deletions

diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 3aca840bc20e..6477d72e6fc0 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/archivemail-0.9.0-r1 b/metadata/md5-cache/net-mail/archivemail-0.9.0-r1
index a5667144dcc1..f964d3ac1db9 100644
--- a/metadata/md5-cache/net-mail/archivemail-0.9.0-r1
+++ b/metadata/md5-cache/net-mail/archivemail-0.9.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/archivemail/archivemail-0.9.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28fcb76a37f4e370e6c42514f6fa02de
diff --git a/metadata/md5-cache/net-mail/automx2-2019.0 b/metadata/md5-cache/net-mail/automx2-2019.0
index 0aa0d7c45581..fffabee19a9b 100644
--- a/metadata/md5-cache/net-mail/automx2-2019.0
+++ b/metadata/md5-cache/net-mail/automx2-2019.0
@@ -10,5 +10,5 @@ RDEPEND=acct-user/automx2 >=dev-python/flask-migrate-2.5.2[python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/automx/automx2/-/archive/2019.0/automx2-2019.0.tar.bz2
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=5d6d5811cd70c1d7795d930c77e31b99
diff --git a/metadata/md5-cache/net-mail/automx2-2020.1-r1 b/metadata/md5-cache/net-mail/automx2-2020.1-r1
index 73c9f4ceb74e..dfeb37492315 100644
--- a/metadata/md5-cache/net-mail/automx2-2020.1-r1
+++ b/metadata/md5-cache/net-mail/automx2-2020.1-r1
@@ -10,5 +10,5 @@ RDEPEND=acct-user/automx2 dev-python/flask-migrate[python_targets_python3_7(-)?,
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitlab.com/automx/automx2/-/archive/2020.1/automx2-2020.1.tar.bz2
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=55cdc9bf845993e414875414ef2b7d85
diff --git a/metadata/md5-cache/net-mail/b4-0.4.0 b/metadata/md5-cache/net-mail/b4-0.5.1
index 10ca1af11c62..31b8bc321335 100644
--- a/metadata/md5-cache/net-mail/b4-0.4.0
+++ b/metadata/md5-cache/net-mail/b4-0.5.1
@@ -9,6 +9,6 @@ LICENSE=GPL-2+
 RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-SRC_URI=mirror://pypi/b/b4/b4-0.4.0.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+SRC_URI=mirror://pypi/b/b4/b4-0.5.1.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=d33c88529697c054071161bb9213d6fe
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.6 b/metadata/md5-cache/net-mail/fetchmail-6.4.6
new file mode 100644
index 000000000000..45e56312ddc7
--- /dev/null
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=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_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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_6? ( dev-python/future[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
+DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
+EAPI=7
+HOMEPAGE=http://www.fetchmail.info/
+IUSE=ssl nls kerberos tk socks libressl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 public-domain
+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_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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_6? ( dev-python/future[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) )
+REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.6.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=a09d34313aede5607144651465fc9fe5
diff --git a/metadata/md5-cache/net-mail/getmail-5.14 b/metadata/md5-cache/net-mail/getmail-5.14
index cd10634cbb8e..d3b153866adf 100644
--- a/metadata/md5-cache/net-mail/getmail-5.14
+++ b/metadata/md5-cache/net-mail/getmail-5.14
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.14.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=92010ced78ae8c18e6cbd285f36bc4c4
diff --git a/metadata/md5-cache/net-mail/mailbase-1.5-r1 b/metadata/md5-cache/net-mail/mailbase-1.5-r1
index 33b755a47779..e8a89e9c4e70 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.5-r1
+++ b/metadata/md5-cache/net-mail/mailbase-1.5-r1
@@ -5,7 +5,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
 LICENSE=GPL-2
-RDEPEND=acct-group/mail acct-user/mail acct-user/postmaster pam? ( sys-libs/pam )
+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_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=ffb972def624a226b1883b708097c93a
+_md5_=784863a99ee49989ec982e344c6a1bfd
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.0 b/metadata/md5-cache/net-mail/mailman-3.3.0
index 0267bcd846e0..b5a834f8815f 100644
--- a/metadata/md5-cache/net-mail/mailman-3.3.0
+++ b/metadata/md5-cache/net-mail/mailman-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailman/mailman-3.3.0.tar.gz https://dev.gentoo.org/~hanno/distfiles/mailman-3.3.0-importlib_resources-fix.diff.xz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=62bc01f9102e3faf08006d6158c3d276
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.1 b/metadata/md5-cache/net-mail/mailman-3.3.1
index ed36ed809598..b4c17327fbe5 100644
--- a/metadata/md5-cache/net-mail/mailman-3.3.1
+++ b/metadata/md5-cache/net-mail/mailman-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailman/mailman-3.3.1.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=7cbb4a2dd295f98a7f3eccf2472e53ad
diff --git a/metadata/md5-cache/net-mail/mailutils-3.9 b/metadata/md5-cache/net-mail/mailutils-3.9
index 41dd848e8a6b..85a8ac9321a0 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.9
+++ b/metadata/md5-cache/net-mail/mailutils-3.9
@@ -5,11 +5,11 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
 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_6 python_single_target_python3_7 python_single_target_python3_8
-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 ~x86-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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) ) 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_6 python_single_target_python3_7 python_single_target_python3_8 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.9.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=a03db864d1f59c05be0709046cf16cdb
+_md5_=6bdf6820af63219048189079d2405bbf
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.3 b/metadata/md5-cache/net-mail/notmuch-0.29.3
index c6f6d3465d25..39c376cd3290 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.3
@@ -11,5 +11,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b26ab11f52674e2a2807f597db67f40f
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.3-r1 b/metadata/md5-cache/net-mail/notmuch-0.29.3-r1
index 884a61a3622d..45b00ddb0564 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.3-r1
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=760d2157bee1296f223e9ad2bf100764
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.3-r2 b/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
index 4fc05ffc9a69..ce651b2906c6 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	89b310c534a033a3566e0f26419daa81	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=b1ed6d2055b49664c2c16e169c611e58
diff --git a/metadata/md5-cache/net-mail/offlineimap-6.5.6 b/metadata/md5-cache/net-mail/offlineimap-6.5.6
index f8dac606d139..4077f35a1b92 100644
--- a/metadata/md5-cache/net-mail/offlineimap-6.5.6
+++ b/metadata/md5-cache/net-mail/offlineimap-6.5.6
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/OfflineIMAP/offlineimap/tarball/v6.5.6 -> offlineimap-6.5.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0bf7b301d5ed9447a739c890c14682f9
diff --git a/metadata/md5-cache/net-mail/offlineimap-7.2.4-r1 b/metadata/md5-cache/net-mail/offlineimap-7.2.4-r1
index f1a4ab01a62a..ba030e1f78a0 100644
--- a/metadata/md5-cache/net-mail/offlineimap-7.2.4-r1
+++ b/metadata/md5-cache/net-mail/offlineimap-7.2.4-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( dev-python/six[python_targets_python2_
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v7.2.4.tar.gz -> offlineimap-7.2.4.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=c60efe1cb27120875dce8003bdfc32aa
diff --git a/metadata/md5-cache/net-mail/offlineimap-7.3.3 b/metadata/md5-cache/net-mail/offlineimap-7.3.3
index b8711d9cb85f..5d20648cfd2c 100644
--- a/metadata/md5-cache/net-mail/offlineimap-7.3.3
+++ b/metadata/md5-cache/net-mail/offlineimap-7.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Powerful IMAP/Maildir synchronization and reader support
 EAPI=7
 HOMEPAGE=https://www.offlineimap.org/ https://github.com/offlineimap/offlineimap
 IUSE=doc ssl +python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/offlineimap/offlineimap/archive/v7.3.3.tar.gz -> offlineimap-7.3.3.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=ec27c0cbb0c37b6e66d7b3f6d7daeb6d
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=6fed7e7de8796b941c60dcdfd176e7f0
diff --git a/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3 b/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3
new file mode 100644
index 000000000000..8aa0512e579b
--- /dev/null
+++ b/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst prepare
+DESCRIPTION=SMTP Relaying Control designed for qmail & tcpserver
+EAPI=7
+HOMEPAGE=http://untroubled.org/relay-ctrl/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/ucspi-tcp virtual/daemontools
+SLOT=0
+SRC_URI=http://untroubled.org/relay-ctrl/archive/relay-ctrl-3.1.1.tar.gz
+_eclasses_=fixheadtails	662e80584ee2337b981d7188078e7c74	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=094cf0c8dd745ec29dc57ca62aa90fbf
diff --git a/metadata/md5-cache/net-mail/relay-ctrl-3.2 b/metadata/md5-cache/net-mail/relay-ctrl-3.2
new file mode 100644
index 000000000000..0e485a20516a
--- /dev/null
+++ b/metadata/md5-cache/net-mail/relay-ctrl-3.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/bglibs
+DESCRIPTION=SMTP Relaying Control designed for qmail & tcpserver
+EAPI=7
+HOMEPAGE=http://untroubled.org/relay-ctrl/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/bglibs sys-apps/ucspi-tcp virtual/daemontools
+SLOT=0
+SRC_URI=http://untroubled.org/relay-ctrl/archive/relay-ctrl-3.2.tar.gz
+_eclasses_=fixheadtails	662e80584ee2337b981d7188078e7c74	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=e98a51af4c1c7d0b8c7142fc69e88a34
diff --git a/metadata/md5-cache/net-mail/rss2email-3.11 b/metadata/md5-cache/net-mail/rss2email-3.11
index 024b11c4c629..5e94f1596395 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.11
+++ b/metadata/md5-cache/net-mail/rss2email-3.11
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/feedparser-5.0.1[python_targets_python3_6(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.11.tar.gz -> rss2email-3.11.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=06641cec381f487720d704adfea8f865
diff --git a/metadata/md5-cache/net-mail/rss2email-3.11-r1 b/metadata/md5-cache/net-mail/rss2email-3.11-r1
index e034a6421141..81857f92613f 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.11-r1
+++ b/metadata/md5-cache/net-mail/rss2email-3.11-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/feedparser-5.0.1[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.11.tar.gz -> rss2email-3.11.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=2d430fa266421c7c2c4f0c38e98a8ef5
diff --git a/metadata/md5-cache/net-mail/smtptools-0.2.3 b/metadata/md5-cache/net-mail/smtptools-0.2.3
index b3e7127d73ff..472c26f1a852 100644
--- a/metadata/md5-cache/net-mail/smtptools-0.2.3
+++ b/metadata/md5-cache/net-mail/smtptools-0.2.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=prepare
 DEPEND=!net-mail/qtools >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A collection of tools to send or receive mails with SMTP
 EAPI=4
-HOMEPAGE=http://www.ohse.de/uwe/software/smtptools.html
+HOMEPAGE=https://www.ohse.de/uwe/software/smtptools.html
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86
 LICENSE=GPL-2
 RDEPEND=!net-mail/qtools
 SLOT=0
 SRC_URI=ftp://ftp.ohse.de/uwe/releases/smtptools-0.2.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66c22f735fa3adba42c35930f1de74e5
+_md5_=934f73e6dd88e5149647ef22d6e10b10