2021-01-07 02:01:21 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-01-07 02:01:26 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-01-07 02:01:26 +0000
commit: 8795d7b6d8febce42f9ba607e17f8c1a50aea1b3 (patch)
tree: 0edc270abfb5da5766ea0e51d7ede677487a6a5e /metadata
parent: Merge updates from master (diff)
download: gentoo-8795d7b6d8febce42f9ba607e17f8c1a50aea1b3.tar.gz
gentoo-8795d7b6d8febce42f9ba607e17f8c1a50aea1b3.tar.bz2
gentoo-8795d7b6d8febce42f9ba607e17f8c1a50aea1b3.zip
146 files changed, 271 insertions, 472 deletions
diff --git a/metadata/md5-cache/app-admin/hardinfo-0.6_alpha_pre20201116 b/metadata/md5-cache/app-admin/hardinfo-0.6_alpha_pre20201116
index fd712889d393..a680344a5064 100644
--- a/metadata/md5-cache/app-admin/hardinfo-0.6_alpha_pre20201116
+++ b/metadata/md5-cache/app-admin/hardinfo-0.6_alpha_pre20201116
@@ -5,10 +5,10 @@ DESCRIPTION=System information and benchmark tool for Linux systems
 EAPI=7
 HOMEPAGE=https://github.com/lpereira/hardinfo
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup sys-libs/zlib x11-libs/cairo >=x11-libs/gtk+-3.0:3
 SLOT=0
 SRC_URI=https://github.com/lpereira/hardinfo/archive/54b2e307af763ce87bc8c88e80785d8114bf38dd.tar.gz -> hardinfo-0.6_alpha_pre20201116.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=882a31716fb65acd8a7aeeb2cd829aef
+_md5_=d46ff8dc6a8a2a1221b3a405749fcc2b
diff --git a/metadata/md5-cache/app-admin/lastpass-cli-1.3.3 b/metadata/md5-cache/app-admin/lastpass-cli-1.3.3
index bfd774cbc5cf..cf2e5a7c9493 100644
--- a/metadata/md5-cache/app-admin/lastpass-cli-1.3.3
+++ b/metadata/md5-cache/app-admin/lastpass-cli-1.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Interfaces with LastPass.com from the command line.
 EAPI=6
 HOMEPAGE=https://github.com/lastpass/lastpass-cli
 IUSE=libressl X +pinentry test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ GPL-2+-with-openssl-exception
 RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.3.3.tar.gz -> lastpass-cli-1.3.3.tar.gz https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/lastpass-cli-man-1.3.1.tar.xz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c74962ae5755e2122e3d509f605f663f
+_md5_=1e5297a968fc80e91ef15fd76b4759dd
diff --git a/metadata/md5-cache/app-admin/restart-services-0.17.0 b/metadata/md5-cache/app-admin/restart-services-0.17.0
index 8fac9c54b263..996676c082c8 100644
--- a/metadata/md5-cache/app-admin/restart-services-0.17.0
+++ b/metadata/md5-cache/app-admin/restart-services-0.17.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Tool to manage OpenRC and systemd services that need to be restarted
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mschiff/restart-services/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-admin/lib_users || ( sys-apps/openrc sys-apps/systemd ) app-portage/portage-utils
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/src/restart-services/restart-services-0.17.0.tgz
-_md5_=bda4b3919f589ff03f6d4f6214ce13c3
+_md5_=215f91a656c9659d3894894227588a10
diff --git a/metadata/md5-cache/app-arch/torrentzip-0.9-r1 b/metadata/md5-cache/app-arch/torrentzip-0.9-r1
index 7b03972c0a04..c0d3ea32f2ad 100644
--- a/metadata/md5-cache/app-arch/torrentzip-0.9-r1
+++ b/metadata/md5-cache/app-arch/torrentzip-0.9-r1
@@ -4,10 +4,10 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Create identical zip archives over multiple systems
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/trrntzip
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/torrentzip-0.9.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=04cccd4cd09a58f1b4b2a6467712214d
+_md5_=7e60833362de09bd8a08942a9351918c
diff --git a/metadata/md5-cache/app-dicts/libydpdict-1.0.2 b/metadata/md5-cache/app-dicts/libydpdict-1.0.2
deleted file mode 100644
index f0a5899abc35..000000000000
--- a/metadata/md5-cache/app-dicts/libydpdict-1.0.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Library for handling the Collins Dictionary database
-EAPI=5
-HOMEPAGE=http://toxygen.net/ydpdict/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://toxygen.net/ydpdict/libydpdict-1.0.2.tar.gz
-_md5_=b7294a232c428b5150af34fdaa41259f
diff --git a/metadata/md5-cache/app-dicts/libydpdict-1.0.4 b/metadata/md5-cache/app-dicts/libydpdict-1.0.4
index f1f718e6c019..661f4b9f6e11 100644
--- a/metadata/md5-cache/app-dicts/libydpdict-1.0.4
+++ b/metadata/md5-cache/app-dicts/libydpdict-1.0.4
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Library for handling the Collins Dictionary database
 EAPI=7
 HOMEPAGE=https://github.com/wojtekka/libydpdict
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libydpdict/archive/1.0.4.tar.gz -> libydpdict-1.0.4.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=0d01ff9d0fe82265652db7928b78d6c8
+_md5_=0943dbcebbbfc8ed84ade667fdd8d1eb
diff --git a/metadata/md5-cache/app-dicts/ydpdict-1.0.2 b/metadata/md5-cache/app-dicts/ydpdict-1.0.2
deleted file mode 100644
index 4c8df2024f86..000000000000
--- a/metadata/md5-cache/app-dicts/ydpdict-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=app-dicts/libydpdict-1.0.2 sys-libs/ncurses[unicode] ao? ( media-libs/libao ) virtual/pkgconfig
-DESCRIPTION=Interface for the Collins Dictionary
-EAPI=5
-HOMEPAGE=http://toxygen.net/ydpdict/
-IUSE=ao
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-dicts/libydpdict-1.0.2 sys-libs/ncurses[unicode] ao? ( media-libs/libao )
-SLOT=0
-SRC_URI=http://toxygen.net/ydpdict/ydpdict-1.0.2.tar.gz
-_md5_=527b850711fd6a751c2da3a0d88eb8de
diff --git a/metadata/md5-cache/app-dicts/ydpdict-1.0.3 b/metadata/md5-cache/app-dicts/ydpdict-1.0.3
index 18ce6b7611c6..afd914f9992a 100644
--- a/metadata/md5-cache/app-dicts/ydpdict-1.0.3
+++ b/metadata/md5-cache/app-dicts/ydpdict-1.0.3
@@ -5,10 +5,10 @@ DESCRIPTION=Interface for the Collins Dictionary
 EAPI=7
 HOMEPAGE=https://github.com/wojtekka/ydpdict
 IUSE=ao
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-dicts/libydpdict sys-libs/ncurses[unicode] ao? ( media-libs/libao )
 SLOT=0
 SRC_URI=https://github.com/wojtekka/ydpdict/archive/1.0.3.tar.gz -> ydpdict-1.0.3.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=33538e91ccbe87eda190e51de9015d76
+_md5_=5c4cf68ec56ff0f9a75c92a2b8a27cda
diff --git a/metadata/md5-cache/app-editors/curses-hexedit-0.9.7 b/metadata/md5-cache/app-editors/curses-hexedit-0.9.7
deleted file mode 100644
index f17a21b926ba..000000000000
--- a/metadata/md5-cache/app-editors/curses-hexedit-0.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses:= >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=full screen curses hex editor (with insert/delete support)
-EAPI=5
-HOMEPAGE=http://www.rogoyski.com/adam/programs/hexedit/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses:=
-SLOT=0
-SRC_URI=http://www.rogoyski.com/adam/programs/hexedit/hexedit-0.9.7.tar.gz
-_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3c7ebd42b1e3dca2edc7a5eb033b6744
diff --git a/metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1 b/metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
index 47bed4082212..04328712a459 100644
--- a/metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
+++ b/metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
@@ -4,10 +4,10 @@ DEPEND=sys-libs/ncurses:=
 DESCRIPTION=full screen curses hex editor (with insert/delete support)
 EAPI=7
 HOMEPAGE=http://www.rogoyski.com/adam/programs/hexedit/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://www.rogoyski.com/adam/programs/hexedit/hexedit-0.9.7.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=0bab9b5a4cdc3b2c46913f9bdaa75d9d
+_md5_=152eef1a6c596f63d652834665e71901
diff --git a/metadata/md5-cache/app-forensics/afflib-3.7.19 b/metadata/md5-cache/app-forensics/afflib-3.7.19
index a673d3e2a1fb..7514d3503684 100644
--- a/metadata/md5-cache/app-forensics/afflib-3.7.19
+++ b/metadata/md5-cache/app-forensics/afflib-3.7.19
@@ -5,7 +5,7 @@ DESCRIPTION=Library that implements the AFF image standard
 EAPI=7
 HOMEPAGE=https://github.com/sshock/AFFLIBv3/
 IUSE=fuse libressl ncurses python qemu readline s3 static-libs threads python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~hppa ~ppc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-libs/expat sys-libs/zlib:0= fuse? ( sys-fs/fuse:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ncurses? ( sys-libs/ncurses:0= ) 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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) ) readline? ( sys-libs/readline:0= ) s3? ( net-misc/curl )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sshock/AFFLIBv3/archive/v3.7.19.tar.gz -> afflib-3.7.19.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=655cb51b433bfdd2d86b2f4169f4ae8d
+_md5_=66e588c9e57ca0cbb7a60f75cfdd757a
diff --git a/metadata/md5-cache/app-misc/figlet-2.2.5-r1 b/metadata/md5-cache/app-misc/figlet-2.2.5-r1
index 207fac93a61f..4d88149a7f85 100644
--- a/metadata/md5-cache/app-misc/figlet-2.2.5-r1
+++ b/metadata/md5-cache/app-misc/figlet-2.2.5-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=program for making large letters out of ordinary text
 EAPI=6
 HOMEPAGE=http://www.figlet.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b6a468c4945f43d4b77458b3cc5ced6b
+_md5_=96b1df3b6971aad005a0f5762f35cef6
diff --git a/metadata/md5-cache/app-misc/ledit-2.04 b/metadata/md5-cache/app-misc/ledit-2.04
index 4598207084c0..5ca0abe8667f 100644
--- a/metadata/md5-cache/app-misc/ledit-2.04
+++ b/metadata/md5-cache/app-misc/ledit-2.04
@@ -4,10 +4,10 @@ DESCRIPTION=A line editor to be used with interactive commands
 EAPI=7
 HOMEPAGE=http://pauillac.inria.fr/~ddr/ledit/
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.09:=[ocamlopt?] dev-ml/camlp5:=
 RESTRICT=installsources !ocamlopt? ( strip )
 SLOT=0
 SRC_URI=http://pauillac.inria.fr/~ddr/ledit/distrib/src/ledit-2.04.tgz
-_md5_=d9c4c9a211aad2225306e37507801d51
+_md5_=5d391e55e22619077e0b09c00aadebdf
diff --git a/metadata/md5-cache/app-office/calcurse-4.7.0 b/metadata/md5-cache/app-office/calcurse-4.7.0
index 76ea5401a387..b3dc5c6cce81 100644
--- a/metadata/md5-cache/app-office/calcurse-4.7.0
+++ b/metadata/md5-cache/app-office/calcurse-4.7.0
@@ -5,7 +5,7 @@ DESCRIPTION=a text-based calendar and scheduling application
 EAPI=7
 HOMEPAGE=https://calcurse.org/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/httplib2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/httplib2[python_targets_python3_9(-)] ) sys-libs/ncurses:0=
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://calcurse.org/files/calcurse-4.7.0.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=c2b2323a05c1dfabf033ec0ef6cf6997
+_md5_=0fa3188702eeae51ce80783a7f25d71e
diff --git a/metadata/md5-cache/app-shells/fish-3.1.2 b/metadata/md5-cache/app-shells/fish-3.1.2
index caf7b9c28d3e..1a666e5d40d7 100644
--- a/metadata/md5-cache/app-shells/fish-3.1.2
+++ b/metadata/md5-cache/app-shells/fish-3.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Friendly Interactive SHell
 EAPI=7
 HOMEPAGE=http://fishshell.com/
 IUSE=doc nls test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-libs/ncurses:0=[unicode]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08d5c2380207dbafe4058eb81a863806
+_md5_=9978f470c6743752a37482a3ec593a02
diff --git a/metadata/md5-cache/app-text/sablotron-1.0.3-r2 b/metadata/md5-cache/app-text/sablotron-1.0.3-r2
index cf95344a955c..d481d68fafef 100644
--- a/metadata/md5-cache/app-text/sablotron-1.0.3-r2
+++ b/metadata/md5-cache/app-text/sablotron-1.0.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=An XSLT Parser in C++
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/sablotron/
 IUSE=perl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/expat-1.95.6-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/sablotron/Sablot-1.0.3.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=bd20bcea54979b67c9f47922a22b9382
+_md5_=2990636deac17e7ab46fcc66058efc7a
diff --git a/metadata/md5-cache/dev-cpp/tbb-2020.3 b/metadata/md5-cache/dev-cpp/tbb-2020.3
index c2d57c7b0a5c..e3d59c723b7e 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2020.3
+++ b/metadata/md5-cache/dev-cpp/tbb-2020.3
@@ -3,9 +3,9 @@ DESCRIPTION=High level abstract threading library
 EAPI=7
 HOMEPAGE=https://www.threadingbuildingblocks.org
 IUSE=debug examples 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/intel/tbb/archive/2020_U3.tar.gz -> tbb-2020.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d0d2438d87d36ea8ec25e8b6350a948c
+_md5_=34d104317e04c91b47eac9ef59fb3c9c
diff --git a/metadata/md5-cache/dev-db/pg_top-4.0.0-r1 b/metadata/md5-cache/dev-db/pg_top-4.0.0-r1
index 5d4d0c48e0cf..9c551a259114 100644
--- a/metadata/md5-cache/dev-db/pg_top-4.0.0-r1
+++ b/metadata/md5-cache/dev-db/pg_top-4.0.0-r1
@@ -4,10 +4,10 @@ DEPEND=dev-db/postgresql:=
 DESCRIPTION='top' for PostgreSQL
 EAPI=7
 HOMEPAGE=https://pg_top.gitlab.io/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://pg_top.gitlab.io/source/pg_top-4.0.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b85d84446cebf76177526d72c986a11
