2019-01-31 22:24:13 UTC

66 files changed, 131 insertions, 131 deletions

diff --git a/metadata/md5-cache/app-admin/ccze-0.2.1-r4 b/metadata/md5-cache/app-admin/ccze-0.2.1-r4
index 5235538cebb5..4ab740a42ae0 100644
--- a/metadata/md5-cache/app-admin/ccze-0.2.1-r4
+++ b/metadata/md5-cache/app-admin/ccze-0.2.1-r4
@@ -3,11 +3,11 @@ DEPEND=dev-libs/libpcre sys-libs/ncurses:0= >=sys-apps/sed-4 >=app-portage/elt-p
 DESCRIPTION=A flexible and fast logfile colorizer
 EAPI=6
 HOMEPAGE=https://github.com/madhouse/ccze/releases
-KEYWORDS=~amd64 ~arm ppc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre sys-libs/ncurses:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/ccze-0.2.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3324cb8d6e0482b2b949c78e0af027c1
+_md5_=3e8ab3f0abadc0b242d4a112b873de11
diff --git a/metadata/md5-cache/app-admin/chroot_safe-1.4-r1 b/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
index d27178259c61..1947d0c2cc0a 100644
--- a/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
+++ b/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Chroot any dynamically linked application in a safe and sane manner
 EAPI=7
 HOMEPAGE=http://chrootsafe.sourceforge.net/
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/chrootsafe/chroot_safe-1.4.tgz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c012b8186e74c3b52ec5b174e442ddf6
+_md5_=fb55931d763081ceadc462829a55e9dd
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27
index d9a542cfcea4..f85f93a264b4 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27
@@ -4,10 +4,10 @@ DESCRIPTION=A simple utility to read the temperature of SMART capable hard drive
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/hddtemp/
 IUSE=network-cron nls selinux
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-hddtemp )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2 mirror://debian/pool/main/h/hddtemp/hddtemp_0.3-beta15-53.diff.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3ff5e509c65fe96795d893797507aded
+_md5_=df5a5392a4c1f71c087890b385674d2a
diff --git a/metadata/md5-cache/app-admin/ide-smart-1.4-r2 b/metadata/md5-cache/app-admin/ide-smart-1.4-r2
index 2a07836f8160..a9fd75d90d7c 100644
--- a/metadata/md5-cache/app-admin/ide-smart-1.4-r2
+++ b/metadata/md5-cache/app-admin/ide-smart-1.4-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A tool to read SMART information from harddiscs
 EAPI=6
 HOMEPAGE=http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html
-KEYWORDS=~amd64 ppc sparc ~x86
+KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.linalco.com/ragnar/ide-smart-1.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bc633134459dffc7024e0a93f2815acc
+_md5_=b3c2dac5f2cf46f38c1c3d3c6d3b465f
diff --git a/metadata/md5-cache/app-arch/afio-2.5.1-r2 b/metadata/md5-cache/app-arch/afio-2.5.1-r2
index 8eca070cd775..939b99ef31b9 100644
--- a/metadata/md5-cache/app-arch/afio-2.5.1-r2
+++ b/metadata/md5-cache/app-arch/afio-2.5.1-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Afio creates cpio-format archives.
 EAPI=7
 HOMEPAGE=http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio
-KEYWORDS=alpha ~amd64 ~hppa ppc sparc ~x86
+KEYWORDS=alpha ~amd64 ~hppa ppc sparc x86
 LICENSE=Artistic LGPL-2
 SLOT=0
 SRC_URI=http://members.chello.nl/k.holtman/afio-2.5.1.tgz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7411163f1120630c52cbf4e2ec75fff4
+_md5_=5365ac0ae4290cd52a8c2f5d4db57436
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.8 b/metadata/md5-cache/app-arch/unrar-5.6.8
index 1981e217c465..9e6b54028296 100644
--- a/metadata/md5-cache/app-arch/unrar-5.6.8
+++ b/metadata/md5-cache/app-arch/unrar-5.6.8
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=6
 HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0/5
 SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.8.tar.gz -> unrar-5.6.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb664589f6674536f107597bd2f67913
+_md5_=bee43529938688d6f718ae361adcbcda
diff --git a/metadata/md5-cache/app-cdr/extract-xiso-2.7.1 b/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
index 49278f831a2d..3c899b3ffc5d 100644
--- a/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
+++ b/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Tool for extracting and creating optimised Xbox ISO images
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/extract-xiso
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=BSD-4
 SLOT=0
 SRC_URI=mirror://sourceforge/extract-xiso/extract-xiso-2.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6345863afc1c113fcd380039b5179fff
+_md5_=96984e532927d94576454803bf786480
diff --git a/metadata/md5-cache/app-crypt/pgpdump-0.33 b/metadata/md5-cache/app-crypt/pgpdump-0.33
index e8f24e49d79c..d95a071013a2 100644
--- a/metadata/md5-cache/app-crypt/pgpdump-0.33
+++ b/metadata/md5-cache/app-crypt/pgpdump-0.33
@@ -3,9 +3,9 @@ DEPEND=sys-libs/zlib app-arch/bzip2
 DESCRIPTION=A PGP packet visualizer
 EAPI=6
 HOMEPAGE=http://www.mew.org/~kazu/proj/pgpdump/
-KEYWORDS=~amd64 ppc sparc ~x86
+KEYWORDS=~amd64 ppc sparc x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib app-arch/bzip2
 SLOT=0
 SRC_URI=http://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.33.tar.gz
-_md5_=c6128cfeacbdea12cc3372db8eb42e69
+_md5_=8a9549b131b9c8a2095e114797f4435e
diff --git a/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0 b/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
index 6df3c8467aa6..3e64d971b01b 100644
--- a/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
+++ b/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2018.04.16-0.tar.bz2
 _eclasses_=aspell-dict-r1	d72b0cd12aab80047c51d57eb5c8f420	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e350b7b95ce3c8fef786e4b83d1cca46
