gentoo resync : 05.02.2020

47 files changed, 76 insertions, 145 deletions

diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 8b49928a11c7..050a6cd13beb 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/autorespond-2.0.4 b/metadata/md5-cache/net-mail/autorespond-2.0.4
index d1e8bf7fbb74..f10200a32fe8 100644
--- a/metadata/md5-cache/net-mail/autorespond-2.0.4
+++ b/metadata/md5-cache/net-mail/autorespond-2.0.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Autoresponder add on package for qmailadmin
 EAPI=7
 HOMEPAGE=http://inter7.com/software/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/qmail
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/autorespond-2.0.4.tar.gz mirror://gentoo/autorespond_2.0.4-1.diff.gz
-_md5_=f63fcf384956e91cd4723a4e11bf1607
+_md5_=2dbecf647897baebb2574bf88adf90b8
diff --git a/metadata/md5-cache/net-mail/checkpassword-0.90-r4 b/metadata/md5-cache/net-mail/checkpassword-0.90-r4
index ef2c4c120b42..03350af3b166 100644
--- a/metadata/md5-cache/net-mail/checkpassword-0.90-r4
+++ b/metadata/md5-cache/net-mail/checkpassword-0.90-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A uniform password checking interface for root applications
 EAPI=7
 HOMEPAGE=https://cr.yp.to/checkpwd.html
 IUSE=static
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=all-rights-reserved
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://cr.yp.to/checkpwd/checkpassword-0.90.tar.gz
 _eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3589a882d77aaea3cf92c197934f01cf
+_md5_=154be3c32969615eb51da00ad1284821
diff --git a/metadata/md5-cache/net-mail/checkpassword-pam-0.99-r1 b/metadata/md5-cache/net-mail/checkpassword-pam-0.99-r1
index 832f5305c94c..c301d8682447 100644
--- a/metadata/md5-cache/net-mail/checkpassword-pam-0.99-r1
+++ b/metadata/md5-cache/net-mail/checkpassword-pam-0.99-r1
@@ -3,8 +3,8 @@ DEPEND=>=sys-libs/pam-0.75
 DESCRIPTION=checkpassword-compatible authentication program w/pam support
 EAPI=7
 HOMEPAGE=http://checkpasswd-pam.sourceforge.net/
-KEYWORDS=alpha ~amd64 ~arm64 hppa ppc x86
+KEYWORDS=~alpha ~amd64 ~arm64 hppa ppc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/checkpasswd-pam/checkpassword-pam-0.99.tar.gz
-_md5_=5713364ea1d0b50bda4084d8d435f05e
+_md5_=72037b7203331392ff311de3b46735d5
diff --git a/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r2 b/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r2
index 057fad66239e..237a78026840 100644
--- a/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r2
+++ b/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r2
@@ -3,10 +3,10 @@ DEPEND=acct-user/cmd5checkpw >=sys-apps/sed-4
 DESCRIPTION=A checkpassword compatible authentication program that used CRAM-MD5 authentication mode
 EAPI=7
 HOMEPAGE=https://www.fehcom.de/qmail/smtpauth.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=public-domain RSA
 RDEPEND=acct-user/cmd5checkpw
 SLOT=0
 SRC_URI=https://www.fehcom.de/qmail/auth/cmd5checkpw-030_tgz.bin -> cmd5checkpw-0.30.tar.gz
 _eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c