+_md5_=6589300e20ea98d54dcd84a9d7544d6f
diff --git a/metadata/md5-cache/dev-db/postgresql-13.1 b/metadata/md5-cache/dev-db/postgresql-13.1
index 28d21baa60fb..236ceda6d143 100644
--- a/metadata/md5-cache/dev-db/postgresql-13.1
+++ b/metadata/md5-cache/dev-db/postgresql-13.1
@@ -5,11 +5,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
 IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=13
 SRC_URI=https://ftp.postgresql.org/pub/source/v13.1/postgresql-13.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f65ba4b670e997ab6b18af2e6f29fc25
+_md5_=e00347e20f91dea56a4bb16d3ee09fe3
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.9 b/metadata/md5-cache/dev-db/unixODBC-2.3.9
index 7db905245a42..2bc77b0d157a 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.9
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.9
@@ -5,10 +5,10 @@ DESCRIPTION=A complete ODBC driver manager
 EAPI=7
 HOMEPAGE=http://www.unixodbc.org/
 IUSE=+minimal odbcmanual static-libs 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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=|| ( dev-libs/libltdl: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(-)?] >=sys-devel/libtool-2.4.2-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(-)?] ) >=sys-libs/readline-6.2_p5-r1: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(-)?] >=sys-libs/ncurses-5.9-r3: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(-)?] >=virtual/libiconv-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=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.9.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=56b57dd49459c0a81c31a5a0bac8a9e7
+_md5_=70ef14c2db280dba92448747a78a21aa
diff --git a/metadata/md5-cache/dev-lang/coffee-script-1.12.5 b/metadata/md5-cache/dev-lang/coffee-script-1.12.5
deleted file mode 100644
index 391e08f65d58..000000000000
--- a/metadata/md5-cache/dev-lang/coffee-script-1.12.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A little language that compiles into javascript
-EAPI=6
-HOMEPAGE=https://coffeescript.org/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-libs/nodejs
-SLOT=0
-SRC_URI=https://github.com/jashkenas/coffeescript/archive/1.12.5.tar.gz -> coffee-script-1.12.5.tar.gz
-_md5_=fd834744a4ecf46a4539584e512c41c0
diff --git a/metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1 b/metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1
deleted file mode 100644
index eb195dda705d..000000000000
--- a/metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A little language that compiles into javascript
-EAPI=5
-HOMEPAGE=https://coffeescript.org/
-IUSE=doc examples
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=net-libs/nodejs
-SLOT=0
-SRC_URI=https://github.com/jashkenas/coffeescript/archive/1.9.3.tar.gz -> coffee-script-1.9.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=b621982143baec6cc762ae35414598e0
diff --git a/metadata/md5-cache/dev-lang/coffee-script-2.5.1 b/metadata/md5-cache/dev-lang/coffee-script-2.5.1
index 838016701cdd..89ba01cf2ac2 100644
--- a/metadata/md5-cache/dev-lang/coffee-script-2.5.1
+++ b/metadata/md5-cache/dev-lang/coffee-script-2.5.1
@@ -3,9 +3,9 @@ DESCRIPTION=A little language that compiles into javascript
 EAPI=7
 HOMEPAGE=https://coffeescript.org/
 IUSE=doc examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=net-libs/nodejs
 SLOT=0
 SRC_URI=https://github.com/jashkenas/coffeescript/archive/2.5.1.tar.gz -> coffee-script-2.5.1.tar.gz
-_md5_=0a7ce54206de30f4329899a0f36c96dd
+_md5_=1c0895c6419ac5c7874f6ea6ac90a54a
diff --git a/metadata/md5-cache/dev-lang/qu-prolog-10.6 b/metadata/md5-cache/dev-lang/qu-prolog-10.6
index 8757f1815a0e..5714cf447af4 100644
--- a/metadata/md5-cache/dev-lang/qu-prolog-10.6
+++ b/metadata/md5-cache/dev-lang/qu-prolog-10.6
@@ -5,10 +5,10 @@ DESCRIPTION=Extended Prolog supporting quantifiers, object-variables and substit
 EAPI=7
 HOMEPAGE=http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html
 IUSE=debug doc examples pedro qt5 readline threads
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0 GPL-2+
 RDEPEND=!dev-util/mpatch !dev-util/rej qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap )
 SLOT=0
 SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp10.6.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=550df1b4249d194cc3ae893132765231
+_md5_=dd06e38fad8f3707bb0daf75711dff6a
diff --git a/metadata/md5-cache/dev-libs/ell-0.35 b/metadata/md5-cache/dev-libs/ell-0.35
index 0542cb6ac8dd..e279b33c4499 100644
--- a/metadata/md5-cache/dev-libs/ell-0.35
+++ b/metadata/md5-cache/dev-libs/ell-0.35
@@ -5,11 +5,11 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie test kernel_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
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib: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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.35.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=04f5474c8890a85a507480a35130bd53
+_md5_=b2e67f6e0119747dae548503be39f784
diff --git a/metadata/md5-cache/dev-libs/expat-2.2.10 b/metadata/md5-cache/dev-libs/expat-2.2.10
index aa7996826832..545e2c8b0b9a 100644
--- a/metadata/md5-cache/dev-libs/expat-2.2.10
+++ b/metadata/md5-cache/dev-libs/expat-2.2.10
@@ -4,9 +4,9 @@ DESCRIPTION=Stream-oriented XML parser library
 EAPI=7
 HOMEPAGE=https://libexpat.github.io/
 IUSE=elibc_FreeBSD examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-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 ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d9c97fbb44d5da668d6d86f8cdea67e5
+_md5_=c0f2883dcb7244c23e0e956edec6aa0d
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.5 b/metadata/md5-cache/dev-libs/girara-0.3.5
index 4414cd5ffb6b..d7bb0995fadd 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.5
+++ b/metadata/md5-cache/dev-libs/girara-0.3.5
@@ -5,11 +5,11 @@ DESCRIPTION=UI library that focuses on simplicity and minimalism
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/girara/
 IUSE=doc libnotify test test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.5.tar.xz
 _eclasses_=meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=77c00d79f4dc5bfa70eab6d8cf3a2776
+_md5_=83eb7cdbcd466f538cbd61bb462ff1dd
diff --git a/metadata/md5-cache/dev-libs/inih-52 b/metadata/md5-cache/dev-libs/inih-52
index e40ff0ec85bb..41a84abc5aaa 100644
--- a/metadata/md5-cache/dev-libs/inih-52
+++ b/metadata/md5-cache/dev-libs/inih-52
@@ -4,9 +4,9 @@ DESCRIPTION=inih (INI not invented here) simple .INI file parser
 EAPI=7
 HOMEPAGE=https://github.com/benhoyt/inih
 IUSE=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 ppc ppc64 s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/benhoyt/inih/archive/r52.tar.gz -> inih-52.tar.gz
 _eclasses_=meson	fdaf2a7b9376934c1c7ddbd32114defb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=a47a2941c6e743daffcfac24fb6e9d13
+_md5_=0268a4bfb474c473e320e7b9dc9ab499
diff --git a/metadata/md5-cache/dev-libs/libcec-6.0.2 b/metadata/md5-cache/dev-libs/libcec-6.0.2
index f66b1a5b8253..147e62024428 100644
--- a/metadata/md5-cache/dev-libs/libcec-6.0.2
+++ b/metadata/md5-cache/dev-libs/libcec-6.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=7
 HOMEPAGE=http://libcec.pulse-eight.com
 IUSE=cubox exynos python raspberry-pi kernel-cec tools +xrandr udev kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libplatform-2.0.0 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] ) ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) tools? ( sys-libs/ncurses:= ) udev? ( virtual/udev ) xrandr? ( x11-libs/libXrandr )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-6.0.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23eff8ece8dce69c72b045f9b479947f