+_md5_=d4cee933fdb758af3ea9698e011d9e34
diff --git a/metadata/md5-cache/app-dicts/dictd-vera-1.23 b/metadata/md5-cache/app-dicts/dictd-vera-1.23
index ac97150b9a9a..b680932eea3e 100644
--- a/metadata/md5-cache/app-dicts/dictd-vera-1.23
+++ b/metadata/md5-cache/app-dicts/dictd-vera-1.23
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict
 EAPI=5
 HOMEPAGE=http://home.snafu.de/ohei/vera/vueber-e.html
-KEYWORDS=~amd64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ppc ppc64 ~sparc x86
 LICENSE=FDL-1.3
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=mirror://gnu/vera/vera-1.23.tar.gz
-_md5_=0c622aa2db072aa68287a533ff4a1da6
+_md5_=892561775f6ed03621533548a5204084
diff --git a/metadata/md5-cache/app-dicts/myspell-da-2.3 b/metadata/md5-cache/app-dicts/myspell-da-2.3
index 6ae4112cc140..ecfee5340fad 100644
--- a/metadata/md5-cache/app-dicts/myspell-da-2.3
+++ b/metadata/md5-cache/app-dicts/myspell-da-2.3
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Danish dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/2.3/@@download/file/dict-da-2-3.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=e2be67860d0f68656660c78a9d2e5112
+_md5_=ced64a9002be9cce0a7b2bb2b08abd1f
diff --git a/metadata/md5-cache/app-dicts/myspell-ga-20160213 b/metadata/md5-cache/app-dicts/myspell-ga-20160213
index 6bcfc51ab1cb..db0d35bf237f 100644
--- a/metadata/md5-cache/app-dicts/myspell-ga-20160213
+++ b/metadata/md5-cache/app-dicts/myspell-ga-20160213
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Irish dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/irish-language-spell-checker-thesaurus-and-hyphenation-patterns
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> myspell-ga-20160213.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=72d3ff576d84a491e7da7e04c2a540dc
+_md5_=25eb6a558046da4508e5e5bf7d6446b0
diff --git a/metadata/md5-cache/app-dicts/myspell-gl-20131013 b/metadata/md5-cache/app-dicts/myspell-gl-20131013
index 717d4680dfcd..9a7d298f0d39 100644
--- a/metadata/md5-cache/app-dicts/myspell-gl-20131013
+++ b/metadata/md5-cache/app-dicts/myspell-gl-20131013
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Galician dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/corrector-ortografico-hunspell-para-galego
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> myspell-gl-20131013.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=dead0ba02e17b45c50dffc2bc160dd37
+_md5_=1aaedee6e09c797ef9c193371f1e002d
diff --git a/metadata/md5-cache/app-dicts/myspell-he-2012.08.15 b/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
index 3ed6ed178103..0d25cdf5de3c 100644
--- a/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
+++ b/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Hebrew dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary/2012-08-15/@@download/file/dict-he-2012-08-15.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=40970b15861c44eee9d1f2a1c1b3ddbb
+_md5_=102315904e0a051a7f7741b3a431353b
diff --git a/metadata/md5-cache/app-dicts/myspell-hr-20080813 b/metadata/md5-cache/app-dicts/myspell-hr-20080813
index 21f74f207838..60bb54bf7e63 100644
--- a/metadata/md5-cache/app-dicts/myspell-hr-20080813
+++ b/metadata/md5-cache/app-dicts/myspell-hr-20080813
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Croatian dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/croatian-dictionary-and-hyphenation-patterns
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-hr.oxt -> myspell-hr-20080813.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=5178dd0bac388bf18cce1f0433add6b1
+_md5_=e4d3bb8c09f510c2e1e94b8b3a800c24
diff --git a/metadata/md5-cache/app-dicts/myspell-ia-20140518 b/metadata/md5-cache/app-dicts/myspell-ia-20140518
index 513edfc22db2..81aa49eef6d1 100644
--- a/metadata/md5-cache/app-dicts/myspell-ia-20140518
+++ b/metadata/md5-cache/app-dicts/myspell-ia-20140518
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Interlingua dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/interlingua-dictionario-orthographic-e-regulas-de-division-de-parolas
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-ia-2014-05-18.oxt -> myspell-ia-20140518.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=42dd0c9a3e0581810884763a85ec5612
+_md5_=575467bd18ad798cd942aea3b6c45e16
diff --git a/metadata/md5-cache/app-dicts/myspell-lt-1.3 b/metadata/md5-cache/app-dicts/myspell-lt-1.3
index 086bda69a5a1..439421dfde2f 100644
--- a/metadata/md5-cache/app-dicts/myspell-lt-1.3
+++ b/metadata/md5-cache/app-dicts/myspell-lt-1.3
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Lithuanian dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://launchpad.net/ispell-lt
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD LPPL-1.3b
 SLOT=0
 SRC_URI=https://launchpad.net/ispell-lt/main/1.3/+download/myspell-lt-1.3.zip
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=815b4d56e9a63c20bed89392275ee961
+_md5_=ea807b3fc0e69abd6237884900b990f2
diff --git a/metadata/md5-cache/app-dicts/myspell-mk-20091211 b/metadata/md5-cache/app-dicts/myspell-mk-20091211
index 2d9a07db4197..0e60a9ffbdc1 100644
--- a/metadata/md5-cache/app-dicts/myspell-mk-20091211
+++ b/metadata/md5-cache/app-dicts/myspell-mk-20091211
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Macedonian dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/macedonian-spellchecker-dictionary
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-mk.oxt -> myspell-mk-20091211.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=02943a7ceb7f57e4ecd7a26f544ce036
+_md5_=7cb0489aafaa72bc1802870548045497
diff --git a/metadata/md5-cache/app-dicts/myspell-ms-20100407 b/metadata/md5-cache/app-dicts/myspell-ms-20100407
index 12cee23de945..ca275d96d451 100644
--- a/metadata/md5-cache/app-dicts/myspell-ms-20100407
+++ b/metadata/md5-cache/app-dicts/myspell-ms-20100407
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Malay dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/kamus-bahasa-malaysia-malay-dictionary
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=FDL-1.2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/ms_my.oxt -> myspell-ms-20100407.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=2fd9e2ff0abe68d16ab751ea170ef902
+_md5_=b3584930194cf12b20a412bb0c8e1f93
diff --git a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1 b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
index 2dd164194422..550f206f82ed 100644
--- a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
+++ b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Dutch dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://www.opentaal.org
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2 CC-BY-3.0
 SLOT=0
 SRC_URI=https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-210g-voor-openofficeorg-3?bid=20&agree=1 -> myspell-nl-2.10g.oxt https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> myspell-nl-2.10g_thes.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=d5705775f4e3bb99127b6ef55970a6be
