2019-10-07 09:06:02 UTC

71 files changed, 132 insertions, 195 deletions

diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.2 b/metadata/md5-cache/app-accessibility/freetts-1.2.2
index fcbc695b0324..85f7d039d0e3 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A speech synthesis system written entirely in Java
 EAPI=5
 HOMEPAGE=http://freetts.sourceforge.net/
 IUSE=jsapi mbrola elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
 RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a12e601f44e6f39f12bc019d01943e7
+_md5_=a8144ad2c818706ece69100ee92e9111
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.15 b/metadata/md5-cache/app-admin/eselect-1.4.15
index 672c28048b90..716b81bf2fcc 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.15
+++ b/metadata/md5-cache/app-admin/eselect-1.4.15
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.15.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=9c32b03cccebd84d034738a8b3b3352e
+_md5_=385b3c308af732c565a4f5467a0825b9
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.101.4 b/metadata/md5-cache/app-antivirus/clamav-0.101.4
index 27164c8c077f..176b4be43b2f 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.101.4
+++ b/metadata/md5-cache/app-antivirus/clamav-0.101.4
@@ -4,10 +4,10 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=6
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) elibc_musl? ( sys-libs/fts-standalone ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.101.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=943b421cc5d93c02e8fa7614021ef452
+_md5_=4c0a2a4e9db4d0586d1b90f0dca8c933
diff --git a/metadata/md5-cache/app-arch/zstd-1.1.3 b/metadata/md5-cache/app-arch/zstd-1.1.3
deleted file mode 100644
index 1ce9df024df9..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/facebook/zstd/archive/v1.1.3.tar.gz -> zstd-1.1.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=875a62cc77c8336e034ae36731864725
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.4-r1 b/metadata/md5-cache/app-arch/zstd-1.3.4-r1
deleted file mode 100644
index d4d02d8e00f4..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.3.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=lz4 static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.3.4.tar.gz -> zstd-1.3.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=a15dce091484c10c709d39d5abb2595b
diff --git a/metadata/md5-cache/app-arch/zstd-1.4.0 b/metadata/md5-cache/app-arch/zstd-1.4.0
deleted file mode 100644
index 2d958ca802d4..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-DESCRIPTION=zstd fast compression library
-EAPI=7
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=lz4 static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.4.0.tar.gz -> zstd-1.4.0.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=0d850bcfc6309713f90139ee6ebf5079
diff --git a/metadata/md5-cache/app-arch/zstd-1.4.1 b/metadata/md5-cache/app-arch/zstd-1.4.1
deleted file mode 100644
index ff3e3ab407be..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-DESCRIPTION=zstd fast compression library
-EAPI=7
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=lz4 static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.4.1.tar.gz -> zstd-1.4.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=0d850bcfc6309713f90139ee6ebf5079
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2 b/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
index 3a845b4a701e..2d7215237385 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Russian spellcheck dictionary based on works of AOT group for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.libreoffice.org/extensions/russian-dictionary-pack
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/russian-dictionary-pack/0.4.0/@@download/file/dict_pack_ru-aot-0-4-0.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=002dd76d27b52c953097bff4b3e5e705
+_md5_=95d146cb0cb6a14d50f473bae3374969
diff --git a/metadata/md5-cache/app-emacs/auctex-12.1-r1 b/metadata/md5-cache/app-emacs/auctex-12.1-r1
index 5975592269ec..a83dde68147d 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.1-r1
+++ b/metadata/md5-cache/app-emacs/auctex-12.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/auctex/
 IUSE=preview-latex
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.1.tar.gz
 _eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=cd8deb389af022223b67285533d1d800
+_md5_=035dfad6f340867e894489f7236ca419
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.15 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.15
index 58b7a544c120..1a9aece7a8d9 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.15
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.15
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Emacs major mode for editing eselect files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.15.tar.xz
 _eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=a0e2f8c2c900a15d68eeccb41818f323
+_md5_=0549b44ac76e205e18c5fc0fc1714784
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.2.6 b/metadata/md5-cache/app-emacs/org-mode-9.2.6
index 1c5ba2033c05..75ef740749e6 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.2.6
+++ b/metadata/md5-cache/app-emacs/org-mode-9.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=An Emacs mode for notes and project planning
 EAPI=7
 HOMEPAGE=https://www.orgmode.org/
 IUSE=contrib doc odt-schema
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
 RDEPEND=>=virtual/emacs-24
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-9.2.6.tar.gz
 _eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=ecb4290edca58d4d9e3738ff2b57bd5f
+_md5_=08fbb2441f5b3702cc493af369992e4d
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0 b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
index 63709e6d1a44..9f6db97466b0 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Objective Caml/Camllight mode for Emacs
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/tuareg/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2+ GPL-3+ ISC
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/archive/2.2.0.tar.gz -> tuareg-mode-2.2.0.tar.gz
 _eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=cc3901a5b658ac4fd7501d0a1cea8669
+_md5_=573fc99336b2a84d0767c09788dd6967
diff --git a/metadata/md5-cache/app-eselect/eselect-unison-0.4 b/metadata/md5-cache/app-eselect/eselect-unison-0.4
index 267a0d56876d..d6ab0970508a 100644
--- a/metadata/md5-cache/app-eselect/eselect-unison-0.4
+++ b/metadata/md5-cache/app-eselect/eselect-unison-0.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=unison module for eselect
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
-_md5_=ef9f5988d70826f5b3c3345723d2e250
+_md5_=e8a056e29a6dde8cd52733b16f422ef1
diff --git a/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3 b/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
index fdb7d8ce5681..ae4f4af65449 100644
--- a/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
+++ b/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Chinese X Input Method
 EAPI=4
 HOMEPAGE=http://cle.linux.org.tw/xcin/
 IUSE=debug nls unicode
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=XCIN GPL-2
 RDEPEND=>=sys-libs/db-4.5 >=app-i18n/libtabe-0.2.6 unicode? ( media-fonts/hkscs-ming media-fonts/arphicfonts ) app-i18n/libchewing x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xcin/xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz mirror://debian/pool/main/x/xcin/xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0171e6bf81ce170c2564b1635a8ab79
+_md5_=c74d6be645fe42ec20e2ea97cb34112f
diff --git a/metadata/md5-cache/app-misc/egads-0.9.5-r1 b/metadata/md5-cache/app-misc/egads-0.9.5-r1
index 33f51324d680..b9f2706dfaef 100644
--- a/metadata/md5-cache/app-misc/egads-0.9.5-r1
+++ b/metadata/md5-cache/app-misc/egads-0.9.5-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Entropy Gathering And Distribution System
 EAPI=6
 HOMEPAGE=http://www.securesoftware.com/download_egads.htm
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.securesoftware.com/egads/egads-0.9.5.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=d0900ddfbfad2ff3e1d03e9ec11cfd7c
+_md5_=0ad636a0ce170275dadccc325b2000eb
diff --git a/metadata/md5-cache/dev-embedded/urjtag-0.10-r1 b/metadata/md5-cache/dev-embedded/urjtag-0.10-r1
index 723631938e6b..ed531700363f 100644
--- a/metadata/md5-cache/dev-embedded/urjtag-0.10-r1
+++ b/metadata/md5-cache/dev-embedded/urjtag-0.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for communicating over JTAG with flash chips, CPUs, and many mo
 EAPI=5
 HOMEPAGE=http://urjtag.sourceforge.net/
 IUSE=ftdi readline usb
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=ftdi? ( dev-embedded/libftdi:0 ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:0 ) !dev-embedded/jtag
 SLOT=0
 SRC_URI=mirror://sourceforge/urjtag/urjtag-0.10.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a10ce30a103088ea11c7f0533a2d8733
+_md5_=78fb0d0a00d39ef92037e2315c026013
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2
index fe7d2807c230..2ba05214c524 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of tasks for Apache Ant
 EAPI=6
 HOMEPAGE=http://ant-contrib.sourceforge.net/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-core-1.7.0:0 dev-java/ant-ivy:0 >=dev-java/bcel-5.1:0 dev-java/commons-httpclient:3 dev-java/xerces:2 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-src.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5f09bd7d6f7b4e8ab3be0f800debf404
+_md5_=72cdb9b26bb05da39d79fed06d31949f
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
index ddd00be812e7..2931065a7e2b 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Ivy is a free java based dependency manager
 EAPI=5
 HOMEPAGE=https://ant.apache.org/ivy/
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=49ed3431f037d7ce198750b72caa0241
+_md5_=cec0f7174b7c6e7e9c0fc3171bac69b2
diff --git a/metadata/md5-cache/dev-lang/cfortran-4.4-r3 b/metadata/md5-cache/dev-lang/cfortran-4.4-r3
index cd7c1e7b69e1..ebface78d3e9 100644
--- a/metadata/md5-cache/dev-lang/cfortran-4.4-r3
+++ b/metadata/md5-cache/dev-lang/cfortran-4.4-r3
@@ -3,9 +3,9 @@ DESCRIPTION=Header file allowing to call Fortran routines from C and C++
 EAPI=5
 HOMEPAGE=https://www-zeus.desy.de/~burow/cfortran/
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/cfortran/cfortran_4.4.orig.tar.gz mirror://debian/pool/main/c/cfortran/cfortran_4.4-14.diff.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5888240d94dd560bd89031ba96e1a956
+_md5_=42656a3cde8433ba295ec990dad410b4
diff --git a/metadata/md5-cache/dev-libs/cvector-1.0.3.1 b/metadata/md5-cache/dev-libs/cvector-1.0.3.1
index fef248922736..13dfc26ab443 100644
--- a/metadata/md5-cache/dev-libs/cvector-1.0.3.1
+++ b/metadata/md5-cache/dev-libs/cvector-1.0.3.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare unpack
 DESCRIPTION=An ANSI C implementation of dynamic arrays (approximation of C++ vectors)
 EAPI=5
 HOMEPAGE=http://cvector.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/cvector/cvector/CVector-1.0.3/CVector-1.0.3.1.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f9630a986b6f6952f4cd653df436b0f7
+_md5_=0501b8c2deadb74de783849012af757c
diff --git a/metadata/md5-cache/dev-libs/ell-0.23 b/metadata/md5-cache/dev-libs/ell-0.23
index b0330ba8808f..e542f76ea963 100644
--- a/metadata/md5-cache/dev-libs/ell-0.23
+++ b/metadata/md5-cache/dev-libs/ell-0.23
@@ -4,10 +4,10 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-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.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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.23.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=66f182062325bfb980b05e8b1dbccf2f
+_md5_=d3cab15f90e1e3d85156826783fdcbf7
diff --git a/metadata/md5-cache/dev-libs/libezV24-0.1.1-r1 b/metadata/md5-cache/dev-libs/libezV24-0.1.1-r1
index d12431961945..adb5d31c2833 100644
--- a/metadata/md5-cache/dev-libs/libezV24-0.1.1-r1
+++ b/metadata/md5-cache/dev-libs/libezV24-0.1.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=library that provides an easy API to Linux serial ports
 EAPI=7
 HOMEPAGE=http://ezv24.sourceforge.net
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/ezv24/libezV24-0.1.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=1b3993792234f83c4816a3eda875bffc
+_md5_=96e1623d93db2d43d0480a6674f7e677
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
index 58be5e5c4f2a..fdb807fcbad8 100644
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
+++ b/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
@@ -3,9 +3,9 @@ DESCRIPTION=quick and easy command line automation tool built on top of expect
 EAPI=6
 HOMEPAGE=http://expect-lite.sourceforge.net/
 IUSE=debug examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
 SLOT=0
 SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.9.0.tar.gz
-_md5_=d0e2962cd23fa82d9ee42014400dc55f
+_md5_=5fe1d8e697a46ee581c6820bc26513d6
diff --git a/metadata/md5-cache/dev-util/cproto-4.7o b/metadata/md5-cache/dev-util/cproto-4.7o
index 8c9c27848a32..6478f402d278 100644
--- a/metadata/md5-cache/dev-util/cproto-4.7o
+++ b/metadata/md5-cache/dev-util/cproto-4.7o
@@ -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.7o.tgz
-_md5_=8596edf1416c9fe13279f0738f33acfa
+_md5_=a5ed5b19815462ee18c678dc4032bbfa
diff --git a/metadata/md5-cache/dev-util/cpuinfo-collection-20101114 b/metadata/md5-cache/dev-util/cpuinfo-collection-20101114
index f2fd93922ac7..84ff420a56be 100644
--- a/metadata/md5-cache/dev-util/cpuinfo-collection-20101114
+++ b/metadata/md5-cache/dev-util/cpuinfo-collection-20101114
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=huge collection of /proc/cpuinfo files
 EAPI=5
 HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/test_proc-14November2010.tar.gz
-_md5_=c8c6adc9c2abd227878958ab6aa82c59
+_md5_=1ec89524505c068b87b4e84b43f84a79
diff --git a/metadata/md5-cache/dev-util/its4-1.1.1-r1 b/metadata/md5-cache/dev-util/its4-1.1.1-r1
index e75d46cf2f21..c66c1d023916 100644
--- a/metadata/md5-cache/dev-util/its4-1.1.1-r1
+++ b/metadata/md5-cache/dev-util/its4-1.1.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=ITS4: Software Security Tool
 EAPI=5
 HOMEPAGE=http://www.cigital.com/its4/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=ITS4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/its4-1.1.1.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0bbf397df9a7809af5b1f2d23a4b3250
+_md5_=70ea2e9e479c5f5d5fc929de996880e7
diff --git a/metadata/md5-cache/dev-util/jconfig-2.9 b/metadata/md5-cache/dev-util/jconfig-2.9
index dc9efd407923..1cd568f92189 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.9
+++ b/metadata/md5-cache/dev-util/jconfig-2.9
@@ -4,10 +4,10 @@ DESCRIPTION=Utility that provides a simple API for the management of properties
 EAPI=5
 HOMEPAGE=http://www.jconfig.org/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=45bf6322487ba3dfa28e4500ecbaa393
+_md5_=3bafa80929e63f424486450302695d27
diff --git a/metadata/md5-cache/dev-util/quilt-0.66 b/metadata/md5-cache/dev-util/quilt-0.66
index f1406edcfbd3..3b9da59526fa 100644
--- a/metadata/md5-cache/dev-util/quilt-0.66
+++ b/metadata/md5-cache/dev-util/quilt-0.66
@@ -3,11 +3,11 @@ DESCRIPTION=quilt patch manager
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/quilt
 IUSE=emacs graphviz elibc_Darwin elibc_SunOS
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
 LICENSE=GPL-2
 PDEPEND=emacs? ( app-emacs/quilt-el )
 RDEPEND=sys-apps/ed dev-util/diffstat graphviz? ( media-gfx/graphviz ) elibc_Darwin? ( app-misc/getopt ) elibc_SunOS? ( app-misc/getopt ) >=sys-apps/coreutils-8.5
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/quilt/quilt-0.66.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9376a124545cef8fcaa4c3d33ebd0f51
+_md5_=be9f0e2d912f19a6146cf76aeecb345c
diff --git a/metadata/md5-cache/dev-util/treecc-0.3.10-r1 b/metadata/md5-cache/dev-util/treecc-0.3.10-r1
index 9c255a33cddd..c4c04832d73f 100644
--- a/metadata/md5-cache/dev-util/treecc-0.3.10-r1
+++ b/metadata/md5-cache/dev-util/treecc-0.3.10-r1
@@ -4,8 +4,8 @@ DESCRIPTION=Compiler-compiler tool for aspect-oriented programming
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/dotgnu
 IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/dotgnu-pnet/treecc-0.3.10.tar.gz
-_md5_=a23a830ce29fc7b1e440e11b106823de
+_md5_=1f5b674fed9e67d9dd896baf9ac1db96
diff --git a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1 b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1
index d12971c0aa6a..3e92709c7819 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1
+++ b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Generates patchset information from a CVS repository
 EAPI=4
 HOMEPAGE=http://www.cobite.com/cvsps/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e982f448d00b1bffec5185eebc206aa
+_md5_=4c1e5266eefab8917080b0e984ee9fe6
diff --git a/metadata/md5-cache/mail-client/clawsker-1.1.0 b/metadata/md5-cache/mail-client/clawsker-1.1.0
index bce58d640cb5..9571b0ce2829 100644
--- a/metadata/md5-cache/mail-client/clawsker-1.1.0
+++ b/metadata/md5-cache/mail-client/clawsker-1.1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Applet to edit Claws Mail's hidden preferences
 EAPI=6
 HOMEPAGE=http://www.claws-mail.org/clawsker.php
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Gtk2-1.200 >=dev-perl/Locale-gettext-1.05 >=mail-client/claws-mail-3.5.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/tools/clawsker-1.1.0.tar.xz
-_md5_=8fd3d6a67d2e2c964e02063f8d5e1969
+_md5_=e56a09a293ab4b5a8a56d4cd91796bc8
diff --git a/metadata/md5-cache/mail-filter/policyd-1.82-r3 b/metadata/md5-cache/mail-filter/policyd-1.82-r3
index afe7ae833243..2fffd24c7c22 100644
--- a/metadata/md5-cache/mail-filter/policyd-1.82-r3
+++ b/metadata/md5-cache/mail-filter/policyd-1.82-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Policy daemon for postfix and other MTAs
 EAPI=7
 HOMEPAGE=http://policyd.sf.net/
 IUSE=libressl
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
 RDEPEND=dev-db/mysql-connector-c:0= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=http://policyd.sourceforge.net/policyd-1.82.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=e23dc182b7481aa03555107c03afc848
+_md5_=597bd8c66903d2cd266f992f11405216
diff --git a/metadata/md5-cache/mail-filter/spampd-2.42 b/metadata/md5-cache/mail-filter/spampd-2.42
index 9bfb57d18c2e..390a498b8696 100644
--- a/metadata/md5-cache/mail-filter/spampd-2.42
+++ b/metadata/md5-cache/mail-filter/spampd-2.42
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/Net-Server mail-filter/spamassassin
 DESCRIPTION=spampd is a program to scan messages for Unsolicited Commercial E-mail content
 EAPI=5
 HOMEPAGE=http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Net-Server mail-filter/spamassassin
 SLOT=0
 SRC_URI=https://github.com/mpaperno/spampd/archive/2.42.tar.gz -> spampd-2.42.tar.gz
-_md5_=5e29351f8a8a3dfdec7307f32ae53d2d
+_md5_=41cca9852094121f85f4ca087d62eba5
diff --git a/metadata/md5-cache/mail-mta/esmtp-1.2-r1 b/metadata/md5-cache/mail-mta/esmtp-1.2-r1
index 8d8b9e188cb8..2705c9d8e01c 100644
--- a/metadata/md5-cache/mail-mta/esmtp-1.2-r1
+++ b/metadata/md5-cache/mail-mta/esmtp-1.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=User configurable relay-only Mail Transfer Agent with a sendmail-lik
 EAPI=5
 HOMEPAGE=http://esmtp.sourceforge.net/
 IUSE=libressl
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/libesmtp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) !mail-mta/courier !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd
 SLOT=0
 SRC_URI=mirror://sourceforge/esmtp/esmtp-1.2.tar.bz2
