2021-04-05 22:35:28 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-04-05 22:35:33 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-04-05 22:35:33 +0000
commit: 20ab2d69306b9b54f90e2a8a0362f2f365ff8f83 (patch)
tree: fb256c528c78ef3025aa92e4f2251d275c7f9eae /metadata/md5-cache/dev-util
parent: Merge updates from master (diff)
download: gentoo-20ab2d69306b9b54f90e2a8a0362f2f365ff8f83.tar.gz
gentoo-20ab2d69306b9b54f90e2a8a0362f2f365ff8f83.tar.bz2
gentoo-20ab2d69306b9b54f90e2a8a0362f2f365ff8f83.zip
66 files changed, 138 insertions, 134 deletions
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r2 b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
index b205ba2ad260..f3b07381255c 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/cucumber/aruba
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby25(-)] >=dev-util/cucumber-1.1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby26(-)] >=dev-util/cucumber-1.1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby27(-)] >=dev-util/cucumber-1.1.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/aruba-0.6.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
-_md5_=64b795dd9ced98b0bdb0d77c42433e59
+_md5_=19cad316a0b504cba01ad67a0a3e032e
diff --git a/metadata/md5-cache/dev-util/byacc-20200330 b/metadata/md5-cache/dev-util/byacc-20200330
index 0e74f3b82f7a..1e288a54a31f 100644
--- a/metadata/md5-cache/dev-util/byacc-20200330
+++ b/metadata/md5-cache/dev-util/byacc-20200330
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=the best variant of the Yacc parser generator
 EAPI=7
 HOMEPAGE=https://invisible-island.net/byacc/byacc.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20200330.tgz
-_md5_=757d9f76fa8271cdf7731b7f23709fc7
+_md5_=5d0efc811e4e1a8d0c232ca77d4ed43e
diff --git a/metadata/md5-cache/dev-util/byacc-20200910 b/metadata/md5-cache/dev-util/byacc-20200910
index cee38025ee61..a8be58eebf61 100644
--- a/metadata/md5-cache/dev-util/byacc-20200910
+++ b/metadata/md5-cache/dev-util/byacc-20200910
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=the best variant of the Yacc parser generator
 EAPI=7
 HOMEPAGE=https://invisible-island.net/byacc/byacc.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20200910.tgz