+_md5_=72ba99975c8536868ea3879fb9d10f55
diff --git a/metadata/md5-cache/app-dicts/myspell-sw-20110106 b/metadata/md5-cache/app-dicts/myspell-sw-20110106
index 4bf621da029d..5425f614d007 100644
--- a/metadata/md5-cache/app-dicts/myspell-sw-20110106
+++ b/metadata/md5-cache/app-dicts/myspell-sw-20110106
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Kiswahili dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/swahili-dictionary
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> myspell-sw-20110106.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=9732c5ac3cd45f75fca304b8c8a0f1d6
+_md5_=c73bc1b0aa6bed37205877bb6aed5fb4
diff --git a/metadata/md5-cache/app-dicts/myspell-zu-20100126 b/metadata/md5-cache/app-dicts/myspell-zu-20100126
index a126c6385367..a802f9063d62 100644
--- a/metadata/md5-cache/app-dicts/myspell-zu-20100126
+++ b/metadata/md5-cache/app-dicts/myspell-zu-20100126
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Zulu dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/zulu-spell-checker
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-zu_za-2010.01.26.oxt -> myspell-zu-20100126.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=bf16588a166388c44d667389c01c9d96
+_md5_=c7c48f14ff17ebec75e651827b05b313
diff --git a/metadata/md5-cache/app-doc/gimp-help-2.8.2 b/metadata/md5-cache/app-doc/gimp-help-2.8.2
index 7afef88f99eb..86a95f721547 100644
--- a/metadata/md5-cache/app-doc/gimp-help-2.8.2
+++ b/metadata/md5-cache/app-doc/gimp-help-2.8.2
@@ -3,9 +3,9 @@ DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2
 DESCRIPTION=GNU Image Manipulation Program help files
 EAPI=6
 HOMEPAGE=https://docs.gimp.org/
-KEYWORDS=alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=FDL-1.2
 SLOT=2
 SRC_URI=mirror://gimp/help/gimp-help-2.8.2.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=90ec71d9d9df2c735d818776a1e5d6a7
+_md5_=42458e117927314e3e60bf5ab83db27b
diff --git a/metadata/md5-cache/app-doc/xmltoman-0.4-r1 b/metadata/md5-cache/app-doc/xmltoman-0.4-r1
index 041a0523b78a..65da834ab84d 100644
--- a/metadata/md5-cache/app-doc/xmltoman-0.4-r1
+++ b/metadata/md5-cache/app-doc/xmltoman-0.4-r1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/XML-Parser
 DESCRIPTION=Simple scripts for converting xml to groff or html
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/xmltoman/
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/XML-Parser
 SLOT=0
 SRC_URI=mirror://sourceforge/xmltoman/xmltoman-0.4.tar.gz
-_md5_=520c26d6e6ab7bd293c73481e4a6a3ff
+_md5_=ab875567063ac419daf5477a8619d14f
diff --git a/metadata/md5-cache/app-editors/dav-0.8.5-r2 b/metadata/md5-cache/app-editors/dav-0.8.5-r2
index 145521550305..2736a3756d87 100644
--- a/metadata/md5-cache/app-editors/dav-0.8.5-r2
+++ b/metadata/md5-cache/app-editors/dav-0.8.5-r2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=A minimal console text editor
 EAPI=6
 HOMEPAGE=http://dav-text.sourceforge.net/
-KEYWORDS=alpha ~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha ~amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://dav-text.sourceforge.net/files/dav-0.8.5.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4f58435a14198c152c6f041988d07dc9
+_md5_=45eb7007b5df33f1ae1718d0926108c4
diff --git a/metadata/md5-cache/app-editors/fte-20110708-r1 b/metadata/md5-cache/app-editors/fte-20110708-r1
index 55584dd8cd69..9fff45eeeecb 100644
--- a/metadata/md5-cache/app-editors/fte-20110708-r1
+++ b/metadata/md5-cache/app-editors/fte-20110708-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight text-mode editor
 EAPI=6
 HOMEPAGE=http://fte.sourceforge.net
 IUSE=gpm slang X
-KEYWORDS=~alpha ~amd64 ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fte/fte-20110708-src.zip mirror://sourceforge/fte/fte-20110708-common.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0bedbbe97c5697d9ad7510e0b234e925
+_md5_=65ee836246be26ab80a081298d5ca2aa
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.5 b/metadata/md5-cache/app-editors/okteta-0.25.5
index c1ba70b9b0a4..8c5ee3845d42 100644
--- a/metadata/md5-cache/app-editors/okteta-0.25.5
+++ b/metadata/md5-cache/app-editors/okteta-0.25.5
@@ -4,10 +4,10 @@ DESCRIPTION=Hex editor by KDE
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta/
 IUSE=crypt designer test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5[scripttools] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/okteta/0.25.5/src/okteta-0.25.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=779812b89e3f2754205bee13d371d032