+_md5_=68e90ab6d0d6e4c87b33cae11580f45a
diff --git a/metadata/md5-cache/dev-libs/libev-4.33 b/metadata/md5-cache/dev-libs/libev-4.33
index a453b59c54df..4de1c32f2e3b 100644
--- a/metadata/md5-cache/dev-libs/libev-4.33
+++ b/metadata/md5-cache/dev-libs/libev-4.33
@@ -4,9 +4,9 @@ DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=7
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
 IUSE=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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( BSD GPL-2 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.33.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=158f8c03b9977d8f00e35c80d2f093b4
+_md5_=089f6efaa066bf6e46de518379d79e5b
diff --git a/metadata/md5-cache/dev-libs/libnl-1.1.4-r1 b/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
index 3197c368e715..08b92d74ab62 100644
--- a/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel inte
 EAPI=6
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/
 IUSE=doc static-libs
-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=LGPL-2.1
 SLOT=1.1
 SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-1.1.4.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=f0fd64542ce9ab538c4463ae9e4f84f4
+_md5_=f3d676d201e4acb61790b5dafe86cb79
diff --git a/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1 b/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
index d11005b938c8..66595906d13b 100644
--- a/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
+++ b/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Hardware-based performance monitoring interface for Linux
 EAPI=7
 HOMEPAGE=http://perfmon2.sourceforge.net
 IUSE=static-libs
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2 MIT
 SLOT=0/4
 SRC_URI=mirror://sourceforge/perfmon2/libpfm4/libpfm-4.10.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=f8a29fe1ec7f961f3b442c48249eefa9
+_md5_=08222560f9d56a27aaa0a3d4f60e26b9
diff --git a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1 b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
index b99369513ea5..c35a05ba717b 100644
--- a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Platform support library used by libCEC and binary add-ons for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/Pulse-Eight/platform
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/platform/archive/p8-platform-2.1.0.1.tar.gz -> libplatform-2.1.0.1.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ffc4b5b1351ca85c2ad724d94ec76eb
+_md5_=45ec89bcaa06da09ffbbad7124e38110
diff --git a/metadata/md5-cache/dev-libs/librep-0.92.7 b/metadata/md5-cache/dev-libs/librep-0.92.7
index 855b2f234e3a..9f5ce47fd641 100644
--- a/metadata/md5-cache/dev-libs/librep-0.92.7
+++ b/metadata/md5-cache/dev-libs/librep-0.92.7
@@ -4,10 +4,10 @@ DESCRIPTION=Shared library implementing a Lisp dialect
 EAPI=7
 HOMEPAGE=https://sawfish.fandom.com/
 IUSE=emacs gmp readline
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/librep/librep_0.92.7.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ee938b5d4b67e135381564fd352e695
+_md5_=ea6c57f87a998817207f61e5b76acd6b
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1.3 b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
index 2acc6f26276b..ac7bed4278be 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1.3
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=C++ classes for flexible logging to files, syslog and other destinat
 EAPI=6
 HOMEPAGE=http://log4cpp.sourceforge.net/
 IUSE=doc 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=amd64 ~arm ~ppc s390 ~x86
+KEYWORDS=amd64 ~arm ~ppc s390 x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.3.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=fd742e86c0d65c3f83fbd25c3507569c
+_md5_=af2adae85c568337fc6ee6ed03f0016b
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.14.0 b/metadata/md5-cache/dev-libs/protobuf-3.14.0
index b6220d18b355..77f61e91a42e 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.14.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test 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 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b60af1f684e9fba5e22612d6e2183b0e
+_md5_=19f243956728975467f216abc4416b9c
diff --git a/metadata/md5-cache/dev-python/Babel-2.9.0 b/metadata/md5-cache/dev-python/Babel-2.9.0
index 54db724cd5a3..acc3c33f1460 100644
--- a/metadata/md5-cache/dev-python/Babel-2.9.0
+++ b/metadata/md5-cache/dev-python/Babel-2.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=Collection of tools for internationalizing Python applications
 EAPI=7
 HOMEPAGE=https://babel.pocoo.org/ https://pypi.org/project/Babel/
 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv s390 ~sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-python/pytz[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/backports-zoneinfo[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_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/backports-zoneinfo[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_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/backports-zoneinfo[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_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/backports-zoneinfo[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_8(-)?,-python_single_target_python3_8(-)] ) 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(-)] >=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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.9.0.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=844aeb80ce57a81c7ec7c08db9a7f525
+_md5_=520b674f3066908af4bb2dd2d32dbb47
diff --git a/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1 b/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
index e23eee9a117c..490d9cdf8d6b 100644
--- a/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Backport of the standard library zoneinfo module
 EAPI=7
 HOMEPAGE=https://github.com/pganssle/zoneinfo/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv s390 ~sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[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 ) >=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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pganssle/zoneinfo/archive/0.2.1.tar.gz -> zoneinfo-0.2.1.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=8a65241e784ab85a8613d30995ab96c3
+_md5_=19b953ab5e55b6df4f3e0f142d582491
diff --git a/metadata/md5-cache/dev-python/brotlicffi-0.8.0 b/metadata/md5-cache/dev-python/brotlicffi-0.8.0
index a175fb3a4c46..d04719f380b5 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-0.8.0
+++ b/metadata/md5-cache/dev-python/brotlicffi-0.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python binding to the Brotli library
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/brotlicffi/ https://pypi.org/project/brotlicffi/
 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 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli:= virtual/python-cffi[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v0.8.0.tar.gz -> brotlicffi-0.8.0.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=5f5a4c3c64b7cc43c99e5dbe175a6bb7
+_md5_=563ce8416f2934a0b6373faa361162b9
diff --git a/metadata/md5-cache/dev-python/cffi-1.14.4 b/metadata/md5-cache/dev-python/cffi-1.14.4
index 6d406f050aa4..0bcc2567338a 100644
--- a/metadata/md5-cache/dev-python/cffi-1.14.4
+++ b/metadata/md5-cache/dev-python/cffi-1.14.4
@@ -5,7 +5,7 @@ DESCRIPTION=Foreign Function Interface for Python calling C code
 EAPI=7
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 IUSE=test doc 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libffi:= dev-python/pycparser[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(-)] 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(-)] >=dev-python/setuptools-42.0.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.14.4
 SRC_URI=mirror://pypi/c/cffi/cffi-1.14.4.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=7f8461bf38991206dc982936806f0a8b
+_md5_=db1f143b21ec408f9ff0398495dbeba8
diff --git a/metadata/md5-cache/dev-python/django-2.2.17 b/metadata/md5-cache/dev-python/django-2.2.17
index 81e26785be65..34b4e7e0cb5c 100644
--- a/metadata/md5-cache/dev-python/django-2.2.17
+++ b/metadata/md5-cache/dev-python/django-2.2.17
@@ -4,7 +4,7 @@ DESCRIPTION=High-level Python web framework
 EAPI=7
 HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
 IUSE=doc sqlite test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=dev-python/pytz[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/sqlparse-0.2.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(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) >=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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/2.2/Django-2.2.17.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.17.checksum.txt )
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=810f7d3e43e07550410364b86345e0b9
+_md5_=cf31b8615f1fb78f740d1d283efb2630
diff --git a/metadata/md5-cache/dev-python/django-3.0.11 b/metadata/md5-cache/dev-python/django-3.0.11
index 6391f66e274b..69bc1a426b63 100644
--- a/metadata/md5-cache/dev-python/django-3.0.11
+++ b/metadata/md5-cache/dev-python/django-3.0.11
@@ -4,7 +4,7 @@ DESCRIPTION=High-level Python web framework
 EAPI=7
 HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
 IUSE=doc sqlite test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ~ppc64 x86
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=dev-python/asgiref[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(-)] dev-python/pytz[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(-)] >=dev-python/sqlparse-0.2.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(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=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(-)] >=dev-python/setuptools-42.0.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=https://media.djangoproject.com/releases/3.0/Django-3.0.11.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.0.11.checksum.txt )
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=6029c9fdd373f03308249fbb9929a262
+_md5_=a3dd77cf5c4e7084ea0d94b66b629a1b
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.4.5 b/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
index b417a9831ca8..1440a8a353ec 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
@@ -4,7 +4,7 @@ DESCRIPTION=A high performance, concurrent HTTP client library for Python using
 EAPI=7
 HOMEPAGE=https://github.com/gwik/geventhttpclient
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/certifi[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(-)] dev-python/gevent[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(-)] dev-python/six[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(-)] 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/g/geventhttpclient/geventhttpclient-1.4.5.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=a4aa6ca2a71cc5a6546dc6c4188522c7
+_md5_=ec1bd672573a0ec4823fde1728e00096
diff --git a/metadata/md5-cache/dev-python/httpbin-0.7.0-r2 b/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
index 8f28fb30abe3..a3d255779254 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
+++ b/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP Request and Response Service
 EAPI=7
 HOMEPAGE=https://github.com/postmanlabs/httpbin https://pypi.org/project/httpbin/
 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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/brotlicffi[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/decorator[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/flask[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/itsdangerous[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/markupsafe[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[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/werkzeug-0.14.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(-)] 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/h/httpbin/httpbin-0.7.0.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=6ef06b03a44911c6a14261b4d5093791
+_md5_=706782efd3d434f29b25808ef9141778
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.3.1 b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
index 4db0a7ff0ba2..33f2641b54f3 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.3.1
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=An efficient C++ implementation of the Cassowary constraint solving
 EAPI=7
 HOMEPAGE=https://github.com/nucleic/kiwi
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=Clear-BSD
 RDEPEND=>=dev-python/cppy-1.1.0[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(-)] 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=https://github.com/nucleic/kiwi/archive/1.3.1.tar.gz -> kiwisolver-1.3.1.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=3fce89bdf8a873d52b4920ce2cda22d5
+_md5_=a889b6f10466dc2df1ec2e1047c11282
diff --git a/metadata/md5-cache/dev-python/multidict-5.1.0 b/metadata/md5-cache/dev-python/multidict-5.1.0
index a168da2e4c0b..10cddf54bd4f 100644
--- a/metadata/md5-cache/dev-python/multidict-5.1.0
+++ b/metadata/md5-cache/dev-python/multidict-5.1.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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 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.1.0.tar.gz -> multidict-5.1.0.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=ba319946822be6ab16cc87c50eda7ee8
+_md5_=e931f4d51bb98c5fe3bcbe2d90f1c289
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.6.0 b/metadata/md5-cache/dev-python/pylibacl-0.6.0
index 16649fc21e84..4173535d4efb 100644
--- a/metadata/md5-cache/dev-python/pylibacl-0.6.0
+++ b/metadata/md5-cache/dev-python/pylibacl-0.6.0
@@ -5,7 +5,7 @@ DESCRIPTION=POSIX ACLs (Access Control Lists) for Python
 EAPI=7
 HOMEPAGE=https://pylibacl.k1024.org/ https://pypi.org/project/pylibacl/ https://github.com/iustin/pylibacl/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/acl 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/iustin/pylibacl/archive/v0.6.0.tar.gz -> pylibacl-0.6.0.gh.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=1c649c79a06fda1fddf5036f281a44ba
+_md5_=6d69d3044079cca360bf891bd7dda782
diff --git a/metadata/md5-cache/dev-python/pyusb-1.1.0 b/metadata/md5-cache/dev-python/pyusb-1.1.0
index 47f9130cbbd2..b3ed88454176 100644
--- a/metadata/md5-cache/dev-python/pyusb-1.1.0
+++ b/metadata/md5-cache/dev-python/pyusb-1.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=USB support for Python
 EAPI=7
 HOMEPAGE=https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=BSD
 RDEPEND=virtual/libusb:= 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/p/pyusb/pyusb-1.1.0.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=7d0678a283bfeb3ea5934bfa666c23de
+_md5_=107b2bc047af42f54b1b89e38d90917f
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.56 b/metadata/md5-cache/dev-python/reportlab-3.5.56
index 8e1850782651..ba6826b871b9 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.5.56
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.56
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for generating printable PDF documents from any data source
 EAPI=7
 HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
 IUSE=test doc 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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(-)] 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.5.56.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=dbf62dd39bf479b1db760c210e48855b
+_md5_=541dffe4043551c5ae7acb5783428870
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.2.1 b/metadata/md5-cache/dev-python/setproctitle-1.2.1
index 64aaeefe52bc..ccfebb7d6999 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.2.1
+++ b/metadata/md5-cache/dev-python/setproctitle-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Allow customization of the process title
 EAPI=7
 HOMEPAGE=https://github.com/dvarrazzo/py-setproctitle
 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 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=mirror://pypi/s/setproctitle/setproctitle-1.2.1.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=f8f592d3a53957ddef63268fb34dbe37
+_md5_=e6cc7001385f973e79adcf0e5db6baff
diff --git a/metadata/md5-cache/dev-python/xarray-0.16.2 b/metadata/md5-cache/dev-python/xarray-0.16.2
index 26bfcfa218d9..18aadb43b5cc 100644
--- a/metadata/md5-cache/dev-python/xarray-0.16.2
+++ b/metadata/md5-cache/dev-python/xarray-0.16.2
@@ -4,7 +4,7 @@ DESCRIPTION=N-D labeled arrays and datasets in Python
 EAPI=7
 HOMEPAGE=https://xarray.pydata.org/
 IUSE=test 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=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.15[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(-)] >=dev-python/pandas-0.25[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(-)] 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(-)] >=dev-python/setuptools-42.0.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/x/xarray/xarray-0.16.2.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=02adcde94a6edc490b8fc28045ba118d
+_md5_=c30a5f339895b16939148a27ceb5c4db
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.1 b/metadata/md5-cache/dev-python/xcffib-0.11.1
index 25804513c970..81dade964a6c 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.11.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.1
@@ -5,7 +5,7 @@ DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=7
 HOMEPAGE=https://github.com/tych0/xcffib
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) dev-python/six[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(-)] x11-libs/libxcb 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.11.1.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=a3a71f9566ddd5ef014168d58818c5bb
+_md5_=431f1580ab20afc8cce319ed31b9057a
diff --git a/metadata/md5-cache/dev-python/yarl-1.6.3 b/metadata/md5-cache/dev-python/yarl-1.6.3
index ee60b0727856..579ea87e64a2 100644
--- a/metadata/md5-cache/dev-python/yarl-1.6.3
+++ b/metadata/md5-cache/dev-python/yarl-1.6.3
@@ -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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 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.3.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=312a3c12a012b6bf46b037c62de05671
+_md5_=bb13a5a3e4df883158737a06ac2b9165
diff --git a/metadata/md5-cache/dev-python/zope-interface-5.2.0 b/metadata/md5-cache/dev-python/zope-interface-5.2.0
index 5ec4c35096c0..8e3dc781b258 100644
--- a/metadata/md5-cache/dev-python/zope-interface-5.2.0
+++ b/metadata/md5-cache/dev-python/zope-interface-5.2.0
@@ -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 ~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 ~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.2.0.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e22c5d1ddd2e8d9ee0b74b3a07252cfa
+_md5_=3eeb91544e2e49b13265546b77e4bf0f
diff --git a/metadata/md5-cache/dev-python/zstandard-0.14.1 b/metadata/md5-cache/dev-python/zstandard-0.14.1
index 9e2cfdb606bd..5ece65ed71d5 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.14.1
+++ b/metadata/md5-cache/dev-python/zstandard-0.14.1
@@ -4,7 +4,7 @@ DESCRIPTION=Zstandard Bindings for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard
 IUSE=test 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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-python/cffi-1.14.0-r2:=[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(-)] 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/z/zstandard/zstandard-0.14.1.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=f562a2a9bf4d0b10ade2d283df4f555f
+_md5_=b711c551fe34120d644af5a9d0f20501
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.9 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
index a2335e1c3008..882ca6dcedcf 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
@@ -5,11 +5,11 @@ DESCRIPTION=Adds a lot of image formats to Tcl/Tk
 EAPI=7
 HOMEPAGE=http://tkimg.sourceforge.net/
 IUSE=doc test static-libs test
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/libpng-1.6:0= >=sys-libs/zlib-1.2.7:= x11-libs/libX11 virtual/jpeg:=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.9/Img-1.4.9-Source.tar.gz https://dev.gentoo.org/~tupone/distfiles/tkimg-1.4.7-patchset-1.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9fed5465e937594c60d4408b92dfb02c
+_md5_=95be64d4951a8fb1d916618f72699885
diff --git a/metadata/md5-cache/dev-util/ccache-4.1 b/metadata/md5-cache/dev-util/ccache-4.1
index 69801a1f86a9..7d050a3d18a1 100644
--- a/metadata/md5-cache/dev-util/ccache-4.1
+++ b/metadata/md5-cache/dev-util/ccache-4.1
@@ -5,11 +5,11 @@ DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
 IUSE=test
-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=GPL-3 LGPL-3
 RDEPEND=app-arch/zstd:0= dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.1/ccache-4.1.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47480543e5d3fb0d4a41fd2040e17e29
+_md5_=25cc0de4f7a2e67fa6d8a23256a92d50
diff --git a/metadata/md5-cache/dev-util/cproto-4.7q b/metadata/md5-cache/dev-util/cproto-4.7q
index 375aeffdd3f1..2d61d733ef00 100644
--- a/metadata/md5-cache/dev-util/cproto-4.7q
+++ b/metadata/md5-cache/dev-util/cproto-4.7q
@@ -3,8 +3,8 @@ DEPEND=sys-devel/flex virtual/yacc
 DESCRIPTION=Generate C function prototypes from C source code
 EAPI=7
 HOMEPAGE=https://invisible-island.net/cproto/
-KEYWORDS=~alpha amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/cproto/cproto-4.7q.tgz
-_md5_=3f34d589f3778a31fde2806b79d04f5b
+_md5_=770c4af11353db02b64d065f6c919c86
diff --git a/metadata/md5-cache/dev-util/netsurf-buildsystem-1.9 b/metadata/md5-cache/dev-util/netsurf-buildsystem-1.9
index 51b32422b083..99339568d125 100644
--- a/metadata/md5-cache/dev-util/netsurf-buildsystem-1.9
+++ b/metadata/md5-cache/dev-util/netsurf-buildsystem-1.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Build system used for netsurf and its libs
 EAPI=7
 HOMEPAGE=https://www.netsurf-browser.org
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://download.netsurf-browser.org/libs/releases/buildsystem-1.9.tar.gz
-_md5_=3d3548265d173681575952383b415630
+_md5_=ba3181f35b9e1f90f6233b32b174dbbd
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.5.2 b/metadata/md5-cache/dev-vcs/mercurial-5.5.2
index e7b6c481cd44..e8d1834ec618 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.5.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.5.2
@@ -5,7 +5,7 @@ DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
 IUSE=+chg emacs gpg test tk zsh-completion python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-misc/ca-certificates dev-python/zstandard[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(-)] gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) 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(+)] ) >=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 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.5.2.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77db615cb23ec627e802f1944a0da568
+_md5_=700ef38ec41726a43e2b3217da159e59
diff --git a/metadata/md5-cache/games-util/qstat-2.14 b/metadata/md5-cache/games-util/qstat-2.14
index a54b0ddeaad4..2c7b6dcce234 100644
--- a/metadata/md5-cache/games-util/qstat-2.14
+++ b/metadata/md5-cache/games-util/qstat-2.14
@@ -4,9 +4,9 @@ DESCRIPTION=Server statics collector supporting many FPS games
 EAPI=6
 HOMEPAGE=https://github.com/multiplay/qstat
 IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc64 x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=https://github.com/multiplay/qstat/archive/v2.14.tar.gz -> qstat-2.14.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=4f26f608c5450f68201d4020663d283e
+_md5_=893247e5546e17b8133ab8f106b3a197
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807 b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
index 5f31e9f9b966..56f70f9db5d3 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
@@ -3,10 +3,10 @@ DEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx
 DESCRIPTION=The $ mail program, which is used to send mail via shell scripts
 EAPI=7
 HOMEPAGE=https://www.debian.org/
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=ca698d7ae6b4244bdf2411518e0bf4cd
+_md5_=ef0440b06d191fd665e0978fe69daf94
diff --git a/metadata/md5-cache/mail-filter/mapson-3.3.1 b/metadata/md5-cache/mail-filter/mapson-3.3.1
index befbb43947b1..5dae5c9249fd 100644
--- a/metadata/md5-cache/mail-filter/mapson-3.3.1
+++ b/metadata/md5-cache/mail-filter/mapson-3.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=A challenge/response-based white-list spam filter
 EAPI=7
 HOMEPAGE=http://mapson.sourceforge.net/
 IUSE=debug
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=acct-user/mail virtual/mta
 SLOT=0
 SRC_URI=mirror://sourceforge/mapson/mapson-3.3.1.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=e312f6c4555bebcf4a3d3704a0802a79
+_md5_=c0b2f9d3ecb7c378f7743aec61c1cbf1
diff --git a/metadata/md5-cache/mail-filter/sieve-connect-0.90 b/metadata/md5-cache/mail-filter/sieve-connect-0.90
index 24e228b7316c..e9013b31d0ed 100644
--- a/metadata/md5-cache/mail-filter/sieve-connect-0.90
+++ b/metadata/md5-cache/mail-filter/sieve-connect-0.90
@@ -3,9 +3,9 @@ DEPEND=>=dev-lang/perl-5
 DESCRIPTION=Sieve Command Line Interface
 EAPI=7
 HOMEPAGE=https://people.spodhuis.org/phil.pennock/software/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/perl-5 >=dev-perl/Authen-SASL-2.11 dev-perl/IO-Socket-INET6 >=dev-perl/IO-Socket-SSL-0.97 dev-perl/Net-DNS dev-perl/Net-SSLeay dev-perl/TermReadKey dev-perl/Term-ReadLine-Gnu
 SLOT=0
 SRC_URI=https://github.com/syscomet/sieve-connect/releases/download/v0.90/sieve-connect-0.90.tar.bz2
-_md5_=1e5e24ea8458f1a6e8dc4a816e609149
+_md5_=1595918e96f3ef07d3d9d7103769c65d
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.68 b/metadata/md5-cache/media-gfx/asymptote-2.68
index 05ec2110fa5a..f39b0c5671cf 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.68
+++ b/metadata/md5-cache/media-gfx/asymptote-2.68
@@ -5,7 +5,7 @@ DESCRIPTION=A vector graphics language that provides a framework for technical d
 EAPI=7
 HOMEPAGE=https://asymptote.sourceforge.io/
 IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( 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(-)] ) X? ( 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/PyQt5[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(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) offscreen? ( opengl ) doc? ( boehm-gc )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.68.src.tgz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=6e8aff9759b9762172ada4e09e490ed3
+_md5_=6c923fd63e965b070b6192a031ec63cb
diff --git a/metadata/md5-cache/media-gfx/exif-0.6.22 b/metadata/md5-cache/media-gfx/exif-0.6.22
index 456bdcbbc90e..bcaab3acaa9e 100644
--- a/metadata/md5-cache/media-gfx/exif-0.6.22
+++ b/metadata/md5-cache/media-gfx/exif-0.6.22
@@ -5,9 +5,9 @@ DESCRIPTION=Small CLI util to show EXIF infos hidden in JPEG files
 EAPI=7
 HOMEPAGE=https://libexif.github.io/ https://github.com/libexif/exif
 IUSE=nls
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2+
 RDEPEND=dev-libs/popt >=media-libs/libexif-0.6.22
 SLOT=0
 SRC_URI=https://github.com/libexif/exif/releases/download/exif-0_6_22-release/exif-0.6.22.tar.gz
-_md5_=e635ddbc0994e477d51d6c853e86321e
+_md5_=3f797fd10c977d4ab8e29eae8ade8c3f
diff --git a/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r6 b/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r6
index 3c0566544531..19f921dbd224 100644
--- a/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r6
+++ b/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r6
@@ -4,10 +4,10 @@ DESCRIPTION=Scanner Access Now Easy
 EAPI=7
 HOMEPAGE=http://www.sane-project.org
 IUSE=gimp gtk
-KEYWORDS=~alpha amd64 ~arm64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-gfx/sane-backends gimp? ( media-gfx/gimp:0/2 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 REQUIRED_USE=gimp? ( gtk )
 SLOT=0
 SRC_URI=https://salsa.debian.org/debian/sane-frontends/-/archive/upstream/1.0.14/sane-frontends-upstream-1.0.14.tar.gz
-_md5_=ec89006b74a1c00df4920a9be4d900a3
+_md5_=5f37c2530584e645740a9f8c57dc9d02
diff --git a/metadata/md5-cache/media-libs/alure-1.2-r1 b/metadata/md5-cache/media-libs/alure-1.2-r1
deleted file mode 100644
index ecad47b8211e..000000000000
--- a/metadata/md5-cache/media-libs/alure-1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/openal-1.1 dumb? ( =media-libs/dumb-0.9*:= ) flac? ( media-libs/flac ) fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= ) mp3? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis )
-DESCRIPTION=The OpenAL Utility Toolkit
-EAPI=7
-HOMEPAGE=https://kcat.strangesoft.net/alure.html
-IUSE=dumb examples flac fluidsynth mp3 sndfile static-libs vorbis
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=media-libs/openal-1.1 dumb? ( =media-libs/dumb-0.9*:= ) flac? ( media-libs/flac ) fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= ) mp3? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis )
-SLOT=0
-SRC_URI=https://kcat.strangesoft.net/alure-releases/alure-1.2.tar.bz2
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff4af673bdbaa2198da26e930e55428f
diff --git a/metadata/md5-cache/media-libs/alure-1.2-r2 b/metadata/md5-cache/media-libs/alure-1.2-r2
index 18d89f9faa9f..ae656140f139 100644
--- a/metadata/md5-cache/media-libs/alure-1.2-r2
+++ b/metadata/md5-cache/media-libs/alure-1.2-r2
@@ -5,10 +5,10 @@ DESCRIPTION=The OpenAL Utility Toolkit
 EAPI=7
 HOMEPAGE=https://kcat.strangesoft.net/alure.html
 IUSE=dumb examples flac fluidsynth mp3 sndfile static-libs vorbis
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=media-libs/openal-1.1 dumb? ( media-libs/dumb:= ) flac? ( media-libs/flac ) fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= ) mp3? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=https://kcat.strangesoft.net/alure-releases/alure-1.2.tar.bz2
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e0bcb842a241fdabb9301c40191e81b
+_md5_=75d320ae601e850f29840bda57aafc23
diff --git a/metadata/md5-cache/media-libs/codec2-0.9.2-r1 b/metadata/md5-cache/media-libs/codec2-0.9.2-r1
index 4875c6fb44ec..d94c37e634a5 100644
--- a/metadata/md5-cache/media-libs/codec2-0.9.2-r1
+++ b/metadata/md5-cache/media-libs/codec2-0.9.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Low bit rate speech codec
 EAPI=7
 HOMEPAGE=https://freedv.org/ http://www.rowetel.com/?page_id=452
 IUSE=examples 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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0/0.9
 SRC_URI=https://github.com/drowe67/codec2/archive/v0.9.2.tar.gz -> codec2-0.9.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4873bf378e3f8da08dbfad175cb591f
