2021-04-26 10:50:09 UTC

32 files changed, 63 insertions, 63 deletions

diff --git a/metadata/md5-cache/app-accessibility/espeakup-0.80 b/metadata/md5-cache/app-accessibility/espeakup-0.80
index 6ed0343c9eda..4f12b78d7ad1 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-0.80
+++ b/metadata/md5-cache/app-accessibility/espeakup-0.80
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://github.com/williamh/espeakup
 INHERIT=vcs-snapshot linux-info
 IUSE=kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
 SRC_URI=https://github.com/williamh/espeakup/archive/v0.80.tar.gz -> espeakup-0.80.tar.gz
 _eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=b3416b738564bb4f49ceafb31105560f
+_md5_=8eeee858b95b73e888464145f82aa477
diff --git a/metadata/md5-cache/app-admin/logrotate-3.18.0 b/metadata/md5-cache/app-admin/logrotate-3.18.0
index ef9b72452e88..43f994dda0ef 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.18.0
+++ b/metadata/md5-cache/app-admin/logrotate-3.18.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/logrotate/logrotate
 INHERIT=systemd tmpfiles
 IUSE=acl +cron selinux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.18.0/logrotate-3.18.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=46cbbf6700a5c2c43431cb51457fa94e
+_md5_=a26f9842be3ad0ef9156b9c52a36aca5
diff --git a/metadata/md5-cache/app-admin/sysklogd-2.2.2 b/metadata/md5-cache/app-admin/sysklogd-2.2.2
index 3752b11e0433..c9191571e05b 100644
--- a/metadata/md5-cache/app-admin/sysklogd-2.2.2
+++ b/metadata/md5-cache/app-admin/sysklogd-2.2.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd
 INHERIT=flag-o-matic systemd toolchain-funcs
 IUSE=logger logrotate systemd
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=logger? ( !<sys-apps/util-linux-2.34-r3 !>=sys-apps/util-linux-2.34-r3[logger] ) logrotate? ( app-admin/logrotate )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/troglobit/sysklogd/releases/download/v2.2.2/sysklogd-2.2.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=6ca321754ccc6364f3b63dcfc144e895
+_md5_=5f9298b51dee27204118a95172928d1e
diff --git a/metadata/md5-cache/app-arch/ncompress-5.0 b/metadata/md5-cache/app-arch/ncompress-5.0
index a2196f6873dd..1e33dc63a85e 100644
--- a/metadata/md5-cache/app-arch/ncompress-5.0
+++ b/metadata/md5-cache/app-arch/ncompress-5.0
@@ -3,9 +3,9 @@ DESCRIPTION=Classic compress & uncompress programs for .Z (LZW) files
 EAPI=7
 HOMEPAGE=https://vapier.github.io/ncompress/
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/vapier/ncompress/archive/v5.0.tar.gz -> ncompress-5.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=7be98c7e7288ee5eec1569859435405d
+_md5_=62cdc2cb6e4102a0f0434dd5070604c2
diff --git a/metadata/md5-cache/app-arch/sharutils-4.15.2-r2 b/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
index c656df939cf6..91406181fdf6 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
+++ b/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/sharutils/
 INHERIT=flag-o-matic l10n
 IUSE=nls
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.15.2.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=f1a3ba5c0daafae0e91f0bc31131aa8c
+_md5_=6cbf8e511902891440ee84d479029189
diff --git a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3 b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
index 67e52ad1a9d9..a01316efe0b4 100644
--- a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
+++ b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=http://canna.osdn.jp/
 INHERIT=autotools cannadic toolchain-funcs
 IUSE=canuum doc ipv6
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT GPL-2
 RDEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	cannadic	6d8054590c0aef2c11c567e1a815c052
-_md5_=a54627b7ee571c87c4c338f7eea88703
+_md5_=660a310a729d060b3fb5ea0850ffedd9
diff --git a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3 b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
index 5feb1dece423..2246078ee079 100644
--- a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
+++ b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Japanese FreeWnn input method module for GTK+2
 EAPI=6
 HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
 INHERIT=autotools gnome2-utils ltprune prefix