+_md5_=b791019bea645cd4ae8b89ef22ddfdca
diff --git a/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1 b/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
index 7d40da445ab0..503349f6b5c2 100644
--- a/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
+++ b/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=48k ZX Spectrum Emulator
 EAPI=4
 HOMEPAGE=http://kempelen.iit.bme.hu/~mszeredi/spectemu/spectemu.html
 IUSE=readline svga +X
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=X? ( x11-base/xorg-proto >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib )
 REQUIRED_USE=|| ( svga X )
 SLOT=0
 SRC_URI=http://www.inf.bme.hu/~mszeredi/spectemu/spectemu-0.99.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1cd61fd996579a963a4a719096b15aa
+_md5_=ae070ee4f9580d3ff7b0479e9d260e5f
diff --git a/metadata/md5-cache/app-i18n/man-pages-fr-3.70 b/metadata/md5-cache/app-i18n/man-pages-fr-3.70
index 69679bd5405e..205ce4c1aa67 100644
--- a/metadata/md5-cache/app-i18n/man-pages-fr-3.70
+++ b/metadata/md5-cache/app-i18n/man-pages-fr-3.70
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=A somewhat comprehensive collection of french Linux man pages
 EAPI=6
 HOMEPAGE=https://traduc.org/perkamon
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD FDL-1.1 FDL-1.2 GPL-2 GPL-2+
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4119/man-pages-fr-3.70-1.tar.xz
-_md5_=c129ab727cd7fcab91c4a470627aaec1
+_md5_=21fe69881875f40d168b3d4e11d87b82
diff --git a/metadata/md5-cache/app-i18n/man-pages-it-4.00 b/metadata/md5-cache/app-i18n/man-pages-it-4.00
index d6a51d1c9c3f..c059edfc7ed3 100644
--- a/metadata/md5-cache/app-i18n/man-pages-it-4.00
+++ b/metadata/md5-cache/app-i18n/man-pages-it-4.00
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A somewhat comprehensive collection of Italian Linux man pages
 EAPI=5
 HOMEPAGE=http://it.tldp.org/man/
-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=man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=ftp://ftp.pluto.it/pub/pluto/ildp/man/man-pages-it-4.00.tar.xz
-_md5_=52e1925fcb692c1f0c505d6acfb1399d
+_md5_=1dbb678d1330bdb17b51e8e678f7c3c9
diff --git a/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2 b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
index 846a33c7a152..5f559ec2858b 100644
--- a/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
+++ b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=A somewhat comprehensive collection of Chinese Linux man pages
 EAPI=6
 HOMEPAGE=https://github.com/man-pages-zh/manpages-zh
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.2
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=https://github.com/man-pages-zh/manpages-zh/archive/v1.6.3.2.tar.gz -> man-pages-zh_CN-1.6.3.2.tar.gz
-_md5_=1cdefa5f64c565255becaaff809fa17c
+_md5_=30757bcf2aa19ac941b3bb50db555c64
diff --git a/metadata/md5-cache/app-misc/cdctl-0.16 b/metadata/md5-cache/app-misc/cdctl-0.16
index cbacf591b3fc..6bf4317c7563 100644
--- a/metadata/md5-cache/app-misc/cdctl-0.16
+++ b/metadata/md5-cache/app-misc/cdctl-0.16
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Utility to control your cd/dvd drive
 EAPI=5
 HOMEPAGE=http://cdctl.sourceforge.net/
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 x86
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=mirror://sourceforge/cdctl/cdctl-0.16.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1dfad3413d00377cef9ca30805e724c9
+_md5_=ad01a29d2efffaf4b49806665040851e
diff --git a/metadata/md5-cache/app-misc/jail-2.0-r4 b/metadata/md5-cache/app-misc/jail-2.0-r4
index 84d612cc7fd3..2c1632fc9012 100644
--- a/metadata/md5-cache/app-misc/jail-2.0-r4
+++ b/metadata/md5-cache/app-misc/jail-2.0-r4
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Builds a chroot and configures all the required files, directories and libraries
 EAPI=7
 HOMEPAGE=https://github.com/spiculator/jail
-KEYWORDS=~amd64 ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-util/strace
 SLOT=0
 SRC_URI=https://github.com/spiculator/jail/archive/v2.0.tar.gz -> jail-2.0.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1c46f8578543ebeffca888a9904c054f
+_md5_=30c26be505fb10785e52f9302dd9e849
diff --git a/metadata/md5-cache/app-text/html2text-1.3.2a-r2 b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
index 72895f3df17d..744dcd70c992 100644
--- a/metadata/md5-cache/app-text/html2text-1.3.2a-r2
+++ b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=HTML to text converter
 EAPI=7
 HOMEPAGE=http://www.mbayer.de/html2text/
-KEYWORDS=alpha ~amd64 hppa ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha ~amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=991755180023f7ea20441848989fdb45
+_md5_=52c26f584f33c30b481c8290c4ce00d3
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8.2 b/metadata/md5-cache/app-text/kbibtex-0.8.2
index 2f1c88831bb2..9f5ae41c388c 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.8.2
+++ b/metadata/md5-cache/app-text/kbibtex-0.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/KBibTeX
 IUSE=webengine webkit zotero test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) !app-text/kbibtex:4 dev-tex/bibtex2html x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 REQUIRED_USE=?? ( webengine webkit )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/KBibTeX/0.8.2/kbibtex-0.8.2.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4c4d487f53e966eb8fc817e3a9c6940e
+_md5_=8dd1cd84d15fd8f48e45633691265998
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.9 b/metadata/md5-cache/app-text/poppler-data-0.4.9
index 656fcf9ef3f0..a339976f5a70 100644
--- a/metadata/md5-cache/app-text/poppler-data-0.4.9
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2 MIT
 SLOT=0
 SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz
-_md5_=45f818afea0f6796a868d155dc0747d3
+_md5_=ff899fd365ac8c5635f3cc2fac5add6e
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.10.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.10.0
index db3b489ea401..fbe3d32767c4 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.10.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
 EAPI=6
 HOMEPAGE=http://icedtea.classpath.org
 IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=-* amd64 ~arm ~arm64 ppc64 x86
 LICENSE=GPL-2-with-classpath-exception
 PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
 RDEPEND=>=sys-devel/gcc-6.4.0[multilib?] >=sys-libs/glibc-2.26[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.11:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
@@ -13,4 +13,4 @@ RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.10.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.10.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-x86.tar.xz ) )
 _eclasses_=java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=af54f06fd17ea7378ff4cd27da5a30e2