-_md5_=e24d44b19c1f53d88cccd8552f7afad0
+_md5_=26261e0f637453873b45fa57e8cf94ac
diff --git a/metadata/md5-cache/media-gfx/darktable-2.6.2 b/metadata/md5-cache/media-gfx/darktable-2.6.2
index 3bc5fd11b235..fa32b436c39c 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.6.2
+++ b/metadata/md5-cache/media-gfx/darktable-2.6.2
@@ -5,10 +5,10 @@ DESCRIPTION=A virtual lighttable and darkroom for photographers
 EAPI=7
 HOMEPAGE=https://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_de l10n_es l10n_fi l10n_fr l10n_hu l10n_ja l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ru l10n_sl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.6.2/darktable-2.6.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/darktable-2.6.2-gcc9.patch.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.6.0/darktable-usermanual.pdf -> darktable-usermanual-2.6.0.pdf )
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9cfd1ad577cd19d71811b650219ecf71
+_md5_=7b60db35edfdc235735b756770f23d45
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.22-r3 b/metadata/md5-cache/media-gfx/ufraw-0.22-r3
index 653a5c86e2f3..631284c0ccb3 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.22-r3
+++ b/metadata/md5-cache/media-gfx/ufraw-0.22-r3
@@ -5,11 +5,11 @@ DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=7
 HOMEPAGE=http://ufraw.sourceforge.net/
 IUSE=contrast fits gimp gnome gtk openmp timezone
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-gfx/exiv2:= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff virtual/jpeg:0= fits? ( sci-libs/cfitsio:= ) gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 )
 REQUIRED_USE=gimp? ( gtk )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.22.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=946fd27083c200920608ceacdb88c60a