-_md5_=aea810dd56c88a37a266d0b30abbe924
+_md5_=41b8778ad4332852d5be0c17fda0e1b4
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.18.2 b/metadata/md5-cache/net-mail/courier-imap-4.18.2
deleted file mode 100644
index 340ea834848b..000000000000
--- a/metadata/md5-cache/net-mail/courier-imap-4.18.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=net-libs/courier-authlib-0.66.4 >=net-libs/courier-unicode-2 >=net-mail/mailbase-0.00-r8 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 ) >=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 virtual/pkgconfig
-DESCRIPTION=An IMAP daemon designed specifically for maildirs
-EAPI=6
-HOMEPAGE=https://www.courier-mta.org/imap/
-IUSE=berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-3
-RDEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=net-libs/courier-authlib-0.66.4 >=net-libs/courier-unicode-2 >=net-mail/mailbase-0.00-r8 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 !net-mail/uw-imap
-REQUIRED_USE=|| ( berkdb gdbm )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/courier-imap-4.18.2.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=07403b85ae2d66d42e3738812ecff099
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
index 3a4146121239..d6a5a8aa352f 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sql
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.10/cyrus-imapd-3.0.10.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9911d2773c5d0f5ecee43908ef3404cd
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
index 05a845759cb8..43a31aa5b702 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sql
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.11/cyrus-imapd-3.0.11.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=60243c5ddb60ce05418e843aca5e6518
diff --git a/metadata/md5-cache/net-mail/dot-forward-0.71-r4 b/metadata/md5-cache/net-mail/dot-forward-0.71-r4
index 2d511dd0231b..fb2512aae39a 100644
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r4
+++ b/metadata/md5-cache/net-mail/dot-forward-0.71-r4
@@ -3,11 +3,11 @@ DEPEND=acct-group/nofiles acct-group/qmail >=sys-apps/sed-4 >=sys-apps/sed-4
 DESCRIPTION=reads sendmail's .forward files under qmail
 EAPI=7
 HOMEPAGE=http://cr.yp.to/dot-forward.html
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=public-domain
 RDEPEND=acct-group/nofiles acct-group/qmail
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d666ba2e2db1272ac7fd4583d2826e96
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4e4202b637601332f769aaa08046ade0
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.7.2 b/metadata/md5-cache/net-mail/dovecot-2.3.7.2
index fff5298ea174..dee35f41bc89 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.7.2
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.7.2
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=https://www.dovecot.org/
 IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.7.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.2.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.2.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=bbac939792405e46b19fd9e176774d1e
+_md5_=0cad9ae60ba35f7f372b3567a4c71130
diff --git a/metadata/md5-cache/net-mail/email-3.1.3 b/metadata/md5-cache/net-mail/email-3.1.3
index 4c673935ce6e..c3b2c54152f7 100644
--- a/metadata/md5-cache/net-mail/email-3.1.3
+++ b/metadata/md5-cache/net-mail/email-3.1.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Advanced CLI tool for sending email
 EAPI=4
 HOMEPAGE=http://www.cleancode.org/projects/email
