gentoo resync : 14.05.2020

21 files changed, 74 insertions, 73 deletions

diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 9460953cf92d..03877b3a8cfc 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/afew-1.2.0 b/metadata/md5-cache/mail-filter/afew-1.2.0
index d2050240d84a..246a476410bd 100644
--- a/metadata/md5-cache/mail-filter/afew-1.2.0
+++ b/metadata/md5-cache/mail-filter/afew-1.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] )
 DESCRIPTION=Initial tagging script for Notmuch
 EAPI=6
 HOMEPAGE=https://github.com/afewmail/afew
 IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-1.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a05823071df807b3cf1ffae60de46e3
diff --git a/metadata/md5-cache/mail-filter/afew-1.3.0-r1 b/metadata/md5-cache/mail-filter/afew-1.3.0-r1
index f49c1f9bccf2..805cebc3c563 100644
--- a/metadata/md5-cache/mail-filter/afew-1.3.0-r1
+++ b/metadata/md5-cache/mail-filter/afew-1.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] )
+DEPEND=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_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] )
 DESCRIPTION=Initial tagging script for Notmuch
 EAPI=6
 HOMEPAGE=https://github.com/afewmail/afew
 IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/dkimpy[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/dkimpy[python_targets_python3_7(-)] net-mail/notmuch[python,python_targets_python3_7(-)] ) python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/dkimpy[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/dkimpy[python_targets_python3_7(-)] net-mail/notmuch[python,python_targets_python3_7(-)] ) 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] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bc9b33318597215f337ff9498ea4f90
diff --git a/metadata/md5-cache/mail-filter/afew-2.0.0 b/metadata/md5-cache/mail-filter/afew-2.0.0
index 231f66c7fb97..b0077f0f4228 100644
--- a/metadata/md5-cache/mail-filter/afew-2.0.0
+++ b/metadata/md5-cache/mail-filter/afew-2.0.0
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] )
+BDEPEND=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_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] )
 DESCRIPTION=Initial tagging script for Notmuch
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/afewmail/afew
 IUSE=doc python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/dkimpy[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/dkimpy[python_targets_python3_7(-)] net-mail/notmuch[python,python_targets_python3_7(-)] ) python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/dkimpy[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/dkimpy[python_targets_python3_7(-)] net-mail/notmuch[python,python_targets_python3_7(-)] ) 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] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-2.0.0.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b077ede87aa1192d2220f5324a5c2789
diff --git a/metadata/md5-cache/mail-filter/afew-3.0.0 b/metadata/md5-cache/mail-filter/afew-3.0.0
index 1e056fb8f60a..d1f9f037b794 100644
--- a/metadata/md5-cache/mail-filter/afew-3.0.0
+++ b/metadata/md5-cache/mail-filter/afew-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] )
+BDEPEND=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_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] )
 DESCRIPTION=Initial tagging script for Notmuch
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/afewmail/afew
 IUSE=doc python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/dkimpy[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/dkimpy[python_targets_python3_7(-)] net-mail/notmuch[python,python_targets_python3_7(-)] ) python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/dkimpy[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/dkimpy[python_targets_python3_7(-)] net-mail/notmuch[python,python_targets_python3_7(-)] ) 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] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-3.0.0.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b077ede87aa1192d2220f5324a5c2789
diff --git a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2 b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2
index e34902480eb7..00ab557ee921 100644
--- a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2
+++ b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=mail-mta/courier dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python filtering architecture for the Courier MTA
@@ -7,9 +7,9 @@ HOMEPAGE=https://bitbucket.org/gordonmessmer/courier-pythonfilter/src/default/
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=mail-mta/courier python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=mail-mta/courier python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/courier-pythonfilter/courier-pythonfilter-3.0.2.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c0dd1c6c2ea3ae6f35381c3c9fbb475d
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.158 b/metadata/md5-cache/mail-filter/dcc-1.3.158
index d5b6a8a2c887..b92f371110d0 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.158
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.158
@@ -4,10 +4,10 @@ DESCRIPTION=Distributed Checksum Clearinghouse
 EAPI=5
 HOMEPAGE=http://www.rhyolite.com/anti-spam/dcc/
 IUSE=cgi ipv6 rrdtool milter
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=DCC GPL-2
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.158.tar.Z
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e48bb4b10482c514f1559144fb26a4d
+_md5_=0cf5d269742c44bc1edb23f1c22be582
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.10 b/metadata/md5-cache/mail-filter/libspf2-1.2.10
index 0abbd0000bcd..cd701112bdae 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.10
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.10
@@ -4,11 +4,11 @@ DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SR
 EAPI=5
 HOMEPAGE=http://www.libspf2.org
 IUSE=static static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( LGPL-2.1 BSD-2 )
 RDEPEND=!dev-perl/Mail-SPF-Query
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
 SRC_URI=http://www.libspf2.org/spf/libspf2-1.2.10.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1c1fb62e778d01daaa8956b0bb4d195