+_md5_=1679b9ab50733dd029eb48971f242d45
diff --git a/metadata/md5-cache/media-libs/libheif-1.5.1 b/metadata/md5-cache/media-libs/libheif-1.5.1
index c7dd6c349a86..2defd09dafb4 100644
--- a/metadata/md5-cache/media-libs/libheif-1.5.1
+++ b/metadata/md5-cache/media-libs/libheif-1.5.1
@@ -5,10 +5,10 @@ DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 EAPI=7
 HOMEPAGE=https://github.com/strukturag/libheif
 IUSE=static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/1.5
 SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.5.1/libheif-1.5.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f39f81ec876e5df7c176bba223865d7
+_md5_=b834dd926cbf3c79c43b4c03eb9a4392
diff --git a/metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1 b/metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1
index 0d474dc8b479..1a20710e24f8 100644
--- a/metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1
@@ -3,10 +3,10 @@ DEPEND=media-libs/ladspa-sdk
 DESCRIPTION=FIL-plugins ladspa plugin package. Filters by Fons Adriaensen
 EAPI=5
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/ladspa-sdk
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/FIL-plugins-0.3.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf425d077ea747199f600d5da79cd9b8
+_md5_=f370a279e76ac70b9c628abc4feca01c
diff --git a/metadata/md5-cache/media-sound/audiotag-0.19-r1 b/metadata/md5-cache/media-sound/audiotag-0.19-r1
index c424df79eabf..f90763630789 100644
--- a/metadata/md5-cache/media-sound/audiotag-0.19-r1
+++ b/metadata/md5-cache/media-sound/audiotag-0.19-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Command-line tool for mass tagging/renaming of audio files
 EAPI=7
 HOMEPAGE=https://github.com/Daenyth/audiotag
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://github.com/downloads/Daenyth/audiotag/audiotag-0.19.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8
-_md5_=9423ea0071df1d5823e1ea7834083a64
+_md5_=cb60070e437aa4d9cac2f7a8a087ca83
diff --git a/metadata/md5-cache/net-analyzer/fprobe-1.1-r3 b/metadata/md5-cache/net-analyzer/fprobe-1.1-r3
index 1ac2b97510e3..e27f863469b2 100644
--- a/metadata/md5-cache/net-analyzer/fprobe-1.1-r3
+++ b/metadata/md5-cache/net-analyzer/fprobe-1.1-r3
@@ -4,9 +4,9 @@ DESCRIPTION=libpcap-based tool to collect network traffic data and emit it as Ne
 EAPI=6
 HOMEPAGE=http://fprobe.sourceforge.net
 IUSE=debug messages
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/fprobe/fprobe-1.1.tar.bz2
-_md5_=5341390630915e76eacb51098a71cc34
+_md5_=65cad8fe4cb62ad8b9c26ae0fb10c3f4
diff --git a/metadata/md5-cache/net-analyzer/ipaudit-1.0_beta2-r1 b/metadata/md5-cache/net-analyzer/ipaudit-1.0_beta2-r1
index 34ddb6a493b5..feae16858df7 100644
--- a/metadata/md5-cache/net-analyzer/ipaudit-1.0_beta2-r1
+++ b/metadata/md5-cache/net-analyzer/ipaudit-1.0_beta2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=IPAudit monitors network activity on a network by host, protocol and
 EAPI=7
 HOMEPAGE=http://ipaudit.sourceforge.net/
 IUSE=mysql
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipaudit/ipaudit-1.0BETA2.tar.gz
-_md5_=baffd0439a5f1053b14793d7e1c17dca
+_md5_=b478cd34c319b53e08479f460271bb95
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
index b655b4f9e11c..844941259289 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
@@ -4,10 +4,10 @@ DESCRIPTION=A Tool for network monitoring and data acquisition
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
 IUSE=+drop-root libressl smi ssl samba suid test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=bb2bda7df29a50c315927af78a8e5299