-KEYWORDS=alpha amd64 x86
+KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.cleancode.org/downloads/email/email-3.1.3.tar.bz2
-_md5_=7a413134924d387ae448d2c82506f585
+_md5_=96d860fe76d54aa11be8150d52e477dd
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-r3
index d38f95e00602..e20670501416 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) v
 REQUIRED_USE=?? ( mysql postgres )
 SLOT=0
 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c5ee696c5b3e9971f4306a8e4d8b71c
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.3.26-r4 b/metadata/md5-cache/net-mail/fetchmail-6.3.26-r4
index dc34c1f026f4..6c279ff0e99b 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.3.26-r4
+++ b/metadata/md5-cache/net-mail/fetchmail-6.3.26-r4
@@ -4,11 +4,11 @@ DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=6
 HOMEPAGE=http://www.fetchmail.info/
 IUSE=ssl nls kerberos tk socks libressl +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:= ) libressl? ( dev-libs/libressl:= ) ) kerberos? ( virtual/krb5 !libressl? ( >=dev-libs/openssl-0.9.6:= ) libressl? ( dev-libs/libressl:= ) ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
 REQUIRED_USE=tk? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.3.26.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fb1c50fd477c2f4902d1563de8dad055
+_md5_=b46d1056315555bee4a24412602253c7
diff --git a/metadata/md5-cache/net-mail/isync-1.3.0-r1 b/metadata/md5-cache/net-mail/isync-1.3.0-r1
deleted file mode 100644
index 52213774a364..000000000000
--- a/metadata/md5-cache/net-mail/isync-1.3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=sys-libs/db-4.2:* zlib? ( sys-libs/zlib ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=MailDir mailbox synchronizer
-EAPI=6
-HOMEPAGE=http://isync.sourceforge.net/
-IUSE=compat sasl libressl ssl zlib
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/db-4.2:* zlib? ( sys-libs/zlib ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/isync/isync/1.3.0/isync-1.3.0.tar.gz
-_md5_=178dc2fb0f594c73b31831399aa0c72a
diff --git a/metadata/md5-cache/net-mail/isync-1.3.1 b/metadata/md5-cache/net-mail/isync-1.3.1
index 94a536a78489..e2f822b84c12 100644
--- a/metadata/md5-cache/net-mail/isync-1.3.1
+++ b/metadata/md5-cache/net-mail/isync-1.3.1
@@ -4,9 +4,9 @@ DESCRIPTION=MailDir mailbox synchronizer
 EAPI=6
 HOMEPAGE=http://isync.sourceforge.net/
 IUSE=libressl sasl ssl zlib
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/isync/isync/1.3.1/isync-1.3.1.tar.gz
-_md5_=66bd7c0a0c506468121e7026f06f1290
+_md5_=e0390ec89f5d600d3deb1332023e5f80
diff --git a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r1 b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r1
index 41de16da65ff..18941d67614a 100644
--- a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r1
+++ b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/list-remote-forwards-0.0.1/list-remote-forwards-0.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43a2f809b1a77229c3554aee16561327
diff --git a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2 b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
index 8a2968872520..fd9fe6a23ee6 100644
--- a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
+++ b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/list-remote-forwards-0.0.1/list-remote-forwards-0.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2159d07b0c21f285e948052bf41c916
diff --git a/metadata/md5-cache/net-mail/mailbase-1.5-r1 b/metadata/md5-cache/net-mail/mailbase-1.5-r1
index d436cf83fcad..dc5eec6f9577 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.5-r1
+++ b/metadata/md5-cache/net-mail/mailbase-1.5-r1
@@ -3,9 +3,9 @@ DESCRIPTION=MTA layout package
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/
 IUSE=pam
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/mail acct-user/mail acct-user/postmaster pam? ( sys-libs/pam )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c7280c445d55810a1b31f2da87f73374
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e24f94c9257cea06a2752b103fad6c8e
diff --git a/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r1 b/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r1
deleted file mode 100644
index e735d07a35ac..000000000000
--- a/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.16.0 >=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/hdbc-2.4 >=dev-haskell/hdbc-postgresql-2.3 >=dev-haskell/hdbc-sqlite3-2.3 >=dev-haskell/missingh-1.2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-lang/ghc-7.6.1 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/filemanip-0.3.6 )
-DESCRIPTION=Count mailboxes in a SQL database
-EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/mailbox-count
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/mailbox-count-0.0.2/mailbox-count-0.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c443103d4fa84668d66be6cba820f2e
diff --git a/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r2 b/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r2
deleted file mode 100644
index 1489815e8c58..000000000000
--- a/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.16.0 >=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/hdbc-2.4 >=dev-haskell/hdbc-postgresql-2.3 >=dev-haskell/hdbc-sqlite3-2.3 >=dev-haskell/missingh-1.2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-lang/ghc-7.6.1 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/filemanip-0.3.6 )
-DESCRIPTION=Count mailboxes in a SQL database
-EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/mailbox-count
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/mailbox-count-0.0.2/mailbox-count-0.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efd5c4edfcfef4ac3057b9e7ef3d865b
diff --git a/metadata/md5-cache/net-mail/mailbox-count-0.0.5 b/metadata/md5-cache/net-mail/mailbox-count-0.0.5
new file mode 100644
index 000000000000..49a517fa32fd
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailbox-count-0.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/hdbc-2.4 >=dev-haskell/hdbc-postgresql-2.3 >=dev-haskell/hdbc-sqlite3-2.3 >=dev-haskell/missingh-1.2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 || ( >=dev-lang/ghc-8.0 ( >=dev-lang/ghc-7.10.1 <dev-lang/ghc-8.0 <dev-haskell/semigroups-0.18.2 ) ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/filemanip-0.3.6 )
+DESCRIPTION=Count mailboxes in a SQL database
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/mailbox-count
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/hdbc-2.4 >=dev-haskell/hdbc-postgresql-2.3 >=dev-haskell/hdbc-sqlite3-2.3 >=dev-haskell/missingh-1.2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 || ( >=dev-lang/ghc-8.0 ( >=dev-lang/ghc-7.10.1 <dev-lang/ghc-8.0 <dev-haskell/semigroups-0.18.2 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/mailbox-count-0.0.5/mailbox-count-0.0.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=20731b008e1e8b5dd0c6196dff2b36fb
diff --git a/metadata/md5-cache/net-mail/mailutils-3.4-r3 b/metadata/md5-cache/net-mail/mailutils-3.4-r3
index d6358b4972f8..f29825844f89 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.4-r3
+++ b/metadata/md5-cache/net-mail/mailutils-3.4-r3
@@ -10,5 +10,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) servers? ( tcpd )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.4.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5787d2050486bd834dacf24660afcfbb
diff --git a/metadata/md5-cache/net-mail/mailutils-3.7 b/metadata/md5-cache/net-mail/mailutils-3.7
index 0132297c8a5b..c44dc3a371fa 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.7
+++ b/metadata/md5-cache/net-mail/mailutils-3.7
@@ -11,5 +11,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.7.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=481f9b9a1e2ff55c55ffbc938754ce6d
diff --git a/metadata/md5-cache/net-mail/mailutils-3.8 b/metadata/md5-cache/net-mail/mailutils-3.8
index b7673a3324db..606972006521 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.8
+++ b/metadata/md5-cache/net-mail/mailutils-3.8
@@ -11,5 +11,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.8.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8824cd4c0ef58c33a9406a691b6f28cc
diff --git a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2 b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
index 9ae90793a842..2b2fff867083 100644
--- a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
+++ b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Metamail (with Debian patches) - Generic MIME package
 EAPI=7
 HOMEPAGE=http://ftp.funet.fi/pub/unix/mail/metamail/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
 SLOT=0
 SRC_URI=http://ftp.funet.fi/pub/unix/mail/metamail/mm2.7.tar.Z mirror://debian/pool/main/m/metamail/metamail_2.7-53.diff.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f86c77829f2cf0c15db752cc9f23a762
+_md5_=670bb3b4881a76ee5dd734de449d1a23
diff --git a/metadata/md5-cache/net-mail/mlmmj-1.3.0 b/metadata/md5-cache/net-mail/mlmmj-1.3.0
index f72bf40f8fe8..d5432efa2f46 100644
--- a/metadata/md5-cache/net-mail/mlmmj-1.3.0
+++ b/metadata/md5-cache/net-mail/mlmmj-1.3.0
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://mlmmj.org/releases/mlmmj-1.3.0.tar.bz2
-_md5_=89759be55cc5062c2727e1c7177f87ac
+_md5_=23107456a8cb8899d0f741904ac9204e
diff --git a/metadata/md5-cache/net-mail/notmuch-0.28.4 b/metadata/md5-cache/net-mail/notmuch-0.28.4
deleted file mode 100644
index da039bd4fc10..000000000000
--- a/metadata/md5-cache/net-mail/notmuch-0.28.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-3.0.3:3.0 >=dev-libs/xapian-1.4.8:= dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/texinfo >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( dev-libs/gmime:3.0[crypt] ) emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig doc? ( app-doc/doxygen dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( app-misc/dtach >=app-editors/emacs-24.1:*[libxml2] 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
-EAPI=6
-HOMEPAGE=https://notmuchmail.org/
-IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 x86 ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-3.0.3:3.0 >=dev-libs/xapian-1.4.8:= dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/texinfo >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( dev-libs/gmime:3.0[crypt] ) emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) crypt? ( app-crypt/gnupg ) nmbug? ( dev-vcs/git ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser )
-REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind )
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://notmuchmail.org/releases/notmuch-0.28.4.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f405ad54e7c81db7c926c3260eb5488
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.2 b/metadata/md5-cache/net-mail/notmuch-0.29.2
deleted file mode 100644
index f9f35bd8bfe4..000000000000
--- a/metadata/md5-cache/net-mail/notmuch-0.29.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-3.0.3:3.0 >=dev-libs/xapian-1.4.8:= dev-python/sphinx sys-apps/texinfo >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( dev-libs/gmime:3.0[crypt] ) emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig doc? ( app-doc/doxygen dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( app-misc/dtach >=app-editors/emacs-24.1:*[libxml2] 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
-EAPI=6
-HOMEPAGE=https://notmuchmail.org/
-IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~x86 ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-3.0.3:3.0 >=dev-libs/xapian-1.4.8:= dev-python/sphinx sys-apps/texinfo >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( dev-libs/gmime:3.0[crypt] ) emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) crypt? ( app-crypt/gnupg ) nmbug? ( dev-vcs/git ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser )
-REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind )
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.2.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d03624f388b88c3b014aac386bc4769
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.3 b/metadata/md5-cache/net-mail/notmuch-0.29.3
index 852dce6f9e16..9cc0671b3f45 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.3
@@ -4,12 +4,12 @@ DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=6
 HOMEPAGE=https://notmuchmail.org/
 IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~x86 ~x64-solaris
+KEYWORDS=~alpha amd64 x86 ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-3.0.3:3.0 >=dev-libs/xapian-1.4.8:= dev-python/sphinx sys-apps/texinfo >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( dev-libs/gmime:3.0[crypt] ) emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) crypt? ( app-crypt/gnupg ) nmbug? ( dev-vcs/git ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser )
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind )
 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	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d03624f388b88c3b014aac386bc4769
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07c89fcd7be73e5a601f394722157cd2
diff --git a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.7 b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.7
index 7de0915a1bbb..c61ae7c3334d 100644
--- a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.7
+++ b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-libs/pam
 SLOT=0
 SRC_URI=https://github.com/kravietz/poppassd-ceti/releases/download/v1.8.7/poppassd-ceti-1.8.7.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a626addf89a97b74b2894ef670f95c3