+_md5_=31023a7300debb72fe31f086cf36159e
diff --git a/metadata/md5-cache/media-libs/dav1d-0.8.0 b/metadata/md5-cache/media-libs/dav1d-0.8.0
index a2c69bfe0e71..d698e7d450e5 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.8.0
+++ b/metadata/md5-cache/media-libs/dav1d-0.8.0
@@ -4,9 +4,9 @@ DESCRIPTION=dav1d is an AV1 Decoder :)
 EAPI=7
 HOMEPAGE=https://code.videolan.org/videolan/dav1d
 IUSE=+8bit +10bit +asm 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=amd64 arm arm64 ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~sparc x86
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.8.0/dav1d-0.8.0.tar.bz2
 _eclasses_=meson	fdaf2a7b9376934c1c7ddbd32114defb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=058da9c580f38625a3c9e498ac3df1c0
+_md5_=7ca48c4e9ac2261d1b37d5e6fba1955e
diff --git a/metadata/md5-cache/media-libs/faac-1.30 b/metadata/md5-cache/media-libs/faac-1.30
index 0e1df1e5b57d..a0e19dc204e4 100644
--- a/metadata/md5-cache/media-libs/faac-1.30
+++ b/metadata/md5-cache/media-libs/faac-1.30
@@ -4,9 +4,9 @@ DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
 EAPI=7
 HOMEPAGE=https://www.audiocoding.com
 IUSE=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 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MPEG-4
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faac-1_30.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=19699cdc97d20dfba6b6e3dc0d5fba4e
+_md5_=198e5201d5e26d18ba5bbdd01b931f4d
diff --git a/metadata/md5-cache/media-libs/faad2-2.10.0 b/metadata/md5-cache/media-libs/faad2-2.10.0
index 7b8293f8ac38..311883031983 100644
--- a/metadata/md5-cache/media-libs/faad2-2.10.0
+++ b/metadata/md5-cache/media-libs/faad2-2.10.0
@@ -4,9 +4,9 @@ DESCRIPTION=AAC audio decoding library
 EAPI=7
 HOMEPAGE=https://www.audiocoding.com/faad2.html
 IUSE=digitalradio 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 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/knik0/faad2/archive/2_10_0.tar.gz -> faad2-2.10.0.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=ae5672ed8be47cf8ce000e9fd65a6a1d
+_md5_=ba0c14b7cab5b6a3eb7c6f39501c8fc3
diff --git a/metadata/md5-cache/media-libs/faad2-2.9.0 b/metadata/md5-cache/media-libs/faad2-2.9.0
deleted file mode 100644
index d799f3c236d9..000000000000
--- a/metadata/md5-cache/media-libs/faad2-2.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=AAC audio decoding library
-EAPI=7
-HOMEPAGE=https://www.audiocoding.com/faad2.html
-IUSE=digitalradio 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://github.com/knik0/faad2/archive/2_9_0.tar.gz -> faad2-2.9.0.tar.gz
-_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=a092a1d1e9d8d1465f53a71d73f8cd52
diff --git a/metadata/md5-cache/media-libs/glm-0.9.9.8-r1 b/metadata/md5-cache/media-libs/glm-0.9.9.8-r1
index 7a1b8792be9c..67ecc7003ba0 100644
--- a/metadata/md5-cache/media-libs/glm-0.9.9.8-r1
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=OpenGL Mathematics
 EAPI=7
 HOMEPAGE=http://glm.g-truc.net/
 IUSE=test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( HappyBunny MIT )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.8.tar.gz -> glm-0.9.9.8.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c8a73c0ba2c6f40716ea46ed36e9de2
+_md5_=c86de69b62c00c38f4b5ae71a6d0e845
diff --git a/metadata/md5-cache/media-libs/libbluray-1.2.0 b/metadata/md5-cache/media-libs/libbluray-1.2.0
index ca2bbb2e5a31..b8a1c5bb07b7 100644
--- a/metadata/md5-cache/media-libs/libbluray-1.2.0
+++ b/metadata/md5-cache/media-libs/libbluray-1.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Blu-ray playback libraries
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libbluray.html
 IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml 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=amd64 arm arm64 ppc ppc64 sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1: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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/2
 SRC_URI=https://downloads.videolan.org/pub/videolan/libbluray/1.2.0/libbluray-1.2.0.tar.bz2
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18bc8e3def4413d689957a72c98d3531
+_md5_=d1675b7891d9d2b0bd63be61cc825bc6
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5-r2 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5-r2
deleted file mode 100644
index 33407c460374..000000000000
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16.5 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
-EAPI=7
-HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
-IUSE=java 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 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD IJG ZLIB
-RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/0.2
-SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.0.5.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5eb3d9b29546d3e7bfb2a136a90e82a
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
index a787e67d4b88..998e51b6fadc 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
 EAPI=7
 HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
 IUSE=java 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 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD IJG ZLIB
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/0.2
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.0.6.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fd977ab37f1b562bdab96a533b0058e
+_md5_=e2f2b6f8eb0ef06321ff48191adc1d31
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.16 b/metadata/md5-cache/media-libs/libmtp-1.1.16
deleted file mode 100644
index 1b7045e711dd..000000000000
--- a/metadata/md5-cache/media-libs/libmtp-1.1.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>sys-devel/gettext-0.18.3 virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=acct-group/plugdev virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
-DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
-EAPI=7
-HOMEPAGE=http://libmtp.sourceforge.net/
-IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-group/plugdev virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
-SLOT=0/9
-SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.16.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=91302ac91bd9869b812755f3d049ec9e
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.17 b/metadata/md5-cache/media-libs/libmtp-1.1.17
index c3667333ce4e..c313b6122663 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.17
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.17
@@ -5,10 +5,10 @@ DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
 EAPI=7
 HOMEPAGE=http://libmtp.sourceforge.net/
 IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-group/plugdev virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.17.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=1ab5defc2f8c589828f56fcfce054d04
+_md5_=f73557d073cb735eda848a11de64dc0c
diff --git a/metadata/md5-cache/media-libs/libnsgif-0.2.1-r3 b/metadata/md5-cache/media-libs/libnsgif-0.2.1-r3
index eb82fc4f3041..ed7873894af8 100644
--- a/metadata/md5-cache/media-libs/libnsgif-0.2.1-r3
+++ b/metadata/md5-cache/media-libs/libnsgif-0.2.1-r3
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=decoding library for the GIF image file format, written in C
 EAPI=7
 HOMEPAGE=https://www.netsurf-browser.org/projects/libnsgif/
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsgif-0.2.1-src.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=c0d565f52059c6c3ede99ea9341d9491
+_md5_=2343ef510b2a48775fd5000f6275bde0
diff --git a/metadata/md5-cache/media-libs/libprojectm-3.1.8 b/metadata/md5-cache/media-libs/libprojectm-3.1.8
index 6e91b7fd3fb4..987c67708369 100644
--- a/metadata/md5-cache/media-libs/libprojectm-3.1.8
+++ b/metadata/md5-cache/media-libs/libprojectm-3.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=A graphical music visualization plugin similar to milkdrop
 EAPI=7
 HOMEPAGE=https://github.com/projectM-visualizer/projectm
 IUSE=gles2 jack qt5 sdl
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2
 RDEPEND=gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] jack? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtopengl:5 virtual/jack ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtopengl:5 media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.5 ) sys-libs/zlib
 SLOT=0/2
 SRC_URI=https://github.com/projectM-visualizer/projectm/archive/v3.1.8.tar.gz -> libprojectm-3.1.8.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=dffec3ce72204fb4d5c21561eab5e5e9
+_md5_=341ef31ea13517957b45e96530dd4967
diff --git a/metadata/md5-cache/media-libs/libshout-2.4.3 b/metadata/md5-cache/media-libs/libshout-2.4.3
index e959ff17dfc6..2ccf9cf422b2 100644
--- a/metadata/md5-cache/media-libs/libshout-2.4.3
+++ b/metadata/md5-cache/media-libs/libshout-2.4.3
@@ -5,10 +5,10 @@ DESCRIPTION=library for connecting and sending data to icecast servers
 EAPI=7
 HOMEPAGE=https://www.icecast.org/
 IUSE=libressl speex static-libs theora 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 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=>=media-libs/libogg-1.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(-)?] >=media-libs/libvorbis-1.3.3-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(-)?] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[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://downloads.xiph.org/releases/libshout/libshout-2.4.3.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=8c684dab0d6a7d8f7da3ab39aa878f1a
+_md5_=9f4d6a9f2232060c2ba7ad09624f7d33
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.4.0 b/metadata/md5-cache/media-libs/openjpeg-2.4.0
index c0ed471e50b8..d4cf96462523 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.4.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=Open-source JPEG 2000 library
 EAPI=7
 HOMEPAGE=https://www.openjpeg.org
 IUSE=doc 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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.4.0.tar.gz -> openjpeg-2.4.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60.tar.gz -> openjpeg-data_20201130.tar.gz )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=416dd7a7c97c9ea1d2e325fb090f8478