+_md5_=4ae202accb5b97c397b9ef33a172c842
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3 b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
index 8d85cd6e382d..6a1ead48d9a4 100644
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
+++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Reports network interface statistics
 EAPI=7
 HOMEPAGE=https://www.frenchfries.net/paul/tcpstat/
 IUSE=ipv6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=30bf4b5368328dba8f3d82f7b04ea72f
+_md5_=a1338ab8761dbaa6a91f5ca38941d1a8
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.4 b/metadata/md5-cache/net-dns/unbound-1.9.4
index 9920522e72a5..7073cd6fe896 100644
--- a/metadata/md5-cache/net-dns/unbound-1.9.4
+++ b/metadata/md5-cache/net-dns/unbound-1.9.4
@@ -5,11 +5,11 @@ DESCRIPTION=A validating, recursive and caching DNS resolver
 EAPI=7
 HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
 IUSE=debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=BSD GPL-2
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=5bfdaa9fd8c0a16c884f398039d8d514
+_md5_=2137904e48727b6b586467f90b4082dc
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01-r3 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r3
index 1104d86b6609..fb088a53368b 100644
--- a/metadata/md5-cache/net-ftp/ftpbase-0.01-r3
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.01-r3
@@ -4,9 +4,9 @@ DESCRIPTION=FTP layout package
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/
 IUSE=pam
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=acct-group/ftp acct-user/ftp
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=247a9206270ffc50fb210cc2cfbefacb
+_md5_=dad89eee972317e15ac9defe86291e8d
diff --git a/metadata/md5-cache/net-im/jabber-base-0.01-r1 b/metadata/md5-cache/net-im/jabber-base-0.01-r1
index 42d07f094474..134a8ff55649 100644
--- a/metadata/md5-cache/net-im/jabber-base-0.01-r1
+++ b/metadata/md5-cache/net-im/jabber-base-0.01-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Jabber servers and transports layout package
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6bd10ea495e560797402ce82bbb5b6d8
+_md5_=1ada6d9a6dc8625affb051bdee0b8fce
diff --git a/metadata/md5-cache/net-libs/iax-0.2.2-r3 b/metadata/md5-cache/net-libs/iax-0.2.2-r3
index dcd91810e580..e163961e4949 100644
--- a/metadata/md5-cache/net-libs/iax-0.2.2-r3
+++ b/metadata/md5-cache/net-libs/iax-0.2.2-r3
@@ -4,9 +4,9 @@ DESCRIPTION=IAX (Inter Asterisk eXchange) Library
 EAPI=7
 HOMEPAGE=https://www.asterisk.org/
 IUSE=debug snomhack
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/libiax/iax-0.2.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=b45ce2f3727515119619732f4f1e7b38
+_md5_=c9d2213a504106837088c4c1e4da0a7b
diff --git a/metadata/md5-cache/net-libs/libpcap-1.9.1 b/metadata/md5-cache/net-libs/libpcap-1.9.1
index 13b265db7860..96c6bf04554d 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.9.1
+++ b/metadata/md5-cache/net-libs/libpcap-1.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=6
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
 IUSE=bluetooth dbus netlink static-libs usb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/the-tcpdump-group/libpcap/archive/libpcap-1.9.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=aa8e1c767c1ef4d54c7b6441aee0e907