diff --git a/metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3 b/metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3
index b3e306e541c3..1671201e5af1 100644
--- a/metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3
+++ b/metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Rate-limited autoresponder for qmail
 EAPI=7
 HOMEPAGE=http://untroubled.org/qmail-autoresponder/
 IUSE=mysql
-KEYWORDS=alpha amd64 hppa ~mips ppc ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~mips ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/bglibs-1.106 mysql? ( dev-db/mysql-connector-c:0= ) virtual/qmail mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=http://untroubled.org/qmail-autoresponder/archive/qmail-autoresponder-0.97.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af5d66ee0a4bb7ac17a62e986acafd3a
+_md5_=7ba57b5446c55cc8a052ea913cd2dfab
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
index cf216328bd16..b73f77dd63c8 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop?
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=96350bfb8c97d7599d9298eb76551029
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
index 0ca1d1188100..9786c775430b 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.16
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/webapp-config-1.50.15
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=37883c32bebc93f1321d2801e61d7141
diff --git a/metadata/md5-cache/net-mail/qmhandle-1.3.2 b/metadata/md5-cache/net-mail/qmhandle-1.3.2
index f06a786530e7..13f78b3efe78 100644
--- a/metadata/md5-cache/net-mail/qmhandle-1.3.2
+++ b/metadata/md5-cache/net-mail/qmhandle-1.3.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Qmail message queue tool
 EAPI=7
 HOMEPAGE=http://qmhandle.sourceforge.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/qmail dev-lang/perl sys-process/psmisc
 SLOT=0
 SRC_URI=mirror://sourceforge/qmhandle/qmhandle-1.3.2.tar.gz