+_md5_=2bac620df2d80e2d92d033bd3129abb7
diff --git a/metadata/md5-cache/dev-libs/expat-2.2.6 b/metadata/md5-cache/dev-libs/expat-2.2.6
index 1c202550fb7f..7974950b6db4 100644
--- a/metadata/md5-cache/dev-libs/expat-2.2.6
+++ b/metadata/md5-cache/dev-libs/expat-2.2.6
@@ -4,9 +4,9 @@ DESCRIPTION=Stream-oriented XML parser library
 EAPI=6
 HOMEPAGE=https://libexpat.github.io/
 IUSE=elibc_FreeBSD examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4fe222c1e49b1e7921e2046a7b695186
+_md5_=8320cf69cb608560742361fcb36878ce
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.15.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.15.1
index 359c5be1b490..ae82bbf11fb6 100644
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.15.1
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.15.1
@@ -4,9 +4,9 @@ DESCRIPTION=C++ library offering some basic functionality for platform-independe
 EAPI=7
 HOMEPAGE=https://lib.filezilla-project.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.15.1.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b3d7fe278ed8bd74fa46342ae9370b81
+_md5_=fdfaf19768438de938294da70ce4384a
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.69 b/metadata/md5-cache/dev-libs/zziplib-0.13.69
index 206f9a2cc29f..bfdf460f4c41 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.69
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.69
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight library for extracting data from files archived in a sin
 EAPI=7
 HOMEPAGE=http://zziplib.sourceforge.net/
 IUSE=doc sdl static-libs test
-KEYWORDS=alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.69.tar.gz -> zziplib-0.13.69.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8243fa41b13826833a70b3159150d557
+_md5_=0c2d504e8570e54fd7a0d0e47a04a673
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.5.0 b/metadata/md5-cache/mail-client/thunderbird-60.5.0
index f1d7aa16aecf..27ce3d1b81c8 100644
--- a/metadata/md5-cache/mail-client/thunderbird-60.5.0
+++ b/metadata/md5-cache/mail-client/thunderbird-60.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Thunderbird Mail Client
 EAPI=6
 HOMEPAGE=https://www.mozilla.org/thunderbird
 IUSE=bindist clang dbus debug hardened jack lightning neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-sqlite wifi custom-cflags custom-optimization l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla sec-policy/selinux-thunderbird )
 REQUIRED_USE=wifi? ( dbus )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ar.xpi -> thunderbird-60.5.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ast.xpi -> thunderbird-60.5.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/be.xpi -> thunderbird-60.5.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/bg.xpi -> thunderbird-60.5.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/br.xpi -> thunderbird-60.5.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ca.xpi -> thunderbird-60.5.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/cs.xpi -> thunderbird-60.5.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/cy.xpi -> thunderbird-60.5.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/da.xpi -> thunderbird-60.5.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/de.xpi -> thunderbird-60.5.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/el.xpi -> thunderbird-60.5.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.5.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/et.xpi -> thunderbird-60.5.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/eu.xpi -> thunderbird-60.5.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fi.xpi -> thunderbird-60.5.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fr.xpi -> thunderbird-60.5.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.5.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.5.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/gd.xpi -> thunderbird-60.5.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/gl.xpi -> thunderbird-60.5.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/he.xpi -> thunderbird-60.5.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hr.xpi -> thunderbird-60.5.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.5.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hu.xpi -> thunderbird-60.5.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.5.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/id.xpi -> thunderbird-60.5.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/is.xpi -> thunderbird-60.5.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/it.xpi -> thunderbird-60.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ja.xpi -> thunderbird-60.5.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ko.xpi -> thunderbird-60.5.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/lt.xpi -> thunderbird-60.5.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.5.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nl.xpi -> thunderbird-60.5.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.5.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pl.xpi -> thunderbird-60.5.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.5.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.5.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/rm.xpi -> thunderbird-60.5.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ro.xpi -> thunderbird-60.5.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ru.xpi -> thunderbird-60.5.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/si.xpi -> thunderbird-60.5.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sk.xpi -> thunderbird-60.5.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sl.xpi -> thunderbird-60.5.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sq.xpi -> thunderbird-60.5.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sr.xpi -> thunderbird-60.5.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.5.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/tr.xpi -> thunderbird-60.5.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/uk.xpi -> thunderbird-60.5.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/vi.xpi -> thunderbird-60.5.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.5.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/source/thunderbird-60.5.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.2.1.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.5-patches-01.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozcoreconf-v6	1139e0e37e324d9066382d5f359f574a	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4e8a0e4a4ec00947b7d87710744eb961
+_md5_=85389cd49beadf4ef8a670162499a871
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3 b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
index 763d53c05d5f..cbb65a19a973 100644
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance interface between the MTA and content checkers
 EAPI=6
 HOMEPAGE=https://gitlab.com/amavis/amavis
 IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 BSD-2
 RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 net-mail/tnef virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/Net-Server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy virtual/perl-IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN dev-perl/File-LibMagic >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/perl-File-Temp dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )
 SLOT=0
 SRC_URI=https://gitlab.com/amavis/amavis/-/archive/amavisd-new-2.11.1/amavis-amavisd-new-2.11.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=80c5404d30edd6862fc5c046bda7d5c3