+_md5_=39ef3beaedbcafbe54faf209c9a34391
diff --git a/metadata/md5-cache/media-libs/opusfile-0.12 b/metadata/md5-cache/media-libs/opusfile-0.12
index d156df8957ad..e9a0da06352a 100644
--- a/metadata/md5-cache/media-libs/opusfile-0.12
+++ b/metadata/md5-cache/media-libs/opusfile-0.12
@@ -4,10 +4,10 @@ DESCRIPTION=A high-level decoding and seeking API for .opus files
 EAPI=7
 HOMEPAGE=https://www.opus-codec.org/
 IUSE=doc fixed-point +float +http libressl static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=media-libs/libogg media-libs/opus http? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=^^ ( fixed-point float )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/opus/opusfile-0.12.tar.gz
-_md5_=0403785c6d41f4081209513f4a9a3b19
+_md5_=1d7c5132f98969fabefc72345d42580e
diff --git a/metadata/md5-cache/media-libs/portaudio-19.06.00-r1 b/metadata/md5-cache/media-libs/portaudio-19.06.00-r1
deleted file mode 100644
index c4a71420ce27..000000000000
--- a/metadata/md5-cache/media-libs/portaudio-19.06.00-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
-DESCRIPTION=A free, cross-platform, open-source, audio I/O library
-EAPI=6
-HOMEPAGE=http://www.portaudio.com/
-IUSE=alsa +cxx debug doc jack oss 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) jack? ( virtual/jack[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://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
-_eclasses_=ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=eeead9aa170ce1b70d74acf8cc988733
diff --git a/metadata/md5-cache/media-libs/portaudio-19.06.00-r3 b/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
index fe5432ab6760..3d5291a47099 100644
--- a/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
+++ b/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A free, cross-platform, open-source, audio I/O library
 EAPI=7
 HOMEPAGE=http://www.portaudio.com/
 IUSE=alsa +cxx debug doc jack oss 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 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) jack? ( virtual/jack[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://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz https://sources.debian.org/data/main/p/portaudio19/19.6.0-1/debian/patches/audacity-portmixer.patch -> portaudio-19.06.00-audacity-portmixer.patch
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=73f50a01a3920d5c291a164efa23876d
+_md5_=a852bd0acb11f54df51c235635eb28da
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20190903-r1 b/metadata/md5-cache/media-libs/x264-0.0.20190903-r1
index 3793b6b57d4a..9d4bc97d43c6 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20190903-r1
+++ b/metadata/md5-cache/media-libs/x264-0.0.20190903-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A free library for encoding X264/AVC streams
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/x264.html
 IUSE=cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads 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 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=opencl? ( >=virtual/opencl-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(-)?] )
 SLOT=0/157
 SRC_URI=https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20190903-2245.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d623f7fadf5fac3c314c44ffdf3c7e32
+_md5_=6e7fe6f431d6df6059200e1239584f3f
diff --git a/metadata/md5-cache/media-libs/xvid-1.3.7 b/metadata/md5-cache/media-libs/xvid-1.3.7
index 9df84eef980a..c896dfd222c7 100644
--- a/metadata/md5-cache/media-libs/xvid-1.3.7
+++ b/metadata/md5-cache/media-libs/xvid-1.3.7
@@ -5,9 +5,9 @@ DESCRIPTION=High performance/quality MPEG-4 video de-/encoding solution
 EAPI=7
 HOMEPAGE=https://www.xvid.org/
 IUSE=elibc_FreeBSD examples pic +threads 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 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f8c5c414d657c7a204f51d34dee1e867
+_md5_=bdbfe0d02862f7e344a7c3abc7953269
diff --git a/metadata/md5-cache/media-libs/zimg-3.0.1 b/metadata/md5-cache/media-libs/zimg-3.0.1
index e0d6e88dba2a..637b17b64fd8 100644
--- a/metadata/md5-cache/media-libs/zimg-3.0.1
+++ b/metadata/md5-cache/media-libs/zimg-3.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=Scaling, colorspace conversion, and dithering library
 EAPI=7
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=debug 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 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-3.0.1.tar.gz -> zimg-3.0.1.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=bfa8346045655242e3c8d75547661a0b
+_md5_=dbc43d8d9e4598ea7a07bd1346efdbdb
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0
index 07bbafe5591d..04268c8ca316 100644
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0
+++ b/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0
@@ -5,10 +5,10 @@ DESCRIPTION=A minimalistic plugin API for video effects
 EAPI=7
 HOMEPAGE=https://www.dyne.org/software/frei0r/
 IUSE=doc +facedetect +scale0tilt 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=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] facedetect? ( >=media-libs/opencv-2.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(-)?] ) scale0tilt? ( >=media-libs/gavl-1.2.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
 SRC_URI=https://files.dyne.org/frei0r/releases/frei0r-plugins-1.7.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=828ecc00a83bae93d5d225247a128486
+_md5_=636d7229a19df72ca51b1b4d3fb6fc1c
diff --git a/metadata/md5-cache/media-sound/mpc-0.33 b/metadata/md5-cache/media-sound/mpc-0.33
index 9673ac802877..e2ae9fd425ce 100644
--- a/metadata/md5-cache/media-sound/mpc-0.33
+++ b/metadata/md5-cache/media-sound/mpc-0.33
@@ -5,11 +5,11 @@ DESCRIPTION=Commandline client for Music Player Daemon (media-sound/mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc
 IUSE=doc iconv test
-KEYWORDS=amd64 arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libmpdclient
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.33.tar.xz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=1bc73d6aba0d2446dedc50f3cabc5308
+_md5_=989ece60a2fb85c7da89a5c328e1bdf2
diff --git a/metadata/md5-cache/media-sound/timidity++-2.14.0-r3 b/metadata/md5-cache/media-sound/timidity++-2.14.0-r3
deleted file mode 100644
index b9e678c42b93..000000000000
--- a/metadata/md5-cache/media-sound/timidity++-2.14.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? ( >=app-editors/emacs-23.1:* ) flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) jack? ( virtual/jack ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( >=media-libs/nas-1.4 ) ncurses? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) speex? ( media-libs/speex ) tk? ( dev-lang/tk:0= ) vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= x11-libs/libXaw x11-libs/libXext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
-EAPI=6
-HOMEPAGE=http://timidity.sourceforge.net/
-IUSE=alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )
-RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? ( >=app-editors/emacs-23.1:* ) flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) jack? ( virtual/jack ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( >=media-libs/nas-1.4 ) ncurses? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) speex? ( media-libs/speex ) tk? ( dev-lang/tk:0= ) vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= x11-libs/libXaw x11-libs/libXext ) app-eselect/eselect-timidity alsa? ( media-sound/alsa-utils ) selinux? ( sec-policy/selinux-timidity )
-REQUIRED_USE=tk? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.xz
-_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ecf72a35b7e6dbddf13993fdbde06fed
diff --git a/metadata/md5-cache/media-sound/timidity++-2.15.0 b/metadata/md5-cache/media-sound/timidity++-2.15.0
index a4bb0400c41b..e0f2a45b4052 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.15.0
+++ b/metadata/md5-cache/media-sound/timidity++-2.15.0
@@ -5,7 +5,7 @@ DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
 EAPI=7
 HOMEPAGE=http://timidity.sourceforge.net/
 IUSE=alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )
 RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? ( >=app-editors/emacs-23.1:* ) flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) jack? ( virtual/jack ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( >=media-libs/nas-1.4 ) ncurses? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) speex? ( media-libs/speex ) tk? ( dev-lang/tk:0= ) vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= x11-libs/libXaw x11-libs/libXext ) app-eselect/eselect-timidity alsa? ( media-sound/alsa-utils ) selinux? ( sec-policy/selinux-timidity )
@@ -13,4 +13,4 @@ REQUIRED_USE=tk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbde329fd9ed6aa118b4a172966ca6d9
+_md5_=7e55d9648fab3bd63c8bc8363e9a1758
diff --git a/metadata/md5-cache/media-video/x264-encoder-0.0.20190903 b/metadata/md5-cache/media-video/x264-encoder-0.0.20190903
index eae25ab1a928..daa7d5a7b6a7 100644
--- a/metadata/md5-cache/media-video/x264-encoder-0.0.20190903
+++ b/metadata/md5-cache/media-video/x264-encoder-0.0.20190903
@@ -5,11 +5,11 @@ DESCRIPTION=A free commandline encoder for X264/AVC streams
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/x264.html
 IUSE=avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=~media-libs/x264-0.0.20190903[interlaced=,threads=] ffmpeg? ( media-video/ffmpeg:= ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )
 REQUIRED_USE=ffmpegsource? ( ffmpeg )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20190903-2245.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c1d54081975841278dd4a82e9596c025
+_md5_=981e52d3fd5a6800744467c3dda5bb3a
diff --git a/metadata/md5-cache/net-analyzer/hping-3_pre20141226 b/metadata/md5-cache/net-analyzer/hping-3_pre20141226
index d527cc1e8838..631e951b8e11 100644
--- a/metadata/md5-cache/net-analyzer/hping-3_pre20141226
+++ b/metadata/md5-cache/net-analyzer/hping-3_pre20141226
@@ -4,10 +4,10 @@ DESCRIPTION=A ping-like TCP/IP packet assembler/analyzer
 EAPI=6
 HOMEPAGE=http://www.hping.org
 IUSE=tcl
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap tcl? ( dev-lang/tcl:0= )
 SLOT=0
 SRC_URI=https://github.com/antirez/hping/archive/3547c7691742c6eaa31f8402e0ccbb81387c1b99.zip -> hping-3_pre20141226.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ecc96d783c7ccefe46843f526f528d0
+_md5_=d2abd801bb671997ed6bc672bfb5decf
diff --git a/metadata/md5-cache/net-analyzer/nstats-0.4-r3 b/metadata/md5-cache/net-analyzer/nstats-0.4-r3
index 43fd5e514b8d..fc247494be13 100644
--- a/metadata/md5-cache/net-analyzer/nstats-0.4-r3
+++ b/metadata/md5-cache/net-analyzer/nstats-0.4-r3
@@ -4,10 +4,10 @@ DEPEND=net-libs/libpcap sys-libs/ncurses virtual/pkgconfig
 DESCRIPTION=Displays statistics about ethernet traffic including protocol breakdown
 EAPI=7
 HOMEPAGE=http://trash.net/~reeler/nstats/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Artistic
 RDEPEND=net-libs/libpcap sys-libs/ncurses
 SLOT=0
 SRC_URI=http://trash.net/~reeler/nstats/files/nstats-0.4.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e1c1978ef896747cb9bfda4a99527185