-KEYWORDS=amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-i18n/freewnn x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=178dddc19ad9f6c6cdf7a9976497dc70
+_md5_=d9de4ea1be0db6515c2630d74d17025d
diff --git a/metadata/md5-cache/app-misc/binwalk-2.3.1 b/metadata/md5-cache/app-misc/binwalk-2.3.1
index caf30475a13a..9126ee80088f 100644
--- a/metadata/md5-cache/app-misc/binwalk-2.3.1
+++ b/metadata/md5-cache/app-misc/binwalk-2.3.1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/ReFirmLabs/binwalk
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 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/ReFirmLabs/binwalk/archive/v2.3.1.tar.gz -> binwalk-2.3.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=e6ce123e615a2fdf755873ee3b081ee9
+_md5_=9a2b01632b5e1d6fee5d5f7ef2958cfd
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.55 b/metadata/md5-cache/app-text/coolreader-3.2.55
index c616435bb7af..b4398c2f4d5b 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.55
+++ b/metadata/md5-cache/app-text/coolreader-3.2.55
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/buggins/coolreader/
 INHERIT=cmake wxwidgets l10n xdg
 IUSE=wxwidgets
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
 SLOT=0
 SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.55.tar.gz -> coolreader-3.2.55.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	wxwidgets	407be90c398e52298054aff2093912a3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=e76313f201d5dbcbbfa1303aebe828c0
+_md5_=2e7484913db4e2e91fecc564a926eb93
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.11-r1 b/metadata/md5-cache/dev-java/commons-lang-3.11-r1
index 3ae0ceb5458b..5a25731aea02 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.11-r1
+++ b/metadata/md5-cache/dev-java/commons-lang-3.11-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://commons.apache.org/lang
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/easymock:3.2 dev-java/commons-io:1 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.6
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.11-src.tar.gz -> commons-lang-3.11.tar.gz
 _eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=29877baa31071b3a0789d382dba9c10b
+_md5_=b131b08db6af9c13d8d04020cac38ee7
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.6 b/metadata/md5-cache/dev-java/commons-lang-3.6
index 92a93ae581ed..14c1eeb115d2 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.6
+++ b/metadata/md5-cache/dev-java/commons-lang-3.6
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=http://commons.apache.org/lang
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/easymock:3.2 dev-java/commons-io:1 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.6
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.6-src.tar.gz -> commons-lang-3.6.tar.gz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=1a22df49d0f59abfd8017cc8f18fcbe5
+_md5_=cad7ab88bef986f7de86c222af9cc90d
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.8 b/metadata/md5-cache/dev-java/jansi-native-1.8
index 467b874c8c69..33336caf8aa5 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.8
+++ b/metadata/md5-cache/dev-java/jansi-native-1.8
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://fusesource.github.io/jansi/
 INHERIT=vcs-snapshot java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz
 _eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=1f2f98c28227bac7dc4bc1812e5169d4
+_md5_=22524733806333c5b8025063164655c4
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r5 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r5
index 45b249cd8037..aec117ac96dc 100644
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r5
+++ b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/werken-xpath/
 INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.8:* dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
 _eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=116a07c7cee46e18fa6952cf574e7fd0