+_md5_=08b7471425318bc914ba5ca49ed661e8
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.12 b/metadata/md5-cache/media-gfx/nomacs-3.12
index 3436fdbd233e..2c9b7d247da8 100644
--- a/metadata/md5-cache/media-gfx/nomacs-3.12
+++ b/metadata/md5-cache/media-gfx/nomacs-3.12
@@ -5,11 +5,11 @@ DESCRIPTION=Qt-based image viewer
 EAPI=7
 HOMEPAGE=https://nomacs.org/
 IUSE=heif +jpeg +opencv raw tiff zip
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 x86 ~amd64-linux
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= heif? ( media-libs/libheif:= ) opencv? ( >=media-libs/opencv-3.4:= ) raw? ( media-libs/libraw:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( dev-libs/quazip[qt5(+)] )
 REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
 SLOT=0
 SRC_URI=https://github.com/nomacs/nomacs/archive/3.12.tar.gz -> nomacs-3.12.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4f4b5031d74e51bf9b16d8c26a939622
+_md5_=d49160331e1b16adb03356b20d0a2bf7
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2
index 17a272394bd8..80080f49c2ec 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Scanner Access Now Easy - Backends
 EAPI=7
 HOMEPAGE=http://www.sane-project.org/
 IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr -sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 -sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek -sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ea65551d64fdc48789f5b58ce4c88a0b
+_md5_=d6ccda6302fa970a7925fe4dc070d210
diff --git a/metadata/md5-cache/media-libs/taglib-1.11.1_p20181028 b/metadata/md5-cache/media-libs/taglib-1.11.1_p20181028
index b6bdd6349cde..ac84c2d09a2f 100644
--- a/metadata/md5-cache/media-libs/taglib-1.11.1_p20181028
+++ b/metadata/md5-cache/media-libs/taglib-1.11.1_p20181028
@@ -4,10 +4,10 @@ DESCRIPTION=A library for reading and editing audio meta data
 EAPI=6
 HOMEPAGE=https://taglib.github.io/
 IUSE=debug examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1 MPL-1.1
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/taglib/taglib/archive/5cb589a5b82c13ba8f0542e5e79629da7645cb3c.tar.gz -> taglib-1.11.1_p20181028.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=58b732d7c0fceeb56ee696343ab7d411
+_md5_=464af3b9edca1514c447bedaa1a29256
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.2 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
index 4ba0bd5217f2..5a7393075ce3 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.2
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for ATM
 EAPI=5
 HOMEPAGE=http://linux-atm.sourceforge.net/
 IUSE=static-libs kernel_linux
-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
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46e298e3ad36b2332919a002bf312ba7
+_md5_=fc12d6793326dbbe6c2dbd262ee9efa6
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.2.1 b/metadata/md5-cache/net-dialup/mgetty-1.2.1
index a8e3ad546def..cd0d098a1a18 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=fax and voice modem programs
 EAPI=6
 HOMEPAGE=http://mgetty.greenie.net/
 IUSE=+fax fidonet
-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=GPL-2
 RDEPEND=>=sys-apps/sed-4 sys-apps/groff dev-lang/perl sys-apps/texinfo virtual/awk fax? ( !net-misc/efax !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b678fd9e75ce73234b1e49ad11d125e7
+_md5_=8b2d28510aaaa7c6b6fa37dc48c23c80
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.39.0 b/metadata/md5-cache/net-ftp/filezilla-3.39.0
index a0c0ca9c8c6d..713226f00ebe 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.39.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.39.0
@@ -4,10 +4,10 @@ DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=6
 HOMEPAGE=https://filezilla-project.org/
 IUSE=dbus nls test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.15.1 >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.39.0_src.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ac7dce8a2ed16ea21c6b43d4aa6094c7
+_md5_=eddb949f515775ff477755f0a0d9280d
diff --git a/metadata/md5-cache/net-im/sendxmpp-1.24 b/metadata/md5-cache/net-im/sendxmpp-1.24
index 86ad9a2cae08..8903a1eaa08a 100644
--- a/metadata/md5-cache/net-im/sendxmpp-1.24
+++ b/metadata/md5-cache/net-im/sendxmpp-1.24
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=A perl-script to send xmpp (jabber), similar to what mail(1) does for mail
 EAPI=5
 HOMEPAGE=http://sendxmpp.hostname.sk/
-KEYWORDS=~amd64 hppa ~ppc sparc ~x86
+KEYWORDS=~amd64 hppa ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Net-XMPP dev-perl/Authen-SASL virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/lhost/sendxmpp/archive/v1.24.tar.gz -> sendxmpp-1.24.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f32bc33b057cfc939da9e2838a6b080
+_md5_=f80a997f7ca220bf1aef66cf4f017f30
diff --git a/metadata/md5-cache/net-libs/libgssglue-0.4-r1 b/metadata/md5-cache/net-libs/libgssglue-0.4-r1
index 30ad21057ad6..be399846774a 100644
--- a/metadata/md5-cache/net-libs/libgssglue-0.4-r1
+++ b/metadata/md5-cache/net-libs/libgssglue-0.4-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Exports a gssapi interface which calls other random gssapi libraries
 EAPI=7
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=!app-crypt/libgssapi
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/libgssglue-0.4.tar.gz
-_md5_=ee8ca4a7e4f8ace4531045b7f85dae34
+_md5_=44d8d428dc91ad561732d352968b3e58
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.6 b/metadata/md5-cache/net-libs/libssh-0.8.6
index 3eccac1fc37a..b0910b92f109 100644
--- a/metadata/md5-cache/net-libs/libssh-0.8.6
+++ b/metadata/md5-cache/net-libs/libssh-0.8.6
@@ -5,11 +5,11 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=7
 HOMEPAGE=https://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
 SLOT=0/4
 SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.6.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=657c54e4c866407384954d1014f428c1
+_md5_=1066a79276b4ee7c2da3035427c447f9
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
index c2f229267bec..5016510bda03 100644
--- a/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=RabbitMQ C client
 EAPI=7
 HOMEPAGE=https://github.com/alanxz/rabbitmq-c
 IUSE=doc libressl test +ssl static-libs tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ssl? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/popt )
 REQUIRED_USE=test? ( static-libs )
 SLOT=0/4
 SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.9.0.zip -> rabbitmq-c-v0.9.0.zip
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2bfe69049e14237688d959e4b692f5d9
+_md5_=c35d0cd8dea4cae57357338fc2773e8b
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.1 b/metadata/md5-cache/net-misc/dhcp-4.4.1
index f2dfe7523eb2..c18b8cc49e5e 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=6
 HOMEPAGE=http://www.isc.org/products/DHCP
 IUSE=+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MPL-2.0 BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.1/dhcp-4.4.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ac8ec2e6862cb5fd8e7444dc107fb6a2
+_md5_=2a01e695ce25cc3e25606d28403ed090
diff --git a/metadata/md5-cache/net-news/rawdog-2.22-r1 b/metadata/md5-cache/net-news/rawdog-2.22-r1
index c4bd5b447f3d..0b3b78a3426e 100644
--- a/metadata/md5-cache/net-news/rawdog-2.22-r1
+++ b/metadata/md5-cache/net-news/rawdog-2.22-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Rawdog, RSS Aggregator Without Delusions Of Grandeur
 EAPI=6
 HOMEPAGE=http://offog.org/code/rawdog.html https://pypi.org/project/rawdog/
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/feedparser[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://offog.org/files/rawdog-2.22.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8c9893582ee4b1eb2030c31e9df795c4
+_md5_=d7aca59777f2cb1eb47403bbe82c341c
diff --git a/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1 b/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1
index 3fe34614dc8d..f2cc7984add5 100644
--- a/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1
+++ b/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A XMPP connection manager, handles single and multi user chats and v
 EAPI=6
 HOMEPAGE=https://telepathy.freedesktop.org/
 IUSE=gnutls +jingle libressl plugins test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.44:2 >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.19.9 dev-libs/libxml2 dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-0.9.8g:0=[-bindist] ) ) jingle? ( >=net-libs/libsoup-2.42 >=net-libs/libnice-0.0.11 ) plugins? ( x11-libs/gtksourceview:3.0[introspection] ) !<net-im/telepathy-mission-control-5.5.0
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.18.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c73ee0fd125f13386d29506d69cdfac4
+_md5_=4e3dcdd8d6ba399c26815596c177bd61
diff --git a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2 b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
index 4e14025914e5..a3e16f7f0929 100644
--- a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
+++ b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A link-local XMPP connection manager for Telepathy
 EAPI=6
 HOMEPAGE=https://telepathy.freedesktop.org/
 IUSE=gnutls test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.8.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9ff988ef077761c70b85117e90b9e830