+_md5_=8de3192f199543ffa0f9c738b0eb61c8
diff --git a/metadata/md5-cache/net-mail/asmail-2.1-r1 b/metadata/md5-cache/net-mail/asmail-2.1-r1
index 007d214d1f1b..8125bdf2a835 100644
--- a/metadata/md5-cache/net-mail/asmail-2.1-r1
+++ b/metadata/md5-cache/net-mail/asmail-2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a small mail monitor similar to xbiff
 EAPI=5
 HOMEPAGE=http://www.tigr.net
 IUSE=jpeg libressl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) x11-libs/libXext x11-libs/libX11 x11-libs/libXpm x11-libs/libICE x11-libs/libSM jpeg? ( virtual/jpeg:= )
 SLOT=0
 SRC_URI=http://www.tigr.net/afterstep/download/asmail/asmail-2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e51b5a3aa08b701106be14fd3fe10d3
+_md5_=0e2fa1b281a3bc7da8b1e3711df82c42
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
index 8ad044ce61da..1725eb8ba035 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Simple yet powerful mailing list manager for qmail
 EAPI=7
 HOMEPAGE=http://www.ezmlm.org
 IUSE=mysql postgres
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) virtual/qmail
 REQUIRED_USE=?? ( mysql postgres )
 SLOT=0
 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	7deefa51d96d23af60035bd683007471	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=cad3612a19b8b193c5372eb773c33216