+_md5_=1751f3de3f1d68e0847c7f7afd079e53
diff --git a/metadata/md5-cache/mail-filter/libsrs_alt-1.0-r1 b/metadata/md5-cache/mail-filter/libsrs_alt-1.0-r1
index 91e029690efc..c9d87cac99a6 100644
--- a/metadata/md5-cache/mail-filter/libsrs_alt-1.0-r1
+++ b/metadata/md5-cache/mail-filter/libsrs_alt-1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Sender Rewriting Scheme library for use with Exim
 EAPI=7
 HOMEPAGE=http://opsec.eu/src/srs/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=!dev-perl/Mail-SRS
 SLOT=0
 SRC_URI=https://opsec.eu/src/srs/libsrs_alt-1.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=02d5a52f4d4816e58937dff417e030af
+_md5_=ecc858f1b8610052638090edba321cb9
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.1.3 b/metadata/md5-cache/mail-filter/opendmarc-1.1.3
deleted file mode 100644
index 371bf8e19e4c..000000000000
--- a/metadata/md5-cache/mail-filter/opendmarc-1.1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail )
-DESCRIPTION=Open source DMARC implementation
-EAPI=5
-HOMEPAGE=http://www.trusteddomain.org/opendmarc/
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail ) dev-perl/Switch
-SLOT=0
-SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.1.3.tar.gz
-_md5_=426ffeddba3b9eaa276d40d7d269520d
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r1 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r1
deleted file mode 100644
index b0e91ea96051..000000000000
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) virtual/pkgconfig
-DESCRIPTION=Open source DMARC implementation
-EAPI=6
-HOMEPAGE=http://www.trusteddomain.org/opendmarc/
-IUSE=spf +reports
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~x86
-LICENSE=BSD
-RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
-_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=ffbfffa8de37e321c8e46679c4e4f594
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
deleted file mode 100644
index da4c81b483eb..000000000000
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) virtual/pkgconfig
-DESCRIPTION=Open source DMARC implementation
-EAPI=6
-HOMEPAGE=http://www.trusteddomain.org/opendmarc/
-IUSE=spf +reports static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
-_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=8a5fb99617e4203a059e1b57ea259919
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
index f27153ec95bd..bd3790cb9744 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Open source DMARC implementation
 EAPI=6
 HOMEPAGE=http://www.trusteddomain.org/opendmarc/
 IUSE=spf +reports static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=e2046c0bd2771285a77e59e9dc1ad47a