+_md5_=d143caa793c892c3706c9f3dc77c066b
diff --git a/metadata/md5-cache/sci-libs/gdal-2.3.1 b/metadata/md5-cache/sci-libs/gdal-2.3.1
index 9a77b61d410c..5f733a86d6f6 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.3.1
+++ b/metadata/md5-cache/sci-libs/gdal-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=6
 HOMEPAGE=https://www.gdal.org/
 IUSE=armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib:=[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.7:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) spatialite? ( sqlite )
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6572836d1c8bd266ba91eeae05a2e85a
+_md5_=121e135eb1ae41e30a30969ab56e5ed2
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.20 b/metadata/md5-cache/sys-libs/libblockdev-2.20
index 843ed93dce40..02254ab51dad 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.20
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.20
@@ -5,11 +5,11 @@ DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
 IUSE=bcache +cryptsetup dmraid doc escrow lvm kbd test vdo python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) escrow? ( cryptsetup )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/archive/2.20-1.tar.gz -> libblockdev-2.20-1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=37895d475dbfd88b80217ffce49939bc
+_md5_=871c16b54aae59ee07c167210b59dc66
diff --git a/metadata/md5-cache/sys-power/acpi-1.7-r1 b/metadata/md5-cache/sys-power/acpi-1.7-r1
index 9b61bfb18779..558dcab9c51b 100644
--- a/metadata/md5-cache/sys-power/acpi-1.7-r1
+++ b/metadata/md5-cache/sys-power/acpi-1.7-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Displays information about ACPI devices
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/acpiclient/
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/acpiclient/acpi-1.7.tar.gz
-_md5_=b90c1f9b7b74a55b6ecbe938c9ae3915
+_md5_=ab852ce08db0a974d2697d0da8d17d6d
diff --git a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1 b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
index 2decb8931338..0c3621c9b0ad 100644
--- a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
+++ b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=small utility to wait for an arbitrary process to exit
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~zzam/wait_on_pid/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/wait_on_pid-0.0.2.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/wait_on_pid-0.0.2.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d913dfd02016de4f8d00943876602a4c
+_md5_=521d672e06fdfa4f26c7fe97e42cbb8a
diff --git a/metadata/md5-cache/www-client/firefox-60.5.0 b/metadata/md5-cache/www-client/firefox-60.5.0
index 7038c28ce9f0..aa6441f98690 100644
--- a/metadata/md5-cache/www-client/firefox-60.5.0
+++ b/metadata/md5-cache/www-client/firefox-60.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Firefox Web Browser
 EAPI=6
 HOMEPAGE=https://www.mozilla.com/firefox
 IUSE=bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ach.xpi -> firefox-60.5.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/af.xpi -> firefox-60.5.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/an.xpi -> firefox-60.5.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ar.xpi -> firefox-60.5.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/as.xpi -> firefox-60.5.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ast.xpi -> firefox-60.5.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/az.xpi -> firefox-60.5.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/bg.xpi -> firefox-60.5.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.5.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.5.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/br.xpi -> firefox-60.5.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/bs.xpi -> firefox-60.5.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ca.xpi -> firefox-60.5.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/cak.xpi -> firefox-60.5.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/cs.xpi -> firefox-60.5.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/cy.xpi -> firefox-60.5.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/da.xpi -> firefox-60.5.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/de.xpi -> firefox-60.5.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/dsb.xpi -> firefox-60.5.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/el.xpi -> firefox-60.5.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/en-GB.xpi -> firefox-60.5.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.5.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/eo.xpi -> firefox-60.5.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/es-AR.xpi -> firefox-60.5.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/es-CL.xpi -> firefox-60.5.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/es-ES.xpi -> firefox-60.5.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/es-MX.xpi -> firefox-60.5.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/et.xpi -> firefox-60.5.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/eu.xpi -> firefox-60.5.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/fa.xpi -> firefox-60.5.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ff.xpi -> firefox-60.5.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/fi.xpi -> firefox-60.5.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/fr.xpi -> firefox-60.5.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.5.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.5.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/gd.xpi -> firefox-60.5.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/gl.xpi -> firefox-60.5.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/gn.xpi -> firefox-60.5.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.5.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/he.xpi -> firefox-60.5.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.5.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hr.xpi -> firefox-60.5.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hsb.xpi -> firefox-60.5.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hu.xpi -> firefox-60.5.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.5.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/id.xpi -> firefox-60.5.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/is.xpi -> firefox-60.5.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/it.xpi -> firefox-60.5.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ja.xpi -> firefox-60.5.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ka.xpi -> firefox-60.5.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/kab.xpi -> firefox-60.5.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/kk.xpi -> firefox-60.5.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/km.xpi -> firefox-60.5.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/kn.xpi -> firefox-60.5.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ko.xpi -> firefox-60.5.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/lij.xpi -> firefox-60.5.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/lt.xpi -> firefox-60.5.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/lv.xpi -> firefox-60.5.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/mai.xpi -> firefox-60.5.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/mk.xpi -> firefox-60.5.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ml.xpi -> firefox-60.5.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/mr.xpi -> firefox-60.5.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ms.xpi -> firefox-60.5.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.5.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/nl.xpi -> firefox-60.5.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.5.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/or.xpi -> firefox-60.5.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.5.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/pl.xpi -> firefox-60.5.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.5.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.5.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/rm.xpi -> firefox-60.5.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ro.xpi -> firefox-60.5.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ru.xpi -> firefox-60.5.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/si.xpi -> firefox-60.5.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sk.xpi -> firefox-60.5.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sl.xpi -> firefox-60.5.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/son.xpi -> firefox-60.5.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sq.xpi -> firefox-60.5.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sr.xpi -> firefox-60.5.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.5.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ta.xpi -> firefox-60.5.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/te.xpi -> firefox-60.5.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/th.xpi -> firefox-60.5.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/tr.xpi -> firefox-60.5.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/uk.xpi -> firefox-60.5.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/uz.xpi -> firefox-60.5.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/vi.xpi -> firefox-60.5.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/xh.xpi -> firefox-60.5.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.5.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.5.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/source/firefox-60.5.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.5-patches-01.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.60	b0c9597a272886ddb9681889887b2322	mozcoreconf-v6	1139e0e37e324d9066382d5f359f574a	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ff1e75d0b1bb93373a0042f40ab218dc