+_md5_=478e33d86c53526a917a5141d25f2b2d
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r1 b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r1
index 02fa62539e5f..1fcf679fac74 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r1
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=fax and voice modem programs
 EAPI=6
 HOMEPAGE=http://mgetty.greenie.net/
 IUSE=+fax fidonet split-usr
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl sys-apps/groff sys-apps/texinfo virtual/awk fax? ( !net-misc/efax !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a4b4d25409be5e4c7aedc571fb8fce22
+_md5_=846f71c37fb04b10e3569edcaa0e9cb3
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.15 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
index b3d74e634f3a..7a79f44b43dc 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
@@ -5,10 +5,10 @@ DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
 EAPI=7
 HOMEPAGE=https://github.com/xelerance/xl2tpd
 IUSE=+kernel
-KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp
 SLOT=0
 SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.15.tar.gz -> xl2tpd-1.3.15.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=7ef998849ad66f5fbfa4fa00ef635705
+_md5_=4e7635d6fc72fc8d2969e07292741a3e
diff --git a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1 b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
index f03916db28b4..c418e2def020 100644
--- a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
+++ b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Arno's iptables firewall script
 EAPI=7
 HOMEPAGE=https://rocky.eld.leidenuniv.nl
 IUSE=+plugins rsyslog
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/ipset net-firewall/iptables sys-apps/coreutils sys-apps/iproute2 plugins? ( net-dns/bind-tools )
 SLOT=0
 SRC_URI=https://github.com/arno-iptables-firewall/aif/archive/2.1.1.tar.gz -> arno-iptables-firewall-2.1.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=24261bd6b79655a40866c230344f0033
+_md5_=380acd576c7b03fcf1a2aad3de32ba00
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.106 b/metadata/md5-cache/net-libs/gsoap-2.8.106
index 0df331a156b2..1e6fc508ea39 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.106
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.106
@@ -5,10 +5,10 @@ DESCRIPTION=A cross-platform open source C and C++ SDK for SOAP/XML Web services
 EAPI=7
 HOMEPAGE=http://gsoap2.sourceforge.net
 IUSE=doc debug examples ipv6 libressl gnutls +ssl
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+
 RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.106.zip
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=11df99c83eab9486eef02c0dffefbc17
+_md5_=4338606a89fd8f359059a9bd2379d284
diff --git a/metadata/md5-cache/net-libs/nodejs-12.20.1 b/metadata/md5-cache/net-libs/nodejs-12.20.1
index 9f90ac15c4ef..82b1e25d3cb2 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.20.1
+++ b/metadata/md5-cache/net-libs/nodejs-12.20.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.20.1/node-v12.20.1.tar.xz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4d9948edb19d382fd69960a7b805dc4
+_md5_=373e7dd144b315896db4e815a6b289df
diff --git a/metadata/md5-cache/net-libs/nodejs-14.15.4 b/metadata/md5-cache/net-libs/nodejs-14.15.4
index 7d58eb74c414..3211ca8a52e4 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.15.4
+++ b/metadata/md5-cache/net-libs/nodejs-14.15.4
@@ -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 pax_kernel +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.4/node-v14.15.4.tar.xz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43b1d9e9fab2fed412a99b3b78dd172b
+_md5_=b005d684c4685483af0383efa970ac20
diff --git a/metadata/md5-cache/net-mail/dbmail-3.2.3-r3 b/metadata/md5-cache/net-mail/dbmail-3.2.3-r3
index c1315bbd354a..c55c647a9323 100644
--- a/metadata/md5-cache/net-mail/dbmail-3.2.3-r3
+++ b/metadata/md5-cache/net-mail/dbmail-3.2.3-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Fast and scalable sql based email services
 EAPI=7
 HOMEPAGE=https://www.dbmail.org/
 IUSE=ldap libressl sieve ssl
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/dbmail acct-user/dbmail app-text/asciidoc app-crypt/mhash app-text/xmlto dev-db/libzdb >=dev-libs/glib-2.16 dev-libs/gmime:2.6 dev-libs/libevent sys-libs/zlib ldap? ( >=net-nds/openldap-2.3.33 ) sieve? ( >=mail-filter/libsieve-2.2.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/dbmail/dbmail/archive/v3.2.3.tar.gz -> dbmail-3.2.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=e691bb29793a61273b1fa1ab23c8af0e
+_md5_=5adcc240478436093049d2a0d6e66423
diff --git a/metadata/md5-cache/net-mail/mlmmj-1.3.0 b/metadata/md5-cache/net-mail/mlmmj-1.3.0
index 84ec92febd45..395f24a66bd4 100644
--- a/metadata/md5-cache/net-mail/mlmmj-1.3.0
+++ b/metadata/md5-cache/net-mail/mlmmj-1.3.0
@@ -3,8 +3,8 @@ DEPEND=virtual/mta
 DESCRIPTION=Mailing list managing made joyful
 EAPI=6
 HOMEPAGE=http://mlmmj.org/
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://mlmmj.org/releases/mlmmj-1.3.0.tar.bz2
-_md5_=62132d3a89fd086b7db9c78433366498
+_md5_=be62271574ef8c61a6cf9e76db3de6b2
diff --git a/metadata/md5-cache/net-misc/iperf-2.0.13 b/metadata/md5-cache/net-misc/iperf-2.0.13
deleted file mode 100644
index bb0c58ccdd78..000000000000
--- a/metadata/md5-cache/net-misc/iperf-2.0.13
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Tool to measure IP bandwidth using UDP or TCP
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/iperf2/
-IUSE=ipv6 threads debug
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=HPND
-SLOT=2
-SRC_URI=mirror://sourceforge/iperf2/iperf-2.0.13.tar.gz
-_md5_=1c9b5dd920b98906f976affbee074355
diff --git a/metadata/md5-cache/net-misc/iperf-2.0.14a b/metadata/md5-cache/net-misc/iperf-2.0.14a
index 81d0f5e8a785..1c79deb0db6e 100644
--- a/metadata/md5-cache/net-misc/iperf-2.0.14a
+++ b/metadata/md5-cache/net-misc/iperf-2.0.14a
@@ -3,9 +3,9 @@ DESCRIPTION=Tool to measure IP bandwidth using UDP or TCP
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/iperf2/
 IUSE=ipv6 threads debug
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=HPND
 SLOT=2
 SRC_URI=mirror://sourceforge/iperf2/iperf-2.0.13.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=7396b05f0f3425511fea396d1cefc2f9
+_md5_=5ea04116e1b6612a93a92fcbf2a3345a
diff --git a/metadata/md5-cache/net-misc/iperf-3.6 b/metadata/md5-cache/net-misc/iperf-3.6
deleted file mode 100644
index e601270ab8ef..000000000000
--- a/metadata/md5-cache/net-misc/iperf-3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sctp? ( net-misc/lksctp-tools ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
-EAPI=6
-HOMEPAGE=https://github.com/esnet/iperf/
-IUSE=libressl sctp static-libs
-KEYWORDS=amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sctp? ( net-misc/lksctp-tools )
-SLOT=3
-SRC_URI=https://github.com/esnet/iperf/archive/3.6.tar.gz -> iperf-3.6.tar.gz
-_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9f5d79dd05569d08137a7608282783e9
diff --git a/metadata/md5-cache/net-misc/iperf-3.9-r1 b/metadata/md5-cache/net-misc/iperf-3.9-r1
index 38e15684e994..e575e69658d7 100644
--- a/metadata/md5-cache/net-misc/iperf-3.9-r1
+++ b/metadata/md5-cache/net-misc/iperf-3.9-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
 EAPI=7
 HOMEPAGE=https://github.com/esnet/iperf/
 IUSE=libressl sctp static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sctp? ( net-misc/lksctp-tools )
 SLOT=3
 SRC_URI=https://github.com/esnet/iperf/archive/3.9.tar.gz -> iperf-3.9.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=28e2e4a74ab8cf604a5daa3683cf61b2
+_md5_=362db40a30de91a6e18df64d0439d1f9
diff --git a/metadata/md5-cache/net-misc/mrouted-3.9.8 b/metadata/md5-cache/net-misc/mrouted-3.9.8
index 352784a548e2..da0c820fd169 100644
--- a/metadata/md5-cache/net-misc/mrouted-3.9.8
+++ b/metadata/md5-cache/net-misc/mrouted-3.9.8
@@ -4,10 +4,10 @@ DESCRIPTION=IP multicast routing daemon
 EAPI=7
 HOMEPAGE=https://troglobit.com/projects/mrouted/
 IUSE=rsrr
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Stanford GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/troglobit/mrouted/releases/download/3.9.8/mrouted-3.9.8.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=d2231cebfdaba3c1c45add6a602b45b1
+_md5_=e559fa30961c337cd73908fe8a477c57
diff --git a/metadata/md5-cache/net-misc/nemesis-1.7-r1 b/metadata/md5-cache/net-misc/nemesis-1.7-r1
index cfdd8dd4b4a5..8cd4721d8b98 100644
--- a/metadata/md5-cache/net-misc/nemesis-1.7-r1
+++ b/metadata/md5-cache/net-misc/nemesis-1.7-r1
@@ -4,10 +4,10 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=A commandline-based, portable human IP stack for UNIX/Linux
 EAPI=7
 HOMEPAGE=https://github.com/libnet/nemesis
-KEYWORDS=~alpha amd64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~sparc x86
 LICENSE=BSD
 RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/libnet/nemesis/archive/v1.7.tar.gz -> nemesis-1.7.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=05b92567c847f570ec3c4d2fca5831b0
+_md5_=d6baf9f1f91be1b8560a13cf6fb59413
diff --git a/metadata/md5-cache/net-misc/nx-3.5.99.25 b/metadata/md5-cache/net-misc/nx-3.5.99.25
index 09dd108b622c..3796d835793e 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.99.25
+++ b/metadata/md5-cache/net-misc/nx-3.5.99.25
@@ -5,10 +5,10 @@ DESCRIPTION=NX compression technology core libraries
 EAPI=7
 HOMEPAGE=https://github.com/ArcticaProject/nx-libs
 IUSE=elibc_glibc
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=media-libs/libpng-1.2.8:0= >=sys-libs/zlib-1.2.3 virtual/jpeg:* x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pixman
 SLOT=0
 SRC_URI=https://github.com/ArcticaProject/nx-libs/archive/3.5.99.25.tar.gz -> nx-libs-3.5.99.25.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=0df0a0893a187b3eb55e90bbeb52180b
+_md5_=8a917829cdc1652812274e4add5470e6
diff --git a/metadata/md5-cache/net-misc/ucarp-1.5.2-r7 b/metadata/md5-cache/net-misc/ucarp-1.5.2-r7
index 9c0d834e0724..134caef4353c 100644
--- a/metadata/md5-cache/net-misc/ucarp-1.5.2-r7
+++ b/metadata/md5-cache/net-misc/ucarp-1.5.2-r7
@@ -5,9 +5,9 @@ DESCRIPTION=Portable userland implementation of Common Address Redundancy Protoc
 EAPI=7
 HOMEPAGE=https://ucarp.wordpress.com
 IUSE=debug nls
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=ftp://ftp.ucarp.org/pub/ucarp/ucarp-1.5.2.tar.gz
-_md5_=33c0baaa963ff0849d692275709d0de4
+_md5_=c75348ac149836b340d9c849387a9586
diff --git a/metadata/md5-cache/net-news/newsboat-2.21 b/metadata/md5-cache/net-news/newsboat-2.21
index d806b4852269..89feac9fa767 100644
--- a/metadata/md5-cache/net-news/newsboat-2.21
+++ b/metadata/md5-cache/net-news/newsboat-2.21
@@ -5,10 +5,10 @@ DESCRIPTION=An RSS/Atom feed reader for text terminals
 EAPI=7
 HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
 IUSE=libressl debug
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB
 RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode] sys-libs/zlib !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl )
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.21/newsboat-2.21.tar.xz https://crates.io/api/v1/crates/addr2line/0.12.2/download -> addr2line-0.12.2.crate https://crates.io/api/v1/crates/adler32/1.1.0/download -> adler32-1.1.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.49/download -> backtrace-0.3.49.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.2/download -> bit-vec-0.6.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.57/download -> cc-1.0.57.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.15/download -> chrono-0.4.15.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/curl-sys/0.4.36+curl-7.71.1/download -> curl-sys-0.4.36+curl-7.71.1.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gettext-rs/0.5.0/download -> gettext-rs-0.5.0.crate https://crates.io/api/v1/crates/gettext-sys/0.19.9/download -> gettext-sys-0.19.9.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lexical-core/0.7.4/download -> lexical-core-0.7.4.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/libz-sys/1.1.0/download -> libz-sys-1.1.0.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/object/0.20.0/download -> object-0.20.0.crate https://crates.io/api/v1/crates/once_cell/1.4.1/download -> once_cell-1.4.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proptest/0.10.1/download -> proptest-0.10.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_xorshift/0.2.0/download -> rand_xorshift-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/section_testing/0.0.4/download -> section_testing-0.0.4.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/0.3.3/download -> tinyvec-0.3.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.13/download -> unicode-normalization-0.1.13.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
 _eclasses_=cargo	7ffdd252643addc68abff0a08cca5306	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=563fb00f6547a46c792c0086a7a1e16e
+_md5_=123ca6175fc05f34c608c1647d800508
diff --git a/metadata/md5-cache/net-news/rsstail-1.8 b/metadata/md5-cache/net-news/rsstail-1.8
deleted file mode 100644
index 1ec5bd060f11..000000000000
--- a/metadata/md5-cache/net-news/rsstail-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=>=net-libs/libmrss-0.17.1
-DESCRIPTION=A tail-like RSS-reader
-EAPI=7
-HOMEPAGE=http://www.vanheusden.com/rsstail/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libmrss-0.17.1
-SLOT=0
-SRC_URI=http://www.vanheusden.com/rsstail/rsstail-1.8.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=2edf9aa3aea7a21e614f7554573721ef
diff --git a/metadata/md5-cache/net-news/rsstail-2.1_p20200310 b/metadata/md5-cache/net-news/rsstail-2.1_p20200310
index 98268c804049..de1499182e7f 100644
--- a/metadata/md5-cache/net-news/rsstail-2.1_p20200310
+++ b/metadata/md5-cache/net-news/rsstail-2.1_p20200310
@@ -4,10 +4,10 @@ DEPEND=>=net-libs/libmrss-0.17.1
 DESCRIPTION=A tail-like RSS-reader
 EAPI=7
 HOMEPAGE=http://www.vanheusden.com/rsstail/ https://github.com/flok99/rsstail
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmrss-0.17.1
 SLOT=0
 SRC_URI=https://github.com/flok99/rsstail/archive/0b23b367c98de8882b58a451742a3f2e385c4ba0.tar.gz -> rsstail-2.1_p20200310.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=663e81eb544d069a2b161a1551a75eec
+_md5_=bc2224a014bf8bf1d03c01c4b98246fc
diff --git a/metadata/md5-cache/net-p2p/ncdc-1.22.1 b/metadata/md5-cache/net-p2p/ncdc-1.22.1
index e3c1cf1de8eb..1c40d899c9cc 100644
--- a/metadata/md5-cache/net-p2p/ncdc-1.22.1
+++ b/metadata/md5-cache/net-p2p/ncdc-1.22.1
@@ -5,10 +5,10 @@ DESCRIPTION=ncurses directconnect client
 EAPI=7
 HOMEPAGE=https://dev.yorhel.nl/ncdc
 IUSE=geoip
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:0=[unicode] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdc-1.22.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=23f6b8fdb52646433ef55a988cf4e36b
+_md5_=4389d31f2000d5f4855a70d5dd69bc64
diff --git a/metadata/md5-cache/net-print/cndrvcups-common-lb-3.70 b/metadata/md5-cache/net-print/cndrvcups-common-lb-3.70
index 26fcad4cd41c..6a5d85f69520 100644
--- a/metadata/md5-cache/net-print/cndrvcups-common-lb-3.70
+++ b/metadata/md5-cache/net-print/cndrvcups-common-lb-3.70
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare setup unpack
 DESCRIPTION=Common files for Canon drivers
 EAPI=7
 HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Canon-UFR-II GPL-2 MIT
 RDEPEND=>=dev-libs/libxml2-2.6:2 >=gnome-base/libglade-2.4:2.0 >=net-print/cups-1.1.17 >=x11-libs/gtk+-2.4:2
 SLOT=0
 SRC_URI=http://gdlp01.c-wss.com/gds/8/0100007658/08/linux-UFRII-drv-v370-uken-05.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=e201fb929c3185abcf56937fb223f007
+_md5_=fcfc98d065c818bf5df60a3cdeefaa14
diff --git a/metadata/md5-cache/net-wireless/iwd-1.10 b/metadata/md5-cache/net-wireless/iwd-1.10
index 815834f683e3..2e235a8c6795 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.10
+++ b/metadata/md5-cache/net-wireless/iwd-1.10
@@ -4,10 +4,10 @@ DESCRIPTION=Wireless daemon for linux
 EAPI=6
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
 IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.35 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.10.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cc431ffe662c6892d7a93d3ca17c72d7
+_md5_=99aaab146de9d02a6380e35c655712b6
diff --git a/metadata/md5-cache/sci-calculators/units-2.20 b/metadata/md5-cache/sci-calculators/units-2.20
index a26b3eef08bf..8f8556b94960 100644
--- a/metadata/md5-cache/sci-calculators/units-2.20
+++ b/metadata/md5-cache/sci-calculators/units-2.20
@@ -4,11 +4,11 @@ DESCRIPTION=Unit conversion program
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/units/units.html
 IUSE=+units-cur python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3 GPL-3
 RDEPEND=sys-libs/readline:= units-cur? ( 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(-)] python_targets_python3_6? ( dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) )
 REQUIRED_USE=units-cur? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://gnu/units/units-2.20.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=d5e48336f0d3d750613ac92c3bf77c82
+_md5_=69e5835d927428380d30fc0ce5e29caf
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.2 b/metadata/md5-cache/sci-electronics/xoscope-2.2
index 5f376b8284b1..06db3e7eb82e 100644
--- a/metadata/md5-cache/sci-electronics/xoscope-2.2
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.2
@@ -5,10 +5,10 @@ DESCRIPTION=Soundcard Oscilloscope for X
 EAPI=7
 HOMEPAGE=http://xoscope.sourceforge.net
 IUSE=kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sci-libs/fftw:3.0= virtual/man x11-libs/gtkdatabox
 SLOT=0
 SRC_URI=mirror://sourceforge/project/xoscope/xoscope/2.2/xoscope-2.2.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=a3e67b9a337c994a4e2c41f5d4f23680