+_md5_=733a9f42a4c681e04100cf9d3c6c2fc1
diff --git a/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2 b/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2
index 1628dfc82da7..094bf7c9aecb 100644
--- a/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2
+++ b/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyspf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[ipv6] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/pyspf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[ipv6] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python-based policy daemon for Postfix SPF verification
 EAPI=6
 HOMEPAGE=https://launchpad.net/pypolicyd-spf
 IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/pyspf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/authres[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[ipv6] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-python/pyspf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/authres[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[ipv6] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypolicyd-spf/pypolicyd-spf-2.0.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96b9d582ef0d3b6f488ce7b7eece85b6
diff --git a/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2-r1 b/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2-r1
index b09ea78c18c3..bd5bc92d2ac7 100644
--- a/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2-r1
+++ b/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[ipv6] ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7[ipv6] ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8[ipv6] ) >=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(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ipv6] ) python_targets_python3_7? ( dev-lang/python:3.7[ipv6] ) python_targets_python3_8? ( dev-lang/python:3.8[ipv6] ) >=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(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/pyspf[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(-)]
 DESCRIPTION=Python-based policy daemon for Postfix SPF verification
@@ -7,9 +7,9 @@ HOMEPAGE=https://launchpad.net/pypolicyd-spf
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/pyspf[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/authres[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.10:3.6[ipv6] ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7[ipv6] ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8[ipv6] ) >=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(-)]
+RDEPEND=dev-python/pyspf[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/authres[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[ipv6] ) python_targets_python3_7? ( dev-lang/python:3.7[ipv6] ) python_targets_python3_8? ( dev-lang/python:3.8[ipv6] ) >=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(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypolicyd-spf/pypolicyd-spf-2.0.2.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=33098c01b9b9ae4dfa05239a1c3f1609
diff --git a/metadata/md5-cache/mail-filter/pyzor-1.0.0-r1 b/metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
index b234a5dd8ca5..1154ced85227 100644
--- a/metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( pyzord? ( gdbm? ( python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[gdbm] ) ) redis? ( dev-python/redis-py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gevent? ( dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( pyzord? ( gdbm? ( python_targets_python3_6? ( dev-lang/python:3.6[gdbm] ) ) redis? ( dev-python/redis-py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gevent? ( dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A distributed, collaborative spam detection and filtering network
 EAPI=6
 HOMEPAGE=https://github.com/SpamExperts/pyzor
 IUSE=doc gdbm gevent pyzord redis test python_targets_python3_6
 KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=pyzord? ( gdbm? ( python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[gdbm] ) ) redis? ( dev-python/redis-py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gevent? ( dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=pyzord? ( gdbm? ( python_targets_python3_6? ( dev-lang/python:3.6[gdbm] ) ) redis? ( dev-python/redis-py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gevent? ( dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/release-1-0-0.tar.gz -> pyzor-1.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8a893682d975bb2e14ccd1b3cb00732
diff --git a/metadata/md5-cache/mail-filter/sieve-connect-0.90 b/metadata/md5-cache/mail-filter/sieve-connect-0.90
new file mode 100644
index 000000000000..d55898a94453
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/sieve-connect-0.90
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5
+DESCRIPTION=Sieve Command Line Interface
+EAPI=7
+HOMEPAGE=https://people.spodhuis.org/phil.pennock/software/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/perl-5 >=dev-perl/Authen-SASL-2.11 dev-perl/IO-Socket-INET6 >=dev-perl/IO-Socket-SSL-0.97 dev-perl/Net-DNS dev-perl/Net-SSLeay dev-perl/TermReadKey dev-perl/Term-ReadLine-Gnu
+SLOT=0
+SRC_URI=https://github.com/syscomet/sieve-connect/releases/download/v0.90/sieve-connect-0.90.tar.bz2
+_md5_=bb8a25d6fc34773606294f6910bf2c65
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.4-r1 b/metadata/md5-cache/mail-filter/spamassassin-3.4.4-r1
new file mode 100644
index 000000000000..297c454a9ecc
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) test? ( app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness ) virtual/pkgconfig
+DESCRIPTION=An extensible mail filter which can identify and tag spam
+EAPI=6
+HOMEPAGE=https://spamassassin.apache.org/
+IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.4.tar.bz2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fb28188036e623d2b4373c8c4379c1c7
diff --git a/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1 b/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
index fe708d5c6708..32049070df2b 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
+++ b/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=mail-filter/spamassassin-3.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://people.ucsc.edu/~jrudd/spamassassin/Botnet-0.8.tar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6f7c8adc0a717c8e20d6eb28c1bed875
diff --git a/metadata/md5-cache/mail-filter/tmda-1.1.12-r2 b/metadata/md5-cache/mail-filter/tmda-1.1.12-r2
index 4fdfbf68c497..6f87dd1e7628 100644
--- a/metadata/md5-cache/mail-filter/tmda-1.1.12-r2
+++ b/metadata/md5-cache/mail-filter/tmda-1.1.12-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install setup
-DEPEND=virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DEPEND=virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
 DESCRIPTION=Python-based SPAM reduction system
 EAPI=6
 HOMEPAGE=http://www.tmda.net/
 IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+RDEPEND=virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tmda/tmda-1.1.12.tgz
-_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fa1a896fa6bf1480a30282bdfee175c9
diff --git a/metadata/md5-cache/mail-filter/zdkimfilter-2.1 b/metadata/md5-cache/mail-filter/zdkimfilter-2.1
new file mode 100644
index 000000000000..c5492f19be53
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/zdkimfilter-2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=mail-filter/opendkim mail-mta/courier dev-db/opendbx dev-libs/nettle net-dns/libidn2 dev-libs/libunistring
+DESCRIPTION=DKIM filter for Courier-MTA
+EAPI=7
+HOMEPAGE=https://www.tana.it/sw/zdkimfilter
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=mail-filter/opendkim mail-mta/courier dev-db/opendbx dev-libs/nettle net-dns/libidn2 dev-libs/libunistring
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.tana.it/sw/zdkimfilter/zdkimfilter-2.1.tar.gz
+_md5_=0d6b6363f44b0c4398106d33a08c3518