+_md5_=7f111d4ab939bfffe65ba8ea50c9168f
diff --git a/metadata/md5-cache/net-mail/mailbase-1.5-r1 b/metadata/md5-cache/net-mail/mailbase-1.5-r1
index 87a6b7694495..37e895dbf23d 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.5-r1
+++ b/metadata/md5-cache/net-mail/mailbase-1.5-r1
@@ -3,9 +3,9 @@ DESCRIPTION=MTA layout package
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/
 IUSE=pam
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=acct-group/mail acct-user/mail acct-user/postmaster pam? ( virtual/pam )
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=b912b3e51c36d5b8f1480b469f2b89e7
+_md5_=f42c6aaf4a2d5e5723600d1d77b982ef
diff --git a/metadata/md5-cache/net-misc/netdate-1.2-r1 b/metadata/md5-cache/net-misc/netdate-1.2-r1
index 71bd7687b10a..bb82b89946e0 100644
--- a/metadata/md5-cache/net-misc/netdate-1.2-r1
+++ b/metadata/md5-cache/net-misc/netdate-1.2-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=utility to synchronize the time with ntp-servers
 EAPI=6
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
-KEYWORDS=~amd64 ~arm ~mips s390 ~sh ~sparc x86
+KEYWORDS=amd64 ~arm ~mips s390 ~sh ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/people/kukuk/ipv6/netdate-1.2.tar.bz2
-_md5_=ea32d7615d9e174788c216ddab3c07ba
+_md5_=fc326f7d9ef50c93865f282685e9b9bb
diff --git a/metadata/md5-cache/net-misc/putty-0.73 b/metadata/md5-cache/net-misc/putty-0.73
index d2566ec20c27..86df03e12909 100644
--- a/metadata/md5-cache/net-misc/putty-0.73
+++ b/metadata/md5-cache/net-misc/putty-0.73
@@ -5,10 +5,10 @@ DESCRIPTION=A Free Telnet/SSH Client
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 IUSE=doc +gtk gtk2 ipv6 gssapi
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/latest/putty-0.73.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=132f0b071c380b37aac0b4fb705428ed
+_md5_=2dcb6dd88b6a777fba9e1a39960897cc
diff --git a/metadata/md5-cache/net-wireless/bluez-5.51 b/metadata/md5-cache/net-wireless/bluez-5.51
index 4f2f5aad6f98..bc39a6c7da6d 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.51
+++ b/metadata/md5-cache/net-wireless/bluez-5.51
@@ -5,7 +5,7 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=7
 HOMEPAGE=http://www.bluez.org
 IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.14 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.14 dev-libs/json-c:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.51.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=a45c26bcaee915d841c4239c5ea20836