+_md5_=36b0f9c914788c820d85f4222648c593
diff --git a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1 b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
index 63e0b388d029..8581800cc575 100644
--- a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
+++ b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A FCGI spawner for lighttpd and cherokee and other webservers
 EAPI=7
 HOMEPAGE=http://redmine.lighttpd.net/projects/spawn-fcgi
 IUSE=ipv6
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=!<=www-servers/lighttpd-1.4.20 !<=www-servers/cherokee-0.98.1
 SLOT=0
 SRC_URI=http://www.lighttpd.net/download/spawn-fcgi-1.6.4.tar.xz
-_md5_=f5801c16ce96958527bdbebd22f942fd
+_md5_=f8441af450a5862b32ef079655609a4d
diff --git a/metadata/md5-cache/x11-misc/qtfm-6.1.5 b/metadata/md5-cache/x11-misc/qtfm-6.1.5
index 6bd3423aa7e6..d9e3ca577cb5 100644
--- a/metadata/md5-cache/x11-misc/qtfm-6.1.5
+++ b/metadata/md5-cache/x11-misc/qtfm-6.1.5
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-
 DESCRIPTION=A small, lightweight file manager for desktops based on pure Qt
 EAPI=6
 HOMEPAGE=https://qtfm.eu/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file
 SLOT=0
 SRC_URI=https://github.com/rodlie/qtfm/archive/6.1.5.tar.gz -> qtfm-6.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4db57bd97aee5dd5b67ded271cbab2d3
+_md5_=3ea589805b5c0da0f7b9a798722ac858
diff --git a/metadata/md5-cache/x11-wm/sawfish-1.12.0 b/metadata/md5-cache/x11-wm/sawfish-1.12.0
index d6f65ef0cbdd..30d8873e0686 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.12.0
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible window manager using a Lisp-based scripting language
 EAPI=6
 HOMEPAGE=http://sawfish.wikia.com/
 IUSE=emacs kde nls xinerama
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2 Artistic-2
 RDEPEND=emacs? ( virtual/emacs !app-emacs/sawfish ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 x11-libs/pangox-compat x11-libs/gdk-pixbuf:2[X] >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst kde? ( kde-frameworks/kdelibs4support ) nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/sawfish/sawfish_1.12.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e94cab959399cbcb1a48ebc5b3f59e40
+_md5_=d0cc4cc0c69c2d582c0a9bb782e04fee
diff --git a/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1 b/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
index 3a0330cfeead..fc24274ab17c 100644
--- a/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
+++ b/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=window manager selector tool
 EAPI=6
 HOMEPAGE=https://ordiluc.net/selectwm
 IUSE=nls
-KEYWORDS=~amd64 ~ppc sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
 SLOT=2
 SRC_URI=https://ordiluc.net/selectwm/selectwm-0.4.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6e30cdacfc3583f0ac4f769a98fcda3b
+_md5_=7e55efe7415d397f1ad2b6054fa6736a
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5edb17613a83..f0dd78c2164a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 31 Jan 2019 22:04:14 +0000
+Thu, 31 Jan 2019 22:24:13 +0000