+_md5_=6b727fad109d20a2e4f6836ca86d6b70
diff --git a/metadata/md5-cache/sci-libs/arpack-3.7.0 b/metadata/md5-cache/sci-libs/arpack-3.7.0
deleted file mode 100644
index 371b82c96324..000000000000
--- a/metadata/md5-cache/sci-libs/arpack-3.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
-DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
-EAPI=7
-HOMEPAGE=http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng
-IUSE=doc examples mpi
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
-SLOT=0
-SRC_URI=https://github.com/opencollab/arpack-ng/archive/3.7.0.tar.gz -> arpack-3.7.0.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
-_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0ae0e5dd903045d55e4db11ab57a248f
diff --git a/metadata/md5-cache/sci-libs/arpack-3.8.0 b/metadata/md5-cache/sci-libs/arpack-3.8.0
index e44180d5256c..049c63661383 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.8.0
+++ b/metadata/md5-cache/sci-libs/arpack-3.8.0
@@ -5,10 +5,10 @@ DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
 EAPI=7
 HOMEPAGE=http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng
 IUSE=doc examples mpi
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 SLOT=0
 SRC_URI=https://github.com/opencollab/arpack-ng/archive/3.8.0.tar.gz -> arpack-3.8.0.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	fortran-2	b4796813ccda91c9c0d3463fc90aa969	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=9f4bce53ec80e2d44d8800b5e823dfaf
+_md5_=8d7aae1d96e0d3af151c3d790e938724
diff --git a/metadata/md5-cache/sci-libs/mpfi-1.5.4 b/metadata/md5-cache/sci-libs/mpfi-1.5.4
index f241ee99ba7b..77d31ea03b3f 100644
--- a/metadata/md5-cache/sci-libs/mpfi-1.5.4
+++ b/metadata/md5-cache/sci-libs/mpfi-1.5.4
@@ -4,10 +4,10 @@ DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0=
 DESCRIPTION=Multiple precision interval arithmetic library based on MPFR
 EAPI=7
 HOMEPAGE=http://perso.ens-lyon.fr/nathalie.revol/software.html
-KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0=
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/38111/mpfi-1.5.4.tgz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=c56def4b131041eab0d7cf01bc63fd13
+_md5_=f4c7cf8e606778e1275baf8f7a812c0d
diff --git a/metadata/md5-cache/sci-physics/bullet-3.07 b/metadata/md5-cache/sci-physics/bullet-3.07
index 0c7c11adf6b8..01a81f446961 100644
--- a/metadata/md5-cache/sci-physics/bullet-3.07
+++ b/metadata/md5-cache/sci-physics/bullet-3.07
@@ -5,7 +5,7 @@ DESCRIPTION=Continuous Collision Detection and Physics Library
 EAPI=7
 HOMEPAGE=https://www.bulletphysics.com/
 IUSE=doc double-precision examples openmp tbb test threads
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=virtual/opengl media-libs/freeglut tbb? ( dev-cpp/tbb )
 REQUIRED_USE=openmp? ( threads ) tbb? ( threads )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/3.07
 SRC_URI=https://github.com/bulletphysics/bullet3/archive/3.07.tar.gz -> bullet-3.07.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8fddda4e89a388328e4a24b45a5fa50
+_md5_=d37a57ab356dcb6627582dfdf6027704
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.11.2 b/metadata/md5-cache/sys-apps/debianutils-4.11.2
index 3abb8ef31c12..50106d3a2642 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.11.2
+++ b/metadata/md5-cache/sys-apps/debianutils-4.11.2
@@ -3,10 +3,10 @@ DESCRIPTION=A selection of tools from Debian
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
 IUSE=+installkernel static
-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=BSD GPL-2 SMAIL
 PDEPEND=installkernel? ( || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.11.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0109966817368ba9c5fa00a10d0cc0af
+_md5_=2cbe85b731947a0ab70cb19c1610d4c5
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.12 b/metadata/md5-cache/sys-apps/portage-3.0.12
index 1c11ea45b4ff..ab29f3a0c389 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.12
+++ b/metadata/md5-cache/sys-apps/portage-3.0.12
@@ -5,7 +5,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
-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=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.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(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,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(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),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(-)] virtual/tmpfiles
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.12.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.12.tar.bz2
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=7ae366b778257d5e448eeb162a895806
+_md5_=fa04e9192fe0df3466ba98514e214813
diff --git a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2 b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
index 13c43a6de24c..dc94ca533873 100644
--- a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
+++ b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A scalable distributed monitoring system for clusters and grids
 EAPI=7
 HOMEPAGE=http://ganglia.sourceforge.net/
 IUSE=minimal pcre examples
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=BSD
 RDEPEND=dev-libs/confuse dev-libs/expat >=dev-libs/apr-1.0 net-libs/libnsl:0= net-libs/libtirpc:0= !dev-db/firebird pcre? ( dev-libs/libpcre ) !minimal? ( net-analyzer/rrdtool )
 SLOT=0
 SRC_URI=mirror://sourceforge/ganglia/ganglia-3.7.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aa8354fa55f4f894bfd8a52b4e57f424
+_md5_=e7067fea04f534db9dc7c35fbf962b60
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.24 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.24
index 34d2ea2924ce..0b4f75b49e09 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.24
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.24
@@ -5,11 +5,11 @@ DESCRIPTION=Pacemaker CRM
 EAPI=7
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
 IUSE=acl smtp snmp python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
 RDEPEND=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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/corosync >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.24.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=93a77d45bfe35b6ffb8f5b2690a93a08
+_md5_=4d1f3ccb8f05638cc6bc0e7aadfdaa2d
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.6 b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.6
index 33fd1b19a433..f3055aff08ee 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.6
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.6
@@ -5,10 +5,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=cron fuse nls static-libs elibc_FreeBSD 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=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.45.6 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eacae188ed4ddf280db16c3bae670f53
+_md5_=b2787ea765874cc65072e10aca6c240b
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.1 b/metadata/md5-cache/sys-fs/udisks-2.9.1
index 057cb76a38a4..e163d7c27dd0 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.1
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.1
@@ -5,11 +5,11 @@ DESCRIPTION=Daemon providing interfaces to work with storage devices
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
 IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ~ppc64 sparc x86
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.24[kbd] ) >=sys-block/parted-3 virtual/eject daemon? ( >=sys-apps/util-linux-2.30 ) selinux? ( sec-policy/selinux-devicekit )
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.1/udisks-2.9.1.tar.bz2
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a71abe265cfe7a40006aaa9eb3c38750
+_md5_=2514af854827fd837acf2913bf71cca2
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.10.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.10.0
index 65dc5a02d07b..2f7420969c47 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-5.10.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=xfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://xfs.wiki.kernel.org/
 IUSE=icu libedit nls split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) !<sys-fs/xfsdump-3
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.10.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c8ce71162010888cdebec2fca069882
+_md5_=8578622aefa52b8c42b06706633c0eee
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.6 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.6
index bc77e455c0de..5d982098951f 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.6
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.6
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=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 ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=571002b9f3fd17858d82bfc765c14e40
+_md5_=688a9f98b090e396c6e2cede7bf9e605
diff --git a/metadata/md5-cache/www-client/elinks-0.13.5 b/metadata/md5-cache/www-client/elinks-0.13.5
index 338b6b4ff198..d32fcbf3a50e 100644
--- a/metadata/md5-cache/www-client/elinks-0.13.5
+++ b/metadata/md5-cache/www-client/elinks-0.13.5
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=7
 HOMEPAGE=http://elinks.or.cz/
 IUSE=bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6 libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
 SLOT=0
 SRC_URI=https://github.com/rkd77/felinks/archive/v0.13.5.tar.gz -> elinks-0.13.5.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=04f3d1dd0781b2c376c1ae7e89bdbc63
+_md5_=1aa941861f6cb91345021ca2dbbf939e
diff --git a/metadata/md5-cache/x11-libs/xforms-1.2.4-r1 b/metadata/md5-cache/x11-libs/xforms-1.2.4-r1
index 1c3f821d69e4..cbeb0c477bb8 100644
--- a/metadata/md5-cache/x11-libs/xforms-1.2.4-r1
+++ b/metadata/md5-cache/x11-libs/xforms-1.2.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A graphical user interface toolkit for X
 EAPI=7
 HOMEPAGE=http://xforms-toolkit.org/
 IUSE=doc opengl
-KEYWORDS=amd64 arm ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 arm ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=virtual/jpeg:0= x11-libs/libSM x11-libs/libX11 x11-libs/libXpm opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/xforms-1.2.4.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=839b4f068255bafe25c6fcdec1e628a4
+_md5_=a75cab433238216201f1955464650d28
diff --git a/metadata/md5-cache/x11-misc/clipnotify-1.0.2 b/metadata/md5-cache/x11-misc/clipnotify-1.0.2
index 4668e62c13bf..13307e0f8f05 100644
--- a/metadata/md5-cache/x11-misc/clipnotify-1.0.2
+++ b/metadata/md5-cache/x11-misc/clipnotify-1.0.2
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXfixes
 DESCRIPTION=Notify on new X clipboard events
 EAPI=7
 HOMEPAGE=https://github.com/cdown/clipnotify
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Unlicense
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes
 SLOT=0
 SRC_URI=https://github.com/cdown/clipnotify/archive/1.0.2.tar.gz -> clipnotify-1.0.2.tar.gz
-_md5_=072641375f110931ca3e55e60d17cd1a
+_md5_=83081f024bba95dd60f1d549fe47e83e
diff --git a/metadata/md5-cache/x11-misc/habak-0.2.5-r3 b/metadata/md5-cache/x11-misc/habak-0.2.5-r3
index 2525b4c28dbc..16d9ed6f13ca 100644
--- a/metadata/md5-cache/x11-misc/habak-0.2.5-r3
+++ b/metadata/md5-cache/x11-misc/habak-0.2.5-r3
@@ -3,10 +3,10 @@ DEPEND=media-libs/imlib2[X] x11-libs/libX11 virtual/pkgconfig x11-base/xorg-prot
 DESCRIPTION=A simple but powerful tool to set desktop wallpaper
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/fvwm-crystal/
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/imlib2[X] x11-libs/libX11
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/fvwm-crystal/files/habak/0.2.5/habak-0.2.5.tar.gz/download -> habak-0.2.5-sourceforge.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=74767e86e527d89d422dd4f5111ba0c7
+_md5_=ae00d23e56e3fb1f027fac12db7951f0
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.13 b/metadata/md5-cache/x11-misc/i3lock-2.13
index c9a4250f35d7..926da205679f 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.13
+++ b/metadata/md5-cache/x11-misc/i3lock-2.13
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libev sys-libs/pam x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb]
 DESCRIPTION=Simple screen locker
 EAPI=7
 HOMEPAGE=https://i3wm.org/i3lock/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev sys-libs/pam x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-xrm
 SLOT=0
 SRC_URI=https://i3wm.org/i3lock/i3lock-2.13.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=e0349131f10c3a6c9b7123d678a23401
+_md5_=9c4f0ce913a98f3ec9771d2a70d9e75e
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-2.0-r2 b/metadata/md5-cache/x11-misc/shared-mime-info-2.0-r2
index 6805854c848f..ec6e7fe07d4a 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-2.0-r2
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-2.0-r2
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2
 DESCRIPTION=The Shared MIME-info Database specification
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/xdg/shared-mime-info
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-2.0.tar.xz
 _eclasses_=meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0946495996d826bba49adb9f8ad217da
+_md5_=aa99411bb9fae7dbd6716be9200c5303
diff --git a/metadata/md5-cache/x11-misc/wayv-0.3-r3 b/metadata/md5-cache/x11-misc/wayv-0.3-r3
index d6597d07742b..559cf321e566 100644
--- a/metadata/md5-cache/x11-misc/wayv-0.3-r3
+++ b/metadata/md5-cache/x11-misc/wayv-0.3-r3
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=Wayv is hand-writing/gesturing recognition software for X
 EAPI=7
 HOMEPAGE=http://www.stressbunny.com/wayv
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=http://www.stressbunny.com/gimme/wayv/wayv-0.3.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=69b09f98c7c63ed0cb6484d59b0ec691
+_md5_=ae2e4e6d48c8e65a58cfe35e01bb23c9
diff --git a/metadata/md5-cache/x11-misc/xvkbd-4.1 b/metadata/md5-cache/x11-misc/xvkbd-4.1
index 2c077cb69249..d8a6e24172bd 100644
--- a/metadata/md5-cache/x11-misc/xvkbd-4.1
+++ b/metadata/md5-cache/x11-misc/xvkbd-4.1
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-lib
 DESCRIPTION=virtual keyboard for X window system
 EAPI=7
 HOMEPAGE=http://t-sato.in.coocan.jp/xvkbd/
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst
 SLOT=0
 SRC_URI=http://t-sato.in.coocan.jp/xvkbd/xvkbd-4.1.tar.gz
-_md5_=86f5bb77f75650df5b64c7e2232bf67e
+_md5_=e05f396c1ce3df8d696f7a00d19aab98
diff --git a/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.1 b/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.1
deleted file mode 100644
index 1af345532ee6..000000000000
--- a/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/spidermonkey:0 >=net-irc/hexchat-2.9.6[plugins(+)] virtual/pkgconfig
-DESCRIPTION=Javascript interface for HexChat
-EAPI=5
-HOMEPAGE=https://github.com/TingPing/hexchat-javascript
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=MPL-2.0
-RDEPEND=dev-lang/spidermonkey:0 >=net-irc/hexchat-2.9.6[plugins(+)]
-SLOT=0
-SRC_URI=https://github.com/TingPing/hexchat-javascript/archive/0.3.1.tar.gz -> hexchat-javascript-0.3.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=781fb7eb4c4364aecbea114778685364
diff --git a/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.2 b/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.2
index 003cf16d8f79..df0b2c3432d9 100644
--- a/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.2
+++ b/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Javascript interface for HexChat
 EAPI=5
 HOMEPAGE=https://github.com/TingPing/hexchat-javascript
 IUSE=examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-lang/spidermonkey:0 >=net-irc/hexchat-2.9.6[plugins(+)]
 SLOT=0
 SRC_URI=https://github.com/TingPing/hexchat-javascript/archive/0.3.2.tar.gz -> hexchat-javascript-0.3.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=bbcea5eea566a5aab825b9065b71167b