-_md5_=2f92e9e68e61c91dd4c9824ccfa977be
+_md5_=89e1dbac7d085699d2209bf7f4191c08
diff --git a/metadata/md5-cache/net-mail/qtools-0.56 b/metadata/md5-cache/net-mail/qtools-0.56
index 3c5c406a7ce5..3aea63821477 100644
--- a/metadata/md5-cache/net-mail/qtools-0.56
+++ b/metadata/md5-cache/net-mail/qtools-0.56
@@ -3,10 +3,10 @@ DESCRIPTION=Utilities for use with qmail, typically as part of .qmail command pr
 EAPI=7
 HOMEPAGE=http://www.superscript.com/qtools/intro.html
 IUSE=static
-KEYWORDS=alpha ~amd64 ~hppa ~mips ppc ~sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc ~sparc x86
 LICENSE=all-rights-reserved public-domain
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.superscript.com/qtools/qtools-0.56.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af54d5314753e7f47079365306064c14
+_md5_=9a420bbd15c5b421afba489c0022da92
diff --git a/metadata/md5-cache/net-mail/queue-fix-1.4-r3 b/metadata/md5-cache/net-mail/queue-fix-1.4-r3
index c43d2988e675..f4174983a847 100644
--- a/metadata/md5-cache/net-mail/queue-fix-1.4-r3
+++ b/metadata/md5-cache/net-mail/queue-fix-1.4-r3
@@ -3,11 +3,11 @@ DEPEND=>=sys-apps/sed-4
 DESCRIPTION=Qmail Queue Repair Application with support for big-todo
 EAPI=7
 HOMEPAGE=http://www.netmeridian.com/e-huss/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86
 LICENSE=all-rights-reserved public-domain
 PDEPEND=virtual/qmail
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.netmeridian.com/e-huss/queue-fix-1.4.tar.gz mirror://qmail/queue-fix-todo.patch
 _eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0cd4bb6c1db1ff554f82dd8c5723bd19