+_md5_=e83fb16a645229e1f7a6ffb0aff50503
diff --git a/metadata/md5-cache/sci-libs/ufconfig-3.7.1 b/metadata/md5-cache/sci-libs/ufconfig-3.7.1
index d9788a5ad239..54d5462d5124 100644
--- a/metadata/md5-cache/sci-libs/ufconfig-3.7.1
+++ b/metadata/md5-cache/sci-libs/ufconfig-3.7.1
@@ -3,9 +3,9 @@ DESCRIPTION=Common configuration scripts for the SuiteSparse libraries
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/UFconfig
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-3.7.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=fe3aa5279e56c6e16945f2e55421681c
+_md5_=4de88a248fe08aba91a5d27a2610badc
diff --git a/metadata/md5-cache/sys-apps/cracklib-words-2.9.6 b/metadata/md5-cache/sys-apps/cracklib-words-2.9.6
index f6dd18596839..eab22a56e219 100644
--- a/metadata/md5-cache/sys-apps/cracklib-words-2.9.6
+++ b/metadata/md5-cache/sys-apps/cracklib-words-2.9.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=large set of crack/cracklib dictionaries
 EAPI=5
 HOMEPAGE=https://github.com/cracklib/cracklib/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-words-2.9.6.gz
-_md5_=dc6795590722dc0319e24ac93722fe9b
+_md5_=d894e2b3a4282b85f7f2fd50f7c3395f
diff --git a/metadata/md5-cache/sys-apps/ucspi-unix-1.0 b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
index 3c1085c27c3d..e9246dbdc7ce 100644
--- a/metadata/md5-cache/sys-apps/ucspi-unix-1.0
+++ b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/bglibs-2.04
 DESCRIPTION=A UCSPI implementation for Unix domain sockets
 EAPI=7
 HOMEPAGE=https://untroubled.org/ucspi-unix/
-KEYWORDS=~amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=!net-analyzer/mk-livestatus
 SLOT=0
 SRC_URI=https://untroubled.org/ucspi-unix/archive/ucspi-unix-1.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=d4c9582ea3465fdb595d6261d6e0f968
+_md5_=51458166c4e465db048404a39ae1b5c6
diff --git a/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0 b/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
index 42e8a82bd375..623ca192b3a6 100644
--- a/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
+++ b/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
@@ -3,8 +3,8 @@ DEPEND=sys-auth/passwdqc[pam]
 DESCRIPTION=Stub ebuild to help migrate to newer package name
 EAPI=5
 HOMEPAGE=http://www.openwall.com/passwdqc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Openwall BSD public-domain
 RDEPEND=sys-auth/passwdqc[pam]
 SLOT=0
-_md5_=923efd2574ae4ed0b4f376e6170b110c
+_md5_=d07cd26b2020100afb0fe308bc663aeb
diff --git a/metadata/md5-cache/sys-auth/passwdqc-1.3.0 b/metadata/md5-cache/sys-auth/passwdqc-1.3.0
index 4a400c98af8f..bbff63b1f942 100644
--- a/metadata/md5-cache/sys-auth/passwdqc-1.3.0
+++ b/metadata/md5-cache/sys-auth/passwdqc-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Password strength checking library (and PAM module)
 EAPI=5
 HOMEPAGE=http://www.openwall.com/passwdqc/
 IUSE=pam utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Openwall BSD public-domain
 RDEPEND=pam? ( virtual/pam !<sys-auth/pam_passwdqc-1.3.0 )
 SLOT=0
 SRC_URI=http://www.openwall.com/passwdqc/passwdqc-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db64bec5e838e825fa372f40a236ab4a
+_md5_=6da6c4960a1875b0aec4097356188933
diff --git a/metadata/md5-cache/sys-block/gpart-0.3 b/metadata/md5-cache/sys-block/gpart-0.3
index ddcb9093dabe..f09fc02d086d 100644
--- a/metadata/md5-cache/sys-block/gpart-0.3
+++ b/metadata/md5-cache/sys-block/gpart-0.3
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Partition table rescue/guessing tool
 EAPI=6
 HOMEPAGE=https://github.com/baruch/gpart
-KEYWORDS=~amd64 ~hppa x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/baruch/gpart/archive/0.3.tar.gz -> gpart-0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=86658400843369a2a559c3e68dba653a
+_md5_=6bfa496745e72935118228ee00e08c5b
diff --git a/metadata/md5-cache/sys-block/noflushd-2.8 b/metadata/md5-cache/sys-block/noflushd-2.8
index f3177931c143..7911fa25bf0a 100644
--- a/metadata/md5-cache/sys-block/noflushd-2.8
+++ b/metadata/md5-cache/sys-block/noflushd-2.8
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install postinst
 DESCRIPTION=A daemon to spin down your disks and force accesses to be cached
 EAPI=5
 HOMEPAGE=http://noflushd.sourceforge.net/
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/noflushd/noflushd-2.8.tar.gz
-_md5_=2b192ad431848ffd66845f5bdcfec23b
+_md5_=2b3c67dd42c9874d10021c55fd893738
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r1 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r1
index 1b1d72313d4b..db57f8049afa 100644
--- a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r1
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl
 DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
 EAPI=7
 HOMEPAGE=http://opendarwin.org
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=APSL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=2371d337667c1d78e207d33cd5cfa2f8
+_md5_=283ba611e51d75c0b167b4b4ae9be407
diff --git a/metadata/md5-cache/sys-process/anacron-2.3-r4 b/metadata/md5-cache/sys-process/anacron-2.3-r4
index 397088216ef2..f097b44286d8 100644
--- a/metadata/md5-cache/sys-process/anacron-2.3-r4
+++ b/metadata/md5-cache/sys-process/anacron-2.3-r4
@@ -3,10 +3,10 @@ DEPEND=sys-process/cronbase
 DESCRIPTION=a periodic command scheduler
 EAPI=6
 HOMEPAGE=http://anacron.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=sys-process/cronbase virtual/mta
 SLOT=0
 SRC_URI=mirror://sourceforge/anacron/anacron-2.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=3cce5dc64cbbde9bd2845c5983a22add