+_md5_=a46f781f98c9d64a140f9fa8bd56538b
diff --git a/metadata/md5-cache/dev-lang/mono-6.12.0.122 b/metadata/md5-cache/dev-lang/mono-6.12.0.122
index 115182561116..d1b4064d686a 100644
--- a/metadata/md5-cache/dev-lang/mono-6.12.0.122
+++ b/metadata/md5-cache/dev-lang/mono-6.12.0.122
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://mono-project.com
 INHERIT=autotools check-reqs linux-info mono-env pax-utils multilib-minimal
 IUSE=doc minimal nls pax_kernel xen 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext ) app-misc/ca-certificates
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-6.12.0.122.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	mono-env	1f24c032c78290b0d9a07d5b343051a7	pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=59d86c806ce80ab60583dc2e00449b43
+_md5_=826bc4c91acd7cbb8b4462b62acaed02
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.6 b/metadata/md5-cache/dev-libs/libjcat-0.1.6
index 687b851bb012..7c9cc33b9682 100644
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.6
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/hughsie/libjcat
 INHERIT=meson python-any-r1 vala xdg-utils
 IUSE=gpg gtk-doc +introspection +man pkcs7 test vala
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.6.tar.gz -> libjcat-0.1.6.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	12de027593aabf8f7d7df8d6c702db16	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90be09ffe98f9da4f0244f56dd7bac5e
+_md5_=ce159cbc042d98ff7b864cf2420def18
diff --git a/metadata/md5-cache/dev-lua/luasec-1.0 b/metadata/md5-cache/dev-lua/luasec-1.0
index 01f7ebf41101..a807bc34c63e 100644
--- a/metadata/md5-cache/dev-lua/luasec-1.0
+++ b/metadata/md5-cache/dev-lua/luasec-1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/brunoos/luasec
 INHERIT=lua toolchain-funcs
 IUSE=libressl lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-lua/luasocket[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) lua_targets_lua5-4? ( dev-lang/lua:5.4[deprecated(+)] )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v1.0.tar.gz -> luasec-1.0.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua	117840f7c4855d27ccde1c6cca990331
-_md5_=31ea5c5af3fca84aa46dc709cd93305b
+_md5_=593c9e13c50f3ea272764aa89d6f93e6
diff --git a/metadata/md5-cache/dev-util/wiggle-1.2 b/metadata/md5-cache/dev-util/wiggle-1.2
index b888d688e918..d55012e46b1f 100644
--- a/metadata/md5-cache/dev-util/wiggle-1.2
+++ b/metadata/md5-cache/dev-util/wiggle-1.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://neil.brown.name/wiggle https://git.neil.brown.name/?p=wiggle.git
 INHERIT=fixheadtails toolchain-funcs
 IUSE=test
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://neil.brown.name/wiggle/wiggle-1.2.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=eb040d7396aa3eebcd3627042b587101
+_md5_=0ede6d62f61b3b6ac9f89bdd5daa18db
diff --git a/metadata/md5-cache/mail-filter/amavisd-milter-1.7.0-r1 b/metadata/md5-cache/mail-filter/amavisd-milter-1.7.0-r1
index 0a562ec93c33..291239704139 100644
--- a/metadata/md5-cache/mail-filter/amavisd-milter-1.7.0-r1
+++ b/metadata/md5-cache/mail-filter/amavisd-milter-1.7.0-r1
@@ -3,9 +3,9 @@ DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) elibc_uclibc? ( net-libs/l
 DESCRIPTION=sendmail milter for amavisd-new
 EAPI=7
 HOMEPAGE=https://github.com/prehor/amavisd-milter/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) elibc_uclibc? ( net-libs/libnsl:0= ) mail-filter/amavisd-new
 SLOT=0
 SRC_URI=https://github.com/prehor/amavisd-milter/releases/download/1.7.0/amavisd-milter-1.7.0.tar.gz
-_md5_=4019c3e0d32ffe1d20d8fd1cbc046b3c
+_md5_=4196bf4339355815e9e76688b2dd7757
diff --git a/metadata/md5-cache/media-libs/jbig2enc-0.29 b/metadata/md5-cache/media-libs/jbig2enc-0.29
index 89db343bf1a5..8ec577fa9fc0 100644
--- a/metadata/md5-cache/media-libs/jbig2enc-0.29
+++ b/metadata/md5-cache/media-libs/jbig2enc-0.29
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/agl/jbig2enc
 INHERIT=autotools
 IUSE=gif jpeg png tiff webp
-KEYWORDS=amd64 ~x86 ~ppc-macos
+KEYWORDS=amd64 x86 ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]
 SLOT=0
 SRC_URI=https://github.com/agl/jbig2enc/archive/0.29.tar.gz -> jbig2enc-0.29.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=21de85e86a3130dc0825acf2cc57ad31
