2020-11-17 19:35:40 UTC

70 files changed, 139 insertions, 139 deletions

diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r2 b/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r2
index 59ecdc639bbe..a3bd38f9f6df 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=MIT Kerberos V
 EAPI=7
 HOMEPAGE=https://web.mit.edu/kerberos/www/
 IUSE=cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !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_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=12e1a7ba46101bc9549ae5ef64ab481d
+_md5_=7fcda28ff28ec75a94ccb1f9da6381ad
diff --git a/metadata/md5-cache/app-portage/eix-0.34.9 b/metadata/md5-cache/app-portage/eix-0.34.9
index 9d43f7fc0149..d69fa31cf335 100644
--- a/metadata/md5-cache/app-portage/eix-0.34.9
+++ b/metadata/md5-cache/app-portage/eix-0.34.9
@@ -5,10 +5,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=7
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.34.9/eix-0.34.9.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=01d5798b8db09ae6d72d9d9be63ed509
+_md5_=3708b3063e4ba6d3f8d104d1d8073bba
diff --git a/metadata/md5-cache/app-portage/pfl-3.1-r1 b/metadata/md5-cache/app-portage/pfl-3.1-r1
index 7c8089ed57af..fa9194d77ea8 100644
--- a/metadata/md5-cache/app-portage/pfl-3.1-r1
+++ b/metadata/md5-cache/app-portage/pfl-3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Searchable online file/package database for Gentoo
 EAPI=7
 HOMEPAGE=http://www.portagefilelist.de https://github.com/portagefilelist/client
 IUSE=+network-cron python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/curl sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] network-cron? ( sys-apps/util-linux[caps] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/portagefilelist/client/archive/3.1.tar.gz -> pfl-3.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=286d7c07d605c5855b3e3a9bbeaf5ff5
+_md5_=91e89b7b80c194b93b1c219918185960
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.9.6 b/metadata/md5-cache/dev-db/phpmyadmin-4.9.6
index 35c9fbf9b0ca..b089c24f226d 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.9.6
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.9.6
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=7
 HOMEPAGE=https://www.phpmyadmin.net/
 IUSE=setup vhosts
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=4.9.6
 SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.9.6/phpMyAdmin-4.9.6-all-languages.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3edf0cc303e7a2a667f0794afe122a06
+_md5_=b09b245a1825af20e600a4be7c02664b
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.9 b/metadata/md5-cache/dev-lang/mujs-1.0.9
index 1f131725c229..3e689641e8df 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.9
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=An embeddable Javascript interpreter in C.
 EAPI=7
 HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=sys-libs/readline:0=
 SLOT=0/1.0.9
 SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.9.tar.gz -> mujs-1.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=959527fda62bb55f9572714f216d0623
+_md5_=0fa31d458d723fb9520a40e303695327
diff --git a/metadata/md5-cache/dev-libs/hiredis-1.0.0 b/metadata/md5-cache/dev-libs/hiredis-1.0.0
index 639a85669b65..24858ad9490c 100644
--- a/metadata/md5-cache/dev-libs/hiredis-1.0.0
+++ b/metadata/md5-cache/dev-libs/hiredis-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Minimalistic C client library for the Redis database
 EAPI=7
 HOMEPAGE=https://github.com/redis/hiredis
 IUSE=examples ssl static-libs test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/redis/hiredis/archive/v1.0.0.tar.gz -> hiredis-1.0.0.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d8a81ae1a15c82b7ef1f2ed68d06bc4
+_md5_=8d8ac898a6b1466c421d33197d4af37b
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
index e73a67696c34..071f9118c361 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.4.tar.gz -> jsoncpp-1.9.4.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b87f7dc7a939b1316f44b1e12d686fc8
+_md5_=15461de5ad49f90d25f9d687b344546b
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.23-r1 b/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
index b2483ec0158d..b499288dfd4f 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Userspace access to USB devices
 EAPI=7
 HOMEPAGE=https://libusb.info/ https://github.com/libusb/libusb
 IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=cd8e6b4bf85b963b4faa700d39f6497c
+_md5_=141b330168c7ab5bba9806a96aba422d
diff --git a/metadata/md5-cache/dev-libs/nspr-4.29 b/metadata/md5-cache/dev-libs/nspr-4.29
index 6e2cc61248b4..89af74ab091b 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.29
+++ b/metadata/md5-cache/dev-libs/nspr-4.29
@@ -4,9 +4,9 @@ DESCRIPTION=Netscape Portable Runtime
 EAPI=7
 HOMEPAGE=https://www.mozilla.org/projects/nspr/
 IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.29/src/nspr-4.29.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f7ab2890c46cf40b23936b4d24a8e03b
+_md5_=838c44ff99447778816f38fb94709d87
diff --git a/metadata/md5-cache/dev-libs/nss-3.58-r2 b/metadata/md5-cache/dev-libs/nss-3.58-r2
index 69f74df2e0c3..892ce5fba02a 100644
--- a/metadata/md5-cache/dev-libs/nss-3.58-r2
+++ b/metadata/md5-cache/dev-libs/nss-3.58-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=7
 HOMEPAGE=https://www.mozilla.org/projects/security/pki/nss/
 IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_58_RTM/src/nss-3.58.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=833e7eee3e4de027aa894c797bad1184
+_md5_=5cb848686816f3d79d9383ccdaaf8115
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
index 0dba3700951f..2ba8bed9926b 100644
--- a/metadata/md5-cache/dev-libs/popt-1.18
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -5,10 +5,10 @@ DESCRIPTION=Parse Options - Command line parser
 EAPI=7
 HOMEPAGE=https://github.com/rpm-software-management/popt
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5659222dc5f85aab747a9a277c89d5cd
+_md5_=6521a87a230ad8f18d649ea782a8fa58
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.3 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
index 7e4a19feaaf5..ec5ad95bdf70 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Protocol Buffers implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/protobuf-c/protobuf-c
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.3/protobuf-c-1.3.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3af5d9fd3352fdbf4c6e37f60b0e717e
+_md5_=4563c1a8f609098843fa2dcc7f3d936f
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
index d651977c18a0..290dd39d7775 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
@@ -5,11 +5,11 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBD-SQLite
 IUSE=test system-sqlite
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.32.3[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.66.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a88ee13ec9bec6b48cc66ece04f4d831
+_md5_=f625492d465eb6dfd2c5e37142aa301b
diff --git a/metadata/md5-cache/dev-python/coverage-5.3 b/metadata/md5-cache/dev-python/coverage-5.3
index 6c2c753eebfd..0f296ef829eb 100644
--- a/metadata/md5-cache/dev-python/coverage-5.3
+++ b/metadata/md5-cache/dev-python/coverage-5.3
@@ -4,7 +4,7 @@ DESCRIPTION=Code coverage measurement for Python
 EAPI=7
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-5.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fa83a04b443236744b0fec6989bf819a
+_md5_=62b92ae6dc1069011804e54621367964
diff --git a/metadata/md5-cache/dev-python/distlib-0.3.1-r1 b/metadata/md5-cache/dev-python/distlib-0.3.1-r1
index 6a3b7140964d..1772de207397 100644
--- a/metadata/md5-cache/dev-python/distlib-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/distlib-0.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level components of distutils2/packaging
 EAPI=7
 HOMEPAGE=https://pypi.org/project/distlib/ https://bitbucket.org/pypa/distlib/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc ~x86
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/pypa/distlib/get/0.3.1.tar.bz2 -> distlib-0.3.1.tar.bz2
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=ce7f918b716307661aa0b75123b2d00f
+_md5_=f538d96bb8472415adde9182b19c4c88
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.14.5 b/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
index fc36a9a85950..96d7f82b381e 100644
--- a/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
@@ -4,7 +4,7 @@ DESCRIPTION=Fast JSON schema validator for Python
 EAPI=7
 HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 arm64 ~x86
+KEYWORDS=~amd64 arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/horejsek/python-fastjsonschema/archive/v2.14.5.tar.gz -> python-fastjsonschema-2.14.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f5d5d26e428946aefebc0f5da6d2fb81
+_md5_=1c79edebd61dc33cf7027bbe1ed99ef3
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.17 b/metadata/md5-cache/dev-python/greenlet-0.4.17
index d1f9fdfbcfe5..b0c8918e5625 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.17
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.17
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=7
 HOMEPAGE=https://pypi.org/project/greenlet/
 IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.17.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a791b51ca93b9c23866506704f1e4767
+_md5_=d399e4f717ca7b75d099a0eada2e166d
diff --git a/metadata/md5-cache/dev-python/lmdb-1.0.0 b/metadata/md5-cache/dev-python/lmdb-1.0.0
index f4169d92cb6f..28aeb9cf2fe3 100644
--- a/metadata/md5-cache/dev-python/lmdb-1.0.0
+++ b/metadata/md5-cache/dev-python/lmdb-1.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the Lightning Database
 EAPI=7
 HOMEPAGE=https://github.com/jnwatson/py-lmdb/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=OPENLDAP
 RDEPEND=dev-db/lmdb:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmdb/lmdb-1.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6a5bd2d36c5bb3c4a04f5b2053a8b472
+_md5_=74453b840df4c8819bf95f1838fcd2c8
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
index d43f0b2760f6..30d7ae73945a 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for UPnP client library
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 verify-sig
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=net-libs/miniupnpc-2.1.20201016:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz.sig )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=e904a4320df55137763fad9609edeee2
+_md5_=dc83ac1c53055f810c780917c3e411a2
diff --git a/metadata/md5-cache/dev-python/multidict-5.0.0 b/metadata/md5-cache/dev-python/multidict-5.0.0
index fb4034cd923f..6c6c8f117b46 100644
--- a/metadata/md5-cache/dev-python/multidict-5.0.0
+++ b/metadata/md5-cache/dev-python/multidict-5.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=multidict implementation
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/multidict/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v5.0.0.tar.gz -> multidict-5.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9b13cce0faf2ec3d7e30d298672b7e6f
+_md5_=e14b4a683216fca4e5097799c840571d
diff --git a/metadata/md5-cache/dev-python/nbformat-5.0.8 b/metadata/md5-cache/dev-python/nbformat-5.0.8
index baa83488b32d..2fa08e3ff904 100644
--- a/metadata/md5-cache/dev-python/nbformat-5.0.8
+++ b/metadata/md5-cache/dev-python/nbformat-5.0.8
@@ -5,7 +5,7 @@ DESCRIPTION=Reference implementation of the Jupyter Notebook format
 EAPI=7
 HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 arm64 ~x86
+KEYWORDS=~amd64 arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbformat/archive/5.0.8.tar.gz -> nbformat-5.0.8.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7f50514da65d2f16ab226c7df003c8fb
+_md5_=aaa6b9117cbebf050ac6d507a5268c4d
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.50.0 b/metadata/md5-cache/dev-python/openstacksdk-0.50.0
index f93e147c0670..5e97366a09a8 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.50.0
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.50.0
@@ -5,11 +5,11 @@ DESCRIPTION=A collection of libraries for building applications to work with Ope
 EAPI=7
 HOMEPAGE=https://github.com/openstack/python-openstacksdk
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0 >=dev-python/pyyaml-3.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/appdirs-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonpatch-1.16[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/jsonpatch-1.20[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/munch-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/decorator-4.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jmespath-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/importlib_metadata[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.50.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fe088d0310dd5cafbd3bf7e6de8afa95
+_md5_=f85c9297b4c0d8da6fdd8decf56da219
diff --git a/metadata/md5-cache/dev-python/os-testr-2.0.0 b/metadata/md5-cache/dev-python/os-testr-2.0.0
index 7ae7f9470e5d..fd2e8ba3b557 100644
--- a/metadata/md5-cache/dev-python/os-testr-2.0.0
+++ b/metadata/md5-cache/dev-python/os-testr-2.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=A testr wrapper to provide functionality for OpenStack projects
 EAPI=7
 HOMEPAGE=https://pypi.org/project/os-testr/ https://github.com/openstack/os-testr
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/testrepository-0.0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/subunit-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-testr/os-testr-2.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=627e001b33b82fa0a6e14704efa74145
+_md5_=d2824da6781c20252eafc8dd7c530ea8
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.3.2 b/metadata/md5-cache/dev-python/oslo-config-8.3.2
index b52f7c4800b8..e4bda7601f3b 100644
--- a/metadata/md5-cache/dev-python/oslo-config-8.3.2
+++ b/metadata/md5-cache/dev-python/oslo-config-8.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=Oslo Configuration API
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/rfc3986-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/importlib_metadata[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.3.2.tar.gz -> oslo-config-8.3.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a2f42acd80faacca74700eb5fbe70341
+_md5_=b08a6b5191f21e2b15786b7b3bf951e0
diff --git a/metadata/md5-cache/dev-python/oslo-context-3.1.1 b/metadata/md5-cache/dev-python/oslo-context-3.1.1
index 5c2c9d1fc84a..1314eedb2f7a 100644
--- a/metadata/md5-cache/dev-python/oslo-context-3.1.1
+++ b/metadata/md5-cache/dev-python/oslo-context-3.1.1
@@ -5,11 +5,11 @@ DESCRIPTION=Helpers to maintain useful information about a request context
 EAPI=7
 HOMEPAGE=https://pypi.org/project/oslo.context/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-3.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=15cd04a4622345dd651cabcd6c697f26
+_md5_=1758b8c2148b7fceb8fe3737ffa1d28e
diff --git a/metadata/md5-cache/dev-python/oslo-utils-4.6.0 b/metadata/md5-cache/dev-python/oslo-utils-4.6.0
index 063f2fa9522b..9b1e9fc10455 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-4.6.0
+++ b/metadata/md5-cache/dev-python/oslo-utils-4.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=Oslo Utility library
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/packaging-20.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-4.6.0.tar.gz -> oslo-utils-4.6.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9c15322db1d3fc2da5bbbaa57aca2e0c
+_md5_=269ffb4d2766d2e7be85c2bc97a41fe8
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.4 b/metadata/md5-cache/dev-python/passlib-1.7.4
index f0ea56e3b3da..dacf4a596524 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.4
+++ b/metadata/md5-cache/dev-python/passlib-1.7.4
@@ -4,7 +4,7 @@ DESCRIPTION=Password hashing framework supporting over 20 schemes
 EAPI=7
 HOMEPAGE=https://foss.heptapod.net/python-libs/passlib/wikis/home
 IUSE=+bcrypt doc +scrypt +totp test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD-2
 RDEPEND=bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) totp? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5c330f09b60e14cd6f40f10875c5498d
+_md5_=4abd0dce8abd8e64570987699e1c378a
diff --git a/metadata/md5-cache/dev-python/pycairo-1.20.0 b/metadata/md5-cache/dev-python/pycairo-1.20.0
index cc3a23669960..344d671410f4 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.20.0
+++ b/metadata/md5-cache/dev-python/pycairo-1.20.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=7
 HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f7c07108f058d85c8a77f0c16be240b
+_md5_=c5b38cf72539150dc62247dca18c30b8
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1 b/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
index e68e4fbcba7c..d398cce37bdf 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=pytest plugin to re-run tests to eliminate flaky failures
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-rerunfailures/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-9.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=257c07dd1f99a0244fca38d3fa5dedd3
+_md5_=4fbba685db51c9d5000c1bbb99dadf88
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.3.1 b/metadata/md5-cache/dev-python/python-ldap-3.3.1
index 4f8c46022f83..732d5f108132 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.3.1
+++ b/metadata/md5-cache/dev-python/python-ldap-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Various LDAP-related Python modules
 EAPI=7
 HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
 IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=PSF-2
 RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.3.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b90c7647e33057caf02a879cd241fe1e
+_md5_=fe02090a36d41aaffd24ae79558b2af0
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.20 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
index e56ec6b41278..6a1af90802d9 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.20.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c10a82135f668b32de16f11844faaaa0
+_md5_=2578c127e5ac68e514b6150f69197f4a
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.15.0 b/metadata/md5-cache/dev-python/testfixtures-6.15.0
index 5829646b40df..78ff3ce21505 100644
--- a/metadata/md5-cache/dev-python/testfixtures-6.15.0
+++ b/metadata/md5-cache/dev-python/testfixtures-6.15.0
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of helpers and mock objects for unit tests and doc test
 EAPI=7
 HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.15.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f5f209d0b0ebfc79a5959a022729278c
+_md5_=fd1fffe5ed9e43c5b55e626f4dfb0ed7
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.0.35 b/metadata/md5-cache/dev-python/virtualenv-20.0.35
index e9313fde3da3..018c28e701c1 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.0.35
+++ b/metadata/md5-cache/dev-python/virtualenv-20.0.35
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual Python Environment builder
 EAPI=7
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.0.35.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9ca68b873cde87ebb604a8334dcfb152
+_md5_=ecd87c29350a2440e31fb083d5c4ed1c
diff --git a/metadata/md5-cache/dev-python/yarl-1.6.2 b/metadata/md5-cache/dev-python/yarl-1.6.2
index 3383697ba3a9..82d486956df0 100644
--- a/metadata/md5-cache/dev-python/yarl-1.6.2
+++ b/metadata/md5-cache/dev-python/yarl-1.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Yet another URL library
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/yarl/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.6.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=67f322e9b07dfd962ed117a42189a632
+_md5_=b3e956fc5cdca83de846f4109deb7d9e
diff --git a/metadata/md5-cache/dev-python/zope-interface-5.1.2 b/metadata/md5-cache/dev-python/zope-interface-5.1.2
index 0d23b8558c1b..8acde99b3246 100644
--- a/metadata/md5-cache/dev-python/zope-interface-5.1.2
+++ b/metadata/md5-cache/dev-python/zope-interface-5.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Interfaces for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-5.1.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a6a1115b6e55ad96d185aed500e9c96
+_md5_=209bf990635f09fae3ca90a078d4336f
diff --git a/metadata/md5-cache/dev-scheme/guile-2.2.7 b/metadata/md5-cache/dev-scheme/guile-2.2.7
index 716b66fef6a6..65e7e601ca31 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.2.7
+++ b/metadata/md5-cache/dev-scheme/guile-2.2.7
@@ -5,11 +5,11 @@ DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= dev-libs/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 RESTRICT=strip
 SLOT=12/2.2-1
 SRC_URI=mirror://gnu/guile/guile-2.2.7.tar.gz
-_md5_=7557a79f480bfff1d729411fc5ae0f20
+_md5_=55cebb2e3a990195ecf32888b8fe6340
diff --git a/metadata/md5-cache/dev-tcltk/tcllib-1.20 b/metadata/md5-cache/dev-tcltk/tcllib-1.20
index 4a8bafe1db22..48f3a8fda152 100644
--- a/metadata/md5-cache/dev-tcltk/tcllib-1.20
+++ b/metadata/md5-cache/dev-tcltk/tcllib-1.20
@@ -5,11 +5,11 @@ DESCRIPTION=Tcl Standard Library
 EAPI=7
 HOMEPAGE=http://www.tcl.tk/software/tcllib/
 IUSE=examples test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-lang/tcl:0= dev-tcltk/tdom
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/tcllib/1.20/tcllib-1.20.tar.xz
 _eclasses_=virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=489e8de56834e120516d24b6951b8375
+_md5_=2ce495644aaba8a214722261e005c172
diff --git a/metadata/md5-cache/dev-util/debugedit-4.16.0 b/metadata/md5-cache/dev-util/debugedit-4.16.0
index 9dc1e5f77312..5f84797e4bf1 100644
--- a/metadata/md5-cache/dev-util/debugedit-4.16.0
+++ b/metadata/md5-cache/dev-util/debugedit-4.16.0
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib:= >=dev-libs/popt-1.7 >=dev-libs/elfutils-0.176-r1 dev-libs
 DESCRIPTION=Stand-alone debugedit from RPM
 EAPI=7
 HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=sys-libs/zlib:= >=dev-libs/popt-1.7 >=dev-libs/elfutils-0.176-r1 dev-libs/nss
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.16.x/rpm-4.16.0.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a7e7f327efca01a816051247a97c88f4
+_md5_=bbbfaf90dc89ec4e7b461eeb60c265b9
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.1 b/metadata/md5-cache/dev-util/ninja-1.10.1
index 5540de51258a..c8d37317e1ba 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.1
+++ b/metadata/md5-cache/dev-util/ninja-1.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.1.tar.gz -> ninja-1.10.1.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d0d845e11b4d22d950d39c91310687c3
+_md5_=d4dca457550fb9c8be98dec5d2779b1d
diff --git a/metadata/md5-cache/mail-mta/courier-1.0.14 b/metadata/md5-cache/mail-mta/courier-1.0.14
index 05a80a30024e..1dd99bedf958 100644
--- a/metadata/md5-cache/mail-mta/courier-1.0.14
+++ b/metadata/md5-cache/mail-mta/courier-1.0.14
@@ -4,11 +4,11 @@ DESCRIPTION=An MTA designed specifically for maildirs
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/
 IUSE=postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 s390 sparc x86
 LICENSE=GPL-3
 PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.70.0 >=net-libs/courier-unicode-2.1 net-dns/libidn:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-1.0.14.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c3b767d9d058d53e56df8b83496a1d6
+_md5_=2f4e0fea8c3f52d800759d1f14fedddc
diff --git a/metadata/md5-cache/media-gfx/fbida-2.14-r2 b/metadata/md5-cache/media-gfx/fbida-2.14-r2
index f8de7b10f45b..fba61d9a06ff 100644
--- a/metadata/md5-cache/media-gfx/fbida-2.14-r2
+++ b/metadata/md5-cache/media-gfx/fbida-2.14-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Image viewers for the framebuffer console (fbi) and X11 (ida)
 EAPI=7
 HOMEPAGE=https://www.kraxel.org/blog/linux/fbida/
 IUSE=curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp
-KEYWORDS=~alpha ~amd64 arm ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2 IJG
 RDEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 app-text/poppler media-libs/libepoxy media-libs/libexif virtual/jpeg:* virtual/ttf-fonts x11-libs/cairo[opengl] curl? ( net-misc/curl ) fbcon? ( app-text/poppler[cairo] media-libs/mesa[X(+),gbm] x11-libs/libdrm x11-libs/pixman ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:* ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:* ) webp? ( media-libs/libwebp ) X? ( >=x11-libs/motif-2.3:0[xft] x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) ghostscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=ghostscript? ( tiff )
 SLOT=0
 SRC_URI=https://www.kraxel.org/releases/fbida/fbida-2.14.tar.gz mirror://gentoo/ida.png.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=83201fe9aae2191a51ed2e234e0da9be
+_md5_=e037f433609d25acf7f698c4e0ef1871
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.13.1-r2 b/metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
index b70a70ffd637..4f6acf34922f 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
@@ -5,7 +5,7 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=7
 HOMEPAGE=https://fontconfig.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elibc_Darwin? ( sys-libs/native-uuid ) elibc_SunOS? ( sys-libs/libuuid ) virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=https://fontconfig.org/release/fontconfig-2.13.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d096f6c9b2e4529cc2a45b1d610ca3e
+_md5_=19116a8473dff02f11714fe7830c179d
diff --git a/metadata/md5-cache/media-libs/freetype-2.10.4 b/metadata/md5-cache/media-libs/freetype-2.10.4
index d63d55d1458c..3a8fdf7fb1e4 100644
--- a/metadata/md5-cache/media-libs/freetype-2.10.4
+++ b/metadata/md5-cache/media-libs/freetype-2.10.4
@@ -5,7 +5,7 @@ DESCRIPTION=A high-quality and portable font engine
 EAPI=7
 HOMEPAGE=https://www.freetype.org/
 IUSE=X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~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 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
 PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 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_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.10.4.tar.xz mirror://nongnu/freetype/freetype-2.10.4.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.10.4.tar.xz mirror://nongnu/freetype/ft2demos-2.10.4.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.10.4.tar.xz mirror://nongnu/freetype/freetype-doc-2.10.4.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bad0e2951e804be64d837555133e8e96
+_md5_=a44ddcbf0468aadd10f675e61067d4ee
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.37-r2 b/metadata/md5-cache/media-libs/libpng-1.6.37-r2
index 2a3e9a50a36a..af4721e95f04 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.37-r2
+++ b/metadata/md5-cache/media-libs/libpng-1.6.37-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=7
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng2
 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_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.37.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.37-apng.patch.gz )
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2d3f5b2d766780d60bd590738ca76948
+_md5_=a30289d13bca0ef294a89dd095cc21b6
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.1 b/metadata/md5-cache/media-libs/opencolorio-1.1.1
index e68174bd1c00..e641d256fa48 100644
--- a/metadata/md5-cache/media-libs/opencolorio-1.1.1
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=A color management framework for visual effects and animation
 EAPI=7
 HOMEPAGE=https://opencolorio.org/
 IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
 REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenColorIO/archive/v1.1.1.tar.gz -> opencolorio-1.1.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee01f398c9c2aad573916a77b10a3528
+_md5_=18b375ec9c928e56965dd1499a0df443
diff --git a/metadata/md5-cache/media-sound/musescore-3.5.2 b/metadata/md5-cache/media-sound/musescore-3.5.2
index 96d0f79490f4..9ccff5f4e111 100644
--- a/metadata/md5-cache/media-sound/musescore-3.5.2
+++ b/metadata/md5-cache/media-sound/musescore-3.5.2
@@ -5,11 +5,11 @@ DESCRIPTION=WYSIWYG Music Score Typesetter
 EAPI=7
 HOMEPAGE=https://musescore.org/
 IUSE=alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://github.com/musescore/MuseScore/archive/v3.5.2.tar.gz -> musescore-3.5.2.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca79e29ce047bdcc28557b703fc30ac2
+_md5_=09b7bb1e5fc3d0d2907b6955c81a495b
diff --git a/metadata/md5-cache/net-dns/libidn-1.36 b/metadata/md5-cache/net-dns/libidn-1.36
index 9c78eb385e89..7067c54a2b46 100644
--- a/metadata/md5-cache/net-dns/libidn-1.36
+++ b/metadata/md5-cache/net-dns/libidn-1.36
@@ -5,10 +5,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) mono? ( >=dev-lang/mono-0.95 ) java? ( >=virtual/jre-1.5 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.36.tar.gz
 _eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0a6e1ecf011476fce9bba885563d2202
+_md5_=589fcf7f8138e2f7997c2742e3ace9cd
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.71.0 b/metadata/md5-cache/net-libs/courier-authlib-0.71.0
index 0a57cf9515bd..cf4571d703d7 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.71.0
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.71.0
@@ -4,11 +4,11 @@ DESCRIPTION=Courier authentication library
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/authlib/
 IUSE=berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.71.0.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6217fe397da67040696ba0a21c7e45c2
+_md5_=aeee8a8de4b1b3a21c975ddade50ad81
diff --git a/metadata/md5-cache/net-libs/courier-unicode-2.1-r1 b/metadata/md5-cache/net-libs/courier-unicode-2.1-r1
index 73a232992266..1179c6a695ec 100644
--- a/metadata/md5-cache/net-libs/courier-unicode-2.1-r1
+++ b/metadata/md5-cache/net-libs/courier-unicode-2.1-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Unicode library used by the courier mail server
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-unicode-2.1.tar.bz2
-_md5_=d35131ae293c844b29c6042fd386951a
+_md5_=a255508938341670515ebf22d84bb294
diff --git a/metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614 b/metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614
index 6ec5c48097ff..3b19801c40d9 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614
+++ b/metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614
@@ -5,7 +5,7 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=7
 HOMEPAGE=https://www.libssh2.org
 IUSE=gcrypt libressl mbedtls zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=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_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !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_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libssh2/libssh2/archive/6c7769dcc422250d14af1b06fce378b6ee009440.tar.gz -> libssh2-1.9.0_p20200614.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dae0c861a2c80f23bc3285accae775ff
+_md5_=4aefe75e92a32cc4612c498bef87bc0e
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
index a042436c01bf..526bc26e7d63 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs verify-sig
-KEYWORDS=~amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz.sig )
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=dddac98ebc11cbef2103438f15dd53f1
+_md5_=f32ebf70e45d2a42c5062460c2c103bf
diff --git a/metadata/md5-cache/net-libs/nodejs-12.19.1 b/metadata/md5-cache/net-libs/nodejs-12.19.1
index 8328f3a36d2a..cbb32be97e94 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.19.1
+++ b/metadata/md5-cache/net-libs/nodejs-12.19.1
@@ -5,7 +5,7 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/12
 SRC_URI=https://nodejs.org/dist/v12.19.1/node-v12.19.1.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3abe6057f38d6807830a279228661dc
+_md5_=9f15ea97ffe884c74c9966c2fe19fe76
diff --git a/metadata/md5-cache/net-libs/nodejs-14.15.1 b/metadata/md5-cache/net-libs/nodejs-14.15.1
index d4198cc1d118..cffaa62ac5bd 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.15.1
+++ b/metadata/md5-cache/net-libs/nodejs-14.15.1
@@ -5,7 +5,7 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl system-icu +system-ssl systemtap test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.15.1/node-v14.15.1.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e52f2b9b440a4d8542a143b7193ef13c
+_md5_=c4e997018c5def511abb00b6d9648e58
diff --git a/metadata/md5-cache/net-misc/electrum-4.0.4 b/metadata/md5-cache/net-misc/electrum-4.0.4
index 180903b5dbe6..cf8a668f7366 100644
--- a/metadata/md5-cache/net-misc/electrum-4.0.4
+++ b/metadata/md5-cache/net-misc/electrum-4.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=User friendly Bitcoin client
 EAPI=7
 HOMEPAGE=https://electrum.org/
 IUSE=cli ncurses qrcode +qt5 test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] =dev-python/aiorpcX-0.18*[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bitstring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/dnspython-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ecdsa-0.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ncurses? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) ) || ( dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.0.4.tar.gz -> electrum-4.0.4.gh.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=659cfe3e2aee82bbb2506dcd39f8dd48
+_md5_=164adac3b5fd500b565f540017ea7bc8
diff --git a/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2 b/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
index 22bb9d6aa710..9d3a1844141a 100644
--- a/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
+++ b/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=7
 HOMEPAGE=http://www.openntpd.org/
 IUSE=libressl selinux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=!net-misc/ntp[-openntpd] libressl? ( dev-libs/libressl:0= ) acct-group/openntpd acct-user/openntpd selinux? ( sec-policy/selinux-ntp )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-6.2p3.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ab699d5c9aa2259d85bc68adc865639
+_md5_=9a02ba156b75e97f3c2b47c9193f0567
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.6 b/metadata/md5-cache/sci-libs/cln-1.3.6
index b9988f56c362..fc677da49ea4 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.6
+++ b/metadata/md5-cache/sci-libs/cln-1.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=Class library (C++) for numbers
 EAPI=7
 HOMEPAGE=https://www.ginac.de/CLN/
 IUSE=doc examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=1
 SRC_URI=https://www.ginac.de/CLN/cln-1.3.6.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad996f7fd8ead6a6e4d7eba58d7bda96
+_md5_=5c11acf7c7d0d1200ef63c1d1a07bf6f
diff --git a/metadata/md5-cache/sys-apps/acl-2.2.53-r1 b/metadata/md5-cache/sys-apps/acl-2.2.53-r1
index 27612d48d662..420e03c2b3e1 100644
--- a/metadata/md5-cache/sys-apps/acl-2.2.53-r1
+++ b/metadata/md5-cache/sys-apps/acl-2.2.53-r1
@@ -5,10 +5,10 @@ DESCRIPTION=access control list utilities, libraries and headers
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/acl
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://nongnu/acl/acl-2.2.53.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c786a7011abeec6d85023d5118175f4a
+_md5_=0d9ee9ad800c711952fdae83ca3907c8
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.48-r4 b/metadata/md5-cache/sys-apps/attr-2.4.48-r4
index 002ff179f658..8093755a19c2 100644
--- a/metadata/md5-cache/sys-apps/attr-2.4.48-r4
+++ b/metadata/md5-cache/sys-apps/attr-2.4.48-r4
@@ -4,9 +4,9 @@ DESCRIPTION=Extended attributes tools
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/attr
 IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://nongnu/attr/attr-2.4.48.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e3e71f4173c1f9e32f814b83208437e
+_md5_=04979d62816343419b14695cdc2ffc83
diff --git a/metadata/md5-cache/sys-apps/less-563-r1 b/metadata/md5-cache/sys-apps/less-563-r1
index a3fa01a8b362..911f8333311d 100644
--- a/metadata/md5-cache/sys-apps/less-563-r1
+++ b/metadata/md5-cache/sys-apps/less-563-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer
 EAPI=7
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-563.tar.gz
-_md5_=fdff877d0ec13671adab6655d4f0a338
+_md5_=afe2f9d2f8dbd1b7001be12453c7777f
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.13-r1 b/metadata/md5-cache/sys-auth/rtkit-0.13-r1
index af9f3ac60484..63c825cf3525 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.13-r1
+++ b/metadata/md5-cache/sys-auth/rtkit-0.13-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Realtime Policy and Watchdog Daemon
 EAPI=7
 HOMEPAGE=https://github.com/heftig/rtkit
 IUSE=systemd kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3 BSD
 RDEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/heftig/rtkit/releases/download/v0.13/rtkit-0.13.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8474a277e0d2473f99834573241f0cc5
+_md5_=9bd19efcbff5fadf8c5bc17e71dba70b
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2 b/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
index 958dc79f71e8..ff6aee20853b 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
@@ -5,9 +5,9 @@ DESCRIPTION=a set of command-line programs providing a simple interface to inoti
 EAPI=7
 HOMEPAGE=https://github.com/inotify-tools/inotify-tools
 IUSE=doc
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.20.2.2.tar.gz -> inotify-tools-3.20.2.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=438ae487a0a791b2020a831d763db300
+_md5_=85b7987a40abd8d37c07797b1a95c9a9
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1 b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
index dc584532e0bc..308b7ddcff35 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
+++ b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Standard GNU database libraries
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gdbm/
 IUSE=+berkdb nls +readline static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/6
 SRC_URI=mirror://gnu/gdbm/gdbm-1.18.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0a64bb35d16ee4a62911eb594e6c2595
+_md5_=b4b2ba0b09e1c0bb0c3dc2f9a01ded9b
diff --git a/metadata/md5-cache/sys-libs/ncurses-compat-6.1_p20190609 b/metadata/md5-cache/sys-libs/ncurses-compat-6.1_p20190609
index 7e9736deafa6..fb50255d73c1 100644
--- a/metadata/md5-cache/sys-libs/ncurses-compat-6.1_p20190609
+++ b/metadata/md5-cache/sys-libs/ncurses-compat-6.1_p20190609
@@ -4,10 +4,10 @@ DESCRIPTION=console display library (ABI version 5)
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
 IUSE=gpm tinfo unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86
 LICENSE=MIT
 RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-libs/ncurses-6:0 !sys-libs/ncurses:5
 SLOT=5/5
 SRC_URI=mirror://gnu/ncurses/ncurses-6.1.tar.gz ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190609-patch.sh.bz2 https://invisible-mirror.net/archives/ncurses/6.1/ncurses-6.1-20190609-patch.sh.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=31e5fe0ecd93b9da524fd68727b508c2
+_md5_=38b85593cce471c755afdf9ab8e66a36
diff --git a/metadata/md5-cache/virtual/udev-217-r2 b/metadata/md5-cache/virtual/udev-217-r2
index ba081d44ce1d..ea0b02fc7fe8 100644
--- a/metadata/md5-cache/virtual/udev-217-r2
+++ b/metadata/md5-cache/virtual/udev-217-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different udev daemon providers
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 RDEPEND=|| ( >=sys-fs/eudev-2.1.1 >=sys-fs/udev-217 >=sys-apps/systemd-217 )
 SLOT=0
-_md5_=8825958d7d3d99020236ceaab60f01d2
+_md5_=e10b987ec882aaf0314e15eeef56da0e
diff --git a/metadata/md5-cache/www-servers/pshs-0.4.1 b/metadata/md5-cache/www-servers/pshs-0.4.1
index b04c97f2de0f..f0b73903b6d2 100644
--- a/metadata/md5-cache/www-servers/pshs-0.4.1
+++ b/metadata/md5-cache/www-servers/pshs-0.4.1
@@ -5,10 +5,10 @@ DESCRIPTION=Pretty small HTTP server -- a command-line tool to share files
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/pshs/
 IUSE=libressl +magic qrcode ssl upnp
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) upnp? ( net-libs/miniupnpc:0= )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pshs/archive/v0.4.1.tar.gz -> pshs-0.4.1.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ed8b8ffaf16aa5b27a35d4c3af16af2
+_md5_=e9ba5cd262ac83c044fc9a41e52b8f31
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.16 b/metadata/md5-cache/xfce-base/thunar-1.8.16
index 218f82afba81..2f0dfe52744f 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.8.16
+++ b/metadata/md5-cache/xfce-base/thunar-1.8.16
@@ -4,10 +4,10 @@ DESCRIPTION=File manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
 IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-0.12:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.16.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a96595ba8d5b30da0c49f9da34f8025a