+_md5_=d9d143c296ef3b7087024be565251010
diff --git a/metadata/md5-cache/sys-process/latencytop-0.5 b/metadata/md5-cache/sys-process/latencytop-0.5
deleted file mode 100644
index ead194c1ad0d..000000000000
--- a/metadata/md5-cache/sys-process/latencytop-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND==dev-libs/glib-2* gtk? ( =x11-libs/gtk+-2* ) sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=tool for identifying where in the system latency is happening
-EAPI=0
-HOMEPAGE=http://www.latencytop.org/
-IUSE=gtk unicode
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND==dev-libs/glib-2* gtk? ( =x11-libs/gtk+-2* ) sys-libs/ncurses
-SLOT=0
-SRC_URI=http://www.latencytop.org/download/latencytop-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c738403a10bfbf6bb3aba57e846a322e
diff --git a/metadata/md5-cache/sys-process/latencytop-0.5-r1 b/metadata/md5-cache/sys-process/latencytop-0.5-r1
index 1bcf789a22e3..02c55a62d54a 100644
--- a/metadata/md5-cache/sys-process/latencytop-0.5-r1
+++ b/metadata/md5-cache/sys-process/latencytop-0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=tool for identifying where in the system latency is happening
 EAPI=5
 HOMEPAGE=http://git.infradead.org/latencytop.git
 IUSE=gtk kernel_linux
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 ) sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/latencytop-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c69e24431f4c775223cf6c6588e5324c
+_md5_=545b0c5cfe66e1191c92b7ea671cb46b
diff --git a/metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1 b/metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1
index 395f0eea804b..ed8e124cb60c 100644
--- a/metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1
+++ b/metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Small and simple weblog engine written in Bash for the command-line
 EAPI=6
 HOMEPAGE=http://nanoblogger.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=mirror://sourceforge/nanoblogger/nanoblogger-3.5-rc1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=720de3a585b2d903a4d46ea7a4fb80ec
+_md5_=09d437a1a69e654ada91af55d2ea2fb8
diff --git a/metadata/md5-cache/www-misc/profile-sync-daemon-5.75 b/metadata/md5-cache/www-misc/profile-sync-daemon-5.75
index 86598ce9c215..19f2373a98a5 100644
--- a/metadata/md5-cache/www-misc/profile-sync-daemon-5.75
+++ b/metadata/md5-cache/www-misc/profile-sync-daemon-5.75
@@ -3,9 +3,9 @@ DESCRIPTION=Symlinks and syncs browser profile dirs to RAM
 EAPI=7
 HOMEPAGE=https://wiki.archlinux.org/index.php/Profile-sync-daemon
 IUSE=systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT GPL-2
 RDEPEND=app-shells/bash net-misc/rsync[xattr] systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/graysky2/profile-sync-daemon/archive/v5.75.tar.gz -> profile-sync-daemon-5.75.tar.gz
-_md5_=a6634abe4f46efc659d637f71fdf406a
+_md5_=63d508f1579416652f186afd53f729f5
diff --git a/metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1 b/metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1
index b8da59dcfb55..500a5b9b6ef2 100644
--- a/metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1
+++ b/metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for overlaying text in X-Windows X-On-Screen-Display
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/libxosd/
 IUSE=static-libs xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz mirror://debian/pool/main/x/xosd/xosd_2.2.14-2.1.debian.tar.xz http://digilander.libero.it/dgp85/gentoo/xosd-gentoo-m4-1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=46b8390b84599eee0e7ceabf0c33a775
+_md5_=f8dfa83db42e69a3b69261793e9fd90a
diff --git a/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827 b/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
index 0837bac2e72d..28e3eb99760c 100644
--- a/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
+++ b/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/
 DESCRIPTION=mouse tool for advanced features such as wheels and 3+ buttons
 EAPI=6
 HOMEPAGE=http://imwheel.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ppc x86
+KEYWORDS=~alpha amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://gentoo/imwheel-1.0.0_pre13_p20100827.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=57f6bfcdec9d29fe44d140e9b6681e13
+_md5_=32e6940d55b51ce6aa4340e4dcbb2b1b
diff --git a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
index 29f86a9bda77..c3aaab61ad63 100644
--- a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
+++ b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Xosd plugin for LINEAK
 EAPI=7
 HOMEPAGE=http://lineak.sourceforge.net/
 IUSE=debug
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND==x11-misc/lineakd-0.9.0* x11-libs/xosd
 SLOT=0
 SRC_URI=mirror://sourceforge/lineak/lineak-xosdplugin-0.9.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=b2dfc6b9fe96e9730dbcf4f843a174e2
+_md5_=5197855d996901b3d14e3a921096307d
diff --git a/metadata/md5-cache/x11-plugins/asmon-0.71-r1 b/metadata/md5-cache/x11-plugins/asmon-0.71-r1
index c20d2b91f94d..4ddba4861439 100644
--- a/metadata/md5-cache/x11-plugins/asmon-0.71-r1
+++ b/metadata/md5-cache/x11-plugins/asmon-0.71-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=WindowMaker/AfterStep system monitor dockapp
 EAPI=5
 HOMEPAGE=http://rio.vg/asmon
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11
 SLOT=0
 SRC_URI=http://rio.vg/asmon/asmon-0.71.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e3e8ee6451514d55c0c91a600865b12
+_md5_=38295733d271849c6802f25f1f05950d