+_md5_=51893be44fb3995015330a8eb0524ba4
diff --git a/metadata/md5-cache/media-libs/lcms-2.12 b/metadata/md5-cache/media-libs/lcms-2.12
index c7ea23844419..29a12033d852 100644
--- a/metadata/md5-cache/media-libs/lcms-2.12
+++ b/metadata/md5-cache/media-libs/lcms-2.12
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://www.littlecms.com/
 INHERIT=libtool multilib-minimal
 IUSE=doc jpeg static-libs test +threads tiff 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 ~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=MIT
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6: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(-)?] )
 REQUIRED_USE=tiff? ( zlib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/mm2/Little-CMS/releases/download/lcms2.12/lcms2-2.12.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=94b9f7ac2bcf1eab5c4a0a013ab3ac94
+_md5_=c026df56d6afe421ad96bbcbe4996d4c
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.9.2-r4 b/metadata/md5-cache/media-libs/libmp3splt-0.9.2-r4
index 6124646132b3..276a42efb0e2 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.9.2-r4
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.9.2-r4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://mp3splt.sourceforge.net/mp3splt_page/home.php
 INHERIT=autotools flag-o-matic
 IUSE=doc flac pcre
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libid3tag media-libs/libogg media-libs/libvorbis flac? ( media-libs/flac ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/libmp3splt-0.9.2.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=4e5c96bc5430f6ad0e237001fbb6e472
+_md5_=eb5fb420e1520103bd5868024762732c
diff --git a/metadata/md5-cache/media-sound/asunder-2.9.6 b/metadata/md5-cache/media-sound/asunder-2.9.6
index ab6daed11686..35292d5283fb 100644
--- a/metadata/md5-cache/media-sound/asunder-2.9.6
+++ b/metadata/md5-cache/media-sound/asunder-2.9.6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://littlesvr.ca/asunder/
 INHERIT=xdg
 IUSE=flac mac mp3 musepack opus vorbis wavpack
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libcddb-0.9.5 media-sound/cdparanoia x11-libs/gtk+:2 flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) musepack? ( media-sound/musepack-tools ) opus? ( media-sound/opus-tools ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=http://littlesvr.ca/asunder/releases/asunder-2.9.6.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=b1f5eebada431dbb55607f50d3b9639a
+_md5_=930d55728194e40840ebf1509f4f9be5
diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16 b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16
index 0988df856788..fcebeef62f01 100644
--- a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16
+++ b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://gmusicbrowser.org/
 INHERIT=gnome2-utils xdg
 IUSE=dbus doc extras gstreamer libnotify mplayer
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )
 SLOT=0
 SRC_URI=https://gmusicbrowser.org/download/gmusicbrowser-1.1.16.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=aba249d50151a2b08d23640813faaf7d
+_md5_=6b3c72fad933e6d3b7262392ddc20dbf
diff --git a/metadata/md5-cache/media-sound/kid3-3.8.6 b/metadata/md5-cache/media-sound/kid3-3.8.6
index 6cce7715b9e7..1aec5224afb9 100644
--- a/metadata/md5-cache/media-sound/kid3-3.8.6
+++ b/metadata/md5-cache/media-sound/kid3-3.8.6
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://kid3.kde.org/
 INHERIT=cmake kde.org python-any-r1 xdg
 IUSE=acoustid flac kde mp3 mp4 +mpris +taglib test vorbis
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint media-video/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis )
 REQUIRED_USE=flac? ( vorbis )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.8.6.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	kde.org	6e4d9db9698dba71a2c9085b861e29b5	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=a5779eb476a6902c50a6512a30553a64
+_md5_=cc20baf52b46400d31e9c91eb7aecdc9
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.21 b/metadata/md5-cache/media-sound/qtractor-0.9.21
index f0d335bb6ebe..127971aecc95 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.9.21
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.21
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://qtractor.sourceforge.io
 INHERIT=flag-o-matic cmake xdg
 IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=dssi? ( ladspa )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.21.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=9a9f4203b3219ccc1eaac2d0eefd269e