+_md5_=851ff9e80ead422bfe511c76853f434f
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.14.3 b/metadata/md5-cache/xfce-base/xfdesktop-4.14.3
index b4d64fff0aee..c705ab9539bd 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.14.3
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.14.3
@@ -4,10 +4,10 @@ DESCRIPTION=Desktop manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug libnotify +thunar
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/cairo-1.12 >=dev-libs/glib-2.42 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-1.7:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.14/xfdesktop-4.14.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38e129784d18d7593f8a1292ab2dd35e
+_md5_=7df752e7760a0c3682a66be95afaf69c
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.14.6 b/metadata/md5-cache/xfce-base/xfwm4-4.14.6
index 5624ae5989ea..e178b1f605dc 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.14.6
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.14.6
@@ -4,10 +4,10 @@ DESCRIPTION=Window manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.14/xfwm4-4.14.6.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dda4d57d225aedc1e871ed65c2c31db9
+_md5_=05835e906aa01b5c526ccb5b0f9a3be2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
index 35f577ad6263..e6e11813171f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 >=xfce-base/l
 DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-dict
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.4.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5536954098183260c4d883208fe20f4b
+_md5_=2b0c5b60c4723c3ead6b6ac56329574b
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 59821408fc1f..574a0e6264bf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Nov 2020 19:05:36 +0000
+Tue, 17 Nov 2020 19:35:40 +0000