-_md5_=757d9f76fa8271cdf7731b7f23709fc7
+_md5_=5d0efc811e4e1a8d0c232ca77d4ed43e
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.17 b/metadata/md5-cache/dev-util/catalyst-3.0.17
index 14550fa763f6..cea4ad4f8e89 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.17
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.17
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 INHERIT=distutils-r1
 IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2+
 PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
 RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pydecomp-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( app-cdr/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.17.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
-_md5_=e317c7baf14aa2c55df2713eaae4b361
+_md5_=e261f02b649967c7d4989b00414d48aa
diff --git a/metadata/md5-cache/dev-util/ccache-4.2 b/metadata/md5-cache/dev-util/ccache-4.2
index fd36a06bea54..56e59a5e7676 100644
--- a/metadata/md5-cache/dev-util/ccache-4.2
+++ b/metadata/md5-cache/dev-util/ccache-4.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://ccache.dev/
 INHERIT=cmake toolchain-funcs
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=app-arch/zstd:0= dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.2/ccache-4.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	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=62f1b6302558540c59ee8fe59337d8a9
+_md5_=5306376c878b26e05982ba24957718ec
diff --git a/metadata/md5-cache/dev-util/cgvg-1.6.3 b/metadata/md5-cache/dev-util/cgvg-1.6.3
index 4816f3f54907..6b5ce797c1fd 100644
--- a/metadata/md5-cache/dev-util/cgvg-1.6.3
+++ b/metadata/md5-cache/dev-util/cgvg-1.6.3
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Minimal command-line source browsing tool similar to cscope
 EAPI=7
 HOMEPAGE=https://uzix.org/cgvg.html
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://uzix.org/cgvg/cgvg-1.6.3.tar.gz
-_md5_=79c90fed3dd7e21b2bb3e436d4f5fc6b
+_md5_=da8c3a53b01ac37760cf0a699c96b0c3
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.5 b/metadata/md5-cache/dev-util/cmake-3.18.5
index 5665cd0c62b3..569e44ee77f1 100644
--- a/metadata/md5-cache/dev-util/cmake-3.18.5
+++ b/metadata/md5-cache/dev-util/cmake-3.18.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://cmake.org/
 INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils
 IUSE=doc emacs ncurses qt5 test test
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.5.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=c2c6bb659e1ae9e780ff06e5cc633766
+_md5_=a0534cb013ea0d4963c4666fe4fefa72
diff --git a/metadata/md5-cache/dev-util/colm-0.13.0.7 b/metadata/md5-cache/dev-util/colm-0.13.0.7
index 6fcb0d4c1638..7e9663b65895 100644
--- a/metadata/md5-cache/dev-util/colm-0.13.0.7
+++ b/metadata/md5-cache/dev-util/colm-0.13.0.7
@@ -3,8 +3,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=COmputer Language Manipulation
 EAPI=7
 HOMEPAGE=https://www.colm.net/open-source/colm/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.colm.net/files/colm/colm-0.13.0.7.tar.gz
-_md5_=00e3aa7ded175ef7421413a0dd586152
+_md5_=d782b3fda2157e3c46a0bad7133e6c64
diff --git a/metadata/md5-cache/dev-util/colm-0.14.7 b/metadata/md5-cache/dev-util/colm-0.14.7
index 75e985834ce3..bc3054604e39 100644
--- a/metadata/md5-cache/dev-util/colm-0.14.7
+++ b/metadata/md5-cache/dev-util/colm-0.14.7
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.colm.net/open-source/colm/
 INHERIT=autotools
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=!<dev-util/ragel-7.0.3
 SLOT=0
 SRC_URI=https://www.colm.net/files/colm/colm-0.14.7.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=55afec71f4f98c4af10a30be6bf5fb08
+_md5_=3ce9834358ff27aa75f370aea38a4b91
diff --git a/metadata/md5-cache/dev-util/cppunit-1.14.0 b/metadata/md5-cache/dev-util/cppunit-1.14.0
index cd1adb3c5cb3..32d582dfa372 100644
--- a/metadata/md5-cache/dev-util/cppunit-1.14.0
+++ b/metadata/md5-cache/dev-util/cppunit-1.14.0
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
 INHERIT=flag-o-matic multilib-minimal
 IUSE=doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=33d71d2ec0ad9e2b7ab27a0cb845ce31
+_md5_=29dfc94e8ea7735c870b746270adb0d4
diff --git a/metadata/md5-cache/dev-util/cppunit-1.15.1-r2 b/metadata/md5-cache/dev-util/cppunit-1.15.1-r2
index 6b608da57b21..e18918fbaf79 100644
--- a/metadata/md5-cache/dev-util/cppunit-1.15.1-r2
+++ b/metadata/md5-cache/dev-util/cppunit-1.15.1-r2
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
 INHERIT=flag-o-matic multilib-minimal
 IUSE=doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 SLOT=0/1.15
 SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=34c2155a4de15837239b46f39d8eb08f
+_md5_=5fc25a9818f07ffc0fb2a50394b5d9c7
diff --git a/metadata/md5-cache/dev-util/cpuinfo-collection-20101114 b/metadata/md5-cache/dev-util/cpuinfo-collection-20101114
index b49d2e88c05f..0b8add8cf8f5 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 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/test_proc-14November2010.tar.gz
-_md5_=5549b70080566273c1ceb8e771d95d09
+_md5_=ba4a4637dbcd56501b4d6a6876022be4
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a-r1 b/metadata/md5-cache/dev-util/cscope-15.8a-r1
index dd094d2b8232..5896d7efe73b 100644
--- a/metadata/md5-cache/dev-util/cscope-15.8a-r1
+++ b/metadata/md5-cache/dev-util/cscope-15.8a-r1
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=http://cscope.sourceforge.net/
 INHERIT=autotools elisp-common toolchain-funcs
 IUSE=emacs
-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=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
-_md5_=dc85cfd8d02f8b96f0994e48c8b2e75d
+_md5_=ceac20d82a4a227e20c6ec8177b0acd2
diff --git a/metadata/md5-cache/dev-util/ctags-20190331 b/metadata/md5-cache/dev-util/ctags-20190331
index 0a5792569263..eebd5bbeff53 100644
--- a/metadata/md5-cache/dev-util/ctags-20190331
+++ b/metadata/md5-cache/dev-util/ctags-20190331
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 INHERIT=autotools
 IUSE=json xml yaml
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 SRC_URI=https://github.com/universal-ctags/ctags/archive/95975bd157cc1326120977ce530f0477bcbf43b1.tar.gz -> ctags-20190331.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=f2c74c52897fd650767648e57415845f
+_md5_=ed570d3baedf8949ff62f0dc495e5956
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.2 b/metadata/md5-cache/dev-util/cucumber-3.1.2
index ac1bf605fc9e..8af53ff945ef 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.1.2
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.2
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 INHERIT=ruby-fakegem
 IUSE=examples test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby25(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby25(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby26(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby26(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.2.tar.gz -> cucumber-3.1.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
-_md5_=8a33e2ab3e350a96579e8795ed4941ef
+_md5_=306589c3afdf6b3ea08e45f9e083588a
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.2.1 b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
index 547af42ed363..5b2126f0198c 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 INHERIT=ruby-fakegem eapi7-ver
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby25(-)] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby25(-)] dev-ruby/gherkin:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby26(-)] dev-ruby/gherkin:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby27(-)] dev-ruby/gherkin:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.2.1.tar.gz -> cucumber-core-3.2.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964
-_md5_=a6edbf9632a28810a8e5f2a825b2779c
+_md5_=9d3258da808435754a4a43ab17a668dd
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
index c2efe588f9e0..837bb598929d 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/cucumber-expressions-6.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
-_md5_=67b766012adc95ac18cac48504c3b2c4
+_md5_=81f10fbb084db1982b20948393330ea7
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
index b9b5474907ea..d04dbf3c290f 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://docs.cucumber.io/tag-expressions/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/cucumber-tag_expressions-1.1.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
-_md5_=7858ce67972a53f440b7b5ccc496a73a
+_md5_=fcf274368bfbc4cc686fbb95d3f8fc65
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
index 0e7d4f550836..6313cdd8b90a 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cucumber-wire-0.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
-_md5_=1c3270c2937c44a7af1c6511ec71713e
+_md5_=095c2d5b39ab6aef9cf6cf5efae31e44
diff --git a/metadata/md5-cache/dev-util/cunit-2.1_p3 b/metadata/md5-cache/dev-util/cunit-2.1_p3
index 6d9706b37f98..5520d79b7e69 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1_p3
+++ b/metadata/md5-cache/dev-util/cunit-2.1_p3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://cunit.sourceforge.net
 INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
 IUSE=ncurses static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-3.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=e16bf56f6096c5935853c0a16429a8c5
+_md5_=f636d365c42d8662d9b1215c12cef7f5
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6.2 b/metadata/md5-cache/dev-util/dejagnu-1.6.2
index 26176ed52608..d1043118519e 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.2
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/tcl dev-tcltk/expect
 DESCRIPTION=Framework for testing other programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/tcl dev-tcltk/expect
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.2.tar.gz
-_md5_=c695536478a35f4f6ec46a076c6f7a4a
+_md5_=aa569309a4d2a644723466394c4c5679
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.24 b/metadata/md5-cache/dev-util/desktop-file-utils-0.24
index eab741fb691b..bdc31b0336d4 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.24
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.24
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
 INHERIT=elisp-common
 IUSE=emacs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.24.tar.xz
 _eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc
-_md5_=6b7b650a019b3eb887cb6ca37ac6dc87
+_md5_=7edbcfb8eb288438eba0422b7a5ae352
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1 b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
index 94a6022a337f..7d7b756d9e8e 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
 INHERIT=elisp-common meson
 IUSE=emacs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz
 _eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	meson	e43eef9331f54965a573ed380854ff47
-_md5_=274d6f718516ad41cc6d58bc2fb321b4
+_md5_=5181987665756aa14dda48b4cdfc34fe
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20170131 b/metadata/md5-cache/dev-util/dialog-1.3.20170131
index a29ba3e8d726..f5c653cfedcc 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20170131
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20170131
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://invisible-island.net/dialog/dialog.html
 INHERIT=eutils ltprune multilib versionator
 IUSE=examples minimal nls static-libs unicode
-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=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0/14
 SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20170131.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=0bd674638436086839b77d410cbd94a1
+_md5_=f91d584c8b1117478ff61bd071cba4f6
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20200327 b/metadata/md5-cache/dev-util/dialog-1.3.20200327
index f0c5996b5a5d..b3a1984004cd 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20200327
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20200327
@@ -4,9 +4,9 @@ DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=7
 HOMEPAGE=https://invisible-island.net/dialog/
 IUSE=examples minimal nls static-libs unicode
-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=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0/15
 SRC_URI=https://dev.gentoo.org/~jer/dialog-1.3-20200327.tar.gz
-_md5_=61b431e07c4bc0daa8efb8b75b7363be
+_md5_=5932b6c10661601160a4a748de301534
diff --git a/metadata/md5-cache/dev-util/diffstat-1.63 b/metadata/md5-cache/dev-util/diffstat-1.63
index f4d31c020430..3c0e1dd9a550 100644
--- a/metadata/md5-cache/dev-util/diffstat-1.63
+++ b/metadata/md5-cache/dev-util/diffstat-1.63
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Display a histogram of diff changes
 EAPI=7
 HOMEPAGE=https://invisible-island.net/diffstat/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=HPND
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/diffstat/diffstat-1.63.tgz
-_md5_=b008ee404ecfc9e0b1965295f7091d24
+_md5_=494ea0b9fd073d9adbcc43fa49081cd1
diff --git a/metadata/md5-cache/dev-util/diffstat-1.64 b/metadata/md5-cache/dev-util/diffstat-1.64
index 362971cb55d8..d08fa90c8373 100644
--- a/metadata/md5-cache/dev-util/diffstat-1.64
+++ b/metadata/md5-cache/dev-util/diffstat-1.64
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Display a histogram of diff changes
 EAPI=7
 HOMEPAGE=https://invisible-island.net/diffstat/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=HPND
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/diffstat/diffstat-1.64.tgz
-_md5_=2c4e4756ed5085cbefde5b577a6ef70e
+_md5_=ab15b986d6fe6d8af7299bda3c915f06
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.66.7 b/metadata/md5-cache/dev-util/gdbus-codegen-2.66.7
index 6945228a961f..31b29b6956d4 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.66.7
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.66.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org distutils-r1
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-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=mirror://gnome/sources/glib/2.66/glib-2.66.7.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
-_md5_=e76391b9112eca536f14cb836ad6b736
+_md5_=d347cca002e8da4ba7a4bee2fbd4abe4
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.66.7 b/metadata/md5-cache/dev-util/glib-utils-2.66.7
index 1c83242a45ff..5bde4abdad9a 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.66.7
+++ b/metadata/md5-cache/dev-util/glib-utils-2.66.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org python-single-r1
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !<dev-libs/glib-2.56.2:2
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.66/glib-2.66.7.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c
-_md5_=6c07fea677971e0309f82e7d9182e890
+_md5_=eadc99b06f961f5b3cbab9a988616ba4
diff --git a/metadata/md5-cache/dev-util/gob-2.0.20 b/metadata/md5-cache/dev-util/gob-2.0.20
index 7777ac04abd8..2d1c73181c5e 100644
--- a/metadata/md5-cache/dev-util/gob-2.0.20
+++ b/metadata/md5-cache/dev-util/gob-2.0.20
@@ -4,10 +4,10 @@ DESCRIPTION=Preprocessor for making GTK+ objects with inline C code
 EAPI=5
 HOMEPAGE=https://www.jirka.org/gob.html
 INHERIT=gnome2
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.4:2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gob2/2.0/gob2-2.0.20.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=2a5810f5ac915f7e538528c208b75799
+_md5_=6fcee9ef8b429c7f844702bd0f35fac5
diff --git a/metadata/md5-cache/dev-util/gperf-3.1 b/metadata/md5-cache/dev-util/gperf-3.1
index b3dbb8fd752d..45d79746c13a 100644
--- a/metadata/md5-cache/dev-util/gperf-3.1
+++ b/metadata/md5-cache/dev-util/gperf-3.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=prepare
 DESCRIPTION=A perfect hash function generator
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gperf/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/gperf/gperf-3.1.tar.gz
-_md5_=ffc4ee4386c6ab37fe4767da59c22b36
+_md5_=8ab931dc9b372750eb13e9da6bd5015b
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
index 55618acc9fca..4ed3486813ff 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
 INHERIT=eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
 IUSE=debug doc emacs +python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	libtool	f143db5a74ccd9ca28c1234deffede96	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=cb03404383104f89212a9bcc39672f3f
+_md5_=a411b89feea4d5b73286733c2b27c72c
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
index 24387ec8605f..23826f16d431 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
 INHERIT=eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
 IUSE=debug doc emacs python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	libtool	f143db5a74ccd9ca28c1234deffede96	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=5a40d4923999b96df87e71a41b7424ab
+_md5_=b47940f7f2972e62a3d4d0c6aed11b1f
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r4 b/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r4
index 3b40629ab7d2..ed1c517ca5bb 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r4
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/DocumentationProject/GtkDoc
 INHERIT=elisp-common gnome.org meson python-single-r1 readme.gentoo-r1
 IUSE=emacs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.38:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.33/gtk-doc-1.33.1.tar.xz
 _eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	c7de0087e87a282f2faec351822e097c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=b626a152dcc496128ba71abd32184374
+_md5_=270237e5a9fc96a729a7824acfc44457
diff --git a/metadata/md5-cache/dev-util/gtk-doc-am-1.32 b/metadata/md5-cache/dev-util/gtk-doc-am-1.32
index b4ab0f01ac4b..55d32a4ece09 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-am-1.32
+++ b/metadata/md5-cache/dev-util/gtk-doc-am-1.32
@@ -4,10 +4,10 @@ DESCRIPTION=Automake files from gtk-doc
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
 INHERIT=gnome.org
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 FDL-1.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3
-_md5_=017fde7413c40878cca1855f795fd6a8
+_md5_=f360a03aee17e4c09f8cb82beffd1644
diff --git a/metadata/md5-cache/dev-util/gtk-doc-am-1.33.1 b/metadata/md5-cache/dev-util/gtk-doc-am-1.33.1
index 40e1a55e2c7d..5b96019f4c14 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-am-1.33.1
+++ b/metadata/md5-cache/dev-util/gtk-doc-am-1.33.1
@@ -4,7 +4,7 @@ DESCRIPTION=Automake files from gtk-doc
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/DocumentationProject/GtkDoc
 INHERIT=gnome.org
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 FDL-1.1
 PDEPEND=virtual/pkgconfig
 RDEPEND=!<dev-util/gtk-doc-1.33
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.33/gtk-doc-1.33.1.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
-_md5_=8fef5e5325492d220cc7bb8ec1efd0c7
+_md5_=d5a900032c11dd57b8137dea441c585b
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
index 36c7bc129b7f..08fbfc47008f 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
@@ -4,10 +4,10 @@ DESCRIPTION=GTK update icon cache
 EAPI=6
 HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache
 INHERIT=meson
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.20/gtk-update-icon-cache-3.24.20.tar.bz2
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	e43eef9331f54965a573ed380854ff47
-_md5_=dc783f8747e814f15a1388a14930cbd8
+_md5_=99297cba5d0628ffd55c6788b8a0e8ab
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21
index f9f7ba34493e..0f3b8f3f7b86 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21
@@ -4,10 +4,10 @@ DESCRIPTION=GTK update icon cache
 EAPI=6
 HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache
 INHERIT=meson
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.21/gtk-update-icon-cache-3.24.21.tar.bz2
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	e43eef9331f54965a573ed380854ff47
-_md5_=5d0aa290539365959a8aaacddb369844
+_md5_=9fadc9d989ef86ff4729b8870f238dd7
diff --git a/metadata/md5-cache/dev-util/indent-2.2.12 b/metadata/md5-cache/dev-util/indent-2.2.12
index 1e084400d5cc..704548afcc61 100644
--- a/metadata/md5-cache/dev-util/indent-2.2.12
+++ b/metadata/md5-cache/dev-util/indent-2.2.12
@@ -3,11 +3,12 @@ DEFINED_PHASES=configure install prepare test
 DESCRIPTION=Indent program source files
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/indent/
+INHERIT=l10n
 IUSE=nls
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/indent/indent-2.2.12.tar.xz
 _eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e
-_md5_=922627b83ea3ba9da204433332624c2f
+_md5_=2065509e81722fb060d5c0fc5c51b0dc
diff --git a/metadata/md5-cache/dev-util/intltool-0.51.0-r2 b/metadata/md5-cache/dev-util/intltool-0.51.0-r2
index 4822892796f7..eeae1ace9e12 100644
--- a/metadata/md5-cache/dev-util/intltool-0.51.0-r2
+++ b/metadata/md5-cache/dev-util/intltool-0.51.0-r2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/XML-Parser
 DESCRIPTION=Internationalization Tool Collection
 EAPI=6
 HOMEPAGE=https://launchpad.net/intltool/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext
 SLOT=0
 SRC_URI=https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
-_md5_=96b6856ff7fdd2110a3b8c25472d77ac
+_md5_=5a8968a0a51284f5a3b66e2548d4ec12
diff --git a/metadata/md5-cache/dev-util/itstool-2.0.6-r1 b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
index cac4e95d9cb3..f75c067bd088 100644
--- a/metadata/md5-cache/dev-util/itstool-2.0.6-r1
+++ b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://itstool.org/
 INHERIT=python-single-r1
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,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=http://files.itstool.org/itstool/itstool-2.0.6.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c
-_md5_=542fad3ec53c47581eded5cec880d1b1
+_md5_=bf3f0d2db35cfff7716afa25f4b614d6
diff --git a/metadata/md5-cache/dev-util/kyua-0.13-r2 b/metadata/md5-cache/dev-util/kyua-0.13-r2
index 6df7dcb440e2..6a94a9d39940 100644
--- a/metadata/md5-cache/dev-util/kyua-0.13-r2
+++ b/metadata/md5-cache/dev-util/kyua-0.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Testing framework for infrastructure software
 EAPI=6
 HOMEPAGE=https://github.com/jmmv/kyua
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-db/sqlite:3 dev-libs/atf dev-lua/lutok
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jmmv/kyua/releases/download/kyua-0.13/kyua-0.13.tar.gz
-_md5_=0211b65ce83e2b019fb872d3d901f15c
+_md5_=d964188f6f9dfdaddd1da04fbd16f4a8
diff --git a/metadata/md5-cache/dev-util/meson-0.55.3 b/metadata/md5-cache/dev-util/meson-0.55.3
index 469c33adcfdc..a076fdf7d1b1 100644
--- a/metadata/md5-cache/dev-util/meson-0.55.3
+++ b/metadata/md5-cache/dev-util/meson-0.55.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.55.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
-_md5_=586cc33d3fa224a61bd65dbf5d561204
+_md5_=ba1223b0860a726bd415dc1acb2f9f48
diff --git a/metadata/md5-cache/dev-util/meson-0.56.2 b/metadata/md5-cache/dev-util/meson-0.56.2
index a3684cd26b9e..82805a727806 100644
--- a/metadata/md5-cache/dev-util/meson-0.56.2
+++ b/metadata/md5-cache/dev-util/meson-0.56.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.56.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
-_md5_=ae96da19e5a79b52d467241cce712c61
+_md5_=9adfcb71958c360bb2a05d76f6a760cc
diff --git a/metadata/md5-cache/dev-util/meson-format-array-0 b/metadata/md5-cache/dev-util/meson-format-array-0
index 8a1b7803da31..fbc9e1cdb27d 100644
--- a/metadata/md5-cache/dev-util/meson-format-array-0
+++ b/metadata/md5-cache/dev-util/meson-format-array-0
@@ -4,10 +4,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=python-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e
-_md5_=11cac31492d06e8440a58ca655c1b2e6
+_md5_=fe500c221740fae75acfd32e8477df01
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.0 b/metadata/md5-cache/dev-util/ninja-1.10.0
index b6ffd45223e0..0b1534f31922 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.0
+++ b/metadata/md5-cache/dev-util/ninja-1.10.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://ninja-build.org/
 INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz -> ninja-1.10.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
-_md5_=035412071b48fc36ef07c54f033790f2
+_md5_=f06f6509db9fdac60f17dd00eeefa2dc
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.1 b/metadata/md5-cache/dev-util/ninja-1.10.1
index ba25833a6416..1beeb4590ea7 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.1
+++ b/metadata/md5-cache/dev-util/ninja-1.10.1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://ninja-build.org/
 INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.1.tar.gz -> ninja-1.10.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
-_md5_=beb8b42457313542feda750782545af3
+_md5_=4b39d507293cbc54aeb83eee91cabc17
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index 9efdaeba3df8..b517198d79d4 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -11,4 +11,4 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=57691513ead437168f53a83c1bfc9913
+_md5_=139af70ef1ff78e1e66d5793dec1a9f2
diff --git a/metadata/md5-cache/dev-util/patchutils-0.3.4 b/metadata/md5-cache/dev-util/patchutils-0.3.4
index 23b7e63e3881..9201fa1b8de4 100644
--- a/metadata/md5-cache/dev-util/patchutils-0.3.4
+++ b/metadata/md5-cache/dev-util/patchutils-0.3.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=test
 DESCRIPTION=A collection of tools that operate on patch files
 EAPI=6
 HOMEPAGE=http://cyberelk.net/tim/patchutils/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.4.tar.xz
-_md5_=abc9ef94fdf24294fd269838115ac063
+_md5_=d9e322e8b53fa35e7acab3f94b16aba8
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.6.3 b/metadata/md5-cache/dev-util/pkgconf-1.6.3
index 6cccfdd4b724..b2b97690e4aa 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.6.3
+++ b/metadata/md5-cache/dev-util/pkgconf-1.6.3
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://git.sr.ht/~kaniini/pkgconf
 INHERIT=multilib multilib-minimal
 IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=ISC
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.6.3.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=1505c19187481451c696441c2d45740c
+_md5_=2d3b20fb503ecadeca047a8e3a97a47b
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.28-r2 b/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
index 5bbbddf3a4eb..94e106dc28cd 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
@@ -5,10 +5,10 @@ EAPI=5
 HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
 INHERIT=eutils flag-o-matic libtool multilib multilib-minimal
 IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
 SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=ebf68e4b20f79c83be8e87b272e92fed
+_md5_=85333f000a8502234084faafca890366
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.29.2 b/metadata/md5-cache/dev-util/pkgconfig-0.29.2
index 61ac1ca5ddd0..d030a5672d83 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.29.2
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.29.2
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
 INHERIT=eutils flag-o-matic libtool multilib multilib-minimal
 IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib 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=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
 SLOT=0
 SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=2b99cd9351b9b44afeb9d01da2dc67b3
+_md5_=e6c0334a48c6baa6638c8bdda7029845
diff --git a/metadata/md5-cache/dev-util/ragel-6.10 b/metadata/md5-cache/dev-util/ragel-6.10
index dd5cc0c70d5c..cb8972d66773 100644
--- a/metadata/md5-cache/dev-util/ragel-6.10
+++ b/metadata/md5-cache/dev-util/ragel-6.10
@@ -4,10 +4,10 @@ DESCRIPTION=Compiles finite state machines from regular languages into executabl
 EAPI=7
 HOMEPAGE=http://www.colm.net/open-source/ragel/
 INHERIT=autotools
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.colm.net/files/ragel/ragel-6.10.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=98e1d91827aa0c8bb1a79fda54258b03
+_md5_=58d7b511472c321049abe456aefa17c9
diff --git a/metadata/md5-cache/dev-util/ragel-7.0.0.12 b/metadata/md5-cache/dev-util/ragel-7.0.0.12
index eca6103d70a6..a9a1c102b50f 100644
--- a/metadata/md5-cache/dev-util/ragel-7.0.0.12
+++ b/metadata/md5-cache/dev-util/ragel-7.0.0.12
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.colm.net/open-source/ragel/
 INHERIT=autotools
 IUSE=vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=~dev-util/colm-0.13.0.7
 SLOT=0
 SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.0.12.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=fec1263c78b04bb40db4f016255cb2fd
+_md5_=62adf36a8bfbc511645a370f0060eb54
diff --git a/metadata/md5-cache/dev-util/ragel-7.0.4 b/metadata/md5-cache/dev-util/ragel-7.0.4
index e6f7140f1836..9a3bfa8adf42 100644
--- a/metadata/md5-cache/dev-util/ragel-7.0.4
+++ b/metadata/md5-cache/dev-util/ragel-7.0.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.colm.net/open-source/ragel/
 INHERIT=autotools
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=~dev-util/colm-0.14.7
 SLOT=0
 SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.4.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=be654bedfcccdf563cf67b041e675c12
+_md5_=8623f1e1f230ea8cc5243858a1855afb
diff --git a/metadata/md5-cache/dev-util/re2c-2.0.3 b/metadata/md5-cache/dev-util/re2c-2.0.3
index 728b124b5e0c..9f753734f04b 100644
--- a/metadata/md5-cache/dev-util/re2c-2.0.3
+++ b/metadata/md5-cache/dev-util/re2c-2.0.3
@@ -3,8 +3,8 @@ DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=7
 HOMEPAGE=http://re2c.org/
 IUSE=debug
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/2.0.3/re2c-2.0.3.tar.xz
-_md5_=69513317cbe5a32eff6231799c406a27
+_md5_=03b6e39025e59059d16eb64b65475727
diff --git a/metadata/md5-cache/dev-util/sel-0.08.4-r2 b/metadata/md5-cache/dev-util/sel-0.08.4-r2
index 66a4423ff404..e50a48948259 100644
--- a/metadata/md5-cache/dev-util/sel-0.08.4-r2
+++ b/metadata/md5-cache/dev-util/sel-0.08.4-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A filemanager for shell scripts
 EAPI=7
 HOMEPAGE=http://www.rninet.de/darkstar/sel.html
-KEYWORDS=amd64 ppc s390 sparc x86
+INHERIT=toolchain-funcs
+KEYWORDS=amd64 ppc ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.rninet.de/darkstar/files/sel-0.08.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=798ee307691503f84daf46a440a56512
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=116ffdf94aedec759fc932e1f9472d21
diff --git a/metadata/md5-cache/dev-util/shadowman-2 b/metadata/md5-cache/dev-util/shadowman-2
index 729621e1f09a..821866d1f3ea 100644
--- a/metadata/md5-cache/dev-util/shadowman-2
+++ b/metadata/md5-cache/dev-util/shadowman-2
@@ -3,9 +3,9 @@ DEPEND=app-admin/eselect
 DESCRIPTION=Unified compiler shadow link directory updater
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/shadowman
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/mgorny/shadowman/archive/v2.tar.gz -> shadowman-2.tar.gz
-_md5_=939d05d1a16a0e017bd53c286a0369c4
+_md5_=6d2c99e72a9ed730bbefcfa70a9ad6b7
diff --git a/metadata/md5-cache/dev-util/shflags-1.0.3 b/metadata/md5-cache/dev-util/shflags-1.0.3
index a6303d59deee..7333097f5f23 100644
--- a/metadata/md5-cache/dev-util/shflags-1.0.3
+++ b/metadata/md5-cache/dev-util/shflags-1.0.3
@@ -3,8 +3,8 @@ DESCRIPTION=Command-line flags module for Unix shell scripts
 EAPI=5
 HOMEPAGE=https://github.com/kward/shflags
 IUSE=examples
-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=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/kward/shflags/archive/1.0.3.tar.gz -> shflags-1.0.3.tgz
-_md5_=c7c8b7bd3f330bea500af9496268fced
+_md5_=192c5b60599f4fb170bae26dde47be03
diff --git a/metadata/md5-cache/dev-util/shflags-1.2.3 b/metadata/md5-cache/dev-util/shflags-1.2.3
index e30f35c6ea78..3f13525dbe3e 100644
--- a/metadata/md5-cache/dev-util/shflags-1.2.3
+++ b/metadata/md5-cache/dev-util/shflags-1.2.3
@@ -3,8 +3,8 @@ DESCRIPTION=Command-line flags module for Unix shell scripts
 EAPI=7
 HOMEPAGE=https://github.com/kward/shflags
 IUSE=examples
-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=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/kward/shflags/archive/v1.2.3.tar.gz -> shflags-1.2.3.tgz
-_md5_=9b574bcd9e011a96b3f6a26ffb7c2fc2
+_md5_=5ecaa56beb46eda88664c4f67ec3cd2a
diff --git a/metadata/md5-cache/dev-util/shtool-2.0.8-r1 b/metadata/md5-cache/dev-util/shtool-2.0.8-r1
index a6b08dcaed7a..5db4fa134907 100644
--- a/metadata/md5-cache/dev-util/shtool-2.0.8-r1
+++ b/metadata/md5-cache/dev-util/shtool-2.0.8-r1
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Set of stable and portable shell scripts
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/shtool/shtool.html
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc s390 sparc x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/shtool/shtool-2.0.8.tar.gz
-_md5_=3bbbfe8819840b0d16dae9b7823b0de5
+_md5_=17c312e63ae5d453763cf1ab23a45146
diff --git a/metadata/md5-cache/dev-util/strace-5.8 b/metadata/md5-cache/dev-util/strace-5.8
index 3aa135bc9cf1..a99d73d9a114 100644
--- a/metadata/md5-cache/dev-util/strace-5.8
+++ b/metadata/md5-cache/dev-util/strace-5.8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://strace.io/
 INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v5.8/strace-5.8.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=72739d3e16d5133d328fc28d1543ce54
+_md5_=15af43105162db3267685073c4f25548
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r1 b/metadata/md5-cache/dev-util/systemtap-4.0-r1
index 0379e0be3621..88f096f3f485 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r1
+++ b/metadata/md5-cache/dev-util/systemtap-4.0-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.sourceware.org/systemtap/
 INHERIT=linux-info autotools python-single-r1 user
 IUSE=libvirt selinux sqlite +ssl test zeroconf kernel_linux python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=f4ebcf899a8aa1c3b98e92b83c141acd
+_md5_=f4fb891067165a9f6fd36040d91a5498
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 75f9fde5849e..1d077e571bdb 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_=29f5e80684437d2bb410278dc7baa233
+_md5_=6858973675b832e9b1a87db676beba70
diff --git a/metadata/md5-cache/dev-util/unifdef-2.10 b/metadata/md5-cache/dev-util/unifdef-2.10
index daeb1102088e..c5fb6b5810ba 100644
--- a/metadata/md5-cache/dev-util/unifdef-2.10
+++ b/metadata/md5-cache/dev-util/unifdef-2.10
@@ -2,9 +2,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Remove #ifdef'ed lines from a file while otherwise leaving the file alone
 EAPI=7
 HOMEPAGE=https://dotat.at/prog/unifdef/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+INHERIT=toolchain-funcs
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dotat.at/prog/unifdef/unifdef-2.10.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1ea2abdcbd463eadbfe7015b683b37ca
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=00cd2aaeb2edbfeaae1390cc833c3d2b
diff --git a/metadata/md5-cache/dev-util/yacc-1.9.1-r6 b/metadata/md5-cache/dev-util/yacc-1.9.1-r6
index 446a962346e0..45c67204c446 100644
--- a/metadata/md5-cache/dev-util/yacc-1.9.1-r6
+++ b/metadata/md5-cache/dev-util/yacc-1.9.1-r6
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postrm preinst prepare
 DESCRIPTION=Yacc: Yet Another Compiler-Compiler
 EAPI=6
 HOMEPAGE=http://dinosaur.compilertools.net/#yacc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+INHERIT=toolchain-funcs
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/yacc-1.9.1.tar.Z
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1118854cd0cd5ddccf5f71b8c23c3804
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=88a633ef6bf8cdd42950260a25cdf3f7
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-04-05 22:35:33 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-04-05 22:35:33 +0000
commit	20ab2d69306b9b54f90e2a8a0362f2f365ff8f83 (patch)
tree	fb256c528c78ef3025aa92e4f2251d275c7f9eae /metadata/md5-cache/dev-util
parent	Merge updates from master (diff)
download	gentoo-20ab2d69306b9b54f90e2a8a0362f2f365ff8f83.tar.gz gentoo-20ab2d69306b9b54f90e2a8a0362f2f365ff8f83.tar.bz2 gentoo-20ab2d69306b9b54f90e2a8a0362f2f365ff8f83.zip