+_md5_=40f7a12636afafc90db5673ccdf424d1
diff --git a/metadata/md5-cache/media-sound/strawberry-0.9.2 b/metadata/md5-cache/media-sound/strawberry-0.9.2
index a8d764f04b12..d5e4898de31b 100644
--- a/metadata/md5-cache/media-sound/strawberry-0.9.2
+++ b/metadata/md5-cache/media-sound/strawberry-0.9.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.strawbs.org/
 INHERIT=cmake flag-o-matic l10n virtualx xdg
 IUSE=cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc test
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( gstreamer vlc )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.9.2/strawberry-0.9.2.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=a7d3be729532880cd93a78d37e6fb424
+_md5_=399fda0088967b8138934d8c23c20feb
diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3
index 6e02dc8f7bb1..fe83a204b522 100644
--- a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3
+++ b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.gropp.org/
 INHERIT=autotools
 IUSE=+csv +html
-KEYWORDS=amd64 ~arm ppc ~x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/vgropp/bwm-ng/archive/v0.6.3.tar.gz -> bwm-ng-0.6.3.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=cc41bf0d3c4008f6d7fed74c63c278e7
+_md5_=d453deaedc646fc719dd008eeade9d0b
diff --git a/metadata/md5-cache/net-im/gajim-1.3.1_p2 b/metadata/md5-cache/net-im/gajim-1.3.1_p2
index 08c9d863bf8f..dad85cb93626 100644
--- a/metadata/md5-cache/net-im/gajim-1.3.1_p2
+++ b/metadata/md5-cache/net-im/gajim-1.3.1_p2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gajim.org/
 INHERIT=distutils-r1 xdg-utils
 IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_7? ( dev-python/idna[python_targets_python3_7(-)] dev-python/precis-i18n[python_targets_python3_7(-)] dev-python/pyasn1[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycurl[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_7(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_7(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_7(-)] dev-python/css-parser[python_targets_python3_7(-)] dev-python/packaging[python_targets_python3_7(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_7(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_7(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_7(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_7(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.3/gajim-1.3.1-2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e2e900a5224f13e822383645209b8c5
+_md5_=d706cf0c33972bb0969552700f6fe1a1
diff --git a/metadata/md5-cache/x11-misc/shutter-0.95 b/metadata/md5-cache/x11-misc/shutter-0.95
index d8c08d3bae10..bacd1684e584 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.95
+++ b/metadata/md5-cache/x11-misc/shutter-0.95
@@ -4,10 +4,10 @@ DESCRIPTION=Feature-rich screenshot program
 EAPI=7
 HOMEPAGE=https://shutter-project.org/
 INHERIT=desktop optfeature prefix xdg
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/gnome2-canvas dev-perl/gnome2-wnck dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/Gtk2-Unique dev-perl/Gtk2-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.95.tar.gz -> shutter-0.95.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	e142388219c7fee6ff016fe1c78a10a5	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=8484300342a3b6d0542c17bcd23e71be
+_md5_=ad13dfa0ebefbb188eb79ec59f680782
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66 b/metadata/md5-cache/x11-misc/xlockmore-5.66
index 2ecb32ec6897..b74eaeee6f08 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.66
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.sillycycle.com/xlockmore.html
 INHERIT=autotools flag-o-matic pam
 IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
 SLOT=0
 SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.66.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=dd17b9d515886decb154359f4e070fc3
+_md5_=7fb3d24cb30a2fd4442fa3f1734fa54e
diff --git a/metadata/md5-cache/x11-terms/xterm-367 b/metadata/md5-cache/x11-terms/xterm-367
index 919720166812..44ce14068741 100644
--- a/metadata/md5-cache/x11-terms/xterm-367
+++ b/metadata/md5-cache/x11-terms/xterm-367
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://invisible-island.net/xterm/
 INHERIT=desktop flag-o-matic toolchain-funcs
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
-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=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-367.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=3250ac630ff1430638a12e8f52e095ff
+_md5_=48eb75e4989618a0bae6e53d73229286
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f80467821bc4..2a7908d1b63e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Apr 2021 10:36:06 +0000
+Mon, 26 Apr 2021 10:50:09 +0000