+_md5_=8dca27b3ae85df0a712f2d2bf3368563
diff --git a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2 b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
index 48bd976b99ec..5e77b0c0cf90 100644
--- a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
+++ b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libXpm virtual/pkgconfig
 DESCRIPTION=dockapp that monitors one or more mailboxes
 EAPI=7
 HOMEPAGE=http://tnemeth.free.fr/projets/dockapps.html
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libXpm
 SLOT=0
 SRC_URI=http://tnemeth.free.fr/projets/programmes/wmmaiload-2.3.0.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=316a7572e5f1f9500b027aa8ac8d7db0
+_md5_=4cc37ed283afc822e7fd4844ec1a8104
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 081b1bce80cc..9d65cb599808 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1187,7 +1187,7 @@ app-dicts/gnome-dictionary 3.26.1: Dictionary utility for GNOME
 app-dicts/gwaei 3.6.2: Japanese-English Dictionary for GNOME
 app-dicts/ipadic 2.7.0-r2: Japanese dictionary for ChaSen
 app-dicts/kasumi 2.5-r1: Anthy dictionary maintenance tool
-app-dicts/libydpdict 1.0.2 1.0.4: Library for handling the Collins Dictionary database
+app-dicts/libydpdict 1.0.4: Library for handling the Collins Dictionary database
 app-dicts/mecab-ipadic 2.7.0.20070801: IPA dictionary for MeCab
 app-dicts/mecab-naist-jdic 0.6.3b_p20111013: NAIST Japanese Dictionary
 app-dicts/mecab-unidic 2.1.2: IPA dictionary for MeCab
@@ -1648,7 +1648,7 @@ app-dicts/sword-vlsJoNT 1.0.1: Het Nieuwe Testament by Nicolaas De Jonge
 app-dicts/verbiste 0.1.44: French conjugation system
 app-dicts/wnn-ldic 1.04: Wnn dictionary for librarian
 app-dicts/wordnet 3.0-r4 3.0-r5 3.1: A lexical database for the English language
-app-dicts/ydpdict 1.0.2 1.0.3: Interface for the Collins Dictionary
+app-dicts/ydpdict 1.0.3: Interface for the Collins Dictionary
 app-doc/NaturalDocs 1.52-r1: Extensible, multi-language source code documentation generator
 app-doc/abs-guide 10: An in-depth exploration of the art of shell scripting
 app-doc/autobook 1.5: GNU Autoconf, Automake and Libtool
@@ -1697,7 +1697,7 @@ app-editors/amyedit 1.0-r2: AmyEdit is a LaTeX editor
 app-editors/beaver 0.4.1-r1: Beaver is an Early AdVanced EditoR
 app-editors/bluefish 2.2.10 2.2.12: A GTK HTML editor for the experienced web designer or programmer
 app-editors/bvi 1.4.1: Display-oriented editor for binary files, based on the vi texteditor
-app-editors/curses-hexedit 0.9.7 0.9.7-r1: full screen curses hex editor (with insert/delete support)
+app-editors/curses-hexedit 0.9.7-r1: full screen curses hex editor (with insert/delete support)
 app-editors/dav 0.8.5-r2: A minimal console text editor
 app-editors/dhex 0.68: ncurses-based hex-editor with diff mode
 app-editors/diakonos 0.9.4: A Linux editor for the masses
@@ -5093,7 +5093,7 @@ dev-lang/cilk 5.4.6-r1 5.4.6-r2: Language for multithreaded parallel programming
 dev-lang/cll1h 0.6-r1: C<<1 programming language system
 dev-lang/clojure 1.8.0 1.9.0-r1 1.10.0: General-purpose programming language with an emphasis on functional programming
 dev-lang/closure-compiler-bin 20170218: JavaScript optimizing compiler
-dev-lang/coffee-script 1.9.3-r1 1.12.5 2.3.2 2.5.1: A little language that compiles into javascript
+dev-lang/coffee-script 2.3.2 2.5.1: A little language that compiles into javascript
 dev-lang/crystal 0.35.1: The Crystal Programming Language
 dev-lang/cxprolog 0.98.2: A WAM based Prolog system
 dev-lang/duktape 2.4.0 2.5.0-r1 2.6.0: Embeddable Javascript engine
@@ -12954,7 +12954,7 @@ media-libs/alsa-lib 1.2.2-r1 1.2.3.2-r1 1.2.4: Advanced Linux Sound Architecture
 media-libs/alsa-oss 1.1.8: Advanced Linux Sound Architecture OSS compatibility layer
 media-libs/alsa-topology-conf 1.2.2 1.2.3 1.2.4: ALSA topology configuration files
 media-libs/alsa-ucm-conf 1.2.2 1.2.3 1.2.4: ALSA ucm configuration files
-media-libs/alure 1.2-r1 1.2-r2: The OpenAL Utility Toolkit
+media-libs/alure 1.2-r2: The OpenAL Utility Toolkit
 media-libs/ampache_browser 1.0.3: Ampache desktop client library
 media-libs/aribb24 1.0.3 1.0.3-r1 1.0.3-r2: Library for decoding ARIB STD-B24 subtitles
 media-libs/assimp 5.0.1: Importer library to import assets from 3D files
@@ -12987,7 +12987,7 @@ media-libs/esdl 1.3.1: Erlang bindings for the SDL library
 media-libs/exempi 2.4.5-r1: Port of the Adobe XMP SDK to work on UNIX
 media-libs/exiftool 12.05 12.08: Read and write meta information in image, audio and video files
 media-libs/faac 1.29.9.2 1.30: Free MPEG-4 audio codecs by AudioCoding.com
-media-libs/faad2 2.9.0 2.9.2 2.10.0: AAC audio decoding library
+media-libs/faad2 2.9.2 2.10.0: AAC audio decoding library
 media-libs/fdk-aac 2.0.1: Fraunhofer AAC codec library
 media-libs/ffmpegsource 2.23 9999: A libav/ffmpeg based source library for easy frame accurate access
 media-libs/fidlib 0.9.10-r1: Run-time filter design and execution library
@@ -13124,7 +13124,7 @@ media-libs/libilbc 2.0.2 3.0.4 9999: Packaged version of iLBC codec from the Web
 media-libs/libinsane 1.0.7 1.0.8 1.0.9: Crossplatform access to image scanners
 media-libs/libiptcdata 1.0.5: Library for International Press Telecommunications Council (IPTC) metadata
 media-libs/libirman 0.4.5: library for Irman control of Unix software
-media-libs/libjpeg-turbo 1.5.3-r4 2.0.5-r2 2.0.6: MMX, SSE, and SSE2 SIMD accelerated JPEG library
+media-libs/libjpeg-turbo 1.5.3-r4 2.0.6: MMX, SSE, and SSE2 SIMD accelerated JPEG library
 media-libs/libjsw 1.5.8: provide a uniform API and user configuration for joysticks and game controllers
 media-libs/libkate 0.4.1-r4: Codec for karaoke and text encapsulation for Ogg
 media-libs/libkeyfinder 2.2.3: Musical key detection library for digital audio
@@ -13152,7 +13152,7 @@ media-libs/libmpdclient 2.19: Library for interfacing Music Player Daemon (media
 media-libs/libmpeg2 0.5.1-r2: library for decoding mpeg-2 and mpeg-1 video
 media-libs/libmpeg3 1.8-r1: An mpeg library for linux
 media-libs/libmpris2client 0.1.0-r1: A library to control MPRIS2 compatible players
-media-libs/libmtp 1.1.16 1.1.17 1.1.18 9999: Implementation of Microsoft's Media Transfer Protocol (MTP)
+media-libs/libmtp 1.1.17 1.1.18 9999: Implementation of Microsoft's Media Transfer Protocol (MTP)
 media-libs/libmygpo-qt 1.1.0 9999: Qt/C++ library wrapping the gpodder.net webservice
 media-libs/libmypaint 1.6.1: Library for making brushstrokes
 media-libs/libnjb 2.2.7: Library for communicating with the Creative Nomad JukeBox digital audio player
@@ -13257,7 +13257,7 @@ media-libs/phonon-vlc 0.11.1: VLC backend for the Phonon multimedia library
 media-libs/plib 1.8.5-r2: multimedia library used by many games
 media-libs/plotutils 2.6-r2: Powerful C/C++ function library for exporting 2-D vector graphics
 media-libs/pnglite 0.1.17: Small and simple library for loading and writing PNG images
-media-libs/portaudio 19.06.00-r1 19.06.00-r2 19.06.00-r3: A free, cross-platform, open-source, audio I/O library
+media-libs/portaudio 19.06.00-r2 19.06.00-r3: A free, cross-platform, open-source, audio I/O library
 media-libs/portmidi 217-r3: Library for real time MIDI input and output
 media-libs/ptex 2.3.2: Per-Face Texture Mapping for Production Rendering
 media-libs/pulseaudio-qt 1.2: Qt bindings for libpulse
@@ -13954,7 +13954,7 @@ media-sound/teamspeak-server 3.12.1 3.13.3: A server software for hosting qualit
 media-sound/tempest_for_eliza 1.0.5-r2: Listen to music on the radio generated by images on your screen
 media-sound/terminatorx 4.0.1-r2: Realtime audio synthesizer allowing you to 'scratch' on sampled audio data
 media-sound/timemachine 0.3.4: JACK client record button remembering the last 10 seconds when pressed
-media-sound/timidity++ 2.14.0-r3 2.15.0: A handy MIDI to WAV converter with OSS and ALSA output support
+media-sound/timidity++ 2.15.0: A handy MIDI to WAV converter with OSS and ALSA output support
 media-sound/timidity-eawpatches 12-r5: Eric Welsh's GUS patches for TiMidity
 media-sound/timidity-freepats 20060219-r1: Free and open set of instrument patches
 media-sound/tk707 0.8-r2: An 7x7 type midi drum sequencer for Linux
@@ -15115,7 +15115,7 @@ net-misc/ifenslave 1.1.0-r6: Attach and detach slave interfaces to a bonding dev
 net-misc/igmpproxy 0.2.1_p20200508: A multicast routing daemon which uses IGMP forwarding
 net-misc/ip-sentinel 0.12-r1: Prevent unauthorized usage of IP addresses
 net-misc/ipcalc 0.42_p2: IP Calculator prints broadcast/network/etc for an IP address and netmask
-net-misc/iperf 2.0.13 2.0.14a 2.99999.99999 3.6 3.9-r1 3.99999.99999: A TCP, UDP, and SCTP network bandwidth measurement tool
+net-misc/iperf 2.0.14a 2.99999.99999 3.9-r1 3.99999.99999: A TCP, UDP, and SCTP network bandwidth measurement tool
 net-misc/ipmiview 2.18.0.201007: A GUI application that allows to manage multiple target systems through BMC
 net-misc/iprange 1.0.4: A tool capable of managing sets of IPs
 net-misc/ipsorcery 2.0.9-r2: Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets
@@ -15342,7 +15342,7 @@ net-news/canto-daemon 0.9.7: Daemon part of Canto-NG RSS reader
 net-news/liferea 1.12.7-r1 1.12.9: News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
 net-news/newsboat 2.20.1 2.21: An RSS/Atom feed reader for text terminals
 net-news/rssguard 3.5.9-r1 3.8.3: Tiny RSS and Atom feed reader
-net-news/rsstail 1.8 2.1 2.1_p20200310: A tail-like RSS-reader
+net-news/rsstail 2.1 2.1_p20200310: A tail-like RSS-reader
 net-news/rsstool 1.0.1_rc2: cmdline tool to read, parse, merge, and write RSS (and Atom) feeds
 net-news/snownews 1.6.10: Command-line RSS feed reader
 net-news/yydecode 0.2.10-r1: A decoder for yENC format, popular on Usenet
@@ -16082,7 +16082,7 @@ sci-libs/adolc 2.7.2 9999: Automatic differentiation system for C/C++
 sci-libs/alglib 3.10.0-r1: Numerical analysis and data processing library
 sci-libs/amd 2.4.6: Library to order a sparse matrix prior to Cholesky factorization
 sci-libs/armadillo 8.300.2 9.800.3 9.850.1: Streamlined C++ linear algebra library
-sci-libs/arpack 3.7.0 3.8.0 9999: Arnoldi package library to solve large scale eigenvalue problems
+sci-libs/arpack 3.8.0 9999: Arnoldi package library to solve large scale eigenvalue problems
 sci-libs/arprec 2.2.18 2.2.19: Arbitrary precision float arithmetics and functions
 sci-libs/atlas 3.10.2: Automatically Tuned Linear Algebra Software
 sci-libs/avogadrolibs 1.91.0_pre20180415 1.93.0: Advanced molecule editor and visualizer 2 - libraries
@@ -18628,7 +18628,7 @@ x11-plugins/gkrelltop 2.2.13-r2: a GKrellM2 plugin which displays the top three
 x11-plugins/gkrellweather 2.0.8-r1: GKrellM2 Plugin that monitors a METAR station and displays weatherinfo
 x11-plugins/gkwebmon 0.2-r2: A web monitor plugin for GKrellM2
 x11-plugins/guifications 2.16: Guifications is a graphical notification plugin for pidgin
-x11-plugins/hexchat-javascript 0.3.1 0.3.2: Javascript interface for HexChat
+x11-plugins/hexchat-javascript 0.3.2: Javascript interface for HexChat
 x11-plugins/i8krellm 2.5-r2: GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks
 x11-plugins/lurch 0.6.8 0.6.8-r1 0.6.8-r2: OMEMO encryption for libpurple (XEP-0384)
 x11-plugins/pidgin-birthday-reminder 1.7-r1: Plugin for Pidgin that reminds you of your buddies birthdays
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6bf52647f9ec..86bd2d015240 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 07 Jan 2021 01:05:17 +0000
+Thu, 07 Jan 2021 02:01:22 +0000
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-01-07 02:01:26 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-01-07 02:01:26 +0000
commit	8795d7b6d8febce42f9ba607e17f8c1a50aea1b3 (patch)
tree	0edc270abfb5da5766ea0e51d7ede677487a6a5e /metadata
parent	Merge updates from master (diff)
download	gentoo-8795d7b6d8febce42f9ba607e17f8c1a50aea1b3.tar.gz gentoo-8795d7b6d8febce42f9ba607e17f8c1a50aea1b3.tar.bz2 gentoo-8795d7b6d8febce42f9ba607e17f8c1a50aea1b3.zip