+_md5_=5e2771496b0c869562e8bf7c7feb1f02
diff --git a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1 b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
index 2be23a87146b..5bed70b5c0cb 100644
--- a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
+++ b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A toolkit for dealing with the qmail queue directory structure
 EAPI=6
 HOMEPAGE=http://pyropus.ca/software/queue-repair/
 IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=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 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pyropus.ca/software/queue-repair/queue-repair-0.9.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b31d922d2e5faeb87f21efa359094bee
+_md5_=e77b8fba43916cfd37562055d37f1c96
diff --git a/metadata/md5-cache/net-mail/smtptools-0.2.3 b/metadata/md5-cache/net-mail/smtptools-0.2.3
index 4d8c44f4c1fd..237f86b9dfbb 100644
--- a/metadata/md5-cache/net-mail/smtptools-0.2.3
+++ b/metadata/md5-cache/net-mail/smtptools-0.2.3
@@ -3,10 +3,10 @@ DEPEND=!net-mail/qtools >=app-portage/elt-patches-20170815 || ( >=sys-devel/auto
 DESCRIPTION=A collection of tools to send or receive mails with SMTP
 EAPI=4
 HOMEPAGE=http://www.ohse.de/uwe/software/smtptools.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=670155f22ecf0f01cf3cb56f61d922e4
+_md5_=57fc36bb67f6682d210dabb1b83886e4
diff --git a/metadata/md5-cache/net-mail/tpop3d-1.5.5 b/metadata/md5-cache/net-mail/tpop3d-1.5.5
index 165ab7ad3df8..bbb82f91c093 100644
--- a/metadata/md5-cache/net-mail/tpop3d-1.5.5
+++ b/metadata/md5-cache/net-mail/tpop3d-1.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sha1? ( >=dev-libs/openssl-0.9.6 ) ssl? ( >=dev-libs/openssl-0.9.6 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( sys-libs/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=mirror://nongnu/tpop3d/tpop3d-1.5.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7217bdc8fc24dc2c1c08133ef1dfb528
diff --git a/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1 b/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
index 532e8f2c07ce..3417f65ce900 100644
--- a/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
+++ b/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sha1? ( >=dev-libs/openssl-0.9.6:0= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( sys-libs/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=mirror://nongnu/tpop3d/tpop3d-1.5.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5df6ab4eb768f4d069fa1484fc501b87
diff --git a/metadata/md5-cache/net-mail/vacation-1.2.7.0 b/metadata/md5-cache/net-mail/vacation-1.2.7.0
index df277b4820fb..0d93b7831c65 100644
--- a/metadata/md5-cache/net-mail/vacation-1.2.7.0
+++ b/metadata/md5-cache/net-mail/vacation-1.2.7.0
@@ -3,10 +3,10 @@ DEPEND=!mail-mta/sendmail sys-libs/gdbm virtual/mta
 DESCRIPTION=automatic mail answering program
 EAPI=7
 HOMEPAGE=http://vacation.sourceforge.net/
-KEYWORDS=alpha amd64 x86
+KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-2
 RDEPEND=!mail-mta/sendmail sys-libs/gdbm virtual/mta
 SLOT=0
 SRC_URI=mirror://sourceforge/vacation/vacation-1.2.7.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d9d5eabd8fd0f1699d89e68d500e7d83
+_md5_=cfae6814bb9cdf115edd0527d5a74391
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4
index dee38a475f47..84e7cfc078a6 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.4
+++ b/metadata/md5-cache/net-mail/vchkuser-0.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=755014e3a95090323c2d540ce2e773d2
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33
index abdb73ad005d..7a6e036511e9 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24b5f60cb8ba99a7fb16e5a16089c946
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r4 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r4
index 85fe5279263b..e2fbafc49e2d 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r4
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r4
@@ -11,5 +11,5 @@ RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-fi
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=45a6543e7068b8c9634d0636d07b27e5
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r5 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r5
index 0033476eb005..12384e1dbece 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r5
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r5
@@ -11,5 +11,5 @@ RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-fi
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c124b96274da7c3ab335f04cb5ff7e50
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7 b/metadata/md5-cache/net-mail/vqadmin-2.3.7
index b22ffb753fb6..5aa935ef43e3 100644
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.7
+++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=78f368d130340d0d6cb8ec696d698daf
diff --git a/metadata/md5-cache/net-mail/ytnef-1.9.3 b/metadata/md5-cache/net-mail/ytnef-1.9.3
index 99fd3f25909d..a412e0ed7a4a 100644
--- a/metadata/md5-cache/net-mail/ytnef-1.9.3
+++ b/metadata/md5-cache/net-mail/ytnef-1.9.3
@@ -5,10 +5,10 @@ DESCRIPTION=Yeraze's TNEF Stream Reader - for winmail.dat files
 EAPI=7
 HOMEPAGE=https://github.com/Yeraze/ytnef
 IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-perl/MIME-tools
 SLOT=0
 SRC_URI=https://github.com/Yeraze/ytnef/archive/v1.9.3.tar.gz -> ytnef-1.9.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af405071edfcb9cf6a4dcd954f067fdf
+_md5_=9664f4d2fca2935274ca343a348cc554