gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /metadata/md5-cache/dev-libs
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
850 files changed, 2307 insertions, 2554 deletions
diff --git a/metadata/md5-cache/dev-libs/9libs-1.0-r4 b/metadata/md5-cache/dev-libs/9libs-1.0-r4
index b264cf7ac124..b7917adb6ad3 100644
--- a/metadata/md5-cache/dev-libs/9libs-1.0-r4
+++ b/metadata/md5-cache/dev-libs/9libs-1.0-r4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=>=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0
 DESCRIPTION=A package of Plan 9 compatibility libraries
@@ -9,5 +9,5 @@ LICENSE=PLAN9
 RDEPEND=>=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0
 SLOT=0
 SRC_URI=https://www.netlib.org/research/9libs/9libs-1.0.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0f3ae8891dbce78f37cc6d6a498dbf0b
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5 b/metadata/md5-cache/dev-libs/Ice-3.6.5
index 8587bbd638ef..8551dc52eab9 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.5
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( 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(-)] ) ruby? ( dev-lang/ruby:2.5 ) mono? ( dev-lang/mono ) readline? ( sys-libs/readline:0= ) test? ( 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/passlib[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(-)] ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DESCRIPTION=ICE middleware C++ library and generator tools
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=test
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.5.tar.gz -> Ice-3.6.5.tar.gz doc? ( https://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	db-use	5b886219e6035ca01d8b1c58eba91679	estack	055c42df72f76a4f45ec92b35e83cd56	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	ruby-ng	97084adc24921dfedde619aafdc14100	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0e802fe39ffbccb519c3a22ca5f53cc8
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5-r1 b/metadata/md5-cache/dev-libs/Ice-3.6.5-r1
index b38bacf8d3d4..8e7633153bc4 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5-r1
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( 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(-)] ) ruby? ( dev-lang/ruby:2.6 ) mono? ( dev-lang/mono ) readline? ( sys-libs/readline:0= ) test? ( 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/passlib[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(-)] ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DESCRIPTION=ICE middleware C++ library and generator tools
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=test
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.5.tar.gz -> Ice-3.6.5.tar.gz doc? ( https://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	db-use	5b886219e6035ca01d8b1c58eba91679	estack	055c42df72f76a4f45ec92b35e83cd56	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	ruby-ng	97084adc24921dfedde619aafdc14100	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=af0d3c31ad88d0f543a9b23a54c46a3d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index db30265a0a1c..b89c689f77de 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10 b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
index 661fa317d99d..b81096f9af53 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
+++ b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/OpenNI/OpenNI/archive/Stable-1.5.7.10.tar.gz -> OpenNI-1.5.7.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=013cfef4386d9d452599891a10cb84cd
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5cb6c17faace52bdafa7047b3b830842
diff --git a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r1 b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r1
index 87a3463dc858..5517777c0c32 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r1
+++ b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/OpenNI/OpenNI/archive/Stable-1.5.7.10.tar.gz -> OpenNI-1.5.7.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=101107b64d77af1e39b10e79c729e28e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c719f0d94a2195d210caf8f5aa89ad06
diff --git a/metadata/md5-cache/dev-libs/OpenNI-9999 b/metadata/md5-cache/dev-libs/OpenNI-9999
index eecdc3f4aa19..847ff340e6f9 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6875528ac3a38ac67026e0e1a8861df6
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=311f400f4eee811133c8f34a042075d0
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2 b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
index 15028e4fc5a0..a66afd6879ca 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
+++ b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/occipital/OpenNI2/archive/2.2-beta2.tar.gz -> OpenNI2-2.2_beta2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a81fe7476f03739a5ae2eb3e2f5832bd
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b11b2eff6cb93d49105f176e0c3cb760
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999
index 86a86c3e7346..805ac560f70e 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI2-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37a029a605283168245e73d7e654ecf6
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2c5aa2703b715cec4a5c9b1066507398
diff --git a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1 b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
deleted file mode 100644
index 321374d7b75c..000000000000
--- a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcached dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Framework for the high-level development of the Evergreen ILS software
-EAPI=5
-HOMEPAGE=https://open-ils.org/
-IUSE=postgres +sqlite
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcached dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://open-ils.org/downloads/opensrf-2.1.1.tar.gz
-_eclasses_=apache-module	6d6745b832afba32cbcfba34e3ee328f	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f29c715f169d764192478edad4970351
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
index 4f7f9e1e9118..5e440fd2c6b2 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-20.40-1147286-ubuntu-20.04.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
 _md5_=3ab9511d36656745f4b8073e3ee4067b
diff --git a/metadata/md5-cache/dev-libs/aml-0.2.0 b/metadata/md5-cache/dev-libs/aml-0.2.0
index 0de357029196..5cbf6cc12644 100644
--- a/metadata/md5-cache/dev-libs/aml-0.2.0
+++ b/metadata/md5-cache/dev-libs/aml-0.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/any1/aml/archive/v0.2.0.tar.gz -> aml-0.2.0.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=028a91eaff859d67422be3df31ae1784
diff --git a/metadata/md5-cache/dev-libs/aml-9999 b/metadata/md5-cache/dev-libs/aml-9999
index 54d0c77b5f7f..b32c704de1d9 100644
--- a/metadata/md5-cache/dev-libs/aml-9999
+++ b/metadata/md5-cache/dev-libs/aml-9999
@@ -7,5 +7,5 @@ IUSE=examples
 LICENSE=ISC
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=028a91eaff859d67422be3df31ae1784
diff --git a/metadata/md5-cache/dev-libs/angelscript-2.34.0 b/metadata/md5-cache/dev-libs/angelscript-2.34.0
index 579a32f17a12..e29d600aa48a 100644
--- a/metadata/md5-cache/dev-libs/angelscript-2.34.0
+++ b/metadata/md5-cache/dev-libs/angelscript-2.34.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 SLOT=0/2.34.0
 SRC_URI=http://www.angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=dc91488b35fb0c7ffabd07ebb0cc166f
diff --git a/metadata/md5-cache/dev-libs/angelscript-2.35.0 b/metadata/md5-cache/dev-libs/angelscript-2.35.0
index 98882819d3b7..68095b7182a3 100644
--- a/metadata/md5-cache/dev-libs/angelscript-2.35.0
+++ b/metadata/md5-cache/dev-libs/angelscript-2.35.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 SLOT=0/2.35.0
 SRC_URI=http://www.angelcode.com/angelscript/sdk/files/angelscript_2.35.0.zip
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a0d796e18257f24bc35400f070b74b72
diff --git a/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1 b/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
index d423e0ead178..4ce283b75dbe 100644
--- a/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
+++ b/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
@@ -1,13 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen[dot] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen[dot] )
 DESCRIPTION=The ANTLR3 C Runtime
 EAPI=7
 HOMEPAGE=https://www.antlr3.org/
-IUSE=debug debugger doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=debug debugger doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=638b9412efd98558ab045fe2aca279bf
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a50c8244be71c0f785c2193c726621a
diff --git a/metadata/md5-cache/dev-libs/appstream-0.12.11-r1 b/metadata/md5-cache/dev-libs/appstream-0.12.11-r1
index 8d21ca2c74a6..9ebc24b5082d 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.11-r1
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.11-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.58:2 dev-libs/libxml2:2 dev-libs/libyaml
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.11.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fcf289e7f5ba3de09b33bc934f54761
diff --git a/metadata/md5-cache/dev-libs/appstream-0.14.3 b/metadata/md5-cache/dev-libs/appstream-0.14.3
index e32c5d814648..7facc5c96943 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.14.3
+++ b/metadata/md5-cache/dev-libs/appstream-0.14.3
@@ -11,5 +11,5 @@ RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.58:2 dev-libs/libxml2:2 dev-libs/libyaml
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.14.3.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c453b0fa0023a9eca7a1f85604efb185
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.16 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.16
deleted file mode 100644
index 257c00aa35f1..000000000000
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/gperf dev-libs/libxml2:2 app-text/docbook-xml-dtd:4.2 dev-libs/libxslt gtk-doc? ( >=dev-util/gtk-doc-1.9 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DESCRIPTION=Provides GObjects and helper methods to read and write AppStream metadata
-EAPI=6
-HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
-IUSE=gtk-doc fonts +introspection stemmer
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
-SLOT=0/8
-SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.16.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed674f274ea62311f5654cba92c0ccee
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.17 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.17
deleted file mode 100644
index 8de56acaa015..000000000000
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/gperf dev-libs/libxml2:2 app-text/docbook-xml-dtd:4.2 dev-libs/libxslt gtk-doc? ( >=dev-util/gtk-doc-1.9 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DESCRIPTION=Provides GObjects and helper methods to read and write AppStream metadata
-EAPI=6
-HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
-IUSE=gtk-doc fonts +introspection stemmer
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
-SLOT=0/8
-SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.17.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29fc86f3855271636339c23a7e65ca40
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.18 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.18
index f305e37d66fb..a0f6cbee1bc9 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.18
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.18
@@ -5,10 +5,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=7
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=gtk-doc fonts +introspection stemmer
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.18.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8cd8ae57e2418edf8cfa47de3ada7aa
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9e18d6dcce9c82d5990823bef1b63c2a
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.3-r4 b/metadata/md5-cache/dev-libs/apr-1.6.3-r4
index 42bfe0d36b2b..beb42a5bee07 100644
--- a/metadata/md5-cache/dev-libs/apr-1.6.3-r4
+++ b/metadata/md5-cache/dev-libs/apr-1.6.3-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Apache Portable Runtime Library
 EAPI=6
 HOMEPAGE=https://apr.apache.org/
 IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~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=Apache-2.0
 RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.6
 SRC_URI=mirror://apache/apr/apr-1.6.3.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=670c8310a1f2799a2b4e0f9e6cbb64e4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=73295dfb22be8bca7da296f564153b6c
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.5-r1 b/metadata/md5-cache/dev-libs/apr-1.6.5-r1
index c483b39139f4..da2c8397fe73 100644
--- a/metadata/md5-cache/dev-libs/apr-1.6.5-r1
+++ b/metadata/md5-cache/dev-libs/apr-1.6.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Apache Portable Runtime Library
 EAPI=6
 HOMEPAGE=https://apr.apache.org/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.6
 SRC_URI=mirror://apache/apr/apr-1.6.5.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a5910823be5b82cae2d830af54290d4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=af655e44abef2ef4aac448adbae4aa03
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0-r1 b/metadata/md5-cache/dev-libs/apr-1.7.0-r1
index 55d3f80f2501..4bf058495dfb 100644
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r1
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
 DESCRIPTION=Apache Portable Runtime Library
 EAPI=7
 HOMEPAGE=https://apr.apache.org/
 IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~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=Apache-2.0
 RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.7
 SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6c8e47ed85586a15deb8223a8d775990
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=279a49928feb30a0939e5ba9ddef73bb
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r6 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r6
index 65562f4b9055..1be88c6d113b 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r6
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r6
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/expat >=dev-libs/apr-1.6.2:1= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
 DESCRIPTION=Apache Portable Runtime Utility Library
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/expat >=dev-libs/apr-1.6.2:1= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	db-use	5b886219e6035ca01d8b1c58eba91679	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=213c324b839bccb5cca025dbad23d752
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index e242208d94d6..22050e7a4d33 100644
--- a/metadata/md5-cache/dev-libs/atcore-1.0.0
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtserialport-5.12.3:5 gui? ( >=dev-qt/qtcharts-5.12.3:5 >=dev-q
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e50ca7ebb68bec4ea41ba8d189940ba
diff --git a/metadata/md5-cache/dev-libs/atf-0.21-r2 b/metadata/md5-cache/dev-libs/atf-0.21-r2
index 97630bb4141a..762fe2a955d6 100644
--- a/metadata/md5-cache/dev-libs/atf-0.21-r2
+++ b/metadata/md5-cache/dev-libs/atf-0.21-r2
@@ -3,8 +3,8 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Libraries to write tests in C, C++ and shell
 EAPI=6
 HOMEPAGE=https://github.com/jmmv/atf
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=https://github.com/jmmv/atf/releases/download/atf-0.21/atf-0.21.tar.gz
-_md5_=36cab6c05701927064061e211bc92f60
+_md5_=92c71ac22d456d859b1d511851ea3838
diff --git a/metadata/md5-cache/dev-libs/atk-2.34.1 b/metadata/md5-cache/dev-libs/atk-2.34.1
deleted file mode 100644
index 916cd4f45d88..000000000000
--- a/metadata/md5-cache/dev-libs/atk-2.34.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) virtual/pkgconfig >=sys-devel/gettext-0.19.8 app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=gtk-doc +introspection 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/atk/2.34/atk-2.34.1.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01e0592acb98b4f4e833e74fa675ea72
diff --git a/metadata/md5-cache/dev-libs/atk-2.36.0 b/metadata/md5-cache/dev-libs/atk-2.36.0
index 3427b84587d4..091ab5f012ba 100644
--- a/metadata/md5-cache/dev-libs/atk-2.36.0
+++ b/metadata/md5-cache/dev-libs/atk-2.36.0
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=gtk-doc +introspection 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.36/atk-2.36.0.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01e0592acb98b4f4e833e74fa675ea72
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01ccefba18722a0c8cd59d552c07f884
diff --git a/metadata/md5-cache/dev-libs/avro-c-1.9.1 b/metadata/md5-cache/dev-libs/avro-c-1.9.1
index 1af802224605..6d79a0c4b531 100644
--- a/metadata/md5-cache/dev-libs/avro-c-1.9.1
+++ b/metadata/md5-cache/dev-libs/avro-c-1.9.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/snappy >=dev-libs/jansson-2.3 sys-libs/zlib
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0beaed2f43cfea7c54b23263ad075ecd
diff --git a/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5 b/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
index 444e4d9a29d6..637e339a3b65 100644
--- a/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
+++ b/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >dev-util/cmake-3.19.1 <dev-util/cmake-3.19.0 ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
+DEPEND=>=dev-libs/aws-c-common-0.4.62:=[static-libs=] >=dev-libs/openssl-1.1.1:=[static-libs=]
 DESCRIPTION=Crypto Abstraction Layer: Cross-Platform C99 wrapper for cryptography primitives
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-c-cal
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-cal/archive/v0.4.5.tar.gz -> aws-c-cal-0.4.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f3966d7b411a7b879f0ef190e6bff2a
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b81f7ddf56c463c1b962d2e8dadab894
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.4.62 b/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
index 59b1235c4be0..35d5b774c4b1 100644
--- a/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
+++ b/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.4.62.tar.gz -> aws-c-common-0.4.62.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a66498e95e23ed07f7f9417d3a0aadd6
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.5.2 b/metadata/md5-cache/dev-libs/aws-c-common-0.5.2
new file mode 100644
index 000000000000..c360e0cc9532
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/aws-c-common-0.5.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core c99 package for AWS SDK for C
+EAPI=7
+HOMEPAGE=https://github.com/awslabs/aws-c-common
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.5.2.tar.gz -> aws-c-common-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2e32b5994b51a5bffbc240e9e3fcda6
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
index c02d98cc95f6..3a78acc0d539 100644
--- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.2.5.tar.gz -> aws-c-event-stream-0.2.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cee1abee2bc3d454e3448f41d7fc733d
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7
new file mode 100644
index 000000000000..d6fb36921ab4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/aws-c-io-0.9.2:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=]
+DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type
+EAPI=7
+HOMEPAGE=https://github.com/awslabs/aws-c-event-stream
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.2.7.tar.gz -> aws-c-event-stream-0.2.7.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=adee10f5729f537db49c920bbf80d04b
diff --git a/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1 b/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
index 524af2b7658b..b9844826bd5e 100644
--- a/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
+++ b/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-io/archive/v0.7.0.tar.gz -> aws-c-io-0.7.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e916c93e8c9faf05f849c17441ebe946
diff --git a/metadata/md5-cache/dev-libs/aws-c-io-0.9.2 b/metadata/md5-cache/dev-libs/aws-c-io-0.9.2
new file mode 100644
index 000000000000..2205168c7dc6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/aws-c-io-0.9.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/aws-c-cal-0.4.5:=[static-libs=] >=dev-libs/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/s2n-0.10.21:=[static-libs=]
+DESCRIPTION=AWS SDK for C module, handles IO and TLS work for application protocols
+EAPI=7
+HOMEPAGE=https://github.com/awslabs/aws-c-io
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/awslabs/aws-c-io/archive/v0.9.2.tar.gz -> aws-c-io-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42b360ca127d36a98b3098778e318fb9
diff --git a/metadata/md5-cache/dev-libs/aws-checksums-0.1.10 b/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
index f736acfc373a..5acb8d523fd1 100644
--- a/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
+++ b/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-checksums/archive/v0.1.10.tar.gz -> aws-checksums-0.1.10.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=216c4cf499e6dbae4fa3f929a1454be7
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
index 8d7d7f122ec9..70ee9e53a356 100644
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
+++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.8.105.tar.gz -> aws-sdk-cpp-1.8.105.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff0dd343514bf82e8df81cb692dfff88
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160
new file mode 100644
index 000000000000..9fb35d230836
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=dev-libs/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/aws-c-event-stream-0.2.7:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=] sys-libs/zlib
+DESCRIPTION=AWS SDK for C++
+EAPI=7
+HOMEPAGE=https://aws.amazon.com/sdk-for-cpp/
+IUSE=+http libressl pulseaudio +rtti +ssl static-libs test unity-build access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe translate waf wellarchitected python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=dev-libs/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/aws-c-event-stream-0.2.7:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=] sys-libs/zlib 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.8.160.tar.gz -> aws-sdk-cpp-1.8.160.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=68bc73427ed746981bd01c928f6ad482
diff --git a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912 b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912
index beb250fecf84..6aab9231483f 100644
--- a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912
+++ b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912
@@ -7,5 +7,4 @@ LICENSE=BSD-1 BSD-2
 RDEPEND=!app-arch/lz4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/bareos-fastlzlib-0_pre20140912.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab5801198fe880d4f8ad7e51fd25ba67
+_md5_=aa978dcecd30280b53db70947ee65291
diff --git a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524 b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
index fbaae8f61025..cab1e8438160 100644
--- a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
+++ b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
@@ -7,5 +7,4 @@ LICENSE=BSD-1 BSD-2
 RDEPEND=!app-arch/lz4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/bareos-fastlzlib-0_pre20150524.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d6f68fa26f3ec1f194815f6c9cd847ec
+_md5_=1a077cafd7e7ef4dc8f474f698c6e502
diff --git a/metadata/md5-cache/dev-libs/bemenu-9999 b/metadata/md5-cache/dev-libs/bemenu-9999
index ec4086c261db..40d9b4ae94d5 100644
--- a/metadata/md5-cache/dev-libs/bemenu-9999
+++ b/metadata/md5-cache/dev-libs/bemenu-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=ncurses? ( sys-libs/ncurses:0 ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/cairo x11-libs/pango ) X? ( x11-libs/libxcb x11-libs/libXext x11-libs/libX11 x11-libs/cairo[X] x11-libs/pango[X] x11-libs/libXinerama )
 REQUIRED_USE=|| ( ncurses wayland X )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=002cf7b5e4d071f6ef16175b83d8a4db
diff --git a/metadata/md5-cache/dev-libs/bitset-2.8.4-r1 b/metadata/md5-cache/dev-libs/bitset-2.8.4-r1
index f53cfb8ec5b4..d5d356665a18 100644
--- a/metadata/md5-cache/dev-libs/bitset-2.8.4-r1
+++ b/metadata/md5-cache/dev-libs/bitset-2.8.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=tcmalloc? ( dev-util/google-perftools:= ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 DESCRIPTION=A compressed bitset with supporting data structures and algorithms
@@ -11,5 +11,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools:= ) jemalloc? ( >=dev-libs/jemallo
 REQUIRED_USE=?? ( jemalloc tcmalloc )
 SLOT=0
 SRC_URI=https://github.com/chriso/bitset/archive/2.8.4.tar.gz -> bitset-2.8.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=915ed145381e9323aa473c03d4dd62f3
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-8.0.4 b/metadata/md5-cache/dev-libs/boehm-gc-8.0.4
index dd4e60aa728c..382855a49851 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-8.0.4
+++ b/metadata/md5-cache/dev-libs/boehm-gc-8.0.4
@@ -5,10 +5,10 @@ DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=7
 HOMEPAGE=https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/
 IUSE=cxx static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=boehm-gc
 RDEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/ivmai/bdwgc/releases/download/v8.0.4/gc-8.0.4.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=79f629e984b8a9063f5a91f395ea48ec
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d615d81086e66ac920d50921c4cdd140
diff --git a/metadata/md5-cache/dev-libs/boost-1.75.0 b/metadata/md5-cache/dev-libs/boost-1.75.0
index d166f85e6a66..17f7ead09924 100644
--- a/metadata/md5-cache/dev-libs/boost-1.75.0
+++ b/metadata/md5-cache/dev-libs/boost-1.75.0
@@ -12,5 +12,5 @@ REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python3_7 python_tar
 RESTRICT=test
 SLOT=0/1.75.0
 SRC_URI=https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54f902c67c4b9d0a392eb00c96b5559a
diff --git a/metadata/md5-cache/dev-libs/boost-1.76.0 b/metadata/md5-cache/dev-libs/boost-1.76.0
new file mode 100644
index 000000000000..4c75aef9a336
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boost-1.76.0
@@ -0,0 +1,16 @@
+BDEPEND==dev-util/boost-build-1.76*
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( 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(-)] numpy? ( dev-python/numpy[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(-)] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Boost Libraries for C++
+EAPI=7
+HOMEPAGE=https://www.boost.org/
+IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=Boost-1.0
+RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( 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(-)] numpy? ( dev-python/numpy[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(-)] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=test
+SLOT=0/1.76.0
+SRC_URI=https://dl.bintray.com/boostorg/release/1.76.0/source/boost_1_76_0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=141e909e7f1a0c3e988b9d9f1b47770b
diff --git a/metadata/md5-cache/dev-libs/botan-2.17.3 b/metadata/md5-cache/dev-libs/botan-2.17.3
index a3e7abf2fb58..a63675ba07f4 100644
--- a/metadata/md5-cache/dev-libs/botan-2.17.3
+++ b/metadata/md5-cache/dev-libs/botan-2.17.3
@@ -11,5 +11,5 @@ RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) l
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=2/2.17
 SRC_URI=https://botan.randombit.net/releases/Botan-2.17.3.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=870e7af5be106a7bef52a0555158845c
diff --git a/metadata/md5-cache/dev-libs/botan-2.18.0 b/metadata/md5-cache/dev-libs/botan-2.18.0
new file mode 100644
index 000000000000..da4287dc0666
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/botan-2.18.0
@@ -0,0 +1,15 @@
+BDEPEND=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-lang/python:3.9 doc? ( dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ) ( dev-lang/python:3.8 doc? ( dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ( dev-lang/python:3.7 doc? ( dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) verify-sig? ( app-crypt/openpgp-keys-botan ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install test unpack
+DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( 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(-)] ) ssl? ( dev-libs/openssl:0=[bindist=] ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+DESCRIPTION=C++ crypto library
+EAPI=7
+HOMEPAGE=https://botan.randombit.net/
+IUSE=bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib cpu_flags_arm_aes cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_rdrand cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( 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(-)] ) ssl? ( dev-libs/openssl:0=[bindist=] ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=2/2.18
+SRC_URI=https://botan.randombit.net/releases/Botan-2.18.0.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.18.0.tar.xz.asc )
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=8af480692c780d82c8691db401204398
diff --git a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110 b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
index 1eca7a04a592..74d1bbdf4b84 100644
--- a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
+++ b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/BoxFort/archive/1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz -> boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=67e237b8acb4e336f763c1fa68781070
diff --git a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902 b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902
index a54f9322e762..564ef907119b 100644
--- a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902
+++ b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902
@@ -5,10 +5,10 @@ DESCRIPTION=Convenient & cross-platform sandboxing C library
 EAPI=7
 HOMEPAGE=https://github.com/Snaipe/BoxFort
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/BoxFort/archive/ac0507b3f45fe58100b528baeb8ca04270b4a8ff.tar.gz -> boxfort-0.0.1_pre20200902.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=653f5ed06cf83390ccaba8ef1259aa5b
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=55f8fe86e59737b6dd86d21611da8ecd
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.21.0 b/metadata/md5-cache/dev-libs/c-blosc-1.21.0
index 9744efdcc6b0..4d87511f1b75 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.21.0
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.21.0
@@ -11,5 +11,5 @@ RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy ) zlib? ( sys-
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.21.0.tar.gz -> c-blosc-1.21.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=163ab31ae22ac71faa52b311124a0067
diff --git a/metadata/md5-cache/dev-libs/c-capnproto-0.3 b/metadata/md5-cache/dev-libs/c-capnproto-0.3
index e094c4760ea3..ff8ddda2dd39 100644
--- a/metadata/md5-cache/dev-libs/c-capnproto-0.3
+++ b/metadata/md5-cache/dev-libs/c-capnproto-0.3
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/xz-utils
 DEFINED_PHASES=-
 DESCRIPTION=C library/compiler for the Cap'n Proto serialization/RPC protocol
 EAPI=7
@@ -7,5 +7,4 @@ KEYWORDS=amd64 arm arm64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/opensourcerouting/c-capnproto/releases/download/c-capnproto-0.3/c-capnproto-0.3.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1a212b94f1b6ccc0b9e87737f70023bb
+_md5_=8e09d59ffe57a3c91f028eeea0709907
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.6.0 b/metadata/md5-cache/dev-libs/cJSON-1.7.14
index 112863d7905b..ba94a1b9df7f 100644
--- a/metadata/md5-cache/dev-libs/rinutils-0.6.0
+++ b/metadata/md5-cache/dev-libs/cJSON-1.7.14
@@ -1,11 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Set of C headers containing macros and static functions
+DESCRIPTION=Ultralightweight JSON parser in ANSI C
 EAPI=7
-HOMEPAGE=https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils
-KEYWORDS=amd64 arm64 x86
+HOMEPAGE=https://github.com/DaveGamble/cJSON
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.6.0/rinutils-0.6.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=368e80ca7946d6e28d8b2bd2e15fed64
+SRC_URI=https://github.com/DaveGamble/cJSON/archive/v1.7.14.tar.gz -> cJSON-1.7.14.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=91d1499a05f26d28214ebc8c0c2c4af9
diff --git a/metadata/md5-cache/dev-libs/caliper-1.5.0 b/metadata/md5-cache/dev-libs/caliper-1.5.0
index 50b3fb979deb..c0a1029ae746 100644
--- a/metadata/md5-cache/dev-libs/caliper-1.5.0
+++ b/metadata/md5-cache/dev-libs/caliper-1.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-misc/curl sys-libs/libunwind dev-libs/papi
 SLOT=0
 SRC_URI=https://github.com/LLNL/caliper/archive/v1.5.0.tar.gz -> caliper-1.5.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bdd47a2cf827d6b42970482c8191f97
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.7.0 b/metadata/md5-cache/dev-libs/capnproto-0.7.0
index 7f705163ddd5..d220d7a209c9 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.7.0
+++ b/metadata/md5-cache/dev-libs/capnproto-0.7.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=ssl? ( dev-libs/openssl:0= ) test? ( dev-cpp/gtest )
 DESCRIPTION=RPC/Serialization system with capabilities support
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= )
 RESTRICT=!test? ( test )
 SLOT=0/070
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.7.0.tar.gz -> capnproto-0.7.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6669d514fc88c81177dec9407bc21acc
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.8.0 b/metadata/md5-cache/dev-libs/capnproto-0.8.0
index bf8600fa1342..f607b537b79c 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.8.0
+++ b/metadata/md5-cache/dev-libs/capnproto-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib:0= ) test? ( dev-cpp/gtest )
 DESCRIPTION=RPC/Serialization system with capabilities support
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:
 RESTRICT=!test? ( test )
 SLOT=0/080
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.8.0.tar.gz -> capnproto-0.8.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0527a47f104c01644c6476ec87f2e597
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2 b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
index fa9c752aa946..f799bc6b10a2 100644
--- a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/aquynh/capstone/archive/4.0.2.tar.gz -> capstone-4.0.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40b66de6ab45c377a7cdffadc1b5043d
diff --git a/metadata/md5-cache/dev-libs/cereal-1.3.0 b/metadata/md5-cache/dev-libs/cereal-1.3.0
index fd58f9839fd1..1306a0ad2f1b 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.3.0
+++ b/metadata/md5-cache/dev-libs/cereal-1.3.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz -> cereal-1.3.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67dca8f28095805811c4269f770dc23a
diff --git a/metadata/md5-cache/dev-libs/cgilib-0.7-r1 b/metadata/md5-cache/dev-libs/cgilib-0.7-r1
index 38b9f8c00a0a..6be091363759 100644
--- a/metadata/md5-cache/dev-libs/cgilib-0.7-r1
+++ b/metadata/md5-cache/dev-libs/cgilib-0.7-r1
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DESCRIPTION=A simple and lightweight interface to the CGI for C and C++ programs
 EAPI=7
 HOMEPAGE=https://www.infodrom.org/projects/cgilib/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.infodrom.org/projects/cgilib/download/cgilib-0.7.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9606b64a771e702babecb1ef441ef021
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=65f22e3733b0c16801bacf3760d2336c
diff --git a/metadata/md5-cache/dev-libs/cgreen-1.3.0 b/metadata/md5-cache/dev-libs/cgreen-1.3.0
index 93295033893f..79b3a4f082e1 100644
--- a/metadata/md5-cache/dev-libs/cgreen-1.3.0
+++ b/metadata/md5-cache/dev-libs/cgreen-1.3.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=sys-libs/glibc:=
 SLOT=0
 SRC_URI=https://github.com/cgreen-devs/cgreen/archive/1.3.0.tar.gz -> cgreen-1.3.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e0562a8ad3d0972b4008f1559580e96
diff --git a/metadata/md5-cache/dev-libs/check-0.15.2-r1 b/metadata/md5-cache/dev-libs/check-0.15.2-r1
index 17ed0263d258..c863c05bb176 100644
--- a/metadata/md5-cache/dev-libs/check-0.15.2-r1
+++ b/metadata/md5-cache/dev-libs/check-0.15.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A unit test framework for C
 EAPI=7
 HOMEPAGE=https://libcheck.github.io/check/
 IUSE=doc subunit 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 ~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=LGPL-2.1+
 RDEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=ppc? ( test ) ppc64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libcheck/check/archive/0.15.2.tar.gz -> check-0.15.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e91064a94d98c1a814df80b0111e8ee
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=24ae0d315c5ed404bf9f343224202906
diff --git a/metadata/md5-cache/dev-libs/chmlib-0.40-r1 b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
index 5709b20c0c0e..7b72ae58caf9 100644
--- a/metadata/md5-cache/dev-libs/chmlib-0.40-r1
+++ b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for MS CHM (compressed html) file format
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.jedrea.com/chmlib/chmlib-0.40.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=544c0b9442030fbe40adc9205d0c5371
diff --git a/metadata/md5-cache/dev-libs/cl-1.2.3 b/metadata/md5-cache/dev-libs/cl-1.2.3
index e00149036156..c6378201c5ca 100644
--- a/metadata/md5-cache/dev-libs/cl-1.2.3
+++ b/metadata/md5-cache/dev-libs/cl-1.2.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
 SLOT=0
 SRC_URI=https://github.com/tonyrog/cl/archive/cl-1.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c6c1eab3722e264ea44274e4e81c23b
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=521f019df741d4a792b80471e23b134f
diff --git a/metadata/md5-cache/dev-libs/cl-1.2.4 b/metadata/md5-cache/dev-libs/cl-1.2.4
index dd116c7a1e9d..571998a7f2f4 100644
--- a/metadata/md5-cache/dev-libs/cl-1.2.4
+++ b/metadata/md5-cache/dev-libs/cl-1.2.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
 SLOT=0
 SRC_URI=https://github.com/tonyrog/cl/archive/cl-1.2.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a584a53f294a3942a6eaa77b569acda7
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ce029572606cbd17900b0e96ab1dbb65
diff --git a/metadata/md5-cache/dev-libs/cl-9999 b/metadata/md5-cache/dev-libs/cl-9999
index b16b18e9de19..67d191f3a091 100644
--- a/metadata/md5-cache/dev-libs/cl-9999
+++ b/metadata/md5-cache/dev-libs/cl-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6baa4870bd6b5243086d79707a1a2910
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8ebe4266df1d7980a0c8a1f436c14439
diff --git a/metadata/md5-cache/dev-libs/clhpp-2.0.12 b/metadata/md5-cache/dev-libs/clhpp-2.0.12
index 2d0841418ae7..4b07d53ab15a 100644
--- a/metadata/md5-cache/dev-libs/clhpp-2.0.12
+++ b/metadata/md5-cache/dev-libs/clhpp-2.0.12
@@ -9,5 +9,5 @@ LICENSE=Khronos-CLHPP
 RDEPEND=virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.12.tar.gz -> clhpp-2.0.12.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2636ef1391d124763945d316b15f6671
diff --git a/metadata/md5-cache/dev-libs/clipper-6.4.2 b/metadata/md5-cache/dev-libs/clipper-6.4.2
index 5cc3e75f474d..0ecd98fa364c 100644
--- a/metadata/md5-cache/dev-libs/clipper-6.4.2
+++ b/metadata/md5-cache/dev-libs/clipper-6.4.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/project/polyclipping/clipper_ver6.4.2.zip -> clipper-6.4.2.zip
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1311323c8aac10932b9e5355586ec17
diff --git a/metadata/md5-cache/dev-libs/cloog-0.20.0 b/metadata/md5-cache/dev-libs/cloog-0.20.0
index 3ffee085c281..4c636dfd632a 100644
--- a/metadata/md5-cache/dev-libs/cloog-0.20.0
+++ b/metadata/md5-cache/dev-libs/cloog-0.20.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare test
 DEPEND=dev-libs/gmp:= dev-libs/isl:=
 DESCRIPTION=A loop generator for scanning polyhedra
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/gmp:= dev-libs/isl:=
 SLOT=0/4
 SRC_URI=https://github.com/periscop/cloog/archive/cloog-0.20.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7ccdaae2b27e883bb7d13351bf21972c
diff --git a/metadata/md5-cache/dev-libs/cloog-9999 b/metadata/md5-cache/dev-libs/cloog-9999
index eb6ec179db51..9537176e48d9 100644
--- a/metadata/md5-cache/dev-libs/cloog-9999
+++ b/metadata/md5-cache/dev-libs/cloog-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare test unpack
 DEPEND=dev-libs/gmp:= dev-libs/isl:=
 DESCRIPTION=A loop generator for scanning polyhedra
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/gmp:= dev-libs/isl:=
 SLOT=0/4
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7ccdaae2b27e883bb7d13351bf21972c
diff --git a/metadata/md5-cache/dev-libs/collada-dom-2.5.0 b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
index 0dbf2a4b370b..b3c4969b3719 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-2.5.0
+++ b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx]
 SLOT=0/25
 SRC_URI=https://github.com/rdiankov/collada-dom/archive/v2.5.0.tar.gz -> collada-dom-2.5.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef441eeab2e2a32fbe1ade89ceded941
diff --git a/metadata/md5-cache/dev-libs/collada-dom-9999 b/metadata/md5-cache/dev-libs/collada-dom-9999
index b5fadcf6b59e..c08c46154119 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-9999
+++ b/metadata/md5-cache/dev-libs/collada-dom-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2:= dev-libs/libpcre:=[cxx]
 SLOT=0/25
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6952f3c6e949caa0ec0449dada0dbe30
diff --git a/metadata/md5-cache/dev-libs/confuse-3.3 b/metadata/md5-cache/dev-libs/confuse-3.3
index 6a29021a730e..b3db1f71d6f6 100644
--- a/metadata/md5-cache/dev-libs/confuse-3.3
+++ b/metadata/md5-cache/dev-libs/confuse-3.3
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/martinh/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8dee25f4d1760d8077447cb56721c7ad
diff --git a/metadata/md5-cache/dev-libs/console_bridge-1.0.1 b/metadata/md5-cache/dev-libs/console_bridge-1.0.1
index 4eb66a38817d..ccdec6cd9caa 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-1.0.1
+++ b/metadata/md5-cache/dev-libs/console_bridge-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads]
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cppcheck/ament_cppcheck/main.py -> console_bridge-1.0.1-ament-0.9.5-cppcheck.py https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cpplint/ament_cpplint/cpplint.py -> console_bridge-1.0.1-ament-0.9.5-cpplint.py https://github.com/ros/console_bridge/archive/1.0.1.tar.gz -> console_bridge-1.0.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8aee939ddc8ad2a8865c521a8569d24d
diff --git a/metadata/md5-cache/dev-libs/console_bridge-9999 b/metadata/md5-cache/dev-libs/console_bridge-9999
index 85afd5d55925..82b3ccef12aa 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-9999
+++ b/metadata/md5-cache/dev-libs/console_bridge-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads]
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cppcheck/ament_cppcheck/main.py -> console_bridge-9999-ament-0.9.5-cppcheck.py https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cpplint/ament_cpplint/cpplint.py -> console_bridge-9999-ament-0.9.5-cpplint.py
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8aee939ddc8ad2a8865c521a8569d24d
diff --git a/metadata/md5-cache/dev-libs/cppcodec-0.2 b/metadata/md5-cache/dev-libs/cppcodec-0.2
index 81a9d9515eef..55f339098157 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-0.2
+++ b/metadata/md5-cache/dev-libs/cppcodec-0.2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tplgy/cppcodec/archive/v0.2.tar.gz -> cppcodec-0.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d77dc9942043d6418fefed40ced92c4a
diff --git a/metadata/md5-cache/dev-libs/cppcodec-9999 b/metadata/md5-cache/dev-libs/cppcodec-9999
index a3d6de6f0f5c..789233cd8513 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-9999
+++ b/metadata/md5-cache/dev-libs/cppcodec-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba3889eecbc7ca5530116e1a8afec67b
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.0.6 b/metadata/md5-cache/dev-libs/crc32c-1.0.6
index 6b54eac16d93..215c5585e4d4 100644
--- a/metadata/md5-cache/dev-libs/crc32c-1.0.6
+++ b/metadata/md5-cache/dev-libs/crc32c-1.0.6
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/google/crc32c/archive/1.0.6.tar.gz -> crc32c-1.0.6.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=968bba5a70ac9e60588ac29f883926f5
diff --git a/metadata/md5-cache/dev-libs/criterion-2.3.3 b/metadata/md5-cache/dev-libs/criterion-2.3.3
index 790c7c385d2c..d7724d315358 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.3.3
+++ b/metadata/md5-cache/dev-libs/criterion-2.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nanomsg:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/releases/download/v2.3.3/criterion-v2.3.3.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=960d8b2ee90c38c6c4b66d9ed152faea
diff --git a/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110 b/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
index 8e695458bf32..73b7d947b863 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
+++ b/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
@@ -5,11 +5,11 @@ DESCRIPTION=Cross platform unit testing framework for C and C++
 EAPI=7
 HOMEPAGE=https://github.com/Snaipe/Criterion
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD-2 MIT ZLIB
 RDEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/archive/4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz -> criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz https://github.com/scottt/debugbreak/archive/6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz -> debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz https://github.com/attractivechaos/klib/archive/cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz -> klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz https://github.com/nanopb/nanopb/archive/6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz -> nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3a3278b4711e222e0b9e9bb56cf37929
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=802c22a46af90ad0b0aed84355d8eaf3
diff --git a/metadata/md5-cache/dev-libs/crossguid-0_pre20150817 b/metadata/md5-cache/dev-libs/crossguid-0_pre20150817
index 5f3d1bb30f01..0e519485af70 100644
--- a/metadata/md5-cache/dev-libs/crossguid-0_pre20150817
+++ b/metadata/md5-cache/dev-libs/crossguid-0_pre20150817
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
 DEPEND=sys-apps/util-linux
 DESCRIPTION=Lightweight cross platform C++ GUID/UUID library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/graeme-hill/crossguid
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=MIT
 RDEPEND=sys-apps/util-linux
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/graeme-hill/crossguid/archive/8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz -> crossguid-0_pre20150817.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cdc384c31c9b59904e4c7f5b04136d48
+_md5_=7b1833f5190cb70f823a8a8cfa8bc44c
diff --git a/metadata/md5-cache/dev-libs/crypto++-8.5.0 b/metadata/md5-cache/dev-libs/crypto++-8.5.0
index 828ee3832751..6f21f3641fa3 100644
--- a/metadata/md5-cache/dev-libs/crypto++-8.5.0
+++ b/metadata/md5-cache/dev-libs/crypto++-8.5.0
@@ -1,12 +1,12 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install prepare
+BDEPEND=app-arch/unzip verify-sig? ( app-crypt/openpgp-keys-crypto++ ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare unpack
 DESCRIPTION=C++ class library of cryptographic schemes
 EAPI=7
 HOMEPAGE=https://cryptopp.com
-IUSE=+asm static-libs
+IUSE=+asm static-libs verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=Boost-1.0
 SLOT=0/8.5
-SRC_URI=https://www.cryptopp.com/cryptopp850.zip
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=108cf215904935005d58c8ec633d9a0f
+SRC_URI=https://www.cryptopp.com/cryptopp850.zip verify-sig? ( https://cryptopp.com/cryptopp850.zip.sig )
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=85eb2b817f5ca62ea5b8f7a9b79f40a0
diff --git a/metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1 b/metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1
index 9d8f1cfde9f1..8a601c550ea3 100644
--- a/metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1
+++ b/metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2.2.1
 SRC_URI=https://github.com/jarro2783/cxxopts/archive/v2.2.1.tar.gz -> cxxopts-2.2.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a028ec8e233efd2021b8c06b0b02bcfa
diff --git a/metadata/md5-cache/dev-libs/cxxtools-2.2.1 b/metadata/md5-cache/dev-libs/cxxtools-2.2.1
index 3265df420a02..cc1eda91b8a4 100644
--- a/metadata/md5-cache/dev-libs/cxxtools-2.2.1
+++ b/metadata/md5-cache/dev-libs/cxxtools-2.2.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure
 DEPEND=virtual/libiconv
 DESCRIPTION=Collection of general purpose C++-classes
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.tntnet.org/cxxtools.html
 KEYWORDS=amd64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/cxxtools-2.2.1.tar.gz
-_md5_=0b0d5983de030f4ae101475f744ac61a
+_md5_=4bc31459e40db96cec171d61e534169c
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
index 7812aa34892e..18a22a32bd2a 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
 DEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
 DESCRIPTION=REINER SCT cyberJack USB chipcard reader user space driver
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
 SLOT=0
 SRC_URI=https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP14/pcsc-cyberjack_3.99.5final.SP14.tar.gz -> pcsc-cyberjack_3.99.5final.SP14.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5334e087e24d64b7cbb94fbba7053a79
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=c7667b8964eff397a14a0e3fac34c8f2
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
index 374c5a19934d..4324e66b44cd 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
 DEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( dev-db/mysql-connector-c: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(-)?] ) pam? ( >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=7
 HOMEPAGE=https://www.cyrusimap.org/sasl/
 IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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=BSD-with-attribution
 RDEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( dev-db/mysql-connector-c: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(-)?] ) pam? ( >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=ldapdb? ( openldap )
 SLOT=2
 SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	db-use	5b886219e6035ca01d8b1c58eba91679	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c02fa6168bdc7fc63af07e1561f4f743
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9768ff98188e71c143edd0d2f4b481d7
diff --git a/metadata/md5-cache/dev-libs/d0_blind_id-1.0 b/metadata/md5-cache/dev-libs/d0_blind_id-1.0
index 495fad4b829f..a9528b3b27c9 100644
--- a/metadata/md5-cache/dev-libs/d0_blind_id-1.0
+++ b/metadata/md5-cache/dev-libs/d0_blind_id-1.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/gmp:0
 DESCRIPTION=Blind-ID library for user identification using RSA blind signatures
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0
 SLOT=0
 SRC_URI=https://github.com/divVerent/d0_blind_id/archive/v1.0.tar.gz -> d0_blind_id-1.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a1ee763bd787abfb250c7460ee5cd3f0
diff --git a/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816 b/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
index 3aef3b205a48..0cd79998144e 100644
--- a/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
+++ b/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69
 DEFINED_PHASES=install prepare
 DESCRIPTION=Darts-clone (Double-ARray Trie System) C++ library
 EAPI=7
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-mac
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/s-yata/darts-clone/archive/e40ce4627526985a7767444b6ed6893ab6ff8983.tar.gz -> darts-0.32h_pre20181117064816.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1de39f938c9d58e39bedf652e2e02a8c
diff --git a/metadata/md5-cache/dev-libs/darts-9999 b/metadata/md5-cache/dev-libs/darts-9999
index 5be6fae63d8a..84f8946e6ae5 100644
--- a/metadata/md5-cache/dev-libs/darts-9999
+++ b/metadata/md5-cache/dev-libs/darts-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Darts-clone (Double-ARray Trie System) C++ library
 EAPI=7
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/s-yata/darts-clone https://code.google.com/archive/p
 LICENSE=BSD-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=5d01bb2ad2758ed14731f03dfc88f603
diff --git a/metadata/md5-cache/dev-libs/date-3.0.0 b/metadata/md5-cache/dev-libs/date-3.0.0
index 0d66586e71e8..d5e29c8e8b26 100644
--- a/metadata/md5-cache/dev-libs/date-3.0.0
+++ b/metadata/md5-cache/dev-libs/date-3.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/HowardHinnant/date/archive/v3.0.0.tar.gz -> date-3.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd7fbaad72a1288726e3068b7c45c2d1
diff --git a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4 b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
index 730b5c4542b0..ff1cc0527ea8 100644
--- a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
+++ b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dbus-cplusplus/libdbus-c++-0.9.0.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a9486f44187be5b41fce6586e6d9ca44
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.110 b/metadata/md5-cache/dev-libs/dbus-glib-0.110
index 4df788d3bab0..114cd7ebb84a 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.110
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.110
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-libs/expat-2.1.0-r3 >=dev-libs/glib-2.40:2 >=sys-apps/dbus-1.8 >=dev-util/glib-utils-2.40 >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-libs/expat-2.1.0-r3 >=dev-libs/glib-2.40:2 >=sys-apps/dbus-1.8 >=dev-util/glib-utils-2.40 >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=D-Bus bindings for glib
 EAPI=7
 HOMEPAGE=https://dbus.freedesktop.org/
 IUSE=debug static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d3cfce1eb0310fc7a45d59b9accd8d06
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ecc7e340c8d8515e820b6b4cc4281cc7
diff --git a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.4 b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.4
index a4fce131d59d..520f263526f0 100644
--- a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.4
+++ b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 RESTRICT=fetch mirror bindist
 SLOT=0
 SRC_URI=deviceatlas-enterprise-c-2.1.4.tgz
-_eclasses_=cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1551e9224b34963e5ba5c17820e3e38
diff --git a/metadata/md5-cache/dev-libs/dietlibc-0.34 b/metadata/md5-cache/dev-libs/dietlibc-0.34
index f198e1e6f32d..b492aca319d1 100644
--- a/metadata/md5-cache/dev-libs/dietlibc-0.34
+++ b/metadata/md5-cache/dev-libs/dietlibc-0.34
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=347073a646420d3a9089cd11bb98d2ca
diff --git a/metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1 b/metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1
index 6cc77bd791cb..15cf8910b604 100644
--- a/metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1
+++ b/metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~patrick/dietlibc-0.34_pre20140729.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1f4bd60f8ae5203dae847705007fcce
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.6.1 b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
index 1ffb85afb174..3300781c6582 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.6.1
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.1.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=08bc16028c985948675eb218b4f6e7cf
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1 b/metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1
index 531a5af2af81..673e393081cd 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-3 GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.1.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=464110b118c7c9467bb79deeb874c4f8
diff --git a/metadata/md5-cache/dev-libs/distorm3-3.5.1 b/metadata/md5-cache/dev-libs/distorm3-3.5.1
deleted file mode 100644
index c0d74e399187..000000000000
--- a/metadata/md5-cache/dev-libs/distorm3-3.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The ultimate disassembler library (X86-32, X86-64)
-EAPI=7
-HOMEPAGE=http://www.ragestorm.net/distorm/
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-4
-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
-SRC_URI=mirror://pypi/d/distorm3/distorm3-3.5.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9310c2699727065dcc59809e370deca9
diff --git a/metadata/md5-cache/dev-libs/distorm3-3.5.2 b/metadata/md5-cache/dev-libs/distorm3-3.5.2
index d51bc0bcbe51..19e5e4304a9c 100644
--- a/metadata/md5-cache/dev-libs/distorm3-3.5.2
+++ b/metadata/md5-cache/dev-libs/distorm3-3.5.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/distorm3/distorm3-3.5.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2cbe91f3c088ba1e556bedcb31c34a93
diff --git a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7 b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
index 84037db77e22..9e3da684bea7 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
+++ b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
@@ -1,13 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-apps/texinfo sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/texinfo
 DESCRIPTION=A Debug Malloc Library
 EAPI=7
 HOMEPAGE=https://dmalloc.com
-IUSE=static-libs threads
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+IUSE=threads
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=https://dmalloc.com/releases/dmalloc-5.5.2.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=56731595791de05284be659349b04627
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b2e151e5d367acfa077f501cb446db75
diff --git a/metadata/md5-cache/dev-libs/dmalloc-999999 b/metadata/md5-cache/dev-libs/dmalloc-999999
index 167866be3a6a..14852bca1fcd 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-999999
+++ b/metadata/md5-cache/dev-libs/dmalloc-999999
@@ -1,11 +1,11 @@
-BDEPEND=app-text/texi2html sys-apps/texinfo >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-text/texi2html sys-apps/texinfo sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A Debug Malloc Library
 EAPI=7
 HOMEPAGE=https://dmalloc.com
-IUSE=static-libs threads
+IUSE=threads
 LICENSE=ISC
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=07303ad5a2e641b30bf8bf44d14020fc
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bcba3397768bf275458f7ebcf4784f43
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.1.5 b/metadata/md5-cache/dev-libs/double-conversion-3.1.5
index 121e013c6297..21f6b4ec4101 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.1.5
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.1.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.1.5.tar.gz -> double-conversion-3.1.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b2706c49eb37b54993be8207b403ccb
diff --git a/metadata/md5-cache/dev-libs/dqlite-1.6.0 b/metadata/md5-cache/dev-libs/dqlite-1.6.0
index 5e63e87c630e..732b5fc8781a 100644
--- a/metadata/md5-cache/dev-libs/dqlite-1.6.0
+++ b/metadata/md5-cache/dev-libs/dqlite-1.6.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-db/sqlite:3 dev-libs/libuv dev-libs/raft test? ( dev-libs/raft[test] )
 DESCRIPTION=Embeddable, replicated and fault tolerant SQL engine
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/libuv dev-libs/raft
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/canonical/dqlite/archive/v1.6.0.tar.gz -> dqlite-1.6.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1caa9a4e34063a5bbdee3c563826117f
diff --git a/metadata/md5-cache/dev-libs/eb-4.4.1-r1 b/metadata/md5-cache/dev-libs/eb-4.4.1-r1
index 73138121a6a0..cb6eb0d3b1ff 100644
--- a/metadata/md5-cache/dev-libs/eb-4.4.1-r1
+++ b/metadata/md5-cache/dev-libs/eb-4.4.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-libs/zlib nls? ( virtual/libintl )
 DESCRIPTION=EB is a C library and utilities for accessing CD-ROM books
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.1.tar.lzma
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=715081613a1b4697c2546049b5c8d4de
diff --git a/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1 b/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1
index 9c012a280029..cc10410fb8e0 100644
--- a/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1
+++ b/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1
@@ -1,16 +1,16 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-accessibility/at-spi2-core dev-libs/glib:2 dev-libs/libcroco virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxklavier x11-libs/pango introspection? ( dev-libs/gobject-introspection ) libcanberra? ( media-libs/libcanberra[gtk3(+)] ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) xtest? ( x11-libs/libXtst ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-accessibility/at-spi2-core dev-libs/glib:2 dev-libs/libcroco virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxklavier x11-libs/pango introspection? ( dev-libs/gobject-introspection ) libcanberra? ( media-libs/libcanberra[gtk3(+)] ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) xtest? ( x11-libs/libXtst ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An easy to use virtual keyboard toolkit
 EAPI=7
 HOMEPAGE=https://github.com/ueno/eekboard
 IUSE=doc +introspection libcanberra static-libs +vala +xtest test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-accessibility/at-spi2-core dev-libs/glib:2 dev-libs/libcroco virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxklavier x11-libs/pango introspection? ( dev-libs/gobject-introspection ) libcanberra? ( media-libs/libcanberra[gtk3(+)] ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) xtest? ( x11-libs/libXtst )
+RDEPEND=app-accessibility/at-spi2-core dev-libs/glib:2 dev-libs/libcroco virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxklavier x11-libs/pango introspection? ( dev-libs/gobject-introspection ) libcanberra? ( media-libs/libcanberra[gtk3(+)] ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) xtest? ( x11-libs/libXtst )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/eekboard/archive/e212262f29e022bdf7047861263ceea0c373e916.tar.gz -> eekboard-1.0.8_p20121001.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=214b391dd9928088aca3ed1d9ab063f7
diff --git a/metadata/md5-cache/dev-libs/efl-1.25.1-r10 b/metadata/md5-cache/dev-libs/efl-1.25.1-r10
deleted file mode 100644
index e722f13138fd..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.25.1-r10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org
-IUSE=+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent zeroconf doc lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ?? ( elogind systemd ) ?? ( gles2-only opengl ) ?? ( fbcon tslib ) ssl drm? ( gles2-only ) examples? ( eet svg ) gles2-only? ( || ( wayland X ) ) ibus? ( glib ) pulseaudio? ( sound ) wayland? ( gles2-only !opengl ) xim? ( X ) xpresent? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz
-_eclasses_=docs	5a0235b1127b58fd6bf54a12c8d21657	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da69d06aa353ffd9fe705f59034954bf
diff --git a/metadata/md5-cache/dev-libs/efl-1.25.1-r11 b/metadata/md5-cache/dev-libs/efl-1.25.1-r11
index bbe32a8b1406..5af5bc2e9caa 100644
--- a/metadata/md5-cache/dev-libs/efl-1.25.1-r11
+++ b/metadata/md5-cache/dev-libs/efl-1.25.1-r11
@@ -1,16 +1,16 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen dev-texlive/texlive-fontutils ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
 IUSE=+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent zeroconf doc lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ?? ( elogind systemd ) ?? ( gles2-only opengl ) ?? ( fbcon tslib ) ssl drm? ( gles2-only ) examples? ( eet svg ) gles2-only? ( || ( wayland X ) ) ibus? ( glib ) pulseaudio? ( sound ) wayland? ( gles2-only !opengl ) xim? ( X ) xpresent? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz
-_eclasses_=docs	5a0235b1127b58fd6bf54a12c8d21657	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1792cc545d8e67f3728158c26020932
+_eclasses_=docs	5a0235b1127b58fd6bf54a12c8d21657	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba77b7a6c87c57f148133f1d0328afdb
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.181 b/metadata/md5-cache/dev-libs/elfutils-0.181
deleted file mode 100644
index f3483c17bbec..000000000000
--- a/metadata/md5-cache/dev-libs/elfutils-0.181
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[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(-)?] ) !dev-libs/libelf valgrind? ( dev-util/valgrind )
-DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
-EAPI=7
-HOMEPAGE=http://elfutils.org/
-IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind 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
-LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[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(-)?] ) !dev-libs/libelf
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://sourceware.org/elfutils/ftp/0.181/elfutils-0.181.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b3268414e03ee314424ead6548edea9
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.182 b/metadata/md5-cache/dev-libs/elfutils-0.182
deleted file mode 100644
index 03be7fc3558c..000000000000
--- a/metadata/md5-cache/dev-libs/elfutils-0.182
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) !dev-libs/libelf valgrind? ( dev-util/valgrind )
-DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
-EAPI=7
-HOMEPAGE=http://elfutils.org/
-IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind zstd 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
-LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) !dev-libs/libelf
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://sourceware.org/elfutils/ftp/0.182/elfutils-0.182.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85713f6430efbc8cc60255026a9fdbe7
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.183 b/metadata/md5-cache/dev-libs/elfutils-0.183
index f3ac2ff2bce6..1ae5833eb927 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.183
+++ b/metadata/md5-cache/dev-libs/elfutils-0.183
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=7
 HOMEPAGE=http://elfutils.org/
 IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind zstd 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) !dev-libs/libelf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.183/elfutils-0.183.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a21a0403dd006837fe461b88a0d95f7
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=48b70d145f82ddd6453382b98231f8bd
diff --git a/metadata/md5-cache/dev-libs/ell-0.38 b/metadata/md5-cache/dev-libs/ell-0.38
index 6ae02d5407c0..77583411204c 100644
--- a/metadata/md5-cache/dev-libs/ell-0.38
+++ b/metadata/md5-cache/dev-libs/ell-0.38
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.38.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1ac0b719c7796614cd8a21be200e334f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1d108d002a058a70791939595c59c966
diff --git a/metadata/md5-cache/dev-libs/ell-0.36 b/metadata/md5-cache/dev-libs/ell-0.39
index ec261d2f27b4..4b70ff044706 100644
--- a/metadata/md5-cache/dev-libs/ell-0.36
+++ b/metadata/md5-cache/dev-libs/ell-0.39
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.36.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1d108d002a058a70791939595c59c966
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.39.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bc1c306250acbbc7a8b07255d7bdfc4c
diff --git a/metadata/md5-cache/dev-libs/ell-9999 b/metadata/md5-cache/dev-libs/ell-9999
index 54af62656665..1fb45b9f6dc4 100644
--- a/metadata/md5-cache/dev-libs/ell-9999
+++ b/metadata/md5-cache/dev-libs/ell-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-apps/dbus )
 DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3d84c3d3663f0511afdde830b10595f
diff --git a/metadata/md5-cache/dev-libs/eventlog-0.2.12 b/metadata/md5-cache/dev-libs/eventlog-0.2.12
index ea13e97254bb..38c48f766b0f 100644
--- a/metadata/md5-cache/dev-libs/eventlog-0.2.12
+++ b/metadata/md5-cache/dev-libs/eventlog-0.2.12
@@ -1,12 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815
 DESCRIPTION=Support library for syslog-ng
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.balabit.com/products/syslog_ng/
 IUSE=static-libs
-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
 SLOT=0
 SRC_URI=http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_0.2.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8c94aaa564e27427b734725405b3451c
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=94564a3f29c88705640014adf77af3e7
diff --git a/metadata/md5-cache/dev-libs/expat-2.2.10 b/metadata/md5-cache/dev-libs/expat-2.2.10
index 25f43146ad27..c5dd900ccbe1 100644
--- a/metadata/md5-cache/dev-libs/expat-2.2.10
+++ b/metadata/md5-cache/dev-libs/expat-2.2.10
@@ -1,12 +1,12 @@
-BDEPEND=unicode? ( || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) >=app-portage/elt-patches-20170815
+BDEPEND=unicode? ( || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Stream-oriented XML parser library
 EAPI=7
 HOMEPAGE=https://libexpat.github.io/
 IUSE=elibc_FreeBSD examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c0f2883dcb7244c23e0e956edec6aa0d
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=1169c670c354a990859cc12845ffe9a2
diff --git a/metadata/md5-cache/dev-libs/expat-2.3.0 b/metadata/md5-cache/dev-libs/expat-2.3.0
index 32457817ed1b..14f3dbf9c8e1 100644
--- a/metadata/md5-cache/dev-libs/expat-2.3.0
+++ b/metadata/md5-cache/dev-libs/expat-2.3.0
@@ -1,4 +1,4 @@
-BDEPEND=unicode? ( || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) >=app-portage/elt-patches-20170815
+BDEPEND=unicode? ( || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Stream-oriented XML parser library
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_3_0/expat-2.3.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c89bf1f7fce005b6501eabc5f50637d
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=6d49106807492fa69061f550072e2c41
diff --git a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2 b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
index 739ee592e499..09eed030596b 100644
--- a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
+++ b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=FastCGI Developer's Kit
 EAPI=7
 HOMEPAGE=http://www.fastcgi.com/
 IUSE=html
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=FastCGI
 SLOT=0
 SRC_URI=http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a55760dce50b0aa1129e60472bc22a55
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=56acb8b2efc26d6496c48a4c878a1998
diff --git a/metadata/md5-cache/dev-libs/fddl-20111124-r1 b/metadata/md5-cache/dev-libs/fddl-20111124-r1
index ac7591e08760..2d117dec3a75 100644
--- a/metadata/md5-cache/dev-libs/fddl-20111124-r1
+++ b/metadata/md5-cache/dev-libs/fddl-20111124-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/fddl-20111124.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad19b744031dbd9f34e9557d4d8b6485
diff --git a/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2 b/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
index 2eba32aca7e9..26267be7b13c 100644
--- a/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
+++ b/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libsigc++-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/witme/ferrisloki-3.0.13.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1eb63cf07350bae268e7641481893a79
diff --git a/metadata/md5-cache/dev-libs/ffcall-2.1 b/metadata/md5-cache/dev-libs/ffcall-2.1
index b42583ca068a..079a742df313 100644
--- a/metadata/md5-cache/dev-libs/ffcall-2.1
+++ b/metadata/md5-cache/dev-libs/ffcall-2.1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libffcall/libffcall-2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e116652fb5e932dc517fcddecb926039
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c0d0d19a5dac57272488b09a04cd59ed
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.12.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
index 1ca6a842e889..f78b8bf8e052 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Memory efficient serialization library
 EAPI=7
 HOMEPAGE=https://google.github.io/flatbuffers/
 IUSE=static-libs test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz -> flatbuffers-1.12.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68f976410042b11bcde7acec06642483
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6581e985634fbac44c2a216785504718
diff --git a/metadata/md5-cache/dev-libs/folks-0.14.0 b/metadata/md5-cache/dev-libs/folks-0.14.0
index 1647cab74568..8792e0686adf 100644
--- a/metadata/md5-cache/dev-libs/folks-0.14.0
+++ b/metadata/md5-cache/dev-libs/folks-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=bluetooth? ( eds )
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.14/folks-0.14.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c3f1b72fadeda0f0dd2300439df9660
diff --git a/metadata/md5-cache/dev-libs/folks-0.15.2 b/metadata/md5-cache/dev-libs/folks-0.15.2
new file mode 100644
index 000000000000..afa8ef941862
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/folks-0.15.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] ) telepathy? ( net-libs/telepathy-glib[vala] ) eds? ( gnome-extra/evolution-data-server[vala] ) test? ( sys-apps/dbus bluetooth? ( || ( ( dev-lang/python:3.9 dev-python/dbusmock[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbusmock[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/dbusmock[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-libs/gobject-introspection-1.54:= telepathy? ( >=net-libs/telepathy-glib-0.19.9 dev-libs/dbus-glib ) eds? ( >=gnome-extra/evolution-data-server-3.38:= ) dev-libs/libxml2:2 utils? ( sys-libs/readline:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library for aggregating people from multiple sources
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Folks
+IUSE=bluetooth eds +telepathy test utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-libs/gobject-introspection-1.54:= telepathy? ( >=net-libs/telepathy-glib-0.19.9 dev-libs/dbus-glib ) eds? ( >=gnome-extra/evolution-data-server-3.38:= ) dev-libs/libxml2:2 utils? ( sys-libs/readline:0= ) bluetooth? ( >=net-wireless/bluez-5[obex] ) telepathy? ( net-im/telepathy-mission-control )
+REQUIRED_USE=bluetooth? ( eds )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=mirror://gnome/sources/folks/0.15/folks-0.15.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0113a40e787492cf4371576188823e1
diff --git a/metadata/md5-cache/dev-libs/foma-0.9.18 b/metadata/md5-cache/dev-libs/foma-0.9.18
index 5522154b54fb..e0c5224d4063 100644
--- a/metadata/md5-cache/dev-libs/foma-0.9.18
+++ b/metadata/md5-cache/dev-libs/foma-0.9.18
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline:* sys-libs/zlib
 SLOT=0
 SRC_URI=https://bitbucket.org/mhulden/foma/downloads/foma-0.9.18.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e60d035580cc2351a2828534d78f98d9
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.10 b/metadata/md5-cache/dev-libs/fribidi-1.0.10
index fa8d8e127749..6ddc041eaed3 100644
--- a/metadata/md5-cache/dev-libs/fribidi-1.0.10
+++ b/metadata/md5-cache/dev-libs/fribidi-1.0.10
@@ -4,9 +4,9 @@ DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=7
 HOMEPAGE=https://fribidi.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a77d05501a47853502f93e6e1ae593a
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6bf6f175a1aa51c53f63b769ef3012c0
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.9 b/metadata/md5-cache/dev-libs/fribidi-1.0.9
deleted file mode 100644
index b2d4034cc708..000000000000
--- a/metadata/md5-cache/dev-libs/fribidi-1.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=A free implementation of the unicode bidirectional algorithm
-EAPI=7
-HOMEPAGE=https://fribidi.org/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=059d182ada7f0f162a32d95c013c9d14
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.6.0 b/metadata/md5-cache/dev-libs/fstrm-0.6.0
index 6eb7886e733b..81f18645ef56 100644
--- a/metadata/md5-cache/dev-libs/fstrm-0.6.0
+++ b/metadata/md5-cache/dev-libs/fstrm-0.6.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=utils? ( dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Frame Streams implementation in C
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=utils? ( dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.6.0.tar.gz -> fstrm-0.6.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=5ab9ce66b64e87898ade5eecf6e6f7a0
diff --git a/metadata/md5-cache/dev-libs/gdl-3.34.0 b/metadata/md5-cache/dev-libs/gdl-3.34.0
index 6e258e9911e7..76d3226adb9f 100644
--- a/metadata/md5-cache/dev-libs/gdl-3.34.0
+++ b/metadata/md5-cache/dev-libs/gdl-3.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=dev-libs/libxml2-2.4:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=3/5
 SRC_URI=mirror://gnome/sources/gdl/3.34/gdl-3.34.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e5cae8854c16420495a8d7c6a1312ad
diff --git a/metadata/md5-cache/dev-libs/geoip-1.6.12 b/metadata/md5-cache/dev-libs/geoip-1.6.12
index 072cd84879d2..6127698eee9f 100644
--- a/metadata/md5-cache/dev-libs/geoip-1.6.12
+++ b/metadata/md5-cache/dev-libs/geoip-1.6.12
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=net-misc/wget
 DESCRIPTION=GeoIP Legacy C API
 EAPI=7
 HOMEPAGE=https://github.com/maxmind/geoip-api-c
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 GPL-2 MaxMind2
 RDEPEND=net-misc/wget
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-c/archive/v1.6.12.tar.gz -> geoip-1.6.12.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=42b0f37c5e291e6b74d238d1edb53748
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=50c5348619dfd0b019da4488bac45063
diff --git a/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1 b/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
index 9303c1890e88..4f207319f2ce 100644
--- a/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=A Comprehensive Open Source Library for Galois Field Arithmetic
 EAPI=7
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/gf-complete-2.0.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=21b4a212b1919ad7ff16e6ac2f286cec
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=890939a432d23634afed9e4850acbee9
diff --git a/metadata/md5-cache/dev-libs/gf2x-1.3.0 b/metadata/md5-cache/dev-libs/gf2x-1.3.0
index 1e0139748d70..93d10979da18 100644
--- a/metadata/md5-cache/dev-libs/gf2x-1.3.0
+++ b/metadata/md5-cache/dev-libs/gf2x-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=C/C++ routines for fast arithmetic in GF(2)[x]
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0/3
 SRC_URI=https://gforge.inria.fr/frs/download.php/38243/gf2x-1.3.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c0a75ff740371567bd31bcd4b6b540b3
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.5 b/metadata/md5-cache/dev-libs/girara-0.3.5
index 391bafbc5f61..149ce4abac55 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.5
+++ b/metadata/md5-cache/dev-libs/girara-0.3.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.5.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=a6213c8b59ce35b077d6c851a9008389
diff --git a/metadata/md5-cache/dev-libs/girara-9999 b/metadata/md5-cache/dev-libs/girara-9999
index 49abce32c00f..ab8139ecb50e 100644
--- a/metadata/md5-cache/dev-libs/girara-9999
+++ b/metadata/md5-cache/dev-libs/girara-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=64703cde2131b8471562d8b74cc9809a
diff --git a/metadata/md5-cache/dev-libs/gjs-1.64.4 b/metadata/md5-cache/dev-libs/gjs-1.64.4
index 980a08932e6e..422584a5f0ab 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.64.4
+++ b/metadata/md5-cache/dev-libs/gjs-1.64.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspectio
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.64/gjs-1.64.4.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=307c39c44e85d951a4b7e66ebbf28fe4
diff --git a/metadata/md5-cache/dev-libs/gjs-1.66.1 b/metadata/md5-cache/dev-libs/gjs-1.66.1
deleted file mode 100644
index dc5df1b46ce0..000000000000
--- a/metadata/md5-cache/dev-libs/gjs-1.66.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.61.2:= dev-lang/spidermonkey:78 cairo? ( x11-libs/cairo[X] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 ) test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] )
-DESCRIPTION=Javascript bindings for GNOME
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
-IUSE=+cairo examples gtk readline sysprof test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.61.2:= dev-lang/spidermonkey:78 cairo? ( x11-libs/cairo[X] ) readline? ( sys-libs/readline:0= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gjs/1.66/gjs-1.66.1.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=e369dfd40f06cbbb37c36e4d27864672
diff --git a/metadata/md5-cache/dev-libs/gjs-1.66.2 b/metadata/md5-cache/dev-libs/gjs-1.66.2
index ff6bd09aff4b..1a87625ce8fe 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.66.2
+++ b/metadata/md5-cache/dev-libs/gjs-1.66.2
@@ -5,11 +5,11 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk readline sysprof test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.61.2:= dev-lang/spidermonkey:78 cairo? ( x11-libs/cairo[X] ) readline? ( sys-libs/readline:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.66/gjs-1.66.2.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=f3281a5f9f6e17fcfea32b826a318e18
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=61cd5b931da9e2ff11f1890dcef9c1fe
diff --git a/metadata/md5-cache/dev-libs/gjs-1.68.0 b/metadata/md5-cache/dev-libs/gjs-1.68.0
index 4c91a2137ffd..756c293e1e62 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.68.0
+++ b/metadata/md5-cache/dev-libs/gjs-1.68.0
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= dev-lang/spidermonkey:78 cairo? ( x11-libs/cairo[X] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 ) test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] )
+DEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= dev-lang/spidermonkey:78 cairo? ( x11-libs/cairo[X,svg] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 ) test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] )
 DESCRIPTION=Javascript bindings for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk readline sysprof test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= dev-lang/spidermonkey:78 cairo? ( x11-libs/cairo[X] ) readline? ( sys-libs/readline:0= )
+RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= dev-lang/spidermonkey:78 cairo? ( x11-libs/cairo[X,svg] ) readline? ( sys-libs/readline:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.68/gjs-1.68.0.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=b5804ca3590a40051c5c95ea019c8b4d
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=5ca47984f875bca386cfcc671a29a79c
diff --git a/metadata/md5-cache/dev-libs/glib-2.66.7 b/metadata/md5-cache/dev-libs/glib-2.66.7
index 51d561e5737a..4625f4fbb4b5 100644
--- a/metadata/md5-cache/dev-libs/glib-2.66.7
+++ b/metadata/md5-cache/dev-libs/glib-2.66.7
@@ -5,12 +5,12 @@ DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.66.7 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.38:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.66/glib-2.66.7.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35f5402c34fbb946df38b695ffcf7f52
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=87cb39804901d22b8f69def3aa33a2ed
diff --git a/metadata/md5-cache/dev-libs/glib-2.68.0 b/metadata/md5-cache/dev-libs/glib-2.68.0
index 83b3fc189142..a117ddbae300 100644
--- a/metadata/md5-cache/dev-libs/glib-2.68.0
+++ b/metadata/md5-cache/dev-libs/glib-2.68.0
@@ -12,5 +12,5 @@ RDEPEND=!<dev-util/gdbus-codegen-2.68.0 >=virtual/libiconv-0-r1[abi_x86_32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64450c19399d7dc47dc42607d14146d7
diff --git a/metadata/md5-cache/dev-libs/glib-2.68.1 b/metadata/md5-cache/dev-libs/glib-2.68.1
new file mode 100644
index 000000000000..09f40333333d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/glib-2.68.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!<dev-util/gdbus-codegen-2.68.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.38:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=The GLib library of C routines
+EAPI=7
+HOMEPAGE=https://www.gtk.org/
+IUSE=dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
+RDEPEND=!<dev-util/gdbus-codegen-2.68.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.38:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64450c19399d7dc47dc42607d14146d7
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.23-r1 b/metadata/md5-cache/dev-libs/gmime-2.6.23-r1
index 8637b5ec344d..a7bad7756fd5 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.23-r1
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.23-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib smime? ( >=app-crypt/gpgme-1.1.6:1= ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= ) >=dev-util/gtk-doc-am-1.8 virtual/libiconv virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib smime? ( >=app-crypt/gpgme-1.1.6:1= ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= ) >=dev-util/gtk-doc-am-1.8 virtual/libiconv virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=6
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
 IUSE=doc smime static-libs test vala
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib smime? ( >=app-crypt/gpgme-1.1.6:1= ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
+RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib smime? ( >=app-crypt/gpgme-1.1.6:1= ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
 RESTRICT=!test? ( test )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.23.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b283cc96cdf5009b283ea5c6831821c4
diff --git a/metadata/md5-cache/dev-libs/gmime-3.2.7 b/metadata/md5-cache/dev-libs/gmime-3.2.7
index 4e39c18cb01f..b494d0f8790a 100644
--- a/metadata/md5-cache/dev-libs/gmime-3.2.7
+++ b/metadata/md5-cache/dev-libs/gmime-3.2.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn2:= ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= ) >=dev-util/gtk-doc-am-1.8 virtual/libiconv virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn2:= ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= ) >=dev-util/gtk-doc-am-1.8 virtual/libiconv virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=6
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
 IUSE=crypt doc idn static-libs test +vala
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn2:= ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
+RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn2:= ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gmime/3.2/gmime-3.2.7.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=02efe8b6326e6ead9bc502db3983742f
diff --git a/metadata/md5-cache/dev-libs/gmp-6.2.1 b/metadata/md5-cache/dev-libs/gmp-6.2.1
deleted file mode 100644
index 22e46076f737..000000000000
--- a/metadata/md5-cache/dev-libs/gmp-6.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=sys-devel/m4 app-arch/xz-utils >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numbers
-EAPI=7
-HOMEPAGE=https://gmplib.org/
-IUSE=+asm doc +cxx pic static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( LGPL-3+ GPL-2+ )
-SLOT=0/10.4
-SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.2.1/gmp-6.2.1.tar.xz mirror://gnu/gmp/gmp-6.2.1.tar.xz doc? ( https://gmplib.org/gmp-man-6.2.0.pdf )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07ada7c7e825161cc6354110f5d0feef
diff --git a/metadata/md5-cache/dev-libs/gmp-6.2.1-r1 b/metadata/md5-cache/dev-libs/gmp-6.2.1-r1
index 4cb94cf75daa..de8c2191a307 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.2.1-r1
+++ b/metadata/md5-cache/dev-libs/gmp-6.2.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=7
 HOMEPAGE=https://gmplib.org/
 IUSE=+asm doc +cxx pic static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.2.1/gmp-6.2.1.tar.xz mirror://gnu/gmp/gmp-6.2.1.tar.xz doc? ( https://gmplib.org/gmp-man-6.2.0.pdf )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69f4e0a3c646444d2daab21ade68dbff
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c693c2bd255967cdb3cdcd3eb3439623
diff --git a/metadata/md5-cache/dev-libs/gnulib-9999-r1 b/metadata/md5-cache/dev-libs/gnulib-9999-r1
index 0627e5252b55..02dd9d139620 100644
--- a/metadata/md5-cache/dev-libs/gnulib-9999-r1
+++ b/metadata/md5-cache/dev-libs/gnulib-9999-r1
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=e9573a93c839c0d5b0f0ae1e4ebf6cd2
diff --git a/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1 b/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
index 699a9d165f40..f97702cd2a5c 100644
--- a/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
+++ b/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/hanwen/go-fuse/archive/8c85ded140ac1889372a0e22d8d21e3d10a303bd.tar.gz -> go-fuse-0_p20140812.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f4d7b263fd59101eb002da02eda3ebc
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=591bfbd0335f6c2b8fd50c1da3ee0c12
diff --git a/metadata/md5-cache/dev-libs/go-fuse-0_p20150422 b/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
index a09db14b9697..8c6bf33a0ba5 100644
--- a/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
+++ b/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/hanwen/go-fuse/archive/ffed29ec8b88f61c1b8954134cc48ef03bb26ce1.tar.gz -> go-fuse-0_p20150422.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ff30d154fd130beb8a080a8256686b94
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=167aeea633f2d574874372726bdb5057
diff --git a/metadata/md5-cache/dev-libs/go-fuse-9999 b/metadata/md5-cache/dev-libs/go-fuse-9999
index e2eb80aaf37a..2b34732afad4 100644
--- a/metadata/md5-cache/dev-libs/go-fuse-9999
+++ b/metadata/md5-cache/dev-libs/go-fuse-9999
@@ -7,5 +7,5 @@ LICENSE=BSD
 PROPERTIES=live
 RESTRICT=strip
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3fd4ae51dff5dd8398e6b806f838e30
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=380779320a01a317e81c871e490cd43c
diff --git a/metadata/md5-cache/dev-libs/go-usb-9999 b/metadata/md5-cache/dev-libs/go-usb-9999
index cd2dd2c3bf94..73b1c944a43e 100644
--- a/metadata/md5-cache/dev-libs/go-usb-9999
+++ b/metadata/md5-cache/dev-libs/go-usb-9999
@@ -7,5 +7,5 @@ LICENSE=BSD
 PROPERTIES=live
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=593a85ee9257499a4ffc7652cd3529cd
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=da3baa614f660d7987a30bf06a70603d
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.62.0-r1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.62.0-r1
deleted file mode 100644
index 4ef6257805ef..000000000000
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.62.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/gobject-introspection-common-1.62.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig 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] ) gtk-doc? ( >=dev-util/gtk-doc-1.19 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.5 ) sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Introspection system for GObject-based libraries
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-IUSE=doctool gtk-doc test python_single_target_python3_7 python_single_target_python3_8
-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=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/gobject-introspection-common-1.62.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig 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] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a77a19b2983d3b365f34cfbd695ef499
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
deleted file mode 100644
index ef0e232cba4c..000000000000
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/gobject-introspection-common-1.64.1 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig 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] ) gtk-doc? ( >=dev-util/gtk-doc-1.19 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.5 ) sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Introspection system for GObject-based libraries
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-IUSE=doctool gtk-doc test python_single_target_python3_7 python_single_target_python3_8
-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=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/gobject-introspection-common-1.64.1 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig 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] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=092fe1766af19bc76d5a2dbcc2f5b2ef
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
index e7421f9c5331..3a995315fcee 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
@@ -5,12 +5,12 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=doctool gtk-doc test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-common-1.66.1 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ) virtual/pkgconfig 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.66/gobject-introspection-1.66.1.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d7f02bd96bcb5bfb941f00f019f117e
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5ed1e801c2c278ed8f7c83824bb191d1
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
index c7b876043df8..bbd44fbc07d8 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a95ece316be940040e7887bbc022439f
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e2d015e0f0bb6ef8120b673fff2df350
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0
deleted file mode 100644
index 1cdf31d5c726..000000000000
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Build infrastructure for GObject Introspection
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-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=HPND
-RDEPEND=!<dev-libs/gobject-introspection-1.62.0
-SLOT=0
-SRC_URI=mirror://gnome/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
-_md5_=62ee480155c4300aeb8096ba0c460f98
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
deleted file mode 100644
index a7726637df4b..000000000000
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Build infrastructure for GObject Introspection
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-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=HPND
-RDEPEND=!<dev-libs/gobject-introspection-1.64.1
-SLOT=0
-SRC_URI=mirror://gnome/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
-_md5_=62ee480155c4300aeb8096ba0c460f98
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.66.1 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.66.1
index 835a6ea6a929..c659056d36c0 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.66.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.66.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.66.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.66/gobject-introspection-1.66.1.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
-_md5_=a1c7198415c5728fe18defa5fbf2e819
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
+_md5_=bef82448c600604ead3ab476cda1116b
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0
index 0d134b66512e..ffc21c7c4c9e 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.68.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
 _md5_=ab1ee10fec78a03a96bd069731af4454
diff --git a/metadata/md5-cache/dev-libs/gom-0.4 b/metadata/md5-cache/dev-libs/gom-0.4
index 6f78087cdb78..21c9c20d5a47 100644
--- a/metadata/md5-cache/dev-libs/gom-0.4
+++ b/metadata/md5-cache/dev-libs/gom-0.4
@@ -1,16 +1,16 @@
 BDEPEND=app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygobject-3.16:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) virtual/pkgconfig test? ( x11-libs/gdk-pixbuf:2 )
+DEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( 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/pygobject-3.16:3[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(-)] ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) virtual/pkgconfig test? ( x11-libs/gdk-pixbuf:2 )
 DESCRIPTION=GObject to SQLite object mapper library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gom
-IUSE=gtk-doc +introspection python test python_targets_python3_7 python_targets_python3_8
+IUSE=gtk-doc +introspection python test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygobject-3.16:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-REQUIRED_USE=python? ( introspection || ( python_targets_python3_7 python_targets_python3_8 ) )
+RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( 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/pygobject-3.16:3[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? ( introspection || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gom/0.4/gom-0.4.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8fe658e544e4e3550cfcdc859109304f
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3b0c39ef8b8f87c81e5397b40930614b
diff --git a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2 b/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2
index de78c64ce858..0dc8eac97891 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2
+++ b/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/openssl-1.1.1:0=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0.3_p20181031
 SRC_URI=https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> gost-engine-1.1.0.3_p20181031.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36abe57e5c5616eaa4998890bf242b41
diff --git a/metadata/md5-cache/dev-libs/gost-engine-9999 b/metadata/md5-cache/dev-libs/gost-engine-9999
index 7d20ef2be1a8..8005a4b61f90 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-9999
+++ b/metadata/md5-cache/dev-libs/gost-engine-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/openssl-1.1.1:0=
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c0aae62cc0992fa99c26dea076b7953
diff --git a/metadata/md5-cache/dev-libs/granite-5.2.5-r1 b/metadata/md5-cache/dev-libs/granite-5.2.5-r1
index 57f608a907f0..e7265e1eb314 100644
--- a/metadata/md5-cache/dev-libs/granite-5.2.5-r1
+++ b/metadata/md5-cache/dev-libs/granite-5.2.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) virtual/pkgconfig doc? ( >=dev-lang/vala-0.40.20[valadoc] dev-util/gtk-doc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) virtual/pkgconfig doc? ( >=dev-lang/vala-0.40.20[valadoc] dev-util/gtk-doc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+-3.22:3[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Elementary OS library that extends GTK+
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elementary/granite/archive/5.2.5.tar.gz -> granite-5.2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbddbf369c34892fe459d6c499a3f2da
diff --git a/metadata/md5-cache/dev-libs/granite-5.5.0 b/metadata/md5-cache/dev-libs/granite-5.5.0
index 62f840021266..7fd42ff58716 100644
--- a/metadata/md5-cache/dev-libs/granite-5.5.0
+++ b/metadata/md5-cache/dev-libs/granite-5.5.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) virtual/pkgconfig doc? ( >=dev-lang/vala-0.40.20[valadoc] dev-util/gtk-doc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) virtual/pkgconfig doc? ( >=dev-lang/vala-0.40.20[valadoc] dev-util/gtk-doc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/libgee:0.8[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Elementary OS library that extends GTK+
@@ -10,5 +10,5 @@ LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/libgee:0.8[introspection]
 SLOT=0
 SRC_URI=https://github.com/elementary/granite/archive/5.5.0.tar.gz -> granite-5.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15abcca204b2cae62ebba8bf54a93cdb
diff --git a/metadata/md5-cache/dev-libs/granite-6.0.0 b/metadata/md5-cache/dev-libs/granite-6.0.0
new file mode 100644
index 000000000000..6c960867deb5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/granite-6.0.0
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/libgee:0.8[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Elementary OS library that extends GTK+
+EAPI=7
+HOMEPAGE=https://github.com/elementary/granite
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/libgee:0.8[introspection]
+SLOT=0
+SRC_URI=https://github.com/elementary/granite/archive/6.0.0.tar.gz -> granite-6.0.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f8769b6098c7994ae6cbf0253a92f0ad
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.2.0 b/metadata/md5-cache/dev-libs/grantlee-5.2.0
index 64bc355a7891..924e320fa694 100644
--- a/metadata/md5-cache/dev-libs/grantlee-5.2.0
+++ b/metadata/md5-cache/dev-libs/grantlee-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=http://downloads.grantlee.org/grantlee-5.2.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99aa06729843b383dd549ac27f0f6f25
diff --git a/metadata/md5-cache/dev-libs/gtx-0.2.2-r1 b/metadata/md5-cache/dev-libs/gtx-0.2.2-r1
index 29311bb48a88..35d7e2864903 100644
--- a/metadata/md5-cache/dev-libs/gtx-0.2.2-r1
+++ b/metadata/md5-cache/dev-libs/gtx-0.2.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2
 DESCRIPTION=Small collection of functions intended to enhance the GLib testing framework
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=https://launchpad.net/gtx/trunk/0.2.2/+download/gtx-0.2.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e0de472ec1cc6884420ec2986f117398
diff --git a/metadata/md5-cache/dev-libs/gumbo-0.10.1 b/metadata/md5-cache/dev-libs/gumbo-0.10.1
index 3d5d3cf5b1e2..f192cf745f8e 100644
--- a/metadata/md5-cache/dev-libs/gumbo-0.10.1
+++ b/metadata/md5-cache/dev-libs/gumbo-0.10.1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=The HTML5 parsing algorithm implemented as a pure C99 library
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz -> gumbo-0.10.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f027c6f5c58bc8d46ce86b5dc767538f
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1 b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
index a6e5240319a1..6e81ea282864 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
+++ b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev: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(-)?] fox? ( x11-libs/fox )
 DESCRIPTION=A multi-platform library for USB and Bluetooth HID-Class devices
@@ -10,5 +10,5 @@ LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/signal11/hidapi/archive/d17db57b9d4354752e0af42f5f33007a42ef2906.tar.gz -> hidapi-0.8.0_rc1_p20140719.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=617ef666c6f35974255fc9fe3e516dc5
diff --git a/metadata/md5-cache/dev-libs/hiredis-0.14.1 b/metadata/md5-cache/dev-libs/hiredis-0.14.1
index be8b9b75f912..7f569c154afa 100644
--- a/metadata/md5-cache/dev-libs/hiredis-0.14.1
+++ b/metadata/md5-cache/dev-libs/hiredis-0.14.1
@@ -4,10 +4,10 @@ DESCRIPTION=Minimalistic C client library for the Redis database
 EAPI=7
 HOMEPAGE=https://github.com/redis/hiredis
 IUSE=examples static-libs test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/0.14
 SRC_URI=https://github.com/redis/hiredis/archive/v0.14.1.tar.gz -> hiredis-0.14.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=daa0a4fe2c156a590a5029481688b6ab
+_md5_=a5ae7130b605f964832bfed2918b809f
diff --git a/metadata/md5-cache/dev-libs/hiredis-1.0.0 b/metadata/md5-cache/dev-libs/hiredis-1.0.0
index be72b0710ba9..388c2bc063e1 100644
--- a/metadata/md5-cache/dev-libs/hiredis-1.0.0
+++ b/metadata/md5-cache/dev-libs/hiredis-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Minimalistic C client library for the Redis database
 EAPI=7
 HOMEPAGE=https://github.com/redis/hiredis
 IUSE=examples ssl static-libs test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/redis/hiredis/archive/v1.0.0.tar.gz -> hiredis-1.0.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b3354f6d51be6ced7ea0709dc07dff57
+_md5_=d74b3071e4550cfc7ef3ff1aed9c34bf
diff --git a/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1 b/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
index f5e169404e6d..6bea262b7c8e 100644
--- a/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for downloading files via HTTP using the GET method
 EAPI=6
 HOMEPAGE=http://http-fetcher.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/http-fetcher/http_fetcher-1.1.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3d25196bfbf8cacd7c173764c22d5210
diff --git a/metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1 b/metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1
index f49a56eb0111..13f7988fd7da 100644
--- a/metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1
+++ b/metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/leveldb:=[snappy]
 DESCRIPTION=Hyperdex fork/extension of leveldb
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/leveldb:=[snappy]
 SLOT=0
 SRC_URI=http://hyperdex.org/src/hyperleveldb-1.2.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=54a8c2cf8a7b8198a47be50e82c733de
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.3.0 b/metadata/md5-cache/dev-libs/hyperscan-5.3.0
deleted file mode 100644
index 7d586bd4b1ec..000000000000
--- a/metadata/md5-cache/dev-libs/hyperscan-5.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ragel dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost
-DESCRIPTION=High-performance regular expression matching library
-EAPI=7
-HOMEPAGE=https://www.hyperscan.io/ https://github.com/intel/hyperscan
-IUSE=cpu_flags_x86_avx2 cpu_flags_x86_ssse3 static-libs
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost
-REQUIRED_USE=cpu_flags_x86_ssse3
-SLOT=0
-SRC_URI=https://github.com/intel/hyperscan/archive/v5.3.0.tar.gz -> hyperscan-5.3.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b97d25cb31e0789e0663e6cf4dba6c5c
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.4.0 b/metadata/md5-cache/dev-libs/hyperscan-5.4.0
index fc9e7fb2ddf4..b90b0e2f134e 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.4.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=
 REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/intel/hyperscan/archive/v5.4.0.tar.gz -> hyperscan-5.4.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00e88eaf9bd2045c30ecb51f763da989
diff --git a/metadata/md5-cache/dev-libs/icu-68.2 b/metadata/md5-cache/dev-libs/icu-68.2
index 6be0948c6674..201c5b34c229 100644
--- a/metadata/md5-cache/dev-libs/icu-68.2
+++ b/metadata/md5-cache/dev-libs/icu-68.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=International Components for Unicode
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=BSD
 SLOT=0/68.2
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bc75856f3a5161a38ce01e32b5a529ac
diff --git a/metadata/md5-cache/dev-libs/icu-69.1 b/metadata/md5-cache/dev-libs/icu-69.1
new file mode 100644
index 000000000000..7f1cad2443e0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-69.1
@@ -0,0 +1,12 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=International Components for Unicode
+EAPI=7
+HOMEPAGE=http://site.icu-project.org/
+IUSE=debug 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=BSD
+SLOT=0/69.1
+SRC_URI=https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=dc92c63c851ae7f8ef6583582830ea54
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-68.2 b/metadata/md5-cache/dev-libs/icu-layoutex-68.2
index 9ab53edb7804..94334ed1c68a 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-68.2
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-68.2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=~dev-libs/icu-68.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=External layout part of International Components for Unicode
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=~dev-libs/icu-68.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[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/68.2
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5d76fa4a0ff0fac9af3f8bfdf877e3cb
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-69.1 b/metadata/md5-cache/dev-libs/icu-layoutex-69.1
new file mode 100644
index 000000000000..ec014698f8f0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-69.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-libs/icu-69.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=External layout part of International Components for Unicode
+EAPI=7
+HOMEPAGE=http://www.icu-project.org/
+IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=~dev-libs/icu-69.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[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/69.1
+SRC_URI=https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=655bdeb0ab1d7985d98f96ada8bdf768
diff --git a/metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1 b/metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
index 0424dc8980a1..6ad1307f6344 100644
--- a/metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
+++ b/metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/icu-58.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=ICU Layout Engine API on top of HarfBuzz shaping library
@@ -10,5 +10,5 @@ LICENSE=icu
 RDEPEND=>=dev-libs/icu-58.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/behdad/icu-le-hb/archive/1.0.3.tar.gz -> icu-le-hb-1.0.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3dc252a687c9c366beddfda51ce2f210
diff --git a/metadata/md5-cache/dev-libs/igraph-0.8.3 b/metadata/md5-cache/dev-libs/igraph-0.8.3
deleted file mode 100644
index 5fc979dc5308..000000000000
--- a/metadata/md5-cache/dev-libs/igraph-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
-DESCRIPTION=Creating and manipulating undirected and directed graphs
-EAPI=7
-HOMEPAGE=http://www.igraph.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
-SLOT=0/0
-SRC_URI=https://github.com/igraph/igraph/releases/download/0.8.3/igraph-0.8.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d9b7f507e45f35b0eb3aa8ab417d954f
diff --git a/metadata/md5-cache/dev-libs/igraph-0.8.5 b/metadata/md5-cache/dev-libs/igraph-0.8.5
index 8ed320faebcc..7e64da8adf88 100644
--- a/metadata/md5-cache/dev-libs/igraph-0.8.5
+++ b/metadata/md5-cache/dev-libs/igraph-0.8.5
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
 DESCRIPTION=Creating and manipulating undirected and directed graphs
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
 SLOT=0/0
 SRC_URI=https://github.com/igraph/igraph/releases/download/0.8.5/igraph-0.8.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6f4b34ebf61440a947a3bdfdc8bb5b6a
diff --git a/metadata/md5-cache/dev-libs/igraph-0.9.0 b/metadata/md5-cache/dev-libs/igraph-0.9.2
index f6f416181b64..4d80caa0a5d1 100644
--- a/metadata/md5-cache/dev-libs/igraph-0.9.0
+++ b/metadata/md5-cache/dev-libs/igraph-0.9.2
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
 RESTRICT=!test? ( test )
 SLOT=0/0
-SRC_URI=https://github.com/igraph/igraph/releases/download/0.9.0/igraph-0.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=013889624ae1ea5668d24c270765dd2a
+SRC_URI=https://github.com/igraph/igraph/releases/download/0.9.2/igraph-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6f47d8d1b044a0035f92ffebd282879
diff --git a/metadata/md5-cache/dev-libs/iksemel-1.4-r1 b/metadata/md5-cache/dev-libs/iksemel-1.4-r1
index 4db62a9afb60..54acb69ec25f 100644
--- a/metadata/md5-cache/dev-libs/iksemel-1.4-r1
+++ b/metadata/md5-cache/dev-libs/iksemel-1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( net-libs/gnutls:= ) ssl? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( net-libs/gnutls:= ) ssl? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=eXtensible Markup Language parser library designed for Jabber applications
 EAPI=6
 HOMEPAGE=https://github.com/meduketto/iksemel
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=ssl? ( net-libs/gnutls:= )
 SLOT=0
 SRC_URI=https://iksemel.googlecode.com/files/iksemel-1.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06269e826cbaa9b075103779af77653b
diff --git a/metadata/md5-cache/dev-libs/inih-52 b/metadata/md5-cache/dev-libs/inih-52
index 085e39330847..66097b9b292d 100644
--- a/metadata/md5-cache/dev-libs/inih-52
+++ b/metadata/md5-cache/dev-libs/inih-52
@@ -4,9 +4,9 @@ DESCRIPTION=inih (INI not invented here) simple .INI file parser
 EAPI=7
 HOMEPAGE=https://github.com/benhoyt/inih
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/benhoyt/inih/archive/r52.tar.gz -> inih-52.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0268a4bfb474c473e320e7b9dc9ab499
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2c34f284ab0cb3a495119409cc0c7570
diff --git a/metadata/md5-cache/dev-libs/inih-52-r1 b/metadata/md5-cache/dev-libs/inih-52-r1
index 1bbae46b8544..0209ba349bcc 100644
--- a/metadata/md5-cache/dev-libs/inih-52-r1
+++ b/metadata/md5-cache/dev-libs/inih-52-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/benhoyt/inih/archive/r52.tar.gz -> inih-52.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=74c15a9cacf41c775c3f04f870b37b52
diff --git a/metadata/md5-cache/dev-libs/inih-53 b/metadata/md5-cache/dev-libs/inih-53
index b0d8cf32287b..44dcd680180c 100644
--- a/metadata/md5-cache/dev-libs/inih-53
+++ b/metadata/md5-cache/dev-libs/inih-53
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/benhoyt/inih/archive/r53.tar.gz -> inih-53.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=74c15a9cacf41c775c3f04f870b37b52
diff --git a/metadata/md5-cache/dev-libs/iniparser-3.1-r2 b/metadata/md5-cache/dev-libs/iniparser-3.1-r2
index 2fbcdbb906df..97dfb957400c 100644
--- a/metadata/md5-cache/dev-libs/iniparser-3.1-r2
+++ b/metadata/md5-cache/dev-libs/iniparser-3.1-r2
@@ -1,13 +1,13 @@
-BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A free stand-alone ini file parsing library
 EAPI=7
 HOMEPAGE=http://ndevilla.free.fr/iniparser/
 IUSE=doc examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ndevilla.free.fr/iniparser/iniparser-3.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d8a0b5d992bf0b65356f49cf82f1bda9
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=749e930c9cf86be936bdee3bc594f347
diff --git a/metadata/md5-cache/dev-libs/iniparser-4.1 b/metadata/md5-cache/dev-libs/iniparser-4.1
index 4173dc468744..644db5fbc2ce 100644
--- a/metadata/md5-cache/dev-libs/iniparser-4.1
+++ b/metadata/md5-cache/dev-libs/iniparser-4.1
@@ -4,9 +4,9 @@ DESCRIPTION=A free stand-alone ini file parsing library
 EAPI=7
 HOMEPAGE=https://github.com/ndevilla/iniparser
 IUSE=doc examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=4
 SRC_URI=https://github.com/ndevilla/iniparser/archive/v4.1.tar.gz -> iniparser-4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=559d8c12553d0d3b104530b2b0772a7c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9455addb04311bf38616fee76ddf06fd
diff --git a/metadata/md5-cache/dev-libs/injeqt-1.2.0 b/metadata/md5-cache/dev-libs/injeqt-1.2.0
index a4b0a802ee37..307f9ce25dd5 100644
--- a/metadata/md5-cache/dev-libs/injeqt-1.2.0
+++ b/metadata/md5-cache/dev-libs/injeqt-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vogel/injeqt/archive/1.2.0.tar.gz -> injeqt-1.2.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c8054126bd9fdd15b4e97048fad2514
diff --git a/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916 b/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
index 3e52bf2f3f6b..d202a4756fb8 100644
--- a/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
+++ b/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2 dev-libs/libxml2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile x11-libs/libxklavier virtual/libintl eekboard? ( dev-libs/eekboard ) introspection? ( dev-libs/gobject-introspection ) xtest? ( x11-libs/libXtst )
 DESCRIPTION=On-screen input pad to send characters with mouse
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile x11-libs/libxklavier virtual/libintl eekboard? ( dev-libs/eekboard ) introspection? ( dev-libs/gobject-introspection ) xtest? ( x11-libs/libXtst )
 SLOT=0
 SRC_URI=https://github.com/fujiwarat/input-pad/releases/download/1.0.99.20140916/input-pad-1.0.99.20140916.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58b9417ecd55c15e226a4d7ea4f532b4
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.16.16582 b/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
index da2044a5cf6c..b47e0ba0038c 100644
--- a/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
+++ b/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3826 >=media-libs/gmmlib-20.1.1 l0? ( <dev-libs/level-zero-1.0.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/20.16.16582.tar.gz -> intel-neo-20.16.16582.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=33075058d1c5db30b34f06f8d870daa6
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.37.17906 b/metadata/md5-cache/dev-libs/intel-neo-20.37.17906
index 9e2ca20a48c9..f8d725b01a49 100644
--- a/metadata/md5-cache/dev-libs/intel-neo-20.37.17906
+++ b/metadata/md5-cache/dev-libs/intel-neo-20.37.17906
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.4944 >=media-libs/gmmlib-20.2.5 l0? ( >=dev-libs/level-zero-1.0.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/20.37.17906.tar.gz -> intel-neo-20.37.17906.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ff4bdcde3cf0384f5740566f6710c70
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.44.18297 b/metadata/md5-cache/dev-libs/intel-neo-20.44.18297
index 536b4c901280..d3685247d7b4 100644
--- a/metadata/md5-cache/dev-libs/intel-neo-20.44.18297
+++ b/metadata/md5-cache/dev-libs/intel-neo-20.44.18297
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.5353 >=media-libs/gmmlib-20.3.2 l0? ( >=dev-libs/level-zero-1.0.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/20.44.18297.tar.gz -> intel-neo-20.44.18297.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9b09cd9bf48707620004d7f9e4871d0
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=904cc2a670f22092f65a78c542a4792d
diff --git a/metadata/md5-cache/dev-libs/isl-0.23-r1 b/metadata/md5-cache/dev-libs/isl-0.23-r1
index 59a551bc36ed..dbdb31e117e4 100644
--- a/metadata/md5-cache/dev-libs/isl-0.23-r1
+++ b/metadata/md5-cache/dev-libs/isl-0.23-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A library for manipulating integer points bounded by linear constrai
 EAPI=7
 HOMEPAGE=http://isl.gforge.inria.fr/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/23
 SRC_URI=http://isl.gforge.inria.fr/isl-0.23.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=897cef72e7b74e967760095b3cf40a3e
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0bb6388b07cb14f775d8bccf491349d6
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.4 b/metadata/md5-cache/dev-libs/ivykis-0.42.4
index ed3210f5957b..3d28177f75a4 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.4
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=Library for asynchronous I/O readiness notification
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x8
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.4.tar.gz -> ivykis-0.42.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a90a3f6ecee5436c7d53f1f77d090a8f
diff --git a/metadata/md5-cache/dev-libs/jansson-2.13.1-r1 b/metadata/md5-cache/dev-libs/jansson-2.13.1-r1
index 4f56b1e392e7..488a347e766b 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.13.1-r1
+++ b/metadata/md5-cache/dev-libs/jansson-2.13.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=7
 HOMEPAGE=https://www.digip.org/jansson/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.digip.org/jansson/releases/jansson-2.13.1.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0711e0299da073f7989de300cd148280
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a125aa50c40654fd9df3f8c7f0c66f40
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.2.1 b/metadata/md5-cache/dev-libs/jemalloc-5.2.1
index 140383f46c7a..a7b20fd09812 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.2.1
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.2.1
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
 EAPI=7
 HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
 IUSE=debug hardened lazy-lock prof static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 SLOT=0/2
 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2f73929a966e7069a038bbe2d467ee00
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0e104b984fa472818141886125bea0d5
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1 b/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
index 71428aad7d15..fedbbcec4906 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~am
 LICENSE=BSD
 SLOT=0/2
 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f0cda50dde4a3f743ed553baef2b519f
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3e177af2fbd5c2367d5f9367ca69733c
diff --git a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r1 b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r1
index a710874b1c36..23f99be7cbf1 100644
--- a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/gf-complete >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/gf-complete sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A Library in C Facilitating Erasure Coding for Storage Applications
 EAPI=5
 HOMEPAGE=http://jerasure.org/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gf-complete
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/jerasure-2.0.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9292221f91f5a677c7dd26ba3b5942e3
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f128e5d7b0130eb583fca574f90b800b
diff --git a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2 b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
index d70d4e117783..8703069b4269 100644
--- a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
+++ b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/gf-complete
 DESCRIPTION=A Library in C Facilitating Erasure Coding for Storage Applications
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gf-complete
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/jerasure-2.0.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=76aa91fbf4761bd60dd6866dbb4cae57
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2bae15febc27a4934798574f80825078
diff --git a/metadata/md5-cache/dev-libs/json-c-0.15 b/metadata/md5-cache/dev-libs/json-c-0.15
index 7afec3cfce19..c070ab812571 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.15
+++ b/metadata/md5-cache/dev-libs/json-c-0.15
@@ -4,9 +4,9 @@ DESCRIPTION=A JSON implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/json-c/json-c/wiki
 IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0/5
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb4409e57bc82fd2b7bd49349cf5e3b2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0cc0f733e2f82842a04dc36a22e2f45f
diff --git a/metadata/md5-cache/dev-libs/json-c-9999 b/metadata/md5-cache/dev-libs/json-c-9999
index debd1def95bb..0df0e2b9ea24 100644
--- a/metadata/md5-cache/dev-libs/json-c-9999
+++ b/metadata/md5-cache/dev-libs/json-c-9999
@@ -7,5 +7,5 @@ IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/5
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1dbb1f855f8ef5f9cc18975c639cdef
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.4.4 b/metadata/md5-cache/dev-libs/json-glib-1.4.4
deleted file mode 100644
index cca03a149a6a..000000000000
--- a/metadata/md5-cache/dev-libs/json-glib-1.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ~app-text/docbook-xml-dtd-4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DESCRIPTION=Library providing GLib serialization and deserialization for the JSON format
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
-IUSE=gtk-doc +introspection 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
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/json-glib/1.4/json-glib-1.4.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1f95d3efd914ecc9d3842f7a4bf7a51
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.6.0 b/metadata/md5-cache/dev-libs/json-glib-1.6.0
deleted file mode 100644
index c12982d26f96..000000000000
--- a/metadata/md5-cache/dev-libs/json-glib-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~app-text/docbook-xml-dtd-4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-DESCRIPTION=Library providing GLib serialization and deserialization for the JSON format
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
-IUSE=gtk-doc +introspection 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
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/json-glib/1.6/json-glib-1.6.0.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6d59b804e12bf7574c5bee4b827a8de
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.6.2 b/metadata/md5-cache/dev-libs/json-glib-1.6.2
index 4c626ba5e813..c6394a749482 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.6.2
+++ b/metadata/md5-cache/dev-libs/json-glib-1.6.2
@@ -5,10 +5,10 @@ DESCRIPTION=Library providing GLib serialization and deserialization for the JSO
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.6/json-glib-1.6.2.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e826353e4c030c2666bf338e25c1416
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=66f74fe615b57117ef3a97a8cdc8de4e
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.3 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.3
index 7f39c7d01eb1..c94d539c019b 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.3
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.3
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz -> jsoncpp-1.9.3.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=15a2507a765266daa549e77bc92557a0
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0977e2e5372b98e0618f4a7667647ff7
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
index 60c166b05ec7..518dd7536dfe 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.4.tar.gz -> jsoncpp-1.9.4.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2d0d9de6ef2efd021dcca73b3bb60b14
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1c9de826e7864f433bf16cef34afa49b
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.34.0 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.34.0
index 463ca2f327f0..a0f558f9bea2 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.34.0
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.34.0
@@ -1,4 +1,4 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/glib:2 dev-libs/json-glib[introspection?] introspection? ( dev-libs/gobject-introspection:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=JSON-RPC library for GLib
@@ -12,5 +12,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.34/jsonrpc-glib-3.34.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae0bdca153a675f251cf9d92db6bf264
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.38.0 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.38.0
index 778df05bbf56..b0b95f566b30 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.38.0
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.38.0
@@ -1,4 +1,4 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/glib:2 dev-libs/json-glib[introspection?] introspection? ( dev-libs/gobject-introspection:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=JSON-RPC library for GLib
@@ -12,5 +12,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.38/jsonrpc-glib-3.38.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47176b57898e5ef94d7a999dfa1b0a78
diff --git a/metadata/md5-cache/dev-libs/jthread-1.3.3 b/metadata/md5-cache/dev-libs/jthread-1.3.3
index 9cdfe1d367c9..5148460ff4db 100644
--- a/metadata/md5-cache/dev-libs/jthread-1.3.3
+++ b/metadata/md5-cache/dev-libs/jthread-1.3.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0/1.3.3
 SRC_URI=https://research.edm.uhasselt.be/jori/jthread/jthread-1.3.3.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a051bed2f5e42bf2bf9de272c45b93d
diff --git a/metadata/md5-cache/dev-libs/judy-1.0.5-r2 b/metadata/md5-cache/dev-libs/judy-1.0.5-r2
index 89a2ad04851a..95a749a52eb6 100644
--- a/metadata/md5-cache/dev-libs/judy-1.0.5-r2
+++ b/metadata/md5-cache/dev-libs/judy-1.0.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A C library that implements a dynamic array
 EAPI=6
 HOMEPAGE=http://judy.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/judy/Judy-1.0.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=275a0e0bbb12ef800f5f356cfd38333b
diff --git a/metadata/md5-cache/dev-libs/judy-1.0.5-r3 b/metadata/md5-cache/dev-libs/judy-1.0.5-r3
index a02f3a4519ef..4ccb6d0bbb65 100644
--- a/metadata/md5-cache/dev-libs/judy-1.0.5-r3
+++ b/metadata/md5-cache/dev-libs/judy-1.0.5-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A C library that implements a dynamic array
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/judy/Judy-1.0.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f06bbb133d8a501e50c57bc6163a3095
diff --git a/metadata/md5-cache/dev-libs/kasync-0.3.0 b/metadata/md5-cache/dev-libs/kasync-0.3.0
index 801f74f73c72..d2a31ba34a79 100644
--- a/metadata/md5-cache/dev-libs/kasync-0.3.0
+++ b/metadata/md5-cache/dev-libs/kasync-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/unstable/kasync/0.3.0/src/kasync-0.3.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5db5e229536b044435b6e32fc7c2f465
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.8.0 b/metadata/md5-cache/dev-libs/kdiagram-2.8.0
index 8df331004532..aa6c37c9026b 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.8.0
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( examples )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.8.0/kdiagram-2.8.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b288ebbb3b01dcbcda2bf503d859aa2
diff --git a/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300 b/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300
index 922b0ecf6395..7505e85de301 100644
--- a/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300
+++ b/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300
@@ -5,9 +5,9 @@ DESCRIPTION=A library for registering global keyboard shortcuts
 EAPI=7
 HOMEPAGE=https://github.com/kupferlauncher/keybinder
 IUSE=+introspection
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender
 SLOT=3
 SRC_URI=https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz
-_md5_=cbdc19b99852d87e1381c8e0b96ed21b
+_md5_=e9ab7aac8f84da061c44b2cb33b107eb
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
index 86086c4e2dcd..7409805e9e8d 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_ta
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=758eeabfb1175bb0886296cfd9f670b0
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index 22ab23126c4c..a1edef9244dd 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:9[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:10[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=758eeabfb1175bb0886296cfd9f670b0
diff --git a/metadata/md5-cache/dev-libs/klibc-2.0.4-r3 b/metadata/md5-cache/dev-libs/klibc-2.0.4-r3
deleted file mode 100644
index 3abfdcb7d600..000000000000
--- a/metadata/md5-cache/dev-libs/klibc-2.0.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-lang/perl sys-devel/bc
-DESCRIPTION=A minimal libc subset for use with initramfs
-EAPI=6
-HOMEPAGE=https://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/
-IUSE=debug test custom-cflags
-KEYWORDS=~alpha amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=dev-lang/perl
-RESTRICT=strip !test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/libs/klibc/2.0/klibc-2.0.4.tar.xz mirror://debian/pool/main/k/klibc/klibc_2.0.4-9.debian.tar.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.14.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a72b54a37f27a56c8d56a308892a7f03
diff --git a/metadata/md5-cache/dev-libs/kopeninghours-21.04.0 b/metadata/md5-cache/dev-libs/kopeninghours-21.04.0
new file mode 100644
index 000000000000..aaea7fd3cbe9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/kopeninghours-21.04.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/kpublictransport-21.04.0:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib python? ( python_single_target_python3_7? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for parsing and evaluating OSM opening hours expressions
+EAPI=7
+HOMEPAGE=https://api.kde.org/kopeninghours/html/index.html https://invent.kde.org/libraries/kopeninghours
+IUSE=python debug test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/kpublictransport-21.04.0:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib python? ( python_single_target_python3_7? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) 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-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.0/src/kopeninghours-21.04.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1c4fb12e475caf49e22e68094f39eac3
diff --git a/metadata/md5-cache/dev-libs/kosmindoormap-21.04.0 b/metadata/md5-cache/dev-libs/kosmindoormap-21.04.0
new file mode 100644
index 000000000000..a83a95c85ef9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/kosmindoormap-21.04.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/kpublictransport-21.04.0:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib test? ( >=dev-qt/qtwidgets-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Data Model and Extraction System for Travel Reservation information
+EAPI=7
+HOMEPAGE=https://invent.kde.org/libraries/kosmindoormap
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/kpublictransport-21.04.0:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.0/src/kosmindoormap-21.04.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=20b9189784b70b2a48dcb9772ca992a6
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406 b/metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406
index 432b632e9f38..2dcccda04b6d 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406
@@ -4,9 +4,10 @@ DESCRIPTION=Path searching library for TeX-related files
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
 IUSE=doc source static-libs
-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
+RDEPEND=virtual/tmpfiles
 SLOT=0/6.3.2
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20200406-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/kpathsea-texmf.d-10.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea.doc-2020.tar.xz )
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=03ddf5afb9f6014215dcc23d7507f0d1
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=657bc185370c298bd7eaf84d684f0ce6
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325 b/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
new file mode 100644
index 000000000000..8b2b300d9c46
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst postrm prepare
+DESCRIPTION=Path searching library for TeX-related files
+EAPI=7
+HOMEPAGE=http://tug.org/texlive/
+IUSE=doc source static-libs
+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
+RDEPEND=virtual/tmpfiles
+SLOT=0/6.3.3
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/kpathsea-texmf.d-11.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea.doc-2021.tar.xz )
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=76caad4ebc0adea3ba3325c85c77f92a
diff --git a/metadata/md5-cache/dev-libs/kpeoplevcard-0.1 b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1
index 8d3d65c76ee3..238d6301be75 100644
--- a/metadata/md5-cache/dev-libs/kpeoplevcard-0.1
+++ b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcontacts-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kpeople-5.64.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kpeoplevcard/0.1/kpeoplevcard-0.1.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74c549769c622ec5725726068fee40e9
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.2.0 b/metadata/md5-cache/dev-libs/kproperty-3.2.0
index d40577505ac0..27bd330587d0 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.2.0
+++ b/metadata/md5-cache/dev-libs/kproperty-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test ) test
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.2.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6da7e25bbdc38d95a9bfb5efebdb3f4
diff --git a/metadata/md5-cache/dev-libs/kpublictransport-21.04.0 b/metadata/md5-cache/dev-libs/kpublictransport-21.04.0
new file mode 100644
index 000000000000..f14106469ddc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/kpublictransport-21.04.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 sys-libs/zlib test? ( >=dev-qt/qtwidgets-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for accessing public transport timetables and other information
+EAPI=7
+HOMEPAGE=https://invent.kde.org/libraries/kpublictransport https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.0/src/kpublictransport-21.04.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a2dd5c8dfb780c623a9699a50c37217d
diff --git a/metadata/md5-cache/dev-libs/kqoauth-0.98-r3 b/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
index 14f6092d998e..127578dbba68 100644
--- a/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
+++ b/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/kypeli/kQOAuth/archive/0.98.tar.gz -> kqoauth-0.98.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d202af1a50d8d972b2b36fd5a93031bd
+_md5_=5fa26ccb739e0d3c9820b6675ea685db
diff --git a/metadata/md5-cache/dev-libs/kreport-3.2.0-r1 b/metadata/md5-cache/dev-libs/kreport-3.2.0-r1
index 84305474845d..2486c0ce3fd7 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.2.0-r1
+++ b/metadata/md5-cache/dev-libs/kreport-3.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/kproperty-3.2.0:5= >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsu
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.2.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfa813f1ab6d6fed64e345adf16bba86
diff --git a/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0 b/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
index 8ed2a09b47b8..63cffb6f5e47 100644
--- a/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
+++ b/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgu
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kuserfeedback/kuserfeedback-1.0.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e106d5f859df77566f74778aafefc997
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.2 b/metadata/md5-cache/dev-libs/leatherman-1.12.2
index d0b562b054fd..369c6c1d11aa 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.2
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.2
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl
 RESTRICT=test
 SLOT=0/1.12.2
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.2.tar.gz -> leatherman-1.12.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77380a9cc2b8448455ff4fdb4372d6ad
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3c22dc1d4bd7f7e2d7d8d93b21ab909
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.4 b/metadata/md5-cache/dev-libs/leatherman-1.12.4
index 9252ff4aa544..7ac2a60a917f 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.4
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.4
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl
 RESTRICT=test
 SLOT=0/1.12.4
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.4.tar.gz -> leatherman-1.12.4.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6810043892581cea467811cd1063e28a
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3c22dc1d4bd7f7e2d7d8d93b21ab909
diff --git a/metadata/md5-cache/dev-libs/level-zero-0.91.10 b/metadata/md5-cache/dev-libs/level-zero-0.91.10
index 981cae5381ff..c3951f1bf33e 100644
--- a/metadata/md5-cache/dev-libs/level-zero-0.91.10
+++ b/metadata/md5-cache/dev-libs/level-zero-0.91.10
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/v0.91.10.tar.gz -> level-zero-0.91.10.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=398359cf8efaf54773fded7401265c84
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.0.0 b/metadata/md5-cache/dev-libs/level-zero-1.0.0
index 21c024926e02..c7145fb45224 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.0.0
+++ b/metadata/md5-cache/dev-libs/level-zero-1.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/v1.0.tar.gz -> level-zero-1.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3035ac8b0e391f1f4ffb0936a1568fd7
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.18-r2 b/metadata/md5-cache/dev-libs/leveldb-1.18-r2
deleted file mode 100644
index 149ceedd2a3f..000000000000
--- a/metadata/md5-cache/dev-libs/leveldb-1.18-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=tcmalloc? ( dev-util/google-perftools ) snappy? ( app-arch/snappy:= static-libs? ( app-arch/snappy[static-libs(-)] ) )
-DESCRIPTION=a fast key-value storage library written at Google
-EAPI=5
-HOMEPAGE=http://leveldb.org/ https://github.com/google/leveldb
-IUSE=+snappy static-libs +tcmalloc kernel_FreeBSD
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=tcmalloc? ( dev-util/google-perftools ) snappy? ( app-arch/snappy:= static-libs? ( app-arch/snappy[static-libs(-)] ) )
-SLOT=0
-SRC_URI=https://github.com/google/leveldb/archive/v1.18.tar.gz -> leveldb-1.18.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79d60c12c3c2a22d20b9320a54881b12
diff --git a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2 b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
index 089fce1bccef..878241e98460 100644
--- a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
+++ b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c69d90828839fe04b5917170f327f4f
diff --git a/metadata/md5-cache/dev-libs/libaio-0.3.112 b/metadata/md5-cache/dev-libs/libaio-0.3.112
index 30fda9a846e8..37f1ac301c20 100644
--- a/metadata/md5-cache/dev-libs/libaio-0.3.112
+++ b/metadata/md5-cache/dev-libs/libaio-0.3.112
@@ -3,10 +3,10 @@ DESCRIPTION=Asynchronous input/output library that uses the kernels native inter
 EAPI=7
 HOMEPAGE=https://pagure.io/libaio
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a863b0e6d448acd975a77c281e7c544b
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=59d4c59336c2d87b6785187456e362bc
diff --git a/metadata/md5-cache/dev-libs/libaio-9999 b/metadata/md5-cache/dev-libs/libaio-9999
index 098c7fa49341..89e047bbba96 100644
--- a/metadata/md5-cache/dev-libs/libaio-9999
+++ b/metadata/md5-cache/dev-libs/libaio-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=34c801e150ac98d67713c1aec6930640
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
index 7fca13b7aab0..0f72c20677e0 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk3,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libindicator-12.10.0: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(-)?] >=x11-libs/gtk+-3.2: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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= ) introspection? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk3,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libindicator-12.10.0: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(-)?] >=x11-libs/gtk+-3.2: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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= ) introspection? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A library to allow applications to export a menu into the Unity Menu bar
 EAPI=6
 HOMEPAGE=https://launchpad.net/libappindicator
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk3,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libindicator-12.10.0: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(-)?] >=x11-libs/gtk+-3.2: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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=3
 SRC_URI=https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c54e0812d6f854a01882e53a0813903
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34895d4ef13860b8021000bfd7d1f214
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.8.0 b/metadata/md5-cache/dev-libs/libarcus-4.8.0
index 196204acf6db..19d52e69fa30 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.8.0
+++ b/metadata/md5-cache/dev-libs/libarcus-4.8.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.8.0.tar.gz -> libarcus-4.8.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8da1d053dd365d4dcaf6b94caecb71cd
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.3 b/metadata/md5-cache/dev-libs/libassuan-2.5.3
index bda58ccc8fcb..ce6d7e4df295 100644
--- a/metadata/md5-cache/dev-libs/libassuan-2.5.3
+++ b/metadata/md5-cache/dev-libs/libassuan-2.5.3
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libgpg-error-1.8
 DESCRIPTION=IPC library used by GnuPG and GPGME
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/related_software/libassuan/index.en.html
-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
+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
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.3.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a30d22a11fc30a36db2fa67cc7659d4e
+_md5_=61bc206484b066bfc2fba45ba49e296a
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.4 b/metadata/md5-cache/dev-libs/libassuan-2.5.4
index 284c03e8a86e..803c8e618082 100644
--- a/metadata/md5-cache/dev-libs/libassuan-2.5.4
+++ b/metadata/md5-cache/dev-libs/libassuan-2.5.4
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libgpg-error-1.17
 DESCRIPTION=IPC library used by GnuPG and GPGME
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/related_software/libassuan/index.en.html
-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
+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
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libgpg-error-1.17
 SLOT=0
 SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.4.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=85cd561c3cb6c1e9668a4cde595c8602
+_md5_=fc27ce1ead06a9334b307c9aaec52f1c
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.10 b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.10
index dcd3c12b3e97..143a318c355c 100644
--- a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.10
+++ b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.10
@@ -3,9 +3,9 @@ DESCRIPTION=Implementation for atomic memory update operations
 EAPI=7
 HOMEPAGE=https://github.com/ivmai/libatomic_ops/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT boehm-gc GPL-2+
 SLOT=0
 SRC_URI=https://github.com/ivmai/libatomic_ops/releases/download/v7.6.10/libatomic_ops-7.6.10.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9ebe544ed7e9d0a65d534e59f8c7990c
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3755181c1b68bda6492ccaa988bee36d
diff --git a/metadata/md5-cache/dev-libs/libb64-2.0.0.1 b/metadata/md5-cache/dev-libs/libb64-2.0.0.1
index 071becb6478e..09970b20f7b9 100644
--- a/metadata/md5-cache/dev-libs/libb64-2.0.0.1
+++ b/metadata/md5-cache/dev-libs/libb64-2.0.0.1
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip
 DESCRIPTION=Fast Base64 encoding/decoding routines
 EAPI=7
 HOMEPAGE=https://github.com/libb64/libb64/
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=CC-PD
 SLOT=0/2.0.0.1
 SRC_URI=https://github.com/libb64/libb64/archive/v2.0.0.1.tar.gz -> libb64-2.0.0.1.tar.gz
-_md5_=f0cf3bc7d9dee210df3eccb3b705470a
+_md5_=200f04878d679c33d23bf334cb35233b
diff --git a/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1 b/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1
index a5e14d20fa13..7d2a82fd3087 100644
--- a/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=tools? ( dev-libs/libgcrypt ) test? ( app-editors/vim-core dev-libs/libgcrypt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=C implementation of Bitcoin's base58 encoding
@@ -11,5 +11,5 @@ RDEPEND=tools? ( dev-libs/libgcrypt )
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/luke-jr/libbase58/archive/v0.1.4.tar.gz -> libbase58-0.1.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f2615cc7623401d9732639586bad0e3f
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.1.0-r1 b/metadata/md5-cache/dev-libs/libbpf-0.1.0-r1
index 10b2967c8e38..33a55ac7d3a8 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libbpf-0.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
 SLOT=0/0.1.0
 SRC_URI=https://github.com/libbpf/libbpf/archive/v0.1.0.tar.gz -> libbpf-0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d1a00e924403de2936a50f5bc8a99191
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.1.1 b/metadata/md5-cache/dev-libs/libbpf-0.1.1
index a47deae94f95..fd9ac9b8d465 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.1.1
+++ b/metadata/md5-cache/dev-libs/libbpf-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
 SLOT=0/0.1.1
 SRC_URI=https://github.com/libbpf/libbpf/archive/v0.1.1.tar.gz -> libbpf-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d1a00e924403de2936a50f5bc8a99191
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.2 b/metadata/md5-cache/dev-libs/libbpf-0.2
index 4cfa12afa39d..a46103a21d82 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.2
+++ b/metadata/md5-cache/dev-libs/libbpf-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
 SLOT=0/0.2
 SRC_URI=https://github.com/libbpf/libbpf/archive/v0.2.tar.gz -> libbpf-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d1a00e924403de2936a50f5bc8a99191
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.3 b/metadata/md5-cache/dev-libs/libbpf-0.3
index f46fb0f00793..10cbef1bad7b 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.3
+++ b/metadata/md5-cache/dev-libs/libbpf-0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
 EAPI=7
 HOMEPAGE=https://github.com/libbpf/libbpf
 IUSE=+static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
 SLOT=0/0.3
 SRC_URI=https://github.com/libbpf/libbpf/archive/v0.3.tar.gz -> libbpf-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e6725dd5ee22dc3174949d5d91f29e5f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c81d4dc8ca847b1bb7b1f7e8854867f0
diff --git a/metadata/md5-cache/dev-libs/libbpf-9999 b/metadata/md5-cache/dev-libs/libbpf-9999
index 01d963db796e..1337430087d3 100644
--- a/metadata/md5-cache/dev-libs/libbpf-9999
+++ b/metadata/md5-cache/dev-libs/libbpf-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 BSD-2
 PROPERTIES=live
 RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
 SLOT=0/9999
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29394d480206e7a3ba55b3fa3a64457f
diff --git a/metadata/md5-cache/dev-libs/libbrahe-1.1.0-r1 b/metadata/md5-cache/dev-libs/libbrahe-1.1.0-r1
index 99b109e43fa6..83a4309ca15a 100644
--- a/metadata/md5-cache/dev-libs/libbrahe-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libbrahe-1.1.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DESCRIPTION=A Heterogenous C Library of Numeric Functions
 EAPI=7
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/libbrahe-1.1.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=98f7766bfa22ddc7c60201a148974ee8
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.10.0 b/metadata/md5-cache/dev-libs/libbsd-0.10.0
index d48e4afc2517..49f3802e3b8f 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.10.0
+++ b/metadata/md5-cache/dev-libs/libbsd-0.10.0
@@ -4,9 +4,9 @@ DESCRIPTION=An library to provide useful functions commonly found on BSD systems
 EAPI=7
 HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 BSD-4 ISC
 SLOT=0
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=512c40fb1881797429757e49b8fdd074
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6763ee9d0aa09d6bcbc9a8e7a79b6ce5
diff --git a/metadata/md5-cache/dev-libs/libbson-1.16.2 b/metadata/md5-cache/dev-libs/libbson-1.16.2
index 3dc8f2ff7944..c666adcae94c 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.16.2
+++ b/metadata/md5-cache/dev-libs/libbson-1.16.2
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.16.2/mongo-c-driver-1.16.2.tar.gz -> libbson-1.16.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b1765586bb1dcfae8028a13e58d4329
diff --git a/metadata/md5-cache/dev-libs/libbson-1.17.0 b/metadata/md5-cache/dev-libs/libbson-1.17.0
index 3b42f530ebf8..d3f070ffecbf 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.17.0
+++ b/metadata/md5-cache/dev-libs/libbson-1.17.0
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.17.0/mongo-c-driver-1.17.0.tar.gz -> libbson-1.17.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe9ec73c9deed365e3b6f9a22c9cfb1e
diff --git a/metadata/md5-cache/dev-libs/libburn-1.5.4 b/metadata/md5-cache/dev-libs/libburn-1.5.4
index 28b298731d7a..24d39040275f 100644
--- a/metadata/md5-cache/dev-libs/libburn-1.5.4
+++ b/metadata/md5-cache/dev-libs/libburn-1.5.4
@@ -2,10 +2,10 @@ BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=7
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wiki/Libburn
 IUSE=debug static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libburn-1.5.4.tar.gz
-_md5_=45fd5e79fbf643f6e7e86271b669de15
+_md5_=3f6502d5bb568f8315cfbbbdc27bbc1e
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.3 b/metadata/md5-cache/dev-libs/libbytesize-2.3
index 8999431304b5..09fc42a3a0ec 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-2.3
+++ b/metadata/md5-cache/dev-libs/libbytesize-2.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/polib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/polib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.3/libbytesize-2.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=cc2242a1b22731a06d104c44685ac477
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.4 b/metadata/md5-cache/dev-libs/libbytesize-2.4
index 7eea8a567fe3..ebcc37a33837 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-2.4
+++ b/metadata/md5-cache/dev-libs/libbytesize-2.4
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/polib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/polib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.4/libbytesize-2.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4c2652cf22e807ed775b3695e37efefe
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.5 b/metadata/md5-cache/dev-libs/libbytesize-2.5
index eec121813718..9956ae60aaf2 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-2.5
+++ b/metadata/md5-cache/dev-libs/libbytesize-2.5
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[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/polib[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(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[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/polib[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(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( 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(-)] )
 DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.5/libbytesize-2.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=65b89cf82eff646935c0eae76986d309
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.8.0 b/metadata/md5-cache/dev-libs/libcbor-0.8.0
index 4e4516b1c460..74e021ef9919 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.8.0
+++ b/metadata/md5-cache/dev-libs/libcbor-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=CBOR protocol implementation for C and others
 EAPI=7
 HOMEPAGE=https://github.com/pjk/libcbor
 IUSE=+custom-alloc doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.8.0.tar.gz -> libcbor-0.8.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7040006abc0539c4927cc616e7651aee
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e934c8b08c772a2a2ed36b1ff25129e8
diff --git a/metadata/md5-cache/dev-libs/libcdada-0.3.4-r2 b/metadata/md5-cache/dev-libs/libcdada-0.3.4-r2
new file mode 100644
index 000000000000..fe27716e2cfd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcdada-0.3.4-r2
@@ -0,0 +1,13 @@
+BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DESCRIPTION=Basic data structures in C
+EAPI=7
+HOMEPAGE=https://github.com/msune/libcdada
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/msune/libcdada/archive/refs/tags/v0.3.4.tar.gz -> libcdada-0.3.4.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9652898ba574e7f30190e52294d48a23
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1 b/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
index 755027d70d21..aeb36f3efda7 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/sed sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/sed sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.
 RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=mirror://gnu/libcdio/libcdio-2.0.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9ab446926b5259fee1c3db836648131c
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1 b/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
index c8198930a221..a94d19ac21ed 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/sed sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-apps/sed sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A library to encapsulate CD-ROM reading and control
@@ -11,5 +11,5 @@ RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=mirror://gnu/libcdio/libcdio-2.1.0.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=858ff5323e10f282aaa40fde573d99a5
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
deleted file mode 100644
index 14116dbeebeb..000000000000
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=an advanced CDDA reader with error correction
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libcdio/
-IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+ GPL-2+ LGPL-2.1
-RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.93+1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4e05867891e13af1eacd4baf08085fc9
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r2 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r2
deleted file mode 100644
index f527c3a32be5..000000000000
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=an advanced CDDA reader with error correction
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libcdio/
-IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+ GPL-2+ LGPL-2.1
-RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=086aa56a083deee43121ed47a551148e
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0-r1
deleted file mode 100644
index 57c0b3c02862..000000000000
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=an advanced CDDA reader with error correction
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/libcdio/
-IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+ GPL-2+ LGPL-2.1
-RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+2.0.0.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e710f84b9b516930c0926f2c8a5729d8
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
index 712f2dd824f5..15d47880b2ec 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=an advanced CDDA reader with error correction
@@ -11,5 +11,5 @@ RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=74c03f37c24efbc08f8ceb6e27a40461
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a484589a07c3c0f3a583cf9b5586c432
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1 b/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
index d9511531201e..b85f334df32e 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-p
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.4.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb4a35f96f43904272a615b6aef38959
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.7 b/metadata/md5-cache/dev-libs/libcec-4.0.7
index 2bb34572e70d..259b28b9e1bc 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.7
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.7
@@ -11,5 +11,5 @@ RDEPEND=udev? ( virtual/udev ) >=dev-libs/libplatform-2.0.0 tools? ( sys-libs/nc
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.7.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=320f2ba079717bbe889aef580b10917d
diff --git a/metadata/md5-cache/dev-libs/libcec-6.0.2 b/metadata/md5-cache/dev-libs/libcec-6.0.2
index 6f119322e650..dfcd6037bf64 100644
--- a/metadata/md5-cache/dev-libs/libcec-6.0.2
+++ b/metadata/md5-cache/dev-libs/libcec-6.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=7
 HOMEPAGE=http://libcec.pulse-eight.com
 IUSE=cubox exynos python raspberry-pi kernel-cec tools +xrandr udev kernel_linux python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) tools? ( sys-libs/ncurses:= ) udev? ( virtual/udev ) xrandr? ( x11-libs/libXrandr )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-6.0.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85ca1fa96d12839daab8b5b5604c0ed8
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c58ff0413d25e9255ec8a63d5483307
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
index 94639e73dd3d..f95c5b9fe60e 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=pam? ( sys-libs/pam ) sys-devel/bison sys-devel/flex elibc_musl? ( sys-libs/fts-standalone ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=pam? ( sys-libs/pam ) sys-devel/bison sys-devel/flex elibc_musl? ( sys-libs/fts-standalone ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Tools and libraries to configure and manage kernel control groups
 EAPI=6
 HOMEPAGE=http://libcg.sourceforge.net/
@@ -11,5 +11,5 @@ REQUIRED_USE=daemon? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4257ec64bdb19667c60f5a1230d3ce25
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
index b4ccff94d16d..69eb93e7b82d 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex elibc_musl? ( sys-libs/fts-standalone ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=sys-devel/bison sys-devel/flex elibc_musl? ( sys-libs/fts-standalone ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
 DEPEND=pam? ( sys-libs/pam )
 DESCRIPTION=Tools and libraries to configure and manage kernel control groups
@@ -12,5 +12,5 @@ REQUIRED_USE=daemon? ( tools )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=47423f8bb6483284b166051eefaa54ca
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.8.0 b/metadata/md5-cache/dev-libs/libcharon-4.8.0
index 7157c2c0753c..78561cc2a67c 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.8.0
+++ b/metadata/md5-cache/dev-libs/libcharon-4.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.8.0.tar.gz -> libcharon-4.8.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b6a53117cf72715fcd0521a365850c0
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
index 85b5d5edcbff..41f1619c8861 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
+++ b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/libclc-0.2.0_pre20201001.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=233264485689ce3b78d6bd86d18c1d8c
diff --git a/metadata/md5-cache/dev-libs/libclthreads-2.4.2 b/metadata/md5-cache/dev-libs/libclthreads-2.4.2
index 986f601f62e1..edf38db5f706 100644
--- a/metadata/md5-cache/dev-libs/libclthreads-2.4.2
+++ b/metadata/md5-cache/dev-libs/libclthreads-2.4.2
@@ -7,4 +7,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-2.4.2.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=873c4f5d2f1f353ca6365097c3bcc59e
+_md5_=7c313e5eca49608ba79230b3af49500e
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.7.2 b/metadata/md5-cache/dev-libs/libconfig-1.7.2
index f320ee6c33f0..04aff5624b77 100644
--- a/metadata/md5-cache/dev-libs/libconfig-1.7.2
+++ b/metadata/md5-cache/dev-libs/libconfig-1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-apps/texinfo sys-devel/bison sys-devel/libtool
 DESCRIPTION=Libconfig is a simple library for manipulating structured configuration files
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-lin
 LICENSE=LGPL-2.1
 SLOT=0/11
 SRC_URI=https://github.com/hyperrealm/libconfig/archive/v1.7.2.tar.gz -> libconfig-1.7.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ff5c1ea41ef13e5db35f5d3279dc8a71
diff --git a/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2 b/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2
index 05dafd78fb1d..5d9e129b73c2 100644
--- a/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2
+++ b/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2
@@ -1,13 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/libpng:0= doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libpng:0=
 DESCRIPTION=A collection of portable C++ classes
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.coyotegulch.com/products/libcoyotl/
-IUSE=doc static-libs
+IUSE=doc
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0=
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/libcoyotl-3.1.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1a5a29139728016b354cd6854a190b94
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a422ede5681ac12eeadbc99f76ca4efa
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.13 b/metadata/md5-cache/dev-libs/libcroco-0.6.13
index 77eec25306d9..62675b2ad50e 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.13
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.13
@@ -5,11 +5,11 @@ DESCRIPTION=Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/libcroco/
 IUSE=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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.13.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff4410242ad2784f07549167b027712c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d8db213001dc3f8a4e631d6c937e9aa
diff --git a/metadata/md5-cache/dev-libs/libcss-0.9.1-r1 b/metadata/md5-cache/dev-libs/libcss-0.9.1-r1
index ec817e061034..53ec82403a66 100644
--- a/metadata/md5-cache/dev-libs/libcss-0.9.1-r1
+++ b/metadata/md5-cache/dev-libs/libcss-0.9.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=CSS parser and selection engine, written in C
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libcss/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
 RDEPEND=dev-libs/libparserutils dev-libs/libwapcaplet
 RESTRICT=!test? ( test )
 SLOT=0/0.9.1
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libcss-0.9.1-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=52d153749a4790034db5363c530be4b8
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	af8fe1901b583a379a6a32af919cea05	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=89ec09453f633d5628f8f509584b3e6e
diff --git a/metadata/md5-cache/dev-libs/libdaemon-0.14-r3 b/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
index 9688f09e1976..f25d50bce258 100644
--- a/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
+++ b/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
@@ -1,12 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Simple library for creating daemon processes in C
-EAPI=6
+EAPI=7
 HOMEPAGE=http://0pointer.de/lennart/projects/libdaemon/
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a5b5ae9effbaa5f6d325c220a899520
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6d4548e611d7c670e15b67b23571393c
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.36.0 b/metadata/md5-cache/dev-libs/libdazzle-3.36.0
deleted file mode 100644
index 71a004289923..000000000000
--- a/metadata/md5-cache/dev-libs/libdazzle-3.36.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.49.0 vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Experimental new features for GTK+ and GLib
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
-IUSE=gtk-doc +introspection test +vala test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libdazzle/3.36/libdazzle-3.36.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f336d0ec58e717d06b19ae2d9fe7406
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.38.0 b/metadata/md5-cache/dev-libs/libdazzle-3.38.0
index d08b21c6347e..ea7a5c1eb738 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.38.0
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.38.0
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-util/meson-0.49.0 vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=>=dev-util/meson-0.49.0 vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Experimental new features for GTK+ and GLib
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
 IUSE=gtk-doc +introspection test +vala test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.38/libdazzle-3.38.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1696adf3b2d0899d62c52f60413f8b70
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fcb6176fd271cd8999b655aa11549561
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.40.0 b/metadata/md5-cache/dev-libs/libdazzle-3.40.0
new file mode 100644
index 000000000000..ddb51cbc2298
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.40.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.49.0 vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Experimental new features for GTK+ and GLib
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
+IUSE=gtk-doc +introspection test +vala test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libdazzle/3.40/libdazzle-3.40.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3cf5de3c25c84f8ca015c6377f97a1ac
diff --git a/metadata/md5-cache/dev-libs/libdbh-5.0.19 b/metadata/md5-cache/dev-libs/libdbh-5.0.19
index 5391b1937c40..1cc797ee706a 100644
--- a/metadata/md5-cache/dev-libs/libdbh-5.0.19
+++ b/metadata/md5-cache/dev-libs/libdbh-5.0.19
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a small library to create and manage 64-bit disk based hash tables
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libdbh/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/dbh/dbh/5.0.19/libdbh2-5.0.19.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=70c6d1e642a5d169c26f6bebf2db551e
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=680eea673053ccf0cb1400d9c4341361
diff --git a/metadata/md5-cache/dev-libs/libdbh-5.0.22 b/metadata/md5-cache/dev-libs/libdbh-5.0.22
index 09b3ade4a9d7..f51db3b2990a 100644
--- a/metadata/md5-cache/dev-libs/libdbh-5.0.22
+++ b/metadata/md5-cache/dev-libs/libdbh-5.0.22
@@ -1,11 +1,11 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=A small library to create and manage 64-bit disk based hash tables
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libdbh/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=mirror://sourceforge/dbh/dbh/5.0.22/libdbh2-5.0.22.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=34ad713f04eb6daf4fff04b2b0432f2e
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e9d950f36f81acbc18d95e8402a072ea
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1 b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1
index bffe42ebc2d3..e3cd054c2e81 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.35.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gtk? ( x11-libs/gtk+:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) app-text/gnome-doc-utils dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( >=dev-libs/json-glib-0.13.4[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/dbus-test-runner-15.04.0_p100 gtk? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) gtk3? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.35.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gtk? ( x11-libs/gtk+:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) app-text/gnome-doc-utils dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( >=dev-libs/json-glib-0.13.4[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/dbus-test-runner-15.04.0_p100 gtk? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) gtk3? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library to pass menu structure across DBus
 EAPI=6
 HOMEPAGE=https://launchpad.net/libdbusmenu
 IUSE=debug gtk gtk3 +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.35.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gtk? ( x11-libs/gtk+:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/dbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed34b624871fc853fff8524ceeae9a31
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=20048ef83c85febffea1f0a306399f11
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
index f35df41f01fc..a7d8e7e6ab02 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e901c94eae52bb160ba003aaf810bfb4
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1 b/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
index 25b7b6daf2ac..035046f3e53c 100644
--- a/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/clang sys-devel/llvm dev-util/ninja dev-util/cmake
+BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!gnustep-base/libobjc2
 DESCRIPTION=A library for concurrent code execution on multicore hardware
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!gnustep-base/libobjc2
 SLOT=0
 SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3.3-RELEASE.tar.gz -> libdispatch-5.3.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc8d1a4bac80bd1187163c5152f43db2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2042fb5f77f3721e3e5f3b94ae520bb5
diff --git a/metadata/md5-cache/dev-libs/libdivecomputer-9999 b/metadata/md5-cache/dev-libs/libdivecomputer-9999
index ec63154d3d5f..80c191e72f90 100644
--- a/metadata/md5-cache/dev-libs/libdivecomputer-9999
+++ b/metadata/md5-cache/dev-libs/libdivecomputer-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=virtual/libusb:1 bluetooth? ( net-wireless/bluez )
 DESCRIPTION=Library for communication with dive computers from various manufacturers.
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 bluetooth? ( net-wireless/bluez )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b66e059fd836c4c8d1a3ea5f6151227f
diff --git a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1 b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
index 43e7d915c80b..008c5ca0d51b 100644
--- a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/y-256/libdivsufsort/archive/2.0.1.tar.gz -> libdivsufsort-2.0.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c16d9afcf5330416980d43ed090036d
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a24fe8aae92fa91ece5c4b619668550
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r2 b/metadata/md5-cache/dev-libs/libdnet-1.14-r2
index 6a1fc9b649af..8ee060fcd149 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r2
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14-r2
@@ -1,4 +1,4 @@
-BDEPEND=python? ( dev-python/cython[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(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=python? ( dev-python/cython[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(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=python? ( 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(-)] )
 DESCRIPTION=simplified, portable interface to several low-level networking routines
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	d8655e1387589a2e1930339b1627d5c1	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=69a70be640e2c5bc3719f59847382abb
diff --git a/metadata/md5-cache/dev-libs/libdnsres-0.1a-r3 b/metadata/md5-cache/dev-libs/libdnsres-0.1a-r3
index 5bf719d6c174..dec339f1c1e1 100644
--- a/metadata/md5-cache/dev-libs/libdnsres-0.1a-r3
+++ b/metadata/md5-cache/dev-libs/libdnsres-0.1a-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/libevent
 DESCRIPTION=A non-blocking DNS resolver library
@@ -10,5 +10,5 @@ LICENSE=BSD-4
 RDEPEND=dev-libs/libevent
 SLOT=0
 SRC_URI=https://www.monkey.org/~provos/libdnsres-0.1a.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=32697be0ce243d50f4b34357b5457782
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1 b/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
index d4dfb7ba2b24..a946e684dcb8 100644
--- a/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
+++ b/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/c-blosc:0= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-l
 RESTRICT=!test? ( test )
 SLOT=0/0.7.2
 SRC_URI=https://github.com/libdynd/libdynd/archive/v0.7.2.tar.gz -> libdynd-0.7.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b350142359c0e8dfb39dccb3903c88dc
diff --git a/metadata/md5-cache/dev-libs/libebml-1.4.2 b/metadata/md5-cache/dev-libs/libebml-1.4.2
index 7078bc2ba968..26be0eb6cedf 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.4.2
+++ b/metadata/md5-cache/dev-libs/libebml-1.4.2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x8
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.4.2.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=be78114279447f69cc1bc6751049a5ff
diff --git a/metadata/md5-cache/dev-libs/libedit-20191211.3.1 b/metadata/md5-cache/dev-libs/libedit-20191211.3.1
deleted file mode 100644
index 4b2ed78f3172..000000000000
--- a/metadata/md5-cache/dev-libs/libedit-20191211.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
-DESCRIPTION=BSD replacement for libreadline
-EAPI=7
-HOMEPAGE=https://thrysoee.dk/editline/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD-2
-RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
-SLOT=0
-SRC_URI=https://thrysoee.dk/editline/libedit-20191211-3.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=a53c5863af07c8bbb21625d4a4d6f858
diff --git a/metadata/md5-cache/dev-libs/libedit-20210216.3.1 b/metadata/md5-cache/dev-libs/libedit-20210216.3.1
index a6ba34fd7d80..d79c3245cc6c 100644
--- a/metadata/md5-cache/dev-libs/libedit-20210216.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20210216.3.1
@@ -1,14 +1,13 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install test
 DEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
 DESCRIPTION=BSD replacement for libreadline
 EAPI=7
 HOMEPAGE=https://thrysoee.dk/editline/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
 SLOT=0
 SRC_URI=https://thrysoee.dk/editline/libedit-20210216-3.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=b785e2f3383092c4604b02b47d1b9c6d
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=2ca2b7648588b390b32927d1cea1a89e
diff --git a/metadata/md5-cache/dev-libs/libedit-20210419.3.1 b/metadata/md5-cache/dev-libs/libedit-20210419.3.1
new file mode 100644
index 000000000000..9a431791538a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libedit-20210419.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
+DESCRIPTION=BSD replacement for libreadline
+EAPI=7
+HOMEPAGE=https://thrysoee.dk/editline/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD-2
+RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
+SLOT=0
+SRC_URI=https://thrysoee.dk/editline/libedit-20210419-3.1.tar.gz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=926e768a725d4baaebb23eaf69905f87
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
index 2e4561520380..7037ffe0d9b3 100644
--- a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A ELF object file access library
 EAPI=6
 HOMEPAGE=http://www.mr511.de/software/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=!dev-libs/elfutils
 SLOT=0
 SRC_URI=http://www.mr511.de/software/libelf-0.8.13.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb72a596d0edb37cccd6fbbcf932ee4d
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=91ff7f90522a585e60c200824b6aa5c5
diff --git a/metadata/md5-cache/dev-libs/liberasurecode-1.6.2 b/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
index 0fd982ab1dbe..71714765a390 100644
--- a/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
+++ b/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/autoconf doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Erasure Code API library written in C with pluggable Erasure Code backends.
 EAPI=6
 HOMEPAGE=https://bitbucket.org/tsg-/liberasurecode/overview
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/openstack/liberasurecode/archive/1.6.2.tar.gz -> liberasurecode-1.6.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba4ec0e101795a93d75fd44a578cd2c1
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=448c45b709575763c590384ce7999ef4
diff --git a/metadata/md5-cache/dev-libs/libestr-0.1.11 b/metadata/md5-cache/dev-libs/libestr-0.1.11
index 15d5177eac39..da3befc6ae56 100644
--- a/metadata/md5-cache/dev-libs/libestr-0.1.11
+++ b/metadata/md5-cache/dev-libs/libestr-0.1.11
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=Library for some string essentials
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libestr.adiscon.com/files/download/libestr-0.1.11.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=207c02ae1f89bcf2136f680cdf89dce0
diff --git a/metadata/md5-cache/dev-libs/libev-4.33 b/metadata/md5-cache/dev-libs/libev-4.33
index 01802d4e779a..75d6731a51ae 100644
--- a/metadata/md5-cache/dev-libs/libev-4.33
+++ b/metadata/md5-cache/dev-libs/libev-4.33
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=7
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( BSD GPL-2 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.33.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=089f6efaa066bf6e46de518379d79e5b
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=78f9eb2ecf4ca4ca0976168147a7a216
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.10.0 b/metadata/md5-cache/dev-libs/libevdev-1.10.0
index 11e52bd5e439..3a667e90232b 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.10.0
+++ b/metadata/md5-cache/dev-libs/libevdev-1.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=Handler library for evdev events
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.10.0.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=80cb76a84b65e2f8801a78de1a14a5c5
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8a86ffa6d8e69b65043980297c67ebb4
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.11.0 b/metadata/md5-cache/dev-libs/libevdev-1.11.0
index 8362d109c245..7cb3a0c1a230 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.11.0
+++ b/metadata/md5-cache/dev-libs/libevdev-1.11.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8a86ffa6d8e69b65043980297c67ebb4
diff --git a/metadata/md5-cache/dev-libs/libevdev-9999 b/metadata/md5-cache/dev-libs/libevdev-9999
index 39099ad6d083..9eaf4fc5e873 100644
--- a/metadata/md5-cache/dev-libs/libevdev-9999
+++ b/metadata/md5-cache/dev-libs/libevdev-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0f8142dca72d9906733c9a017d9116d9
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.11 b/metadata/md5-cache/dev-libs/libevent-2.1.11
index cac8f9932eeb..dd381ebfd369 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.11
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.11
@@ -4,11 +4,11 @@ DESCRIPTION=Library to execute a function when a specific event occurs on a file
 EAPI=7
 HOMEPAGE=https://libevent.org/ https://github.com/libevent/libevent/
 IUSE=debug libressl +ssl static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<=dev-libs/9libs-1.0
 RESTRICT=!test? ( test )
 SLOT=0/2.1-7
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.11-stable/libevent-2.1.11-stable.tar.gz -> libevent-2.1.11.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7d3f19422fe8c1fff24318142a8a4701
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6dd107798b3fbc048f5b81530be079fa
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.12 b/metadata/md5-cache/dev-libs/libevent-2.1.12
index c2960e96c933..64143bc27560 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.12
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.12
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=Library to execute a function when a specific event occurs on a file descriptor
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x
 RESTRICT=!test? ( test )
 SLOT=0/2.1-7
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz -> libevent-2.1.12.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d633912e4c88d88b295c27f6c2b0c18b
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.9999 b/metadata/md5-cache/dev-libs/libevent-2.1.9999
index 1306285c8f6f..ba605877bfac 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.9999
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=Library to execute a function when a specific event occurs on a file descriptor
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<=dev-libs/9libs-1.0
 RESTRICT=test
 SLOT=0/2.1-7
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=989603a947dedaf5ad420dceb515f143
diff --git a/metadata/md5-cache/dev-libs/libevent-9999 b/metadata/md5-cache/dev-libs/libevent-9999
index aab8a22298f8..9e7833ddf932 100644
--- a/metadata/md5-cache/dev-libs/libevent-9999
+++ b/metadata/md5-cache/dev-libs/libevent-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=mbedtls? ( net-libs/mbedtls ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=Library to execute a function when a specific event occurs on a file descriptor
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=mbedtls? ( net-libs/mbedtls ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<=dev-libs/9libs-1.0
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9a542cd24c1092d3b5182af4fd11bffa
diff --git a/metadata/md5-cache/dev-libs/libevocosm-3.3.1-r1 b/metadata/md5-cache/dev-libs/libevocosm-3.3.1-r1
index b3d9810093a8..9d8163ee3d10 100644
--- a/metadata/md5-cache/dev-libs/libevocosm-3.3.1-r1
+++ b/metadata/md5-cache/dev-libs/libevocosm-3.3.1-r1
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libcoyotl dev-libs/libbrahe
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/libevocosm-3.3.1.tar.gz
-_md5_=ed50b09530d07c0f1227aca3187f8651
+_md5_=bd562752d2e49104f1081fe7212133be
diff --git a/metadata/md5-cache/dev-libs/libf2c-20130927-r1 b/metadata/md5-cache/dev-libs/libf2c-20130927-r1
index 94565aaec2b3..80b45007efbe 100644
--- a/metadata/md5-cache/dev-libs/libf2c-20130927-r1
+++ b/metadata/md5-cache/dev-libs/libf2c-20130927-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 SLOT=0
 SRC_URI=http://www.netlib.org/f2c/libf2c.zip -> libf2c-20130927.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e860d87dfa5250fa9d9454654921606
diff --git a/metadata/md5-cache/dev-libs/libfastjson-0.99.8 b/metadata/md5-cache/dev-libs/libfastjson-0.99.8
index 691c742bee61..94e5778b37ac 100644
--- a/metadata/md5-cache/dev-libs/libfastjson-0.99.8
+++ b/metadata/md5-cache/dev-libs/libfastjson-0.99.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/autoconf-archive-2015.02.04 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-devel/autoconf-archive-2015.02.04 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Fork of the json-c library, which is optimized for liblognorm processing
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/tag/libfastjson/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 ~hppa sparc x86
 LICENSE=MIT
 SLOT=0/4.2.0
 SRC_URI=http://download.rsyslog.com/libfastjson/libfastjson-0.99.8.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=02bd3ede9674c1c7b63746fcf3e54358
diff --git a/metadata/md5-cache/dev-libs/libfastjson-0.99.9 b/metadata/md5-cache/dev-libs/libfastjson-0.99.9
index 1912d51bc38e..8c87d523f8a8 100644
--- a/metadata/md5-cache/dev-libs/libfastjson-0.99.9
+++ b/metadata/md5-cache/dev-libs/libfastjson-0.99.9
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/autoconf-archive-2015.02.04 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-devel/autoconf-archive-2015.02.04 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Fork of the json-c library, which is optimized for liblognorm processing
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/tag/libfastjson/
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa sparc x86
 LICENSE=MIT
 SLOT=0/4.3.0
 SRC_URI=http://download.rsyslog.com/libfastjson/libfastjson-0.99.9.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16a8b313b726a331d3dd3068a6a77464
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8e61fcd245237dacfa19a6cce1e5153d
diff --git a/metadata/md5-cache/dev-libs/libffi-3.3-r2 b/metadata/md5-cache/dev-libs/libffi-3.3-r2
index 4e2403a4b923..d75d9e42fe80 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.3-r2
+++ b/metadata/md5-cache/dev-libs/libffi-3.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=a portable, high level programming interface to various calling conv
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
 IUSE=debug pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f522fcc105f2b5c3a4584461de3a470b
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5068964716729cb77d0976720c68e957
diff --git a/metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3 b/metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
index 23cbacadf8af..eb15ffc52974 100644
--- a/metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
+++ b/metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
@@ -11,5 +11,5 @@ RDEPEND=!dev-libs/libffi:0/0
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=91748f446e6d01f4c6cd1740e2c6b5b3
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=51d0fde7f7605447f4ee57b2bd95ff21
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.5.0-r1 b/metadata/md5-cache/dev-libs/libfido2-1.5.0-r1
index 4afea28350ff..59f7af0a3929 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.5.0-r1
+++ b/metadata/md5-cache/dev-libs/libfido2-1.5.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Provides library functionality for FIDO 2.0
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/libfido2
 IUSE=libressl +static-libs kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= virtual/libudev:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.5.0.tar.gz -> libfido2-1.5.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d671e5e8da8bbe0b9b0597f0d66ff938
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ecf67eaafa05109a9cd8187868697cb5
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.6.0 b/metadata/md5-cache/dev-libs/libfido2-1.6.0
index c982556d60b5..ff5f713639d2 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.6.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.6.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= virtual/libudev:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.6.0.tar.gz -> libfido2-1.6.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=faef4172b1a5eb066a5560a907af90d4
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.7.0 b/metadata/md5-cache/dev-libs/libfido2-1.7.0
new file mode 100644
index 000000000000..c3f6a72f3443
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfido2-1.7.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:=
+DESCRIPTION=Provides library functionality for FIDO 2.0
+EAPI=7
+HOMEPAGE=https://github.com/Yubico/libfido2
+IUSE=nfc +static-libs kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:= acct-group/plugdev
+SLOT=0/1
+SRC_URI=https://github.com/Yubico/libfido2/archive/1.7.0.tar.gz -> libfido2-1.7.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=61946df38d90acbcac9c27c6a78b0e81
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.25.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.25.0
deleted file mode 100644
index e8ed1dfefbf6..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.25.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=91916528890f1415d0e0c04e5a8bb6d5
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.26.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.26.0
deleted file mode 100644
index 967ec35b5aea..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.26.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7bc64b7298286633806d09ffa099d067
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1 b/metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1
deleted file mode 100644
index 186e133d90cc..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
-RESTRICT=!test? ( test )
-SLOT=0/12
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.27.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=439e066587c05225d636fe90a4f41c69
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.27.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.27.1
index 8929601f1665..ed9ffd8b90e7 100644
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.27.1
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.27.1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ library offering some basic functionality for platform-independe
 EAPI=7
 HOMEPAGE=https://lib.filezilla-project.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
 RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.27.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=439e066587c05225d636fe90a4f41c69
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2ebfed00c7d5f4f11944dc3265877128
diff --git a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009 b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
index 1cb058af786d..79c94cf55718 100644
--- a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
+++ b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/libflatarray/archive/c8df37f6ac73250998b90c397458469902d6d9b9.tar.gz -> libflatarray-0.4.0_pre20201009.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53e4733346863f16ccb5eed2e5677080
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.0.3 b/metadata/md5-cache/dev-libs/libfmt-7.0.3
index e718b11bcb36..32247c1c66cc 100644
--- a/metadata/md5-cache/dev-libs/libfmt-7.0.3
+++ b/metadata/md5-cache/dev-libs/libfmt-7.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz -> libfmt-7.0.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fe01fdf0e88dc9d0c00ceed31f5c45d
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.1.2 b/metadata/md5-cache/dev-libs/libfmt-7.1.2
index f16fd10e2974..d6e27a8ac538 100644
--- a/metadata/md5-cache/dev-libs/libfmt-7.1.2
+++ b/metadata/md5-cache/dev-libs/libfmt-7.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/fmtlib/fmt/archive/7.1.2.tar.gz -> libfmt-7.1.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f36d02cbdc974338c90523c5a07f02a
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.1.3 b/metadata/md5-cache/dev-libs/libfmt-7.1.3
index 1d2fe07254ab..9b7912894aa0 100644
--- a/metadata/md5-cache/dev-libs/libfmt-7.1.3
+++ b/metadata/md5-cache/dev-libs/libfmt-7.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz -> libfmt-7.1.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f36d02cbdc974338c90523c5a07f02a
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
index 2659614d2bb0..07738fcd87f1 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9999
+++ b/metadata/md5-cache/dev-libs/libfmt-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f36d02cbdc974338c90523c5a07f02a
diff --git a/metadata/md5-cache/dev-libs/libfstrcmp-0.7 b/metadata/md5-cache/dev-libs/libfstrcmp-0.7
index 3c521cc7cb55..d2a0b24fff1b 100644
--- a/metadata/md5-cache/dev-libs/libfstrcmp-0.7
+++ b/metadata/md5-cache/dev-libs/libfstrcmp-0.7
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-apps/groff doc? ( app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
 DESCRIPTION=Make fuzzy comparisons of strings and byte arrays
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> libfstrcmp-0.7.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=231fb413085bb325f1ca3884c6a13400
diff --git a/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1 b/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
index 70d6c5350a5b..d59485532746 100644
--- a/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
+++ b/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
@@ -1,14 +1,14 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-apps/groff doc? ( app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
 DESCRIPTION=Make fuzzy comparisons of strings and byte arrays
 EAPI=7
 HOMEPAGE=http://fstrcmp.sourceforge.net/
 IUSE=doc static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~x86
 LICENSE=GPL-3+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> libfstrcmp-0.7.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fc3fecc3ec723f8c999036ccea815515
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ca6694187555357c0ca86ed3a41028c6
diff --git a/metadata/md5-cache/dev-libs/libg15-9999 b/metadata/md5-cache/dev-libs/libg15-9999
index 23ee85976220..456ae08ef5cc 100644
--- a/metadata/md5-cache/dev-libs/libg15-9999
+++ b/metadata/md5-cache/dev-libs/libg15-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/subversion[http(+)] net-misc/rsync
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/subversion[http(+)] net-misc/rsync
 DEFINED_PHASES=configure install preinst prepare unpack
 DEPEND=virtual/libusb:0
 DESCRIPTION=The libg15 library gives low-level access to the Logitech G15 keyboard
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:0
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	estack	055c42df72f76a4f45ec92b35e83cd56	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9a1ef09fc0454d59ac09e978b429c469
diff --git a/metadata/md5-cache/dev-libs/libg15render-1.2-r2 b/metadata/md5-cache/dev-libs/libg15render-1.2-r2
index 56587a086918..b8240f351b23 100644
--- a/metadata/md5-cache/dev-libs/libg15render-1.2-r2
+++ b/metadata/md5-cache/dev-libs/libg15render-1.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=truetype? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=truetype? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/libg15 truetype? ( media-libs/freetype )
 DESCRIPTION=Small library for display text and graphics on a Logitech G15 keyboard
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libg15 truetype? ( media-libs/freetype )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15tools/libg15render-1.2.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d30131e924969d3461fbef5c828dc88a
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
index e72cb232e949..e8990f466b8c 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=6
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=32874ac5ac6608d318adb3b361555f7a
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=104a0d5157b97da745dea6116ba96545
diff --git a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1 b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
index 25cb91353a47..b6261f741ef1 100644
--- a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
+++ b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/cairo x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/libgaminggear/libgaminggear-0.15.1.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=964033e2a1813d100a1305d104c5960b
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.6 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.6
index 3227f27cb091..3f4a9937dbd2 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.6
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.6
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( virtual/texi2dvi ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/
 IUSE=doc o-flag-munging static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[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/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.6.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4b8b5410962e4e9fafece980148a9be
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cfd71a947f45beaac5766064991c1b2c
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.7 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.7
index 2cd398e67991..8d104a0b2fe9 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.7
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.7
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( virtual/texi2dvi ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/
 IUSE=doc o-flag-munging static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[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/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.7.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa69159a4e512cab34d29c9f07e47889
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cfd71a947f45beaac5766064991c1b2c
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.9.1-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.9.1-r1
index d0accfe12233..120fa97954d0 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.9.1-r1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.9.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( virtual/texi2dvi ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[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/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.9.1.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30fed6d2a8c7d0903a53d10e1e817890
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.9.2 b/metadata/md5-cache/dev-libs/libgcrypt-1.9.2
index a7e874740209..ce984c46ee4f 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.9.2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.9.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( virtual/texi2dvi ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[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/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.9.2.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b7ac2063d3ce2de68281c2e9ae1561bf
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.9.3 b/metadata/md5-cache/dev-libs/libgcrypt-1.9.3
new file mode 100644
index 000000000000..589180fccac3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.9.3
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( virtual/texi2dvi ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=General purpose crypto library based on the code used in GnuPG
+EAPI=7
+HOMEPAGE=https://www.gnupg.org/
+IUSE=+asm cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1 MIT
+RDEPEND=>=dev-libs/libgpg-error-1.25[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/20
+SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.9.3.tar.bz2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b7ac2063d3ce2de68281c2e9ae1561bf
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6 b/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
index 36a076263f64..10ccaddfbe0f 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
+++ b/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libgcrypt:0/11 !dev-libs/libgcrypt:11/11
 DESCRIPTION=Old version of libgcrypt needed by some binaries
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libgcrypt:0/11 !dev-libs/libgcrypt:11/11
 SLOT=11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.6.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1092f52dc0901a021a6eb47abf264e84
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2407a0041665ec9de836c5402e45deb0
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.13 b/metadata/md5-cache/dev-libs/libgdata-0.17.13
index 4fc4dba403dd..9a98fb8f7024 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.13
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.13
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5.0 >=x11-libs/gdk-pixbuf-2.14:2 ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5.0 >=x11-libs/gdk-pixbuf-2.14:2 ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
 IUSE=+crypt gnome-online-accounts gtk-doc +introspection test vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.13.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9dada727e8bfdc1164a505eb258818f0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b850eef5d2dc92e898063563c0029f95
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.12 b/metadata/md5-cache/dev-libs/libgdata-0.18.1
index 9da4dd573949..366f40d86ee0 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.12
+++ b/metadata/md5-cache/dev-libs/libgdata-0.18.1
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-util/meson-0.50.0 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5.0 >=x11-libs/gdk-pixbuf-2.14:2 ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5.0 >=x11-libs/gdk-pixbuf-2.14:2 ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
 IUSE=+crypt gnome-online-accounts gtk-doc +introspection test vala
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/22
-SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.12.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c296699b5cd057ecd3336d08b0593eea
+SRC_URI=mirror://gnome/sources/libgdata/0.18/libgdata-0.18.1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=48a99b4d5bcb20d257ac4da5e65249b8
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.3 b/metadata/md5-cache/dev-libs/libgee-0.20.3
index 2f5a9b9a7e36..2e799f9f9641 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.20.3
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0.8/2
 SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.3.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=608eabd822d1ec4a85002fff0809ad80
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.4 b/metadata/md5-cache/dev-libs/libgee-0.20.4
new file mode 100644
index 000000000000..d93e33a9e4f1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GObject-based interfaces and classes for commonly used data structures
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Libgee
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+SLOT=0.8/2
+SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.4.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6d4acb8d4261fa978b14df3a8072e9ee
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.1.0-r2 b/metadata/md5-cache/dev-libs/libgit2-1.1.0-r2
index b2b7b4a1d3a9..19ce01ef7eef 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.1.0-r2
+++ b/metadata/md5-cache/dev-libs/libgit2-1.1.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib !libressl? ( dev
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.1.0.tar.gz -> libgit2-1.1.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4712353b7c8408645bbbb5150ea3ce0
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r2 b/metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r2
index 930dcd890d38..ce07cc9ab87e 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r2
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/gobject-introspection-1.54:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0=[ssh?] python? ( 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/pygobject:3[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-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Git library for GLib
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gobject-introspection-1.54:= >=dev-libs/glib-2.44.0:2 >=dev-l
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.99/libgit2-glib-0.99.0.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=faef5250c9de1fcb31b8ff45760ecb4f
diff --git a/metadata/md5-cache/dev-libs/libgnome-games-support-1.6.1 b/metadata/md5-cache/dev-libs/libgnome-games-support-1.6.1
index f602ed947605..33d77a58b345 100644
--- a/metadata/md5-cache/dev-libs/libgnome-games-support-1.6.1
+++ b/metadata/md5-cache/dev-libs/libgnome-games-support-1.6.1
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.19.2:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Library for code common to Gnome games
@@ -9,5 +9,5 @@ LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.19.2:3
 SLOT=1/3
 SRC_URI=mirror://gnome/sources/libgnome-games-support/1.6/libgnome-games-support-1.6.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e3f9543f18b2a054e45a528034a3252
diff --git a/metadata/md5-cache/dev-libs/libgnome-games-support-1.8.0 b/metadata/md5-cache/dev-libs/libgnome-games-support-1.8.1
index 2c9715631758..fa35636b8c0d 100644
--- a/metadata/md5-cache/dev-libs/libgnome-games-support-1.8.0
+++ b/metadata/md5-cache/dev-libs/libgnome-games-support-1.8.1
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.19.2:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Library for code common to GNOME games
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.19.2:3
 SLOT=1/3
-SRC_URI=mirror://gnome/sources/libgnome-games-support/1.8/libgnome-games-support-1.8.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+SRC_URI=mirror://gnome/sources/libgnome-games-support/1.8/libgnome-games-support-1.8.1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f65a259778c33451bf306259bdd15293
diff --git a/metadata/md5-cache/dev-libs/libgnt-2.14.0 b/metadata/md5-cache/dev-libs/libgnt-2.14.0
index 9092fcf9bfcc..ac9ad30c372e 100644
--- a/metadata/md5-cache/dev-libs/libgnt-2.14.0
+++ b/metadata/md5-cache/dev-libs/libgnt-2.14.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/libgnt-2.14.0.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=269776432f3ac2dd20cd3595dd2ef895
diff --git a/metadata/md5-cache/dev-libs/libgnt-2.14.1 b/metadata/md5-cache/dev-libs/libgnt-2.14.1
index d738deca1f7d..c0a9736af858 100644
--- a/metadata/md5-cache/dev-libs/libgnt-2.14.1
+++ b/metadata/md5-cache/dev-libs/libgnt-2.14.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/libgnt-2.14.1.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=978745deb24745bc7affcb360d7e9251
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.38 b/metadata/md5-cache/dev-libs/libgpg-error-1.38
index fcff848a54cb..aefdf215fcec 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.38
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.38
@@ -1,14 +1,14 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Contains error handling functions used by GnuPG software
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error
 IUSE=common-lisp nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;hb=libgpg-error-1.38 -> gen-lock-obj-1.38.sh
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=321b442dd85593e4445967311c214dd4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7950d776f0875679eff891d87d5a16fd
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.41 b/metadata/md5-cache/dev-libs/libgpg-error-1.41
index a1a2d14d93d3..d3ecf8a78f7d 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.41
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.41
@@ -1,14 +1,14 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Contains error handling functions used by GnuPG software
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error
 IUSE=common-lisp nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~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 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.41.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a22348e556b20e68ca0e88806223eed4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a551e8ea6a73c0b13cd111e6470eb10b
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.42 b/metadata/md5-cache/dev-libs/libgpg-error-1.42
index 79f74c840418..b8334cfe9592 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.42
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.42
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Contains error handling functions used by GnuPG software
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.42.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9602c944cc8c65de7dabf729f33ab686
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dd8fcfc1b90bcef4ce03259500a75091
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.1.1 b/metadata/md5-cache/dev-libs/libgpiod-1.1.1
index 81a8c9b576ad..03483edfc834 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.1.1
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0/1
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.1.1.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f878e066bf8ae8bb317817d0bf70397b
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=18e1371c1de71838bcd7ab08070e7b3b
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.4.1 b/metadata/md5-cache/dev-libs/libgpiod-1.4.1
index 508329e97638..b39cbd544772 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.4.1
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.4.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.4.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=19ec6c068bf2d2f04ee9c1b2c6e8a129
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=10e633df505f591cc03546d9db6e5688
diff --git a/metadata/md5-cache/dev-libs/libgpuarray-0.6.0 b/metadata/md5-cache/dev-libs/libgpuarray-0.6.0
deleted file mode 100644
index 114cf663aef8..000000000000
--- a/metadata/md5-cache/dev-libs/libgpuarray-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) test? ( cuda? ( amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) ) opencl? ( virtual/opencl || ( sci-libs/clblast sci-libs/clblas ) ) dev-libs/check virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Library to manipulate tensors on the GPU
-EAPI=6
-HOMEPAGE=http://deeplearning.net/software/libgpuarray/
-IUSE=cuda doc opencl static-libs test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=cuda? ( amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) ) opencl? ( virtual/opencl || ( sci-libs/clblast sci-libs/clblas ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.0.tar.gz -> libgpuarray-0.6.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32d3f31f419762dd6d3a4f5f305d87d5
diff --git a/metadata/md5-cache/dev-libs/libgpuarray-0.6.7 b/metadata/md5-cache/dev-libs/libgpuarray-0.6.7
deleted file mode 100644
index 2c7e3135f176..000000000000
--- a/metadata/md5-cache/dev-libs/libgpuarray-0.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) test? ( cuda? ( amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) ) opencl? ( virtual/opencl || ( sci-libs/clblast sci-libs/clblas ) ) dev-libs/check virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Library to manipulate tensors on the GPU
-EAPI=6
-HOMEPAGE=http://deeplearning.net/software/libgpuarray/
-IUSE=cuda doc opencl static-libs test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=cuda? ( amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) ) opencl? ( virtual/opencl || ( sci-libs/clblast sci-libs/clblas ) )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.7.tar.gz -> libgpuarray-0.6.7.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=441f35f32a96ea9fc3a44881e0bebcb9
diff --git a/metadata/md5-cache/dev-libs/libgudev-233-r1 b/metadata/md5-cache/dev-libs/libgudev-233-r1
deleted file mode 100644
index 32c14e9cd99c..000000000000
--- a/metadata/md5-cache/dev-libs/libgudev-233-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.18 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GObject bindings for libudev
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
-IUSE=introspection 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
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://gnome/sources/libgudev/233/libgudev-233.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed616d364f7f704cf8c500c04ebcdd01
diff --git a/metadata/md5-cache/dev-libs/libgudev-234 b/metadata/md5-cache/dev-libs/libgudev-234
index 59012b949657..f5680e0ae4d5 100644
--- a/metadata/md5-cache/dev-libs/libgudev-234
+++ b/metadata/md5-cache/dev-libs/libgudev-234
@@ -5,10 +5,10 @@ DESCRIPTION=GObject bindings for libudev
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 IUSE=introspection 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/libgudev/234/libgudev-234.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9fca30162f3e98af453667599cdead1c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f68e379603a223f842b1c876cc4e8e89
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.3 b/metadata/md5-cache/dev-libs/libgusb-0.3.3
deleted file mode 100644
index 711ba845f9ff..000000000000
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
-DESCRIPTION=GObject wrapper for libusb
-EAPI=7
-HOMEPAGE=https://github.com/hughsie/libgusb
-IUSE=gtk-doc +introspection static-libs test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=57dbd771cef094196a74714252905d3f
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.5 b/metadata/md5-cache/dev-libs/libgusb-0.3.5
deleted file mode 100644
index b4e3df9b9cb3..000000000000
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[xml(+)] dev-python/setuptools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
-DESCRIPTION=GObject wrapper for libusb
-EAPI=7
-HOMEPAGE=https://github.com/hughsie/libgusb
-IUSE=gtk-doc +introspection static-libs test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.5.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef1c34593a3814fd6ba59a49cfb67ad2
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.6 b/metadata/md5-cache/dev-libs/libgusb-0.3.6
index 5469e4a8dad7..c70c6088c0c3 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.6
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.6
@@ -1,16 +1,16 @@
-BDEPEND=|| ( ( dev-lang/python:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[xml(+)] dev-python/setuptools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( ( dev-lang/python:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[xml(+)] dev-python/setuptools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
 DESCRIPTION=GObject wrapper for libusb
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libgusb
 IUSE=gtk-doc +introspection static-libs test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.6.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f1c88b72e377d9105cc907f55d982397
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ef1c34593a3814fd6ba59a49cfb67ad2
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.36.1 b/metadata/md5-cache/dev-libs/libgweather-3.36.2
index 3510141d0989..8147c9be2100 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.36.1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.36.2
@@ -1,5 +1,5 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Location and timezone database and weather-lookup library
 EAPI=7
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-16-2
-SRC_URI=mirror://gnome/sources/libgweather/3.36/libgweather-3.36.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c503d43f73a6613b198c4d831769e9a
+SRC_URI=mirror://gnome/sources/libgweather/3.36/libgweather-3.36.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dcaf1c9d325cb4f04bf15e0e4eab7f24
diff --git a/metadata/md5-cache/dev-libs/libgweather-40.0 b/metadata/md5-cache/dev-libs/libgweather-40.0
new file mode 100644
index 000000000000..a671f24a2f29
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgweather-40.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) || ( ( dev-lang/python:3.9 dev-python/pygobject[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pygobject[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Location and timezone database and weather-lookup library
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
+IUSE=glade gtk-doc +introspection +vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=2/3-16-2
+SRC_URI=mirror://gnome/sources/libgweather/40/libgweather-40.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4907262a3b826a9cb5e68835215bbaf1
diff --git a/metadata/md5-cache/dev-libs/libhid-0.2.17 b/metadata/md5-cache/dev-libs/libhid-0.2.17
index 6d742a6b61f8..d863eb8d95dc 100644
--- a/metadata/md5-cache/dev-libs/libhid-0.2.17
+++ b/metadata/md5-cache/dev-libs/libhid-0.2.17
@@ -1,4 +1,4 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=virtual/libusb:0=
 DESCRIPTION=Provides a generic and flexible way to access and interact with USB HID devices
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=virtual/libusb:0=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~conikost/files/libhid-0.2.17.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=83f3baff3f6dd06945ee87d551d911c1
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.10 b/metadata/md5-cache/dev-libs/libical-3.0.10
new file mode 100644
index 000000000000..216dd9bcf98f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libical-3.0.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) glib? ( || ( ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 ) glib? ( dev-libs/libxml2:2 )
+DESCRIPTION=An implementation of basic iCAL protocols
+EAPI=7
+HOMEPAGE=https://github.com/libical/libical
+IUSE=berkdb doc examples +glib +introspection static-libs test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=|| ( MPL-2.0 LGPL-2.1 )
+RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 ) sys-libs/timezone-data
+REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4ee0fc4baa268b8a5f68512a37f91c2
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.8 b/metadata/md5-cache/dev-libs/libical-3.0.8
index 72d966ba9060..28e077c874e6 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.8
+++ b/metadata/md5-cache/dev-libs/libical-3.0.8
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 ) glib? ( dev-libs/libxml2:2 )
 DESCRIPTION=An implementation of basic iCAL protocols
@@ -12,5 +12,5 @@ REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.8/libical-3.0.8.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d164e0f3675b79a29da534e4289fce3
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.9 b/metadata/md5-cache/dev-libs/libical-3.0.9
index dcd7351292e5..4c6b58433e07 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.9
+++ b/metadata/md5-cache/dev-libs/libical-3.0.9
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) glib? ( || ( ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/ninja dev-util/cmake
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) glib? ( || ( ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 ) glib? ( dev-libs/libxml2:2 )
 DESCRIPTION=An implementation of basic iCAL protocols
@@ -12,5 +12,5 @@ REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.9/libical-3.0.9.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cde8f6849c32590d0084a4441c36c0b3
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.15 b/metadata/md5-cache/dev-libs/libiconv-1.15
index f9268fddeeb5..d963265bae4b 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.15
+++ b/metadata/md5-cache/dev-libs/libiconv-1.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ GPL-3+
 RDEPEND=!sys-libs/glibc !sys-libs/musl !userland_GNU? ( !sys-apps/man-pages )
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.15.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=8219e25728b5dcfc933ab8ce90ecd695
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=f97d78804b4acd132e78b75e9a918e91
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3 b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
index 0db2dea61d04..7113bd032d85 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libdbusmenu[introspection?] dev-libs/libxml2 gtk? ( dev-libs/libdbusmenu[gtk3] x11-libs/gtk+:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) app-text/gnome-doc-utils dev-util/gtk-doc-am gnome-base/gnome-common virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libdbusmenu[introspection?] dev-libs/libxml2 gtk? ( dev-libs/libdbusmenu[gtk3] x11-libs/gtk+:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) app-text/gnome-doc-utils dev-util/gtk-doc-am gnome-base/gnome-common virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library to raise flags on DBus for other components of the desktop
 EAPI=6
 HOMEPAGE=https://launchpad.net/libindicate
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libdbusmenu[introspection?]
 RESTRICT=test
 SLOT=3
 SRC_URI=https://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc59764ac49fe160534d6d69b9482cff
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
index 76b2fcaaf658..cf764aa925d7 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A set of symbols and convience functions that all indicators would like to use
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c39c1a7b357f576912474893b82e4731
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index d6c22b02e58e..5002c3802fe2 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.2: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(-)?]
 DESCRIPTION=A set of symbols and convience functions that all indicators would like to use
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b618b88f5248d5d93c3c766f91ff35e
diff --git a/metadata/md5-cache/dev-libs/libinput-1.16.4 b/metadata/md5-cache/dev-libs/libinput-1.16.4
deleted file mode 100644
index 235fc92f07f3..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-1.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.9 dev-python/commonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/commonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/recommonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
-DESCRIPTION=Library to handle input devices in Wayland
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
-IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.16.4.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=33a01670cc64e07b23dc2dd7bf8760b8
diff --git a/metadata/md5-cache/dev-libs/libinput-1.16.5 b/metadata/md5-cache/dev-libs/libinput-1.16.5
deleted file mode 100644
index 4f67d61a679b..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-1.16.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.9 dev-python/commonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/commonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/recommonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
-DESCRIPTION=Library to handle input devices in Wayland
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
-IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.16.5.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=6a74d8917c099759af7744ffcf4fe0c2
diff --git a/metadata/md5-cache/dev-libs/libinput-1.17.0 b/metadata/md5-cache/dev-libs/libinput-1.17.0
deleted file mode 100644
index f5bb8ff734e2..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-1.17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.9 dev-python/commonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/commonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/recommonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
-DESCRIPTION=Library to handle input devices in Wayland
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
-IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.17.0.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=6a74d8917c099759af7744ffcf4fe0c2
diff --git a/metadata/md5-cache/dev-libs/libinput-1.17.1 b/metadata/md5-cache/dev-libs/libinput-1.17.1
index f2729f5578c6..3126aa0f6fd1 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.17.1
+++ b/metadata/md5-cache/dev-libs/libinput-1.17.1
@@ -5,11 +5,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.17.1.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=6a74d8917c099759af7744ffcf4fe0c2
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=33a01670cc64e07b23dc2dd7bf8760b8
diff --git a/metadata/md5-cache/dev-libs/libintl-0.21 b/metadata/md5-cache/dev-libs/libintl-0.21
index 435516a45ce3..6ba74567b00a 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.21
+++ b/metadata/md5-cache/dev-libs/libintl-0.21
@@ -5,10 +5,10 @@ DESCRIPTION=the GNU international library (split out of gettext)
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gettext/
 IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !sys-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=c21e30999a5402d4a8a48f76ac390911
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=15185deadc450ba03670ab53dd3a53f5
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.5.4 b/metadata/md5-cache/dev-libs/libisoburn-1.5.4
index 79a12b03e1f5..9aa0922dbc59 100644
--- a/metadata/md5-cache/dev-libs/libisoburn-1.5.4
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.5.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libburn-1.5.4 >=dev-libs/libisofs-1.5.4 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
 DESCRIPTION=Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn
 EAPI=7
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wiki/Libisoburn
 IUSE=acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 GPL-3
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libburn-1.5.4 >=dev-libs/libisofs-1.5.4 readline? ( sys-libs/
 REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.5.4.tar.gz
-_md5_=eb3a749dd62bc496910957db3fcc8764
+_md5_=a82b1da02a0bb4cc9d88ac23c34ef31f
diff --git a/metadata/md5-cache/dev-libs/libisofs-1.5.4 b/metadata/md5-cache/dev-libs/libisofs-1.5.4
index 4ce047db0d42..62d92e60915a 100644
--- a/metadata/md5-cache/dev-libs/libisofs-1.5.4
+++ b/metadata/md5-cache/dev-libs/libisofs-1.5.4
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install
 DEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
 DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=7
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wiki/Libisofs
 IUSE=acl debug static-libs verbose-debug xattr zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisofs-1.5.4.tar.gz
-_md5_=77526dac126950a0811babde5d344c77
+_md5_=e61357a76d55bf403e947b0d7461d512
diff --git a/metadata/md5-cache/dev-libs/libite-2.2.0 b/metadata/md5-cache/dev-libs/libite-2.4.0
index 8b00d28557e4..bef9e3b177c3 100644
--- a/metadata/md5-cache/dev-libs/libite-2.2.0
+++ b/metadata/md5-cache/dev-libs/libite-2.4.0
@@ -2,9 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=A collection of useful BSD APIs
 EAPI=7
 HOMEPAGE=https://github.com/troglobit/libite
-IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://github.com/troglobit/libite/releases/download/v2.2.0/libite-2.2.0.tar.xz
-_md5_=76f0680d4df895b8e433a4abadda7716
+SRC_URI=https://github.com/troglobit/libite/releases/download/v2.4.0/libite-2.4.0.tar.xz
+_md5_=604130a852358f3731c474ffb2592965
diff --git a/metadata/md5-cache/dev-libs/libixion-0.15.0 b/metadata/md5-cache/dev-libs/libixion-0.15.0
index 85aebac1f993..6d423fe5446d 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.15.0
+++ b/metadata/md5-cache/dev-libs/libixion-0.15.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( 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] ) ) dev-libs/spdlog
 DESCRIPTION=General purpose formula parser & interpreter
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( python_single_target_pyth
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/0.15
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.15.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b016d8d0da3f999e04d56cc27234981f
diff --git a/metadata/md5-cache/dev-libs/libixion-0.16.1 b/metadata/md5-cache/dev-libs/libixion-0.16.1
index 54976ff2108e..e9ddd7168e23 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.16.1
+++ b/metadata/md5-cache/dev-libs/libixion-0.16.1
@@ -4,10 +4,11 @@ DESCRIPTION=General purpose formula parser & interpreter
 EAPI=7
 HOMEPAGE=https://gitlab.com/ixion/ixion
 IUSE=debug python +threads python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( 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] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/0.16
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.16.1.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c5bd2524606e1ad13dd881d3f66439e9
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=be79114372bac6f21dda0a7b16dfa8fc
diff --git a/metadata/md5-cache/dev-libs/libixion-9999 b/metadata/md5-cache/dev-libs/libixion-9999
index 5622ce62bd3c..dfb8644a1aef 100644
--- a/metadata/md5-cache/dev-libs/libixion-9999
+++ b/metadata/md5-cache/dev-libs/libixion-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=dev-libs/boost:= dev-util/mdds:1/9999 python? ( 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] ) )
 DESCRIPTION=General purpose formula parser & interpreter
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-util/mdds:1/9999 python? ( 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] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/0.16
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=14f849e32fac7eddb5de89e76a998c20
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.4 b/metadata/md5-cache/dev-libs/libjcat-0.1.4
deleted file mode 100644
index a164e48181b6..000000000000
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[xml] dev-python/setuptools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) gtk-doc? ( dev-util/gtk-doc ) man? ( sys-apps/help2man ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
-DESCRIPTION=Library and tool for reading and writing Jcat files
-EAPI=7
-HOMEPAGE=https://github.com/hughsie/libjcat
-IUSE=gpg gtk-doc +introspection +man pkcs7 test vala
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.4.tar.gz -> libjcat-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0370e957b9b401849e948aa35ed98779
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.5 b/metadata/md5-cache/dev-libs/libjcat-0.1.5
deleted file mode 100644
index 6e454dde7816..000000000000
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[xml] dev-python/setuptools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) gtk-doc? ( dev-util/gtk-doc ) man? ( sys-apps/help2man ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
-DESCRIPTION=Library and tool for reading and writing Jcat files
-EAPI=7
-HOMEPAGE=https://github.com/hughsie/libjcat
-IUSE=gpg gtk-doc +introspection +man pkcs7 test vala
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.5.tar.gz -> libjcat-0.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce159cbc042d98ff7b864cf2420def18
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.6 b/metadata/md5-cache/dev-libs/libjcat-0.1.6
index e488084ba05f..640eee1288ee 100644
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.6
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.6
@@ -5,11 +5,11 @@ DESCRIPTION=Library and tool for reading and writing Jcat files
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libjcat
 IUSE=gpg gtk-doc +introspection +man pkcs7 test vala
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.6.tar.gz -> libjcat-0.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b133d93c355ccabb62f528f2f7a8fdc0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce159cbc042d98ff7b864cf2420def18
diff --git a/metadata/md5-cache/dev-libs/libksba-1.3.5-r1 b/metadata/md5-cache/dev-libs/libksba-1.3.5-r1
deleted file mode 100644
index 0e2a0fcc51f3..000000000000
--- a/metadata/md5-cache/dev-libs/libksba-1.3.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libgpg-error-1.8
-DESCRIPTION=X.509 and CMS (PKCS#7) library
-EAPI=6
-HOMEPAGE=http://www.gnupg.org/related_software/libksba
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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=LGPL-3+ GPL-2+ GPL-3
-RDEPEND=>=dev-libs/libgpg-error-1.8
-SLOT=0
-SRC_URI=mirror://gnupg/libksba/libksba-1.3.5.tar.bz2
-_eclasses_=ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8cfcd10e7453aa4457fb963bdb0362bf
diff --git a/metadata/md5-cache/dev-libs/libksba-1.3.5-r2 b/metadata/md5-cache/dev-libs/libksba-1.3.5-r2
deleted file mode 100644
index 39d0727bc0d2..000000000000
--- a/metadata/md5-cache/dev-libs/libksba-1.3.5-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libgpg-error-1.8
-DESCRIPTION=X.509 and CMS (PKCS#7) library
-EAPI=7
-HOMEPAGE=http://www.gnupg.org/related_software/libksba
-IUSE=static-libs
-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
-LICENSE=LGPL-3+ GPL-2+ GPL-3
-RDEPEND=>=dev-libs/libgpg-error-1.8
-SLOT=0
-SRC_URI=mirror://gnupg/libksba/libksba-1.3.5.tar.bz2
-_md5_=7eb618bd65c299baf4287d5132175e09
diff --git a/metadata/md5-cache/dev-libs/libksba-1.5.0 b/metadata/md5-cache/dev-libs/libksba-1.5.0
index e214bb203b00..029aa94db539 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.5.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.5.0
@@ -5,9 +5,9 @@ DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/libksba
 IUSE=static-libs
-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
+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
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.5.0.tar.bz2
-_md5_=54033bad3b32270b009459e934089a7c
+_md5_=59d8f81b3bf5af6e5ed8c096f5cbe387
diff --git a/metadata/md5-cache/dev-libs/libksba-1.4.0 b/metadata/md5-cache/dev-libs/libksba-1.5.1
index 7d5931594d49..41ff8ed714f8 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.4.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.5.1
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
-SRC_URI=mirror://gnupg/libksba/libksba-1.4.0.tar.bz2
+SRC_URI=mirror://gnupg/libksba/libksba-1.5.1.tar.bz2
 _md5_=56b83464f96421f16087ad0e0c0e334f
diff --git a/metadata/md5-cache/dev-libs/liblinear-243 b/metadata/md5-cache/dev-libs/liblinear-243
index c1b62e5025fe..b42d8b9cdfbc 100644
--- a/metadata/md5-cache/dev-libs/liblinear-243
+++ b/metadata/md5-cache/dev-libs/liblinear-243
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Library for Large Linear Classification
 EAPI=7
 HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 SLOT=0/4
 SRC_URI=https://github.com/cjlin1/liblinear/archive/v243.tar.gz -> liblinear-243.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=933c6c9b366cc93636d280d3bbec08a8
+_md5_=8f237703fb74cceec1f4aed46a43db44
diff --git a/metadata/md5-cache/dev-libs/liblist-2.4 b/metadata/md5-cache/dev-libs/liblist-2.4
deleted file mode 100644
index 37ecc3101a35..000000000000
--- a/metadata/md5-cache/dev-libs/liblist-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst
-DEPEND=doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base )
-DESCRIPTION=Generic linked-list manipulation routines, plus queues and stacks
-EAPI=7
-HOMEPAGE=http://ohnopub.net/liblist
-IUSE=doc examples
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base )
-SLOT=0
-SRC_URI=ftp://ohnopublishing.net/mirror/liblist-2.4.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6e3e89c89cbbc35482f675f4bb200b8e
diff --git a/metadata/md5-cache/dev-libs/liblist-2.4-r1 b/metadata/md5-cache/dev-libs/liblist-2.4-r1
new file mode 100644
index 000000000000..d1b6f3235a15
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblist-2.4-r1
@@ -0,0 +1,11 @@
+BDEPEND=doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base )
+DEFINED_PHASES=configure install postinst
+DESCRIPTION=Generic linked-list manipulation routines, plus queues and stacks
+EAPI=7
+HOMEPAGE=http://ohnopub.net/liblist
+IUSE=doc examples
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ohnopublishing.net/mirror/liblist-2.4.tar.bz2
+_md5_=500c77c56d60e60ba83d8bd6cd6e9710
diff --git a/metadata/md5-cache/dev-libs/liblogging-1.0.6 b/metadata/md5-cache/dev-libs/liblogging-1.0.6
index 6e0d80d51748..7c4be8e5b327 100644
--- a/metadata/md5-cache/dev-libs/liblogging-1.0.6
+++ b/metadata/md5-cache/dev-libs/liblogging-1.0.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=systemd? ( sys-apps/systemd )
 DESCRIPTION=Liblogging is an easy to use, portable, open source library for system logging
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=systemd? ( sys-apps/systemd )
 SLOT=0/0
 SRC_URI=http://download.rsyslog.com/liblogging/liblogging-1.0.6.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=442fcdfc756f41c2a733256f7548a809
diff --git a/metadata/md5-cache/dev-libs/liblognorm-2.0.6 b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
index 329424761664..206b7c8e5206 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-2.0.6
+++ b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libfastjson-0.99.2:= >=sys-devel/autoconf-archive-2015.02.04 virtual/pkgconfig doc? ( >=dev-python/sphinx-1.2.2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libfastjson-0.99.2:= >=sys-devel/autoconf-archive-2015.02.04 virtual/pkgconfig doc? ( >=dev-python/sphinx-1.2.2 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Fast samples-based log normalization library
 EAPI=6
 HOMEPAGE=https://www.liblognorm.com
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libfastjson-0.99.2:=
 RESTRICT=!test? ( test )
 SLOT=0/5.1.0
 SRC_URI=https://www.liblognorm.com/files/download/liblognorm-2.0.6.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=26720a9af75b9601e0eb9e2a55ad9086
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.13.0 b/metadata/md5-cache/dev-libs/liblouis-3.13.0
index 7943d7fbb5d9..45ca49d9235d 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.13.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.13.0/liblouis-3.13.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=12e0060b2008125d9adb2a7553f5b243
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.17.0 b/metadata/md5-cache/dev-libs/liblouis-3.17.0
new file mode 100644
index 000000000000..8f619153ce4d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblouis-3.17.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/help2man python? ( 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(-)] ) test? ( dev-libs/libyaml )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python? ( 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(-)] )
+DESCRIPTION=An open-source braille translator and back-translator
+EAPI=7
+HOMEPAGE=https://github.com/liblouis/liblouis
+IUSE=python test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=python? ( 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? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=0/20
+SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.17.0/liblouis-3.17.0.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c81cb8dd5f6c121b1d2513c4abe57fe1
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.6 b/metadata/md5-cache/dev-libs/libltdl-2.4.6
index 8cd7030ef30c..3eb23f6e3419 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.6
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=A shared library tool for developers
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=!<sys-devel/libtool-2.4.3-r2:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57e02f452b352b91b70798a16dc42d55
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e9c2d27d844f0e6def0d96e2b8cb3a79
diff --git a/metadata/md5-cache/dev-libs/liblzw-0.2-r1 b/metadata/md5-cache/dev-libs/liblzw-0.2-r1
index 16922436673a..28f283cf14db 100644
--- a/metadata/md5-cache/dev-libs/liblzw-0.2-r1
+++ b/metadata/md5-cache/dev-libs/liblzw-0.2-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=small C library for reading LZW compressed files (.Z)
 EAPI=7
 HOMEPAGE=https://github.com/vapier/liblzw
-KEYWORDS=amd64 arm ~hppa ~ia64 ~m68k s390 x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ~m68k ~s390 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/freestdf/liblzw-0.2.tar.lzma
-_md5_=541d98fa7571d7d5a84348208477538a
+_md5_=886d02159d06b0e87c6264c02ac4649d
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.5 b/metadata/md5-cache/dev-libs/libmanette-0.2.5
index de9081695d67..9ff5417cf251 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.5
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.5
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
 IUSE=+introspection +udev +vala
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-libs/libevdev introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.5.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96946bd3d5150cc255131eb275d661bb
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=359ca4af0c68d68094c403b37fe32b6d
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.4 b/metadata/md5-cache/dev-libs/libmanette-0.2.6
index e96af0d48617..a1c4985ea738 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.4
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.6
@@ -1,15 +1,16 @@
 BDEPEND=app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
-IUSE=+introspection +udev +vala
-KEYWORDS=amd64 arm arm64 ppc64 x86
+IUSE=gtk-doc +introspection +udev +vala test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-libs/libevdev introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.4.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=359ca4af0c68d68094c403b37fe32b6d
+SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.6.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=25174d66d5d3c7aad53fe50885884ef6
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1 b/metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1
index aa21cf823ac7..974f4091d69b 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8:* >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8:* >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=MATE library to access weather information from online services
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmateweather-1.24.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f93a0d87a221981fba7df3b79c7be13
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.24.1 b/metadata/md5-cache/dev-libs/libmateweather-1.24.1
index 91e44ec75e27..cdae93fd2bbe 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.24.1
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.24.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=MATE library to access weather information from online services
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmateweather-1.24.1.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ffd8617bb82649b74d05012082a1717
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a9c728b056705d53ef2f3ffed6d185ae
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-9999 b/metadata/md5-cache/dev-libs/libmaxminddb-9999
index 099f7244e461..7e372e20a37c 100644
--- a/metadata/md5-cache/dev-libs/libmaxminddb-9999
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=test? ( dev-perl/IPC-Run3 )
 DESCRIPTION=C library for the MaxMind DB file format
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/0.0.7
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=30c16f871a77994cd3eea12bdc95c512
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=18d44340479b14d10a106e9615e5215b
diff --git a/metadata/md5-cache/dev-libs/libmba-0.9.1-r3 b/metadata/md5-cache/dev-libs/libmba-0.9.1-r3
deleted file mode 100644
index cab093ad6d41..000000000000
--- a/metadata/md5-cache/dev-libs/libmba-0.9.1-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A library of generic C modules
-EAPI=5
-HOMEPAGE=http://www.ioplex.com/~miallen/libmba/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://www.ioplex.com/~miallen/libmba/dl/libmba-0.9.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7eef9d82a4fa7988f716966bc6a1ca58
diff --git a/metadata/md5-cache/dev-libs/libmba-0.9.1-r4 b/metadata/md5-cache/dev-libs/libmba-0.9.1-r4
new file mode 100644
index 000000000000..fba589c9d0e1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmba-0.9.1-r4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A library of generic C modules
+EAPI=7
+HOMEPAGE=http://www.ioplex.com/~miallen/libmba/
+KEYWORDS=amd64 x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://www.ioplex.com/~miallen/libmba/dl/libmba-0.9.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6b5713fd3daac2cda23557e986c4c7e8
diff --git a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4 b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
index f1baceb37c2f..5f91a8db0b6e 100644
--- a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DESCRIPTION=libmcrypt provides uniform interface to access several encryption algorithms
 EAPI=7
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4b778d718a088752647673db6f5f79af
diff --git a/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1 b/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
index 3e914cc3e223..5bd0d82fd1a1 100644
--- a/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
+++ b/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://www.hick.org/code/skape/libmelf/libmelf-0.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63572dcf417e73db4a555e8fba95602b
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
index 90d0e2a93760..39fc6c8622e7 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a C client library to the memcached server
 EAPI=5
 HOMEPAGE=https://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e0390e6c3463b9bb34eeac2b0349cf94
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a332b156e9d3451415fee57527a5cd1e
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.4 b/metadata/md5-cache/dev-libs/libmirage-3.2.4
index 8113661023b1..4ee84ee4172c 100644
--- a/metadata/md5-cache/dev-libs/libmirage-3.2.4
+++ b/metadata/md5-cache/dev-libs/libmirage-3.2.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=0/11
 SRC_URI=https://download.sourceforge.net/cdemu/libmirage/libmirage-3.2.4.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae8baa7fcf4f1d3f7906e2aec2778769
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.5 b/metadata/md5-cache/dev-libs/libmirage-3.2.5
new file mode 100644
index 000000000000..5bd22d48860a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmirage-3.2.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
+DESCRIPTION=CD and DVD image access library
+EAPI=7
+HOMEPAGE=https://cdemu.sourceforge.io
+IUSE=doc +introspection
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
+SLOT=0/11
+SRC_URI=https://download.sourceforge.net/cdemu/libmirage/libmirage-3.2.5.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e6f213660577920e7546dbe28c5d35cf
diff --git a/metadata/md5-cache/dev-libs/libmix-2.05-r7 b/metadata/md5-cache/dev-libs/libmix-2.05-r7
index 4d4a9a40bcc9..1820e8557f65 100644
--- a/metadata/md5-cache/dev-libs/libmix-2.05-r7
+++ b/metadata/md5-cache/dev-libs/libmix-2.05-r7
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DESCRIPTION=Programs Crypto/Network/Multipurpose Library
 EAPI=7
 HOMEPAGE=http://mixter.void.ru/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://mixter.void.ru/libmix-205.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fa535b07ca2a5acf9f277aae118f2af6
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=86a4c77c2231c092d335419d38c48b1a
diff --git a/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2 b/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2
index 9a204820de37..bb9229fe9f8a 100644
--- a/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2
+++ b/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !~dev-libs/libmowgli-2.1.0
 DESCRIPTION=Useful set of performance and usability-oriented extensions to C
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !~dev-libs/libmowgli-2.1.0
 SLOT=2
 SRC_URI=https://github.com/atheme/libmowgli-2/archive/v2.1.3.tar.gz -> libmowgli-2.1.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8e734124dba127ab580f7def99c42656
diff --git a/metadata/md5-cache/dev-libs/libmowgli-9999 b/metadata/md5-cache/dev-libs/libmowgli-9999
index d926b25c16ec..d291c7e8d571 100644
--- a/metadata/md5-cache/dev-libs/libmowgli-9999
+++ b/metadata/md5-cache/dev-libs/libmowgli-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=2
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=c3b38b5572c2ad78fb590aa1c531b8f4
diff --git a/metadata/md5-cache/dev-libs/libmpack-1.0.5 b/metadata/md5-cache/dev-libs/libmpack-1.0.5
index 094ab0326a05..27e7a75a4f80 100644
--- a/metadata/md5-cache/dev-libs/libmpack-1.0.5
+++ b/metadata/md5-cache/dev-libs/libmpack-1.0.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=Simple implementation of msgpack in C
 EAPI=7
 HOMEPAGE=https://github.com/libmpack/libmpack
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack/archive/1.0.5.tar.gz -> libmpack-1.0.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3ae80cfcbcd7d84ce80db2cc93af0748
+_md5_=4c2136e2ffb2c6ac31f8d776f1ede3d7
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
index 5bf50eaac5f3..40de74257968 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
+++ b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
 IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a9a25cb9b25e5229acfc8fec26cb053a
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0d6cd24b6de800b1b9094326184f4585
diff --git a/metadata/md5-cache/dev-libs/libmspack-9999 b/metadata/md5-cache/dev-libs/libmspack-9999
index 9c041eb1f33b..24523bc47826 100644
--- a/metadata/md5-cache/dev-libs/libmspack-9999
+++ b/metadata/md5-cache/dev-libs/libmspack-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
@@ -7,5 +7,5 @@ IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mi
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e63a76e97f7e234e698e90a1a7e3e2de
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.3.0 b/metadata/md5-cache/dev-libs/libnatspec-0.3.0
index 95eec8c638a8..7895ba8eb13c 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.3.0
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.3.0
@@ -1,13 +1,14 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/popt doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/popt
 DESCRIPTION=library to smooth charset/localization issues
-EAPI=6
+EAPI=7
 HOMEPAGE=http://natspec.sourceforge.net/
 IUSE=doc
-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
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.3.0.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6e860fd1654255f2fa383a6f18f402ce
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f7d2586488fe938663fe91d81655a752
diff --git a/metadata/md5-cache/dev-libs/libnest2d-0.4-r1 b/metadata/md5-cache/dev-libs/libnest2d-0.4-r1
index ec887f5d26a3..cebbdaa694ac 100644
--- a/metadata/md5-cache/dev-libs/libnest2d-0.4-r1
+++ b/metadata/md5-cache/dev-libs/libnest2d-0.4-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/clipper sci-libs/nlopt
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/tamasmeszaros/libnest2d/archive/0.4.tar.gz -> libnest2d-0.4.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2475e52d95d3b4ed141ff649e09792e8
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.7.2 b/metadata/md5-cache/dev-libs/libnfc-1.7.2
index ee4b64d43555..cd290f282269 100644
--- a/metadata/md5-cache/dev-libs/libnfc-1.7.2
+++ b/metadata/md5-cache/dev-libs/libnfc-1.7.2
@@ -1,5 +1,6 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
-DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 ) doc? ( app-doc/doxygen )
+DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 DESCRIPTION=Near Field Communications (NFC) library
 EAPI=7
 HOMEPAGE=http://www.libnfc.org/
@@ -9,5 +10,4 @@ LICENSE=LGPL-3
 RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.7.2/libnfc-1.7.2.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=87f23c24088fe358a2aeb8b5a1ee5345
+_md5_=a282821e98d5dca38f841456bf3bbc14
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.8.0 b/metadata/md5-cache/dev-libs/libnfc-1.8.0
index 2094c9cb4955..845d6c637b81 100644
--- a/metadata/md5-cache/dev-libs/libnfc-1.8.0
+++ b/metadata/md5-cache/dev-libs/libnfc-1.8.0
@@ -1,5 +1,6 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
-DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 ) doc? ( app-doc/doxygen )
+DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 DESCRIPTION=Near Field Communications (NFC) library
 EAPI=7
 HOMEPAGE=http://www.libnfc.org/
@@ -9,5 +10,4 @@ LICENSE=LGPL-3
 RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.8.0/libnfc-1.8.0.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=87f23c24088fe358a2aeb8b5a1ee5345
+_md5_=a282821e98d5dca38f841456bf3bbc14
diff --git a/metadata/md5-cache/dev-libs/libnl-1.1.4-r1 b/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
index 1112d3771cf2..8b9964280876 100644
--- a/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel inte
 EAPI=6
 HOMEPAGE=https://www.infradead.org/~tgr/libnl/
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=1.1
 SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-1.1.4.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ca725d4c0a62f6019c62d86fbd4bd7b2
+_md5_=c5661d695b5201b4e33f5fb9cad16ebf
diff --git a/metadata/md5-cache/dev-libs/libnl-1.1.9999 b/metadata/md5-cache/dev-libs/libnl-1.1.9999
index bf60581cccf3..4725412c3d63 100644
--- a/metadata/md5-cache/dev-libs/libnl-1.1.9999
+++ b/metadata/md5-cache/dev-libs/libnl-1.1.9999
@@ -1,6 +1,5 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
 HOMEPAGE=https://www.infradead.org/~tgr/libnl/
@@ -8,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=1.1
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=751899fc69824481be2f264c58acab49
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d04db0328e46831a4782ca6431dc242a
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
index c497ea99da21..62a730954f86 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.5.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel inte
 EAPI=7
 HOMEPAGE=https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
 IUSE=+debug static-libs python +threads utils python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
 RDEPEND=python? ( 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? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b7a0ca18ea74c5cd721ffa5ec17577e9
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8f9764d0956c756c85ad24473536a48c
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index 3391255f7376..06d1055f7e2b 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -1,4 +1,4 @@
-BDEPEND=python? ( 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(-)] ) sys-devel/bison sys-devel/flex python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( 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(-)] ) sys-devel/bison sys-devel/flex python? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python? ( 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(-)] )
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python? ( 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? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=3
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=51869d5387d6462b6ba8ee299b519c23
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.2.2-r1 b/metadata/md5-cache/dev-libs/libnsfb-0.2.2-r1
index 23c00c5b53a1..99f346f0d7a7 100644
--- a/metadata/md5-cache/dev-libs/libnsfb-0.2.2-r1
+++ b/metadata/md5-cache/dev-libs/libnsfb-0.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=C library for framebuffer abstraction
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libnsfb/
 IUSE=sdl test vnc wayland X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
 RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4 ) vnc? ( >=net-libs/libvncserver-0.9.9-r2 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libxcb-1.9.1 >=x11-libs/xcb-util-0.3.9-r1 >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 )
 RESTRICT=!test? ( test )
 SLOT=0/0.2.2
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsfb-0.2.2-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=20b8060b727d8b573c1c4e682ecc974e
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	af8fe1901b583a379a6a32af919cea05	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6ca4385fad0437a69faca5e24279497f
diff --git a/metadata/md5-cache/dev-libs/libnsutils-0.1.0-r1 b/metadata/md5-cache/dev-libs/libnsutils-0.1.0-r1
index d6e9cc8ddedf..412988cd4a63 100644
--- a/metadata/md5-cache/dev-libs/libnsutils-0.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libnsutils-0.1.0-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=C library for base64 and time
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
 SLOT=0/0.1.0
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsutils-0.1.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6a6ca7314f0af6e5dd4ea3e67c887703
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	af8fe1901b583a379a6a32af919cea05	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=329a9f3bd071349055c47ce46c15ee79
diff --git a/metadata/md5-cache/dev-libs/libofx-0.10.1-r1 b/metadata/md5-cache/dev-libs/libofx-0.10.1-r1
index 61ee609fdd0a..5a8ac756019d 100644
--- a/metadata/md5-cache/dev-libs/libofx-0.10.1-r1
+++ b/metadata/md5-cache/dev-libs/libofx-0.10.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-crypt/gnupg ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
 DESCRIPTION=Library to support the Open Financial eXchange XML format
@@ -11,5 +11,5 @@ RDEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=n
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/libofx/libofx/archive/0.10.1.tar.gz -> libofx-0.10.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53d8d4354e9fb0649089bc7e208e2fe9
diff --git a/metadata/md5-cache/dev-libs/libofx-0.10.2 b/metadata/md5-cache/dev-libs/libofx-0.10.2
new file mode 100644
index 000000000000..133f58cab5a9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libofx-0.10.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-crypt/gnupg ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
+DESCRIPTION=Library to support the Open Financial eXchange XML format
+EAPI=7
+HOMEPAGE=https://github.com/libofx/libofx
+IUSE=doc test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://github.com/libofx/libofx/archive/0.10.2.tar.gz -> libofx-0.10.2.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0afe041a3c5b8d9993fb5b2a9e4741c1
diff --git a/metadata/md5-cache/dev-libs/liboil-0.3.17-r3 b/metadata/md5-cache/dev-libs/liboil-0.3.17-r3
index 3e603b85a77f..6515d1d14cf7 100644
--- a/metadata/md5-cache/dev-libs/liboil-0.3.17-r3
+++ b/metadata/md5-cache/dev-libs/liboil-0.3.17-r3
@@ -11,5 +11,5 @@ RDEPEND=examples? ( dev-libs/glib:2 )
 RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=https://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=faff30a5e79fd57f9a001cb28bab85b3
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.15.4 b/metadata/md5-cache/dev-libs/liborcus-0.15.4
index 39bce7afb6be..03e14a64df4a 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.15.4
+++ b/metadata/md5-cache/dev-libs/liborcus-0.15.4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( 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] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.15 ) dev-util/mdds:1/1.5
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_p
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/0.15
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.15.4.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=47df1a1757e1415bd4efc1f75c6fe507
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.16.1 b/metadata/md5-cache/dev-libs/liborcus-0.16.1
index 18b4f3de2533..8487b132a37e 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.16.1
+++ b/metadata/md5-cache/dev-libs/liborcus-0.16.1
@@ -4,10 +4,11 @@ DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=7
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 IUSE=python +spreadsheet-model tools python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
 RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( 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] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/0.16
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.16.1.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b15c5517f3e2e8b3186048e157fa7d51
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=de3c2bbfb38b995efde07a0cec231c5e
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index 7c76db291d7f..766d8d9957f3 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( 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] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 ) dev-util/mdds:1/9999
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( 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] ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/0.16
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4b26dc18ffe7f71b48fe2b7849e7c8d8
diff --git a/metadata/md5-cache/dev-libs/libotf-0.9.16 b/metadata/md5-cache/dev-libs/libotf-0.9.16
index 576e9e11b5cb..809552dcc565 100644
--- a/metadata/md5-cache/dev-libs/libotf-0.9.16
+++ b/metadata/md5-cache/dev-libs/libotf-0.9.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt ) virtual/pkgconfig X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libXmu ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt ) virtual/pkgconfig X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libXmu ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for handling OpenType fonts (OTF)
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/m17n/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/libotf-0.9.16.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=74671f5422d2b92f4484dd155669451a
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.31-r1 b/metadata/md5-cache/dev-libs/libowfat-0.31-r1
index 851b3a9e6afd..aff7e1587011 100644
--- a/metadata/md5-cache/dev-libs/libowfat-0.31-r1
+++ b/metadata/md5-cache/dev-libs/libowfat-0.31-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
 SLOT=0
 SRC_URI=https://www.fefe.de/libowfat/libowfat-0.31.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1682b0f49c0ce12a33faab720e5f72b
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.32-r1 b/metadata/md5-cache/dev-libs/libowfat-0.32-r1
index 08efaaa55247..c953d6dfb875 100644
--- a/metadata/md5-cache/dev-libs/libowfat-0.32-r1
+++ b/metadata/md5-cache/dev-libs/libowfat-0.32-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
 SLOT=0
 SRC_URI=https://www.fefe.de/libowfat/libowfat-0.32.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e0c90dfcc3da7d04bf67e526039e8af
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.32-r2 b/metadata/md5-cache/dev-libs/libowfat-0.32-r2
index f6971a075a1a..6336a1ba5f22 100644
--- a/metadata/md5-cache/dev-libs/libowfat-0.32-r2
+++ b/metadata/md5-cache/dev-libs/libowfat-0.32-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
 SLOT=0
 SRC_URI=https://www.fefe.de/libowfat/libowfat-0.32.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd3019a3c9a04223cbf482b703b45b45
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
deleted file mode 100644
index 55b6068d43c3..000000000000
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl )
-DESCRIPTION=library for building efficient parsers, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
-IUSE=iconv test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/0.2.4
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=439f10fc73e8667f05fef0963ff151b1
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
index 6341964a5fd5..f3062c2af9eb 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
@@ -1,13 +1,13 @@
+BDEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl )
 DESCRIPTION=C library for building efficient parsers
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
 IUSE=iconv test
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=145d0747968f8bf72cb7c64eae389fe2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	af8fe1901b583a379a6a32af919cea05	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a73f7f5bf781c249576259bb5ec07152
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.44 b/metadata/md5-cache/dev-libs/libpcre-8.44
index bd1b8d4a43d8..657e405bf59b 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.44
+++ b/metadata/md5-cache/dev-libs/libpcre-8.44
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=7
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.44.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.44.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=99fd9c44056f203d1d0e7315092815d1
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=d9c206c84030413e70032e757dc5c9b0
diff --git a/metadata/md5-cache/dev-libs/libpcre-debian-8-r2 b/metadata/md5-cache/dev-libs/libpcre-debian-8-r2
index 65ecd2cdfdd3..b2ed41aeab65 100644
--- a/metadata/md5-cache/dev-libs/libpcre-debian-8-r2
+++ b/metadata/md5-cache/dev-libs/libpcre-debian-8-r2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libpcre: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(-)?]
 SLOT=3
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ce21e5327497138515b6854b727d60a0
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=549f9eda98c84261e4fb5c5ce515caf4
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.35 b/metadata/md5-cache/dev-libs/libpcre2-10.35
index 83823870c553..cff267232934 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.35
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.35
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=7
 HOMEPAGE=https://www.pcre.org/
 IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.35.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.35.tar.bz2 https://dev.gentoo.org/~whissi/dist/libpcre2/libpcre2-10.34-patchset-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/libpcre2-10.34-patchset-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53f4cb1a0f36e9e52163daff50ba82c9
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=b05d4a0d98c5dcdcb72bb52f715b53f0
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.36 b/metadata/md5-cache/dev-libs/libpcre2-10.36
index a70e5eb74e37..1ee7eb53ec92 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.36
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.36
@@ -11,5 +11,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.36.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.36.tar.bz2 https://dev.gentoo.org/~whissi/dist/libpcre2/libpcre2-10.34-patchset-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/libpcre2-10.34-patchset-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d819dc3ed4a00b2d94f17f247e4b20f5
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=b79a7c7649e980a200b81d6bde485564
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.36-r1 b/metadata/md5-cache/dev-libs/libpcre2-10.36-r1
index 6e576018bb2b..0ec2783ac7de 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.36-r1
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.36-r1
@@ -11,5 +11,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.36.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.36.tar.bz2 https://dev.gentoo.org/~whissi/dist/libpcre2/libpcre2-10.36-patchset-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/libpcre2-10.36-patchset-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64175a2c1ef5500bf54badf82f718004
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=5279d3a9cdf44fe257d2fb496ece0633
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.26.0-r100 b/metadata/md5-cache/dev-libs/libpeas-1.26.0-r100
deleted file mode 100644
index d183d78411a7..000000000000
--- a/metadata/md5-cache/dev-libs/libpeas-1.26.0-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( 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_7? ( >=dev-python/pygobject-3.2:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) ) dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GObject plugins library
-EAPI=7
-HOMEPAGE=https://developer.gnome.org/libpeas/stable/
-IUSE=glade +gtk gtk-doc lua +python vala lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( 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_7? ( >=dev-python/pygobject-3.2:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libpeas/1.26/libpeas-1.26.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6af8d54f48945abf96d29273e0d46ed9
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.28.0-r100 b/metadata/md5-cache/dev-libs/libpeas-1.28.0-r100
index 7dce63622758..c013a71f0889 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.28.0-r100
+++ b/metadata/md5-cache/dev-libs/libpeas-1.28.0-r100
@@ -5,12 +5,12 @@ DESCRIPTION=A GObject plugins library
 EAPI=7
 HOMEPAGE=https://developer.gnome.org/libpeas/stable/
 IUSE=glade +gtk gtk-doc lua +python vala lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.2:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.28/libpeas-1.28.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d701b2b8788f3e17057d5ca30c6bb47d
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3eb656e7bd96b39994f3e20d00fe2a15
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.30.0 b/metadata/md5-cache/dev-libs/libpeas-1.30.0
index 806067dec497..9d91673a3d95 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.30.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.30.0
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.30/libpeas-1.30.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c064bc20cfe38162a665893493f26656
diff --git a/metadata/md5-cache/dev-libs/libpfm-4.11.0 b/metadata/md5-cache/dev-libs/libpfm-4.11.0
index dce4664ac130..c13693019fd6 100644
--- a/metadata/md5-cache/dev-libs/libpfm-4.11.0
+++ b/metadata/md5-cache/dev-libs/libpfm-4.11.0
@@ -3,9 +3,9 @@ DESCRIPTION=Hardware-based performance monitoring interface for Linux
 EAPI=7
 HOMEPAGE=http://perfmon2.sourceforge.net
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2 MIT
 SLOT=0/4
 SRC_URI=mirror://sourceforge/perfmon2/libpfm4/libpfm-4.11.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=039fe0eaa90558e96b38b1a117b930c4
+_md5_=c4f9f52f89af55ea025d87257aecd6a6
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.2 b/metadata/md5-cache/dev-libs/libpipeline-1.5.2
index 710e1dfdb55c..fef202bcb214 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.5.2
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.5.2
@@ -5,9 +5,9 @@ DESCRIPTION=a pipeline manipulation library
 EAPI=7
 HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.2.tar.gz
-_md5_=6e1a198a605e8f11e3e51828aba292a5
+_md5_=d8f3bc1f15059bca38a042f4cf1dbfc5
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.3 b/metadata/md5-cache/dev-libs/libpipeline-1.5.3
index ef8b347e70d1..ce0ec0cbfa65 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.5.3
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.5.3
@@ -5,9 +5,9 @@ DESCRIPTION=a pipeline manipulation library
 EAPI=7
 HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs 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 ~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
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.3.tar.gz
-_md5_=f4e8dcb9c123492b5748c52030766f1d
+_md5_=1fda344167d772d2f6ee6e9440a764f4
diff --git a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1 b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
index 4c941a52a533..e2ad693fb5d0 100644
--- a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Platform support library used by libCEC and binary add-ons for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/Pulse-Eight/platform
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/platform/archive/p8-platform-2.1.0.1.tar.gz -> libplatform-2.1.0.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45ec89bcaa06da09ffbbad7124e38110
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=25ec0900e6ce6b786e804b513860e293
diff --git a/metadata/md5-cache/dev-libs/libplatform-9999 b/metadata/md5-cache/dev-libs/libplatform-9999
index 046cd1181775..8c8f1b62b0f7 100644
--- a/metadata/md5-cache/dev-libs/libplatform-9999
+++ b/metadata/md5-cache/dev-libs/libplatform-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/Pulse-Eight/platform
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71be9b103e3d71be93e4b9909a7f4fe3
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.1.2 b/metadata/md5-cache/dev-libs/libpqxx-7.1.2
index 734987839440..8afbc2feccd9 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.1.2
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.1.2.tar.gz -> libpqxx-7.1.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=128ee3e642ae2ab04fad4e6244606af9
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.2.1 b/metadata/md5-cache/dev-libs/libpqxx-7.2.1
index 6f591f382ceb..76896e267c75 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.2.1
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.2.1.tar.gz -> libpqxx-7.2.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f9c2035a28701c8ba46b0b383ab0b530
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.3.0 b/metadata/md5-cache/dev-libs/libpqxx-7.3.0
index a7b379d10c63..3a1eb607c7b4 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.3.0
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.3.0.tar.gz -> libpqxx-7.3.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=638182d9feca9198740f247f922002b3
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.4.1 b/metadata/md5-cache/dev-libs/libpqxx-7.4.1
index fcdb51461696..9f4ccfda1d68 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.4.1
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.4.1.tar.gz -> libpqxx-7.4.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=5a26c90c36da495f85168dd20617bef5
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10 b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
index 59b14b9610b8..3dd08b86ce36 100644
--- a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
+++ b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems ) virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems ) virtual/pkgconfig virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems )
 DESCRIPTION=Prelude-SIEM Framework Library
@@ -11,5 +11,5 @@ RDEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libprelude-5.2.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	d8655e1387589a2e1930339b1627d5c1	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=45aca8915c200145c863bf5e7b4a173b
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.1.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
index 64909118bd1c..6ee46d49c1e2 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/swig-3.0.11 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-lang/swig-3.0.11 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=>=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Framework to easy access to the Prelude database
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 net-libs/gnutls:= mys
 REQUIRED_USE=python? ( || ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/libpreludedb-5.1.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	d8655e1387589a2e1930339b1627d5c1	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ce77ace4271cbf9a390c681a9483314e
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
index 2258ca1a5b26..53e537b84ea3 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Framework to easy access to the Prelude database
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mys
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libpreludedb-5.2.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	d8655e1387589a2e1930339b1627d5c1	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=63246f81a55bd2c2aed84c63f80f29fd
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
index 7b65440c152f..935a81438d57 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Pthread functions stubs for platforms missing them
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/pthread-stubs
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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=MIT
 SLOT=0
 SRC_URI=https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=94f297142dee59066741e416f14b82fd
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=42373952448cbf679d982b930f12a396
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.2 b/metadata/md5-cache/dev-libs/libpwquality-1.4.2
index f363befb212f..543fbeed19e8 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.2
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python?
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.2/libpwquality-1.4.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c4b79fc1225fbbe0aad09008c1cbcd5
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=df43d7b7f3cded94936d5185c9a3ee9f
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
index 26904cb7d2ed..b254c7ff0146 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=Library for password quality checking and generating random password
 EAPI=7
 HOMEPAGE=https://github.com/libpwquality/libpwquality
 IUSE=pam python static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 split-usr
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( 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? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=25501ab949ce0fac7b449bd554cc0717
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=df43d7b7f3cded94936d5185c9a3ee9f
diff --git a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1 b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
index a2f47beed623..bf8e4df7a8af 100644
--- a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( sparsehash ) || ( python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quantopian/libpy/archive/0.2.5.tar.gz -> libpy-0.2.5.tar.gz test? ( https://github.com/google/googletest/archive/23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz -> gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz )
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d019d93ddcd830801278bf529349deb6
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b4085a82745c364031c4e955841d6d88
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.6.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.6.0
index f73533edc7aa..91158f812203 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.6.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.6.0
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.6.0/libqtxdg-3.6.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28a9d4861f307ae5c5e5c7f99cde6d6d
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.7.1 b/metadata/md5-cache/dev-libs/libqtxdg-3.7.1
new file mode 100644
index 000000000000..c806e70f1476
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.7.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/lxqt-build-tools-0.9.0 virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils test? ( dev-qt/qttest:5 )
+DESCRIPTION=Qt Implementation of XDG Standards
+EAPI=7
+HOMEPAGE=https://lxqt.github.io/
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.7.1/libqtxdg-3.7.1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b9cc3a6595d6ab559545fd5a75caa0e
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.15 b/metadata/md5-cache/dev-libs/libratbag-0.15
index 572e9ae99dd3..a8e197c3a7a2 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.15
+++ b/metadata/md5-cache/dev-libs/libratbag-0.15
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.15.tar.gz -> libratbag-0.15.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=d11a7fc7cae7ef18de0150a9b2cdcd1b
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.5.0 b/metadata/md5-cache/dev-libs/librdkafka-1.5.0
index e21e1bdf39f5..63eb39c97dfa 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.5.0
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.5.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.5.0.tar.gz -> librdkafka-1.5.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=05de04517f0bcc90c55c8019397bb319
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.5.2 b/metadata/md5-cache/dev-libs/librdkafka-1.5.2
index 0df79a400960..1041a06e9244 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.5.2
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.5.2
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.5.2.tar.gz -> librdkafka-1.5.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=05de04517f0bcc90c55c8019397bb319
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.5.3 b/metadata/md5-cache/dev-libs/librdkafka-1.5.3
index 5f61daa21d66..c2bcaeb77810 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.5.3
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.5.3
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.5.3.tar.gz -> librdkafka-1.5.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=05de04517f0bcc90c55c8019397bb319
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.6.0 b/metadata/md5-cache/dev-libs/librdkafka-1.6.0
index 0457f535faa7..28867fbf38ce 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.6.0
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.6.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.6.0.tar.gz -> librdkafka-1.6.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=73c3dc4f412d66fd0fbe00a224d9ffad
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.6.1 b/metadata/md5-cache/dev-libs/librdkafka-1.6.1
index 8f938c504582..af739ea63b2f 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.6.1
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
 IUSE=lz4 sasl ssl static-libs zstd
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.6.1.tar.gz -> librdkafka-1.6.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=73c3dc4f412d66fd0fbe00a224d9ffad
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7c7fa9508fe55deef8192c0950c9364b
diff --git a/metadata/md5-cache/dev-libs/librelp-1.10.0 b/metadata/md5-cache/dev-libs/librelp-1.10.0
index 4a31785e9889..8271db46710a 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.10.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.10.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) virtual/pkgconfig
 DESCRIPTION=An easy to use library for the RELP protocol
@@ -12,5 +12,5 @@ REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=https://download.rsyslog.com/librelp/librelp-1.10.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=315a9401cec3395f19a4bb9700339e90
diff --git a/metadata/md5-cache/dev-libs/librelp-1.7.0 b/metadata/md5-cache/dev-libs/librelp-1.7.0
index 3daa6a160469..647def445e3d 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.7.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.7.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) ) virtual/pkgconfig
 DESCRIPTION=An easy to use library for the RELP protocol
@@ -12,5 +12,5 @@ REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://download.rsyslog.com/librelp/librelp-1.7.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=042e4497963c6ceeaff069bb96302226
diff --git a/metadata/md5-cache/dev-libs/librelp-1.8.0 b/metadata/md5-cache/dev-libs/librelp-1.8.0
index 610365d65b78..8afe7a0d204a 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.8.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.8.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) ) virtual/pkgconfig
 DESCRIPTION=An easy to use library for the RELP protocol
@@ -12,5 +12,5 @@ REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://download.rsyslog.com/librelp/librelp-1.8.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f71724ec75ef68cd56e23b9ad5d4f670
diff --git a/metadata/md5-cache/dev-libs/librelp-1.9.0 b/metadata/md5-cache/dev-libs/librelp-1.9.0
index 7315a8bffe87..68fc4fc74102 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.9.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.9.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) ) virtual/pkgconfig
 DESCRIPTION=An easy to use library for the RELP protocol
@@ -12,5 +12,5 @@ REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://download.rsyslog.com/librelp/librelp-1.9.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f71724ec75ef68cd56e23b9ad5d4f670
diff --git a/metadata/md5-cache/dev-libs/librep-0.92.7 b/metadata/md5-cache/dev-libs/librep-0.92.7
index a4c88f794ce7..ddd76f1d6f43 100644
--- a/metadata/md5-cache/dev-libs/librep-0.92.7
+++ b/metadata/md5-cache/dev-libs/librep-0.92.7
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= ) sys-apps/texinfo >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= ) sys-apps/texinfo sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DESCRIPTION=Shared library implementing a Lisp dialect
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/librep/librep_0.92.7.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ba884cd0bd7328949bf3b7caf7b7fff4
diff --git a/metadata/md5-cache/dev-libs/libreport-2.13.1 b/metadata/md5-cache/dev-libs/libreport-2.13.1
index f29c22f72572..e23809bd0415 100644
--- a/metadata/md5-cache/dev-libs/libreport-2.13.1
+++ b/metadata/md5-cache/dev-libs/libreport-2.13.1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=sys-devel/gettext-0.17 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=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(-)] app-admin/augeas >=dev-libs/glib-2.43.4:2 dev-libs/satyr:0= dev-libs/json-c:= dev-libs/libtar dev-libs/libxml2:2 dev-libs/nettle:= dev-libs/newt:= dev-libs/xmlrpc-c:= net-libs/libproxy:= net-misc/curl:=[ssl] sys-apps/dbus sys-apps/systemd gtk? ( >=x11-libs/gtk+-3.3.12:3 ) python? ( 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(-)] ) x11-misc/xdg-utils
 DESCRIPTION=Generic library for reporting software bugs
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/abrt/libreport/archive/2.13.1.tar.gz -> libreport-2.13.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=56b08bd33e2a2dbb9c70c588e51e8867
diff --git a/metadata/md5-cache/dev-libs/libressl-2.9.2 b/metadata/md5-cache/dev-libs/libressl-2.9.2
index e3ce513607e6..62506a49e072 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.9.2
+++ b/metadata/md5-cache/dev-libs/libressl-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/47
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=06f37d5eac9150d9d9f7f736fa0854af
diff --git a/metadata/md5-cache/dev-libs/libressl-3.0.2 b/metadata/md5-cache/dev-libs/libressl-3.0.2
index 556d0ad92922..052d35b2b04f 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.0.2
+++ b/metadata/md5-cache/dev-libs/libressl-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/47
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.0.2.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d98efa17221f024051102973c2647ca9
diff --git a/metadata/md5-cache/dev-libs/libressl-3.1.3 b/metadata/md5-cache/dev-libs/libressl-3.1.3
index 1bf4f1f6a7f8..732ca8320fb4 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.1.3
+++ b/metadata/md5-cache/dev-libs/libressl-3.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.3.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=28b0758e5233e7d2ed25f3162da970b6
diff --git a/metadata/md5-cache/dev-libs/libressl-3.1.4 b/metadata/md5-cache/dev-libs/libressl-3.1.4
index 8a6433baebe6..70a480cec2a2 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.1.4
+++ b/metadata/md5-cache/dev-libs/libressl-3.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.4.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=28b0758e5233e7d2ed25f3162da970b6
diff --git a/metadata/md5-cache/dev-libs/libressl-3.1.5 b/metadata/md5-cache/dev-libs/libressl-3.1.5
index fb0cb829becd..be9347ea5bf5 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.1.5
+++ b/metadata/md5-cache/dev-libs/libressl-3.1.5
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.5.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=28b0758e5233e7d2ed25f3162da970b6
diff --git a/metadata/md5-cache/dev-libs/libressl-3.2.0 b/metadata/md5-cache/dev-libs/libressl-3.2.0
index 715b75167ad2..f6935b402d44 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.2.0
+++ b/metadata/md5-cache/dev-libs/libressl-3.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.2.0.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4352615857318dca2a56d2110428972f
diff --git a/metadata/md5-cache/dev-libs/libressl-3.2.1 b/metadata/md5-cache/dev-libs/libressl-3.2.1
index 30789f151842..130256697dad 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.2.1
+++ b/metadata/md5-cache/dev-libs/libressl-3.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.2.1.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4352615857318dca2a56d2110428972f
diff --git a/metadata/md5-cache/dev-libs/libressl-3.2.3 b/metadata/md5-cache/dev-libs/libressl-3.2.3
index 4e161dc20b16..5514bbdebd9c 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.2.3
+++ b/metadata/md5-cache/dev-libs/libressl-3.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.2.3.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4352615857318dca2a56d2110428972f
diff --git a/metadata/md5-cache/dev-libs/libressl-3.3.0 b/metadata/md5-cache/dev-libs/libressl-3.3.0
index cc8112d16911..25acfc5ebd4d 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.3.0
+++ b/metadata/md5-cache/dev-libs/libressl-3.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.0.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d57b0e376cf8b276c78fdc8e508f57e6
diff --git a/metadata/md5-cache/dev-libs/libressl-3.3.1 b/metadata/md5-cache/dev-libs/libressl-3.3.1
index 0bed89af56a8..d5fcd078919d 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.3.1
+++ b/metadata/md5-cache/dev-libs/libressl-3.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.1.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=5e5194d0b16697dc92cedca19ab3a890
diff --git a/metadata/md5-cache/dev-libs/libretls-3.3.1-r1 b/metadata/md5-cache/dev-libs/libretls-3.3.1-r1
index 1497c22b58e2..5040ac9e9496 100644
--- a/metadata/md5-cache/dev-libs/libretls-3.3.1-r1
+++ b/metadata/md5-cache/dev-libs/libretls-3.3.1-r1
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=dev-libs/openssl:= !dev-libs/libressl
 SLOT=0
 SRC_URI=https://causal.agency/libretls/libretls-3.3.1.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3b76035426eb88a29003d566e38f541f
diff --git a/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1 b/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
index 57358041d091..ee01c04bf126 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b8dd42888e4be1006d8c70d9428bd1b
diff --git a/metadata/md5-cache/dev-libs/librevenge-9999 b/metadata/md5-cache/dev-libs/librevenge-9999
index c5a78ac43b99..b9b122492b18 100644
--- a/metadata/md5-cache/dev-libs/librevenge-9999
+++ b/metadata/md5-cache/dev-libs/librevenge-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost test? ( dev-util/cppunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Helper library for REVerse ENGineered formats filters
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8233c860c760d05c041c29dd01bb1b28
diff --git a/metadata/md5-cache/dev-libs/libsass-3.6.1 b/metadata/md5-cache/dev-libs/libsass-3.6.1
index fe3eb8eec945..8d5564f04ffa 100644
--- a/metadata/md5-cache/dev-libs/libsass-3.6.1
+++ b/metadata/md5-cache/dev-libs/libsass-3.6.1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A C/C++ implementation of a Sass CSS compiler
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=https://github.com/sass/libsass/archive/3.6.1.tar.gz -> libsass-3.6.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2ddeeaf5eee71c9444b55cb4efe408f1
diff --git a/metadata/md5-cache/dev-libs/libsass-3.6.4 b/metadata/md5-cache/dev-libs/libsass-3.6.4
index b77f51a1ffb1..bb4d3335a11a 100644
--- a/metadata/md5-cache/dev-libs/libsass-3.6.4
+++ b/metadata/md5-cache/dev-libs/libsass-3.6.4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A C/C++ implementation of a Sass CSS compiler
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=https://github.com/sass/libsass/archive/3.6.4.tar.gz -> libsass-3.6.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=50da7e896cd2779d40580707b2bd2a15
diff --git a/metadata/md5-cache/dev-libs/libsass-9999 b/metadata/md5-cache/dev-libs/libsass-9999
index 1e0823528e60..df9fd3daf92f 100644
--- a/metadata/md5-cache/dev-libs/libsass-9999
+++ b/metadata/md5-cache/dev-libs/libsass-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A C/C++ implementation of a Sass CSS compiler
 EAPI=7
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/1
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ba364aed23e242408b29cb88a6cf4f40
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.8.0 b/metadata/md5-cache/dev-libs/libsavitar-4.8.0
index 3f0f1ff8070a..26b632b8d1f4 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.8.0
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.8.0.tar.gz -> libsavitar-4.8.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a89b5622ed4ebc1f2b12cef6a186d03a
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401 b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
index 5d2b88b8b5f1..67c953da99e2 100644
--- a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
@@ -1,4 +1,4 @@
-BDEPEND=java? ( virtual/jdk ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=java? ( virtual/jdk ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=gmp? ( dev-libs/gmp:0= ) java? ( virtual/jdk ) test-openssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Optimized C library for EC operations on curve secp256k1
@@ -12,5 +12,5 @@ REQUIRED_USE=asm? ( || ( amd64 arm ) arm? ( experimental ) ) ecdh? ( experimenta
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin-core/secp256k1/archive/b19c000063be11018b4d1a6b0a85871ab9d0bdcf.tar.gz -> libsecp256k1-v0.1_pre20190401.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4d2fddd6ed97d47498f064301a1a7bc7
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028 b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028
index 1b85555facca..9cac969bc142 100644
--- a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=gmp? ( dev-libs/gmp:0= ) virtual/pkgconfig test-openssl? ( dev-libs/openssl:0 ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=Optimized C library for EC operations on curve secp256k1
@@ -12,5 +12,5 @@ REQUIRED_USE=asm? ( || ( amd64 arm ) arm? ( experimental ) ) extrakeys? ( experi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin-core/secp256k1/archive/3967d96bf184519eb98b766af665b4d4b072563e.tar.gz -> libsecp256k1-v0.1_pre20201028.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3b99a12b036b57cfa25967a1d7fd5a09
diff --git a/metadata/md5-cache/dev-libs/libserialport-0.1.1 b/metadata/md5-cache/dev-libs/libserialport-0.1.1
index efb951c76235..5372f56216f8 100644
--- a/metadata/md5-cache/dev-libs/libserialport-0.1.1
+++ b/metadata/md5-cache/dev-libs/libserialport-0.1.1
@@ -1,12 +1,11 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig
 DESCRIPTION=Cross platform serial port access library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sigrok.org/wiki/Libserialport
 IUSE=static-libs
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=https://sigrok.org/download/source/libserialport/libserialport-0.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=962b37d2c553e46c5d83025f1525e1e0
+_md5_=479726962020bc62acde9c82ad25f99d
diff --git a/metadata/md5-cache/dev-libs/libserialport-9999 b/metadata/md5-cache/dev-libs/libserialport-9999
index 0dd71797550e..3376aac7fa00 100644
--- a/metadata/md5-cache/dev-libs/libserialport-9999
+++ b/metadata/md5-cache/dev-libs/libserialport-9999
@@ -1,11 +1,11 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Cross platform serial port access library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sigrok.org/wiki/Libserialport
 IUSE=static-libs
 LICENSE=LGPL-3
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9ef6982be3aa06f74bf517614269eb0b
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6ab9ca5b5aabf78dd85a614dbc069b9c
diff --git a/metadata/md5-cache/dev-libs/libsigc++-1.2.7 b/metadata/md5-cache/dev-libs/libsigc++-1.2.7
deleted file mode 100644
index ad971d2bb66e..000000000000
--- a/metadata/md5-cache/dev-libs/libsigc++-1.2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=sys-devel/m4 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Typesafe callback system for standard C++
-EAPI=5
-HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
-IUSE=debug
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2 LGPL-2.1+
-SLOT=1.2
-SRC_URI=mirror://gnome/sources/libsigc++/1.2/libsigc++-1.2.7.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0a755076255c6a1500fe526beca66be
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.1 b/metadata/md5-cache/dev-libs/libsigc++-2.10.1
deleted file mode 100644
index ed649c920e89..000000000000
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=sys-devel/m4 doc? ( app-doc/doxygen ) test? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Typesafe callback system for standard C++
-EAPI=6
-HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
-IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a54123a646e390ac12815b9c38ac7008
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.3 b/metadata/md5-cache/dev-libs/libsigc++-2.10.3
deleted file mode 100644
index 868ec4c42c3e..000000000000
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=sys-devel/m4 doc? ( app-doc/doxygen ) test? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Typesafe callback system for standard C++
-EAPI=6
-HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
-IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.3.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=def1a22904bbcf829b0dfe515ffd0d27
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.6 b/metadata/md5-cache/dev-libs/libsigc++-2.10.6
index 10c24222bea0..09447d5f1879 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.6
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.6
@@ -5,10 +5,10 @@ DESCRIPTION=Typesafe callback system for standard C++
 EAPI=7
 HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.6.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b07c8eb6672f8e74e79fab8c46afaaf2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=04438198b18e594b6be13c9163625ea6
diff --git a/metadata/md5-cache/dev-libs/libsigc++-3.0.6 b/metadata/md5-cache/dev-libs/libsigc++-3.0.6
index 0c9494561524..8f699c8d6db3 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-3.0.6
+++ b/metadata/md5-cache/dev-libs/libsigc++-3.0.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libsigc++/3.0/libsigc++-3.0.6.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a6db4280ec8e3ba049a4e8a0ce79f42
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1 b/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
index e65e8838d3f3..ac0803746fe5 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for handling page faults in user mode
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libsigsegv/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-li
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.12.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb422d81cd99f9428026a2231377c80e
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.13 b/metadata/md5-cache/dev-libs/libsigsegv-2.13
index 4c65a1f057ff..7c36748ab212 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.13
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.13
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=Library for handling page faults in user mode
 EAPI=7
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.13.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=eaec576c8767ef228f232ab8dbb2bd5f
diff --git a/metadata/md5-cache/dev-libs/libslz-1.1.0 b/metadata/md5-cache/dev-libs/libslz-1.1.0
index f412d435b738..d9ec71331821 100644
--- a/metadata/md5-cache/dev-libs/libslz-1.1.0
+++ b/metadata/md5-cache/dev-libs/libslz-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=http://git.1wt.eu/web?p=libslz.git;a=snapshot;h=v1.1.0;sf=tbz2 -> libslz-1.1.0.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=53cccde18525cc2ee3e75f5a61ff6078
diff --git a/metadata/md5-cache/dev-libs/libslz-1.2.0 b/metadata/md5-cache/dev-libs/libslz-1.2.0
index 62afe9dc62f1..7e07113777e7 100644
--- a/metadata/md5-cache/dev-libs/libslz-1.2.0
+++ b/metadata/md5-cache/dev-libs/libslz-1.2.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=http://git.1wt.eu/web?p=libslz.git;a=snapshot;h=v1.2.0;sf=tbz2 -> libslz-1.2.0.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2723253026f5ec6d15f988b0573c665b
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18 b/metadata/md5-cache/dev-libs/libsodium-1.0.18
index fda381b2f52f..0e903ee64e26 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.18
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-jedisct1 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
 EAPI=7
-HOMEPAGE=https://github.com/jedisct1/libsodium
-IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes 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
+HOMEPAGE=https://libsodium.org
+IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
 SLOT=0/23
-SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ac738ffba0760a5be057547c51bf51e6
+SRC_URI=https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz verify-sig? ( https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz.sig )
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=ca5ee9b0edafcd965bab744c592946a4
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210421 b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210421
new file mode 100644
index 000000000000..75c91b308e63
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210421
@@ -0,0 +1,12 @@
+BDEPEND=verify-sig? ( app-crypt/minisign ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
+EAPI=7
+HOMEPAGE=https://libsodium.org
+IUSE=+asm minimal static-libs +urandom cpu_flags_x86_aes cpu_flags_x86_sse4_1 verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc
+LICENSE=ISC
+SLOT=0/23
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210421.tar.gz -> libsodium-1.0.18_p20210421.tar.gz verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210421.tar.gz.minisig -> libsodium-1.0.18_p20210421.tar.gz.minisig )
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5b313c480d97ecf3e62f6da4f57c0aa4
diff --git a/metadata/md5-cache/dev-libs/libspnav-0.2.3 b/metadata/md5-cache/dev-libs/libspnav-0.2.3
index 8c591a7910c7..73123224e5c2 100644
--- a/metadata/md5-cache/dev-libs/libspnav-0.2.3
+++ b/metadata/md5-cache/dev-libs/libspnav-0.2.3
@@ -10,4 +10,4 @@ RDEPEND=app-misc/spacenavd[X?] X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%200.2.3/libspnav-0.2.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=89cf609d3858109995c7cd4a8e5a638a
+_md5_=eaf80301ab12903753c6562cdf0e3f42
diff --git a/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1 b/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
index 45753212dcbc..5e8be0baa09a 100644
--- a/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
+++ b/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
@@ -10,4 +10,4 @@ RDEPEND=app-misc/spacenavd[X?] X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%200.2.3/libspnav-0.2.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dc27acd0df280820d3b29c7890957396
+_md5_=c9785d24950233b079bc3c70d42c6a32
diff --git a/metadata/md5-cache/dev-libs/libspt-1.1-r4 b/metadata/md5-cache/dev-libs/libspt-1.1-r4
index 134f4682cd11..102dedbabb22 100644
--- a/metadata/md5-cache/dev-libs/libspt-1.1-r4
+++ b/metadata/md5-cache/dev-libs/libspt-1.1-r4
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=net-libs/libtirpc
 DESCRIPTION=Library for handling root privilege
 EAPI=7
 HOMEPAGE=http://www.j10n.org/libspt/
 IUSE=suid
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD-2
 RDEPEND=net-libs/libtirpc
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.j10n.org/libspt/libspt-1.1.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1c65cbca90322255f33d394a18a5fdb4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0b68cfabf8b082e2e4ad032efc4bc74a
diff --git a/metadata/md5-cache/dev-libs/libstrl-0.5.1-r1 b/metadata/md5-cache/dev-libs/libstrl-0.5.1-r1
index 37b1760565c0..6d165ca0c36d 100644
--- a/metadata/md5-cache/dev-libs/libstrl-0.5.1-r1
+++ b/metadata/md5-cache/dev-libs/libstrl-0.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mirror.ohnopub.net/mirror/libstrl-0.5.1.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c1c362bcaed321d443a834723be948c1
diff --git a/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1 b/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
index 3dbd16343088..0109d6308a8a 100644
--- a/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
+++ b/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A Stroke and Gesture recognition Library
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.etla.net/libstroke/libstroke-0.5.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b4601341eaca9b4f8a62500d0dcdd542
diff --git a/metadata/md5-cache/dev-libs/libtar-1.2.20-r4 b/metadata/md5-cache/dev-libs/libtar-1.2.20-r4
index 17376eb27800..fada2ddb69d1 100644
--- a/metadata/md5-cache/dev-libs/libtar-1.2.20-r4
+++ b/metadata/md5-cache/dev-libs/libtar-1.2.20-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=C library for manipulating tar archives
 EAPI=6
 HOMEPAGE=https://repo.or.cz/w/libtar.git/
@@ -10,5 +10,5 @@ RDEPEND=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/libtar-1.2.20.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd9bea22c6c95fe0b933084c7f3f6217
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.13 b/metadata/md5-cache/dev-libs/libtasn1-4.13
index a47e2c4a25cb..8e88722a202c 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.13
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.13
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs test valgrind 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 ~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-3 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.13.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e4d97d4f03f100fcff703ad5f377e47d
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4106beb87eb9482d4c02db5b509adc5d
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.15.0-r1 b/metadata/md5-cache/dev-libs/libtasn1-4.15.0-r1
index ade5c16dd878..7599e0d1351b 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.15.0-r1
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.15.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/help2man virtual/yacc test? ( valgrind? ( dev-util/valgrind ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-apps/help2man virtual/yacc test? ( valgrind? ( dev-util/valgrind ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=ASN.1 library
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.15.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b3c4a6dcbcdb599aa817c5ed56a71b1
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=242bd6f532876c6e753469148655b43d
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.16.0 b/metadata/md5-cache/dev-libs/libtasn1-4.16.0
index ba759df86ec7..98237b57ceff 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.16.0
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.16.0
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs test valgrind 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 ~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-3 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.16.0.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9080b1adb54d22623a9caf94f304ac13
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=65fed22f449e2f8db7f4234ca0f6cc0b
diff --git a/metadata/md5-cache/dev-libs/libtecla-1.6.3 b/metadata/md5-cache/dev-libs/libtecla-1.6.3
index 3c92c187aeda..94d569367f33 100644
--- a/metadata/md5-cache/dev-libs/libtecla-1.6.3
+++ b/metadata/md5-cache/dev-libs/libtecla-1.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=sys-libs/ncurses:= >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/ncurses:= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Tecla command-line editing library
 EAPI=6
 HOMEPAGE=https://www.astro.caltech.edu/~mcs/tecla/
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a857d752bf84d6caa1f3ae4473315e1
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.20 b/metadata/md5-cache/dev-libs/libtermkey-0.20
index e55d5a6087fa..5e77ea4ea894 100644
--- a/metadata/md5-cache/dev-libs/libtermkey-0.20
+++ b/metadata/md5-cache/dev-libs/libtermkey-0.20
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/unibilium:=
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6506f04e47631b255d1a5c33b2b3ee4d
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.22 b/metadata/md5-cache/dev-libs/libtermkey-0.22
index 45a18d8600a2..6950ad695b06 100644
--- a/metadata/md5-cache/dev-libs/libtermkey-0.22
+++ b/metadata/md5-cache/dev-libs/libtermkey-0.22
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/unibilium:=
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3c8270c3eee9d895b3ce9d605ff96ced
diff --git a/metadata/md5-cache/dev-libs/libthreadar-1.3.0 b/metadata/md5-cache/dev-libs/libthreadar-1.3.1
index ee9c0f01fa86..ebcda7172747 100644
--- a/metadata/md5-cache/dev-libs/libthreadar-1.3.0
+++ b/metadata/md5-cache/dev-libs/libthreadar-1.3.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Threading library used by dar archiver
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/libthreadar/
-KEYWORDS=~amd64 ~sparc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=LGPL-3
 SLOT=0
-SRC_URI=mirror://sourceforge/libthreadar/libthreadar-1.3.0.tar.gz
-_md5_=0a29fbfe837f516c881cd0545c667509
+SRC_URI=mirror://sourceforge/libthreadar/libthreadar-1.3.1.tar.gz
+_md5_=88333f799a1a06c0e9cb9890fd0cc441
diff --git a/metadata/md5-cache/dev-libs/libthreadar-1.3.2 b/metadata/md5-cache/dev-libs/libthreadar-1.3.2
new file mode 100644
index 000000000000..052fd9d420f0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libthreadar-1.3.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Threading library used by dar archiver
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/libthreadar/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=LGPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/libthreadar/libthreadar-1.3.2.tar.gz
+_md5_=88333f799a1a06c0e9cb9890fd0cc441
diff --git a/metadata/md5-cache/dev-libs/libtimezonemap-0.4.6 b/metadata/md5-cache/dev-libs/libtimezonemap-0.4.6
index 4ba54729d749..b9182ee6fdf2 100644
--- a/metadata/md5-cache/dev-libs/libtimezonemap-0.4.6
+++ b/metadata/md5-cache/dev-libs/libtimezonemap-0.4.6
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst postrm preinst prepare
 DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:0= dev-libs/json-glib net-libs/libsoup x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GTK+3 timezone map widget
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:0= dev-libs/json-glib net-libs/libsoup x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libt/libtimezonemap/libtimezonemap_0.4.6.orig.tar.gz -> libtimezonemap_0.4.6.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=656aed9ecdc4e83884e7cb9246aaba2b
diff --git a/metadata/md5-cache/dev-libs/libtommath-1.2.0 b/metadata/md5-cache/dev-libs/libtommath-1.2.0
index 8d09de29a2ca..daef65651b8f 100644
--- a/metadata/md5-cache/dev-libs/libtommath-1.2.0
+++ b/metadata/md5-cache/dev-libs/libtommath-1.2.0
@@ -1,12 +1,12 @@
-BDEPEND=sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Optimized and portable routines for integer theoretic applications
 EAPI=7
 HOMEPAGE=https://www.libtom.net/
 IUSE=doc examples static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=https://github.com/libtom/libtommath/releases/download/v1.2.0/ltm-1.2.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1549f1410d2d58d26bf99ceb35f33b77
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=78c3a5c52ed370f32a735415a2e8c20e
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.8.2 b/metadata/md5-cache/dev-libs/libtpms-0.8.2
index 2cc201d2db59..1404129c1339 100644
--- a/metadata/md5-cache/dev-libs/libtpms-0.8.2
+++ b/metadata/md5-cache/dev-libs/libtpms-0.8.2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=Library providing software emultion of a TPM
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.8.2.tar.gz -> libtpms-0.8.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8b42fa7f6316ee47c6df0bbc1f9478d4
diff --git a/metadata/md5-cache/dev-libs/libtsm-4.0.1 b/metadata/md5-cache/dev-libs/libtsm-4.0.1
index e769f46fcca2..59020f262248 100644
--- a/metadata/md5-cache/dev-libs/libtsm-4.0.1
+++ b/metadata/md5-cache/dev-libs/libtsm-4.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 MIT
 SLOT=0/4
 SRC_URI=https://github.com/Aetf/libtsm/archive/v4.0.1.tar.gz -> libtsm-4.0.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f81b5af2a3033b9a0a6b3e30fcef6fc4
diff --git a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100 b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
index a907894e1e75..a6439e57ea5d 100644
--- a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
+++ b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
@@ -1,4 +1,4 @@
-BDEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 )
 DESCRIPTION=Universal configuration library parser
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/libucl/archive/0.8.1.tar.gz -> libucl-0.8.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=71d8ad695b7e804e4ad7dd77a544233f
diff --git a/metadata/md5-cache/dev-libs/libucl-9999 b/metadata/md5-cache/dev-libs/libucl-9999
index 9eb98596402f..8d059654657d 100644
--- a/metadata/md5-cache/dev-libs/libucl-9999
+++ b/metadata/md5-cache/dev-libs/libucl-9999
@@ -1,4 +1,4 @@
-BDEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup test unpack
 DEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 )
 DESCRIPTION=Universal configuration library parser
@@ -11,5 +11,5 @@ RDEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=71d8ad695b7e804e4ad7dd77a544233f
diff --git a/metadata/md5-cache/dev-libs/libudfread-1.1.0 b/metadata/md5-cache/dev-libs/libudfread-1.1.0
index 8feae08398c9..77ef2b581840 100644
--- a/metadata/md5-cache/dev-libs/libudfread-1.1.0
+++ b/metadata/md5-cache/dev-libs/libudfread-1.1.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for reading UDF from raw devices and image files
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libudfread/-/archive/1.1.0/libudfread-1.1.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=97b3a98289c952805f0a025834484900
diff --git a/metadata/md5-cache/dev-libs/libudfread-1.1.1 b/metadata/md5-cache/dev-libs/libudfread-1.1.1
index 4b018affe25f..524e8eee10cd 100644
--- a/metadata/md5-cache/dev-libs/libudfread-1.1.1
+++ b/metadata/md5-cache/dev-libs/libudfread-1.1.1
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for reading UDF from raw devices and image files
 EAPI=7
 HOMEPAGE=https://code.videolan.org/videolan/libudfread/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libudfread/-/archive/1.1.1/libudfread-1.1.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=97b3a98289c952805f0a025834484900
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b7c08d9307f7091a95f573dd02d961bb
diff --git a/metadata/md5-cache/dev-libs/libudfread-1.1.2 b/metadata/md5-cache/dev-libs/libudfread-1.1.2
new file mode 100644
index 000000000000..7370a982d672
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libudfread-1.1.2
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for reading UDF from raw devices and image files
+EAPI=7
+HOMEPAGE=https://code.videolan.org/videolan/libudfread/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=https://code.videolan.org/videolan/libudfread/-/archive/1.1.2/libudfread-1.1.2.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ccd21dff5723c914849f2515112bb992
diff --git a/metadata/md5-cache/dev-libs/libudfread-9999 b/metadata/md5-cache/dev-libs/libudfread-9999
index ed802caf680f..91b8b8446035 100644
--- a/metadata/md5-cache/dev-libs/libudfread-9999
+++ b/metadata/md5-cache/dev-libs/libudfread-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Library for reading UDF from raw devices and image files
 EAPI=7
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=97b3a98289c952805f0a025834484900
diff --git a/metadata/md5-cache/dev-libs/libugpio-0.0.7 b/metadata/md5-cache/dev-libs/libugpio-0.0.7
index 421f0de37cac..69f495bff499 100644
--- a/metadata/md5-cache/dev-libs/libugpio-0.0.7
+++ b/metadata/md5-cache/dev-libs/libugpio-0.0.7
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-3+ LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/mhei/libugpio/releases/download/v0.0.7/libugpio-0.0.7.tar.bz2
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d66d723ee954b5a39192fa8cd7541898
diff --git a/metadata/md5-cache/dev-libs/libunibreak-4.1 b/metadata/md5-cache/dev-libs/libunibreak-4.1
index 8ba4aefc0fd9..a3208c123361 100644
--- a/metadata/md5-cache/dev-libs/libunibreak-4.1
+++ b/metadata/md5-cache/dev-libs/libunibreak-4.1
@@ -1,5 +1,5 @@
+BDEPEND=man? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=man? ( app-doc/doxygen )
 DESCRIPTION=Line and word breaking library
 EAPI=7
 HOMEPAGE=http://vimgadgets.sourceforge.net/libunibreak/
@@ -10,4 +10,4 @@ RDEPEND=!dev-libs/liblinebreak
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_1/libunibreak-4.1.tar.gz
-_md5_=2ba362703227602bcd72a1a6c5695790
+_md5_=6a2098e2b058da7d050478f545197d13
diff --git a/metadata/md5-cache/dev-libs/libunibreak-4.2 b/metadata/md5-cache/dev-libs/libunibreak-4.2
index 0ce9edcfb7b2..6465af35363b 100644
--- a/metadata/md5-cache/dev-libs/libunibreak-4.2
+++ b/metadata/md5-cache/dev-libs/libunibreak-4.2
@@ -1,5 +1,5 @@
+BDEPEND=man? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=man? ( app-doc/doxygen )
 DESCRIPTION=Line and word breaking library
 EAPI=7
 HOMEPAGE=http://vimgadgets.sourceforge.net/libunibreak/
@@ -10,4 +10,4 @@ RDEPEND=!dev-libs/liblinebreak
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_2-1/libunibreak-4.2-1.tar.gz
-_md5_=3d486c44009fc07fb7a4960c8970140d
+_md5_=857ef1d665ec1249e713b9cc5389da4b
diff --git a/metadata/md5-cache/dev-libs/libunibreak-4.3 b/metadata/md5-cache/dev-libs/libunibreak-4.3
index 9696ae55a38f..1cdd3d9960cc 100644
--- a/metadata/md5-cache/dev-libs/libunibreak-4.3
+++ b/metadata/md5-cache/dev-libs/libunibreak-4.3
@@ -1,5 +1,5 @@
+BDEPEND=man? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=man? ( app-doc/doxygen )
 DESCRIPTION=Line and word breaking library
 EAPI=7
 HOMEPAGE=http://vimgadgets.sourceforge.net/libunibreak/
@@ -9,4 +9,4 @@ LICENSE=ZLIB
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_3/libunibreak-4.3.tar.gz
-_md5_=b9329bb9d04b30c1c47442164916e107
+_md5_=ceff9715729c3909a1845ee74b571e8e
diff --git a/metadata/md5-cache/dev-libs/libunique-1.1.6-r2 b/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
index 8140df60942a..33a299e7aa02 100644
--- a/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
+++ b/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.12:2 >=x11-libs/gtk+-2.11:2[introspection?] x11-libs/l
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libunique/1.1/libunique-1.1.6.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b870bf3d637c1285ea9afcca2a9fbe7
diff --git a/metadata/md5-cache/dev-libs/libunique-3.0.2-r1 b/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
index 53c609c820d0..e53359cacd4a 100644
--- a/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
+++ b/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.25.7:2 sys-apps/dbus[X] >=x11-libs/gtk+-2.90.0:3[intro
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libunique/3.0/libunique-3.0.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=498353312f9970a5c15ba2917efa2488
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.10-r1 b/metadata/md5-cache/dev-libs/libunistring-0.9.10-r1
index 926ab57a498d..866bb8857e58 100644
--- a/metadata/md5-cache/dev-libs/libunistring-0.9.10-r1
+++ b/metadata/md5-cache/dev-libs/libunistring-0.9.10-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libunistring/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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=|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )
 SLOT=0/2
 SRC_URI=mirror://gnu/libunistring/libunistring-0.9.10.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=755032182e8788dbedfdd67ec72872fa
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=16b4232a29c0d367cb7335736fc89ae2
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.23-r1 b/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
index d6739672bbbe..e4b051fce19d 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
@@ -11,5 +11,5 @@ RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=3210d32b3c0b255cc7eca4cf6e3de44d
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=6395aea8b0e27cfabd3dd1bf032c3d3c
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.24-r1 b/metadata/md5-cache/dev-libs/libusb-1.0.24-r1
index ba96e6b6a90b..fd060325c616 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.24-r1
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.24-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Userspace access to USB devices
 EAPI=7
 HOMEPAGE=https://libusb.info/ https://github.com/libusb/libusb
 IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.24/libusb-1.0.24.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=e1b08aa0c9d06ae738e52f0a06a7563a
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=337108e3e2f4b25bf4373a93cd478928
diff --git a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2 b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
index a7602dc3454c..5aa3936c07bf 100644
--- a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
+++ b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Userspace access to USB devices (libusb-0.1 compat wrapper)
 EAPI=6
 HOMEPAGE=http://libusb.sourceforge.net/
 IUSE=debug 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 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=77a62df30f4a631c95a2597c2d9fdb5f
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=bd1cdc335874a45163baf11f2aacbe4a
diff --git a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3 b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
index e88c88b4daf3..1792c94008dd 100644
--- a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
+++ b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=b6406f95914cf700893abeeada698823
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=78e4749ee7874966dd6cbbaffe7d81e0
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1 b/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
deleted file mode 100644
index f26787d5e7a4..000000000000
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-util/netsurf-buildsystem
-DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-SLOT=0/2.2.0_p1
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libutf8proc-2.2.0-1-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b9dcb20cc0f8473f0f73e81ef50cad4
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.6.1 b/metadata/md5-cache/dev-libs/libutf8proc-2.6.1
index 0acaae0d11a1..9e51cfd59e66 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.6.1
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.6.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2.6.1
 SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.6.1.tar.gz -> libutf8proc-2.6.1.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-13.0.0-r1.xz )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=cb03659708db992f14e116fb404d64f4
diff --git a/metadata/md5-cache/dev-libs/libuv-1.40.0 b/metadata/md5-cache/dev-libs/libuv-1.40.0
index 3a3d7fe20c8b..5409feab195c 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.40.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.40.0
@@ -1,13 +1,13 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/libtool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
 HOMEPAGE=https://github.com/libuv/libuv
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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 ~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=BSD BSD-2 ISC MIT
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.40.0.tar.gz -> libuv-1.40.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8b7a72aead85f61cb12bee038bd4dd21
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f86962eba57c51b1a9dcdab711a9e963
diff --git a/metadata/md5-cache/dev-libs/libuv-9999 b/metadata/md5-cache/dev-libs/libuv-9999
index 5ce3f4d265da..149084b37b26 100644
--- a/metadata/md5-cache/dev-libs/libuv-9999
+++ b/metadata/md5-cache/dev-libs/libuv-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/libtool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
@@ -8,5 +8,5 @@ LICENSE=BSD BSD-2 ISC MIT
 PROPERTIES=live
 RESTRICT=test
 SLOT=0/1
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=18e8e552a94aaf39e575981afa928161
diff --git a/metadata/md5-cache/dev-libs/libvarlink-16 b/metadata/md5-cache/dev-libs/libvarlink-16
index c2fbe1671134..4f83ce9efc32 100644
--- a/metadata/md5-cache/dev-libs/libvarlink-16
+++ b/metadata/md5-cache/dev-libs/libvarlink-16
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/varlink/libvarlink/archive/16.tar.gz -> libvarlink-16.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=34baba02f809adce677a03829d3bf935
diff --git a/metadata/md5-cache/dev-libs/libvarlink-18 b/metadata/md5-cache/dev-libs/libvarlink-18
index 924813883183..6a5a5ef7fbf6 100644
--- a/metadata/md5-cache/dev-libs/libvarlink-18
+++ b/metadata/md5-cache/dev-libs/libvarlink-18
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/varlink/libvarlink/archive/18.tar.gz -> libvarlink-18.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=807ad263c2855f764cbb6e3665bd21e2
diff --git a/metadata/md5-cache/dev-libs/libvarlink-19 b/metadata/md5-cache/dev-libs/libvarlink-19
index b15f9c21a668..b4a7042e0801 100644
--- a/metadata/md5-cache/dev-libs/libvarlink-19
+++ b/metadata/md5-cache/dev-libs/libvarlink-19
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/varlink/libvarlink/archive/19.tar.gz -> libvarlink-19.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=794b00220e5f500b0c130a0f2a5a494e
diff --git a/metadata/md5-cache/dev-libs/libverto-0.3.1-r1 b/metadata/md5-cache/dev-libs/libverto-0.3.1-r1
index 13aabb64c4a1..95236c76fdb5 100644
--- a/metadata/md5-cache/dev-libs/libverto-0.3.1-r1
+++ b/metadata/md5-cache/dev-libs/libverto-0.3.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=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(-)?] ) libev? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libevent? ( >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tevent? ( >=sys-libs/tevent-0.9.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Main event loop abstraction library
 EAPI=7
 HOMEPAGE=https://github.com/latchset/libverto/
 IUSE=glib +libev libevent tevent +threads static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=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(-)?] ) libev? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libevent? ( >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tevent? ( >=sys-libs/tevent-0.9.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( glib libev libevent tevent )
 SLOT=0
 SRC_URI=https://github.com/latchset/libverto/releases/download/0.3.1/libverto-0.3.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5b79ce3391c11ab4ecda7c49d3b00b44
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=814e206a8580f1d10c515e34337eb238
diff --git a/metadata/md5-cache/dev-libs/libvformat-1.13-r2 b/metadata/md5-cache/dev-libs/libvformat-1.13-r2
index dcce64200072..1c706c47529c 100644
--- a/metadata/md5-cache/dev-libs/libvformat-1.13-r2
+++ b/metadata/md5-cache/dev-libs/libvformat-1.13-r2
@@ -1,12 +1,11 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library to read and write vcard files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/vformat/
-IUSE=static-libs
 KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libv/libvformat/libvformat_1.13.orig.tar.gz mirror://debian/pool/main/libv/libvformat/libvformat_1.13-10.debian.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e8806e24bf1f7c1bf57d9a5d4e5652f2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2a094b0c33cb0560be98690e86991d80
diff --git a/metadata/md5-cache/dev-libs/libvoikko-4.3 b/metadata/md5-cache/dev-libs/libvoikko-4.3
deleted file mode 100644
index 4b22846f4c59..000000000000
--- a/metadata/md5-cache/dev-libs/libvoikko-4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( app-crypt/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install unpack
-DEPEND=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(-)] hfst? ( >=dev-util/hfstospell-0.5.0 )
-DESCRIPTION=Spell checking, hyphenation and morphological analysis tool for Finnish language
-EAPI=7
-HOMEPAGE=https://voikko.puimula.org/
-IUSE=+expvfst +hfst verify-sig python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
-KEYWORDS=amd64 x86
-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(-)] hfst? ( >=dev-util/hfstospell-0.5.0 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.tar.gz.asc )
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=64898926989b8ef0871ea1046769bb21
diff --git a/metadata/md5-cache/dev-libs/libvoikko-4.3.1 b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
index f9fd1cb12012..cf0685fc9167 100644
--- a/metadata/md5-cache/dev-libs/libvoikko-4.3.1
+++ b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
@@ -5,12 +5,12 @@ DESCRIPTION=Spell checking, hyphenation and morphological analysis tool for Finn
 EAPI=7
 HOMEPAGE=https://voikko.puimula.org/
 IUSE=+expvfst +hfst verify-sig python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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(-)] hfst? ( >=dev-util/hfstospell-0.5.0 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz.asc )
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=663db16aed1464f7db29fdd02d7783f9
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=8a9cbaa4e6c2bdc3e5e9367effea99c1
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.0_pre20181126 b/metadata/md5-cache/dev-libs/libvterm-0.0_pre20181126
index 669b1d0b8184..53e69afd2b15 100644
--- a/metadata/md5-cache/dev-libs/libvterm-0.0_pre20181126
+++ b/metadata/md5-cache/dev-libs/libvterm-0.0_pre20181126
@@ -1,12 +1,12 @@
+BDEPEND=sys-devel/libtool virtual/pkgconfig
 DEFINED_PHASES=compile install
-DEPEND=sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.leonerd.org.uk/code/libvterm/
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=!dev-libs/libvterm-neovim
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tranquility/distfiles/libvterm-0.0_pre20181126.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=94b81dd1aa22c64da9fa4a5c9eae928e
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6c1821011500f1e6aec011ac914ad2e2
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.1.1 b/metadata/md5-cache/dev-libs/libvterm-0.1.1
index ef8b1e879e61..08610f1d68bf 100644
--- a/metadata/md5-cache/dev-libs/libvterm-0.1.1
+++ b/metadata/md5-cache/dev-libs/libvterm-0.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!dev-libs/libvterm-neovim
 SLOT=0
 SRC_URI=https://launchpad.net/libvterm/trunk/v0.1/+download/libvterm-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=90680b8707beaa7a29dbca6c3d0f07cd
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5d93d82275c67d6a2c5223c27478d6e7
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.1.2 b/metadata/md5-cache/dev-libs/libvterm-0.1.2
index 499662019a77..e9eaaec8647c 100644
--- a/metadata/md5-cache/dev-libs/libvterm-0.1.2
+++ b/metadata/md5-cache/dev-libs/libvterm-0.1.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!dev-libs/libvterm-neovim
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2509acd3a5936dfdae9c46df5e03a6d
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8024fade9927455e47030612b81eafbb
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.1.3 b/metadata/md5-cache/dev-libs/libvterm-0.1.3
index ead564ff96a9..0819ac27f9b6 100644
--- a/metadata/md5-cache/dev-libs/libvterm-0.1.3
+++ b/metadata/md5-cache/dev-libs/libvterm-0.1.3
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
 EAPI=7
 HOMEPAGE=http://www.leonerd.org.uk/code/libvterm/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=!dev-libs/libvterm-neovim
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d9ade17b1b8b1fe77694e1d2f03c92b
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d1f7f925df1da9f36f8a82456932eaab
diff --git a/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150309 b/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150309
index 4127b5fc2dbc..cd746704a279 100644
--- a/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150309
+++ b/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150309
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/libvterm-neovim-0.0_pre20150309.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=19bca3b0120752e455e980f8d961047b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=afd8e461487bd614b9464ebecf457f47
diff --git a/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150621 b/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150621
index fd47f4773773..84f1519389b3 100644
--- a/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150621
+++ b/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150621
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/libvterm-neovim-0.0_pre20150621.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=19bca3b0120752e455e980f8d961047b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=afd8e461487bd614b9464ebecf457f47
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.1 b/metadata/md5-cache/dev-libs/libwacom-1.1
index bcf1b8d8f4ca..5927bd327dfa 100644
--- a/metadata/md5-cache/dev-libs/libwacom-1.1
+++ b/metadata/md5-cache/dev-libs/libwacom-1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.1/libwacom-1.1.tar.bz2
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=93eff8650a5f9f9acdbcfddc49736013
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.7 b/metadata/md5-cache/dev-libs/libwacom-1.7
index f7717c469167..9e4410bf1e64 100644
--- a/metadata/md5-cache/dev-libs/libwacom-1.7
+++ b/metadata/md5-cache/dev-libs/libwacom-1.7
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.7/libwacom-1.7.tar.bz2
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=02b802a7c14fbcce7e823c4b37399b86
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.9 b/metadata/md5-cache/dev-libs/libwacom-1.9
index 38e87f8e3ce4..00f269a9394a 100644
--- a/metadata/md5-cache/dev-libs/libwacom-1.9
+++ b/metadata/md5-cache/dev-libs/libwacom-1.9
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.9/libwacom-1.9.tar.bz2
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=02b802a7c14fbcce7e823c4b37399b86
diff --git a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.3-r1 b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.3-r1
index efb6e9633932..946697478f03 100644
--- a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.3-r1
+++ b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=string internment library, written in C
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libwapcaplet/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libwapcaplet-0.4.3-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9dcbb8b4d15da8d33c2f4845f7fb7da3
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	af8fe1901b583a379a6a32af919cea05	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c67e2f71112ffdc3c837d29e61e03682
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.7 b/metadata/md5-cache/dev-libs/libwbxml-0.11.7
index 03700553195b..e67b3b5a3505 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.7
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.7
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libwbxml/libwbxml/archive/libwbxml-0.11.7.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d8673c6ab6c167be7b9340f5715eccd
diff --git a/metadata/md5-cache/dev-libs/libx86-1.1-r4 b/metadata/md5-cache/dev-libs/libx86-1.1-r4
index 95c3465a85bc..e2d6daf02fc9 100644
--- a/metadata/md5-cache/dev-libs/libx86-1.1-r4
+++ b/metadata/md5-cache/dev-libs/libx86-1.1-r4
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58b79afcce279e1d8554ca2c396f8f61
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6bcb8fcea0adab3c77e54eb11c8dee7f
diff --git a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1 b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
index f027cb0e70ef..08560a42e7fc 100644
--- a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
@@ -1,12 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Small library to access XDG Base Directories Specification paths
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/devnev/libxdg-basedir
-IUSE=doc static-libs
+IUSE=doc
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-1.2.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d0e208b0f5d5a1b3128df94f704cc56a
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=192799c4f58b3f8fa6125c5870ea40af
diff --git a/metadata/md5-cache/dev-libs/libxdiff-0.23-r2 b/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
index 117cb1a9f8b4..ccc9cba0cd73 100644
--- a/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
+++ b/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for creating diff files
 EAPI=6
 HOMEPAGE=http://www.xmailserver.org/xdiff-lib.html
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.xmailserver.org/libxdiff-0.23.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f559089fdcebe785917762b266d45ee
diff --git a/metadata/md5-cache/dev-libs/libxls-1.6.2 b/metadata/md5-cache/dev-libs/libxls-1.6.2
index 275ee6811814..96e078c66d2e 100644
--- a/metadata/md5-cache/dev-libs/libxls-1.6.2
+++ b/metadata/md5-cache/dev-libs/libxls-1.6.2
@@ -8,5 +8,4 @@ LICENSE=BSD-2
 RESTRICT=test
 SLOT=0/8
 SRC_URI=https://github.com/libxls/libxls/releases/download/v1.6.2/libxls-1.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1b469954a1129170b4efd5578969e616
+_md5_=d6a2d1721a2dbe12c24b1a54bff329b0
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
index 4b41a72dbe77..066019801730 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
 DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
 IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-patchset.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c2bcda892639749c83a0a281e4d408b
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8af6419f32a7a26007b31858eeac4fe3
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r5 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r5
index b0740c08e92b..30003dd274a3 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r5
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r5
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
 DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
 IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-patchset.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=52d0e92bcf1da174c5b3e42c1f1870a8
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=67841ca5649809744eb3e36b3b396443
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.15 b/metadata/md5-cache/dev-libs/libxmlb-0.1.15
index c59f7fa12893..6aba690ff1eb 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.15
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.15
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.15.tar.gz -> libxmlb-0.1.15.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b4df9539c7ee384e2ebc812ee399eb18
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.2.1 b/metadata/md5-cache/dev-libs/libxmlb-0.2.1
index dfd33bd41b4e..04a15f3a1b40 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.2.1
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.2.1.tar.gz -> libxmlb-0.2.1.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=bcd656ab8c3a351dadebcb3185f50dce
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.3.0 b/metadata/md5-cache/dev-libs/libxmlb-0.3.0
index 92f25632b6ae..1da87b83f671 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.3.0
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.3.0.tar.gz -> libxmlb-0.3.0.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=bcd656ab8c3a351dadebcb3185f50dce
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
index a419557cc9e1..0584a14c4c4c 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
@@ -5,10 +5,10 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt
 IUSE=crypt debug examples static-libs elibc_Darwin 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6d074ff0a4b7a4925bbf2981c8769f83
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f7b6c6a2da0366f96b44e3f705ddac4b
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.2 b/metadata/md5-cache/dev-libs/libyaml-0.2.2
index b6303a078180..1d781da742f9 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.2
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.2
@@ -1,14 +1,13 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=YAML 1.1 parser and emitter written in C
 EAPI=7
 HOMEPAGE=https://github.com/yaml/libyaml
 IUSE=doc static-libs 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/libyaml/archive/0.2.2.tar.gz -> libyaml-0.2.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0c2b3967573de629523211821ff2bf7e
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8583e735da06e702b580a3afd7805f5d
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.5 b/metadata/md5-cache/dev-libs/libyaml-0.2.5
index 13c3d8f24883..1b6164691090 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.5
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.5
@@ -1,13 +1,13 @@
-BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=YAML 1.1 parser and emitter written in C
 EAPI=7
 HOMEPAGE=https://github.com/yaml/libyaml
 IUSE=doc static-libs 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/libyaml/archive/0.2.5.tar.gz -> libyaml-0.2.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3a1c619c199871a158ea5714de6d9015
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8583e735da06e702b580a3afd7805f5d
diff --git a/metadata/md5-cache/dev-libs/libzia-4.23 b/metadata/md5-cache/dev-libs/libzia-4.23
deleted file mode 100644
index 92d6607f4ae0..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.23
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 ) virtual/pkgconfig
-DESCRIPTION=platform abstraction code for tucnak package
-EAPI=7
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.23.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e8e5df6ccecfd6491da633d7605a49c0
diff --git a/metadata/md5-cache/dev-libs/libzia-4.24 b/metadata/md5-cache/dev-libs/libzia-4.24
deleted file mode 100644
index 785777058e11..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.24
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) virtual/pkgconfig
-DESCRIPTION=platform abstraction code for tucnak package
-EAPI=7
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.24.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=203bc420b6844d6d6a9fbae0059d5ef2
diff --git a/metadata/md5-cache/dev-libs/libzia-4.25 b/metadata/md5-cache/dev-libs/libzia-4.25
index fee972584e3a..e213e1cc51ac 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.25
+++ b/metadata/md5-cache/dev-libs/libzia-4.25
@@ -1,14 +1,14 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) virtual/pkgconfig
 DESCRIPTION=platform abstraction code for tucnak package
 EAPI=7
 HOMEPAGE=http://tucnak.nagano.cz
 IUSE=ftdi
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.25.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b94808a91c41b795110f5480bbfc4cb
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=910ff98b158cf0eeb19044b431872777
diff --git a/metadata/md5-cache/dev-libs/libzia-4.27 b/metadata/md5-cache/dev-libs/libzia-4.27
new file mode 100644
index 000000000000..00a01d2cedb0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.27
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) virtual/pkgconfig
+DESCRIPTION=platform abstraction code for tucnak package
+EAPI=7
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.27.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2b94808a91c41b795110f5480bbfc4cb
diff --git a/metadata/md5-cache/dev-libs/libzia-4.28 b/metadata/md5-cache/dev-libs/libzia-4.28
new file mode 100644
index 000000000000..506ed5b8ad78
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.28
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) virtual/pkgconfig
+DESCRIPTION=platform abstraction code for tucnak package
+EAPI=7
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.28.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2b94808a91c41b795110f5480bbfc4cb
diff --git a/metadata/md5-cache/dev-libs/libzip-1.7.3 b/metadata/md5-cache/dev-libs/libzip-1.7.3
index 0571651f491b..30db64347ff6 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.7.3
+++ b/metadata/md5-cache/dev-libs/libzip-1.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.7.3.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c0963042213260a20a0de69caebf601
diff --git a/metadata/md5-cache/dev-libs/light-1.2.2 b/metadata/md5-cache/dev-libs/light-1.2.2
index 07997c9c9465..2d98bda8df47 100644
--- a/metadata/md5-cache/dev-libs/light-1.2.2
+++ b/metadata/md5-cache/dev-libs/light-1.2.2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=udev? ( virtual/libudev:= )
 DESCRIPTION=A program to control backlights (and other hardware lights)
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/haikarainen/light/archive/v1.2.2.tar.gz -> light-1.2.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4dcbdc03b478930adc354d0e64d83292
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=df8c4f9eb33c1f360d48e39ab0f6827b
diff --git a/metadata/md5-cache/dev-libs/light-1.2.2-r1 b/metadata/md5-cache/dev-libs/light-1.2.2-r1
index 45319804a62e..527103b49aae 100644
--- a/metadata/md5-cache/dev-libs/light-1.2.2-r1
+++ b/metadata/md5-cache/dev-libs/light-1.2.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure postinst prepare
 DEPEND=udev? ( virtual/libudev:= ) acct-group/video
 DESCRIPTION=A program to control backlights (and other hardware lights)
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=acct-group/video
 SLOT=0
 SRC_URI=https://github.com/haikarainen/light/archive/v1.2.2.tar.gz -> light-1.2.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=3c53ac247318eb78b43e07838f4504fb
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.8.0 b/metadata/md5-cache/dev-libs/link-grammar-5.8.0
index 2515e0a50e33..e019725c9a88 100644
--- a/metadata/md5-cache/dev-libs/link-grammar-5.8.0
+++ b/metadata/md5-cache/dev-libs/link-grammar-5.8.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/swig:0 sys-devel/autoconf-archive virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-lang/swig:0 sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( 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(-)] ) !sci-mathematics/minisat java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A Syntactic English parser
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspel
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.abisource.com/downloads/link-grammar/5.8.0/link-grammar-5.8.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f8a094fbf85c5aa43aff974c2144a477
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.8.1 b/metadata/md5-cache/dev-libs/link-grammar-5.8.1
new file mode 100644
index 000000000000..d5a09337678f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/link-grammar-5.8.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/swig:0 sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( 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(-)] ) !sci-mathematics/minisat java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A Syntactic English parser
+EAPI=7
+HOMEPAGE=https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/
+IUSE=aspell +hunspell java python elibc_FreeBSD java python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( 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(-)] ) !sci-mathematics/minisat java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0/5
+SRC_URI=https://www.abisource.com/downloads/link-grammar/5.8.1/link-grammar-5.8.1.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8dbf9686c23c23c19a11fd8325b28435
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
index 8956677f3f2d..70b770cbf69e 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for locking devices
 EAPI=5
 HOMEPAGE=http://packages.debian.org/source/sid/lockdev
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4476cc727326ef5c782fdf519bcdd2b9
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c0495dd1a20ffb5bd9cbbb9914456ed6
diff --git a/metadata/md5-cache/dev-libs/log4cplus-1.2.0 b/metadata/md5-cache/dev-libs/log4cplus-1.2.0
index 989fa842a1d0..ab77a9612576 100644
--- a/metadata/md5-cache/dev-libs/log4cplus-1.2.0
+++ b/metadata/md5-cache/dev-libs/log4cplus-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
 REQUIRED_USE=?? ( iconv working-locale working-c-locale )
 SLOT=0/1.2-5
 SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/1.2.0/log4cplus-1.2.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ab8da484d8db3aadeb9c0750329b9ecf
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1.3 b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
index eaf228b0a490..711263c56fc5 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1.3
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=C++ classes for flexible logging to files, syslog and other destinations
 EAPI=6
 HOMEPAGE=http://log4cpp.sourceforge.net/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ppc s390 x86
+KEYWORDS=amd64 ~arm ppc ~s390 x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5e1b35a0729eac4a834d4eba6e8d3884
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8cbcf1b2afb8c99344ce1441b49ff84f
diff --git a/metadata/md5-cache/dev-libs/log4cxx-0.11.0 b/metadata/md5-cache/dev-libs/log4cxx-0.11.0
index cb86495e10b5..e96b73c5dfd0 100644
--- a/metadata/md5-cache/dev-libs/log4cxx-0.11.0
+++ b/metadata/md5-cache/dev-libs/log4cxx-0.11.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/apr:1= dev-libs/apr-util:1= odbc? ( iodbc? ( >=dev-db/libiodbc-3.52.4 ) !iodbc? ( dev-db/unixODBC ) ) smtp? ( net-libs/libesmtp )
 DESCRIPTION=Library of C++ classes for logging to files, syslog and other destinations
@@ -12,5 +12,5 @@ REQUIRED_USE=iodbc? ( !odbc )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b65027f18335662f4fbd0d85895ebe3e
diff --git a/metadata/md5-cache/dev-libs/log4sh-1.4.2 b/metadata/md5-cache/dev-libs/log4sh-1.4.2
index f836302d234f..5d94ba4b4dfa 100644
--- a/metadata/md5-cache/dev-libs/log4sh-1.4.2
+++ b/metadata/md5-cache/dev-libs/log4sh-1.4.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst test
 DESCRIPTION=A flexible logging framework for shell scripts
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/log4sh
 IUSE=examples
 KEYWORDS=amd64 ~arm ~ppc x86
@@ -8,5 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=mirror://sourceforge/log4sh/log4sh-1.4.2.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ed295665d602d4b8da9eea0981ba0c33
+_md5_=325b59cb94833044bd3a1503155fa6d3
diff --git a/metadata/md5-cache/dev-libs/luise-0.1.1-r1 b/metadata/md5-cache/dev-libs/luise-0.1.1-r1
index a34c931bf12b..4f896879138a 100644
--- a/metadata/md5-cache/dev-libs/luise-0.1.1-r1
+++ b/metadata/md5-cache/dev-libs/luise-0.1.1-r1
@@ -8,5 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~conikost/files/LUIse_0.1.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=73127d4cde76de8d5afb4d51d2d53e73
+_md5_=b4eeeeb459edae31dfa67e87db28cd85
diff --git a/metadata/md5-cache/dev-libs/lzo-2.10 b/metadata/md5-cache/dev-libs/lzo-2.10
index 60d3d3baf1bf..064b575d7b59 100644
--- a/metadata/md5-cache/dev-libs/lzo-2.10
+++ b/metadata/md5-cache/dev-libs/lzo-2.10
@@ -3,9 +3,9 @@ DESCRIPTION=An extremely fast compression and decompression library
 EAPI=7
 HOMEPAGE=https://www.oberhumer.com/opensource/lzo/
 IUSE=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 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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+
 SLOT=2
 SRC_URI=https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=f98e919085bdab6b5fb73ca5d50da804
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=70857e091e9db6e3fcb02e62c78749bc
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.7.0 b/metadata/md5-cache/dev-libs/m17n-lib-1.7.0
index e0690ff241ca..fc803b29f16b 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.7.0
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=~dev-db/m17n-db-1.7.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=~dev-db/m17n-db-1.7.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Multilingual Library for Unix/Linux
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-db/m17n-db-1.7.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/m17n-lib-1.7.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51e3b7e263dbf8036d9b07c036194681
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.8.0 b/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
index 78db0faf7798..061138b8f860 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=~dev-db/m17n-db-1.8.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=~dev-db/m17n-db-1.8.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Multilingual Library for Unix/Linux
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-db/m17n-db-1.8.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/m17n-lib-1.8.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7ea7679b4079a3a88d77eedc54c3c3c
diff --git a/metadata/md5-cache/dev-libs/maloc-1.5-r1 b/metadata/md5-cache/dev-libs/maloc-1.5-r1
index 4832df70d30f..01c564097927 100644
--- a/metadata/md5-cache/dev-libs/maloc-1.5-r1
+++ b/metadata/md5-cache/dev-libs/maloc-1.5-r1
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-libs/readline:0= mpi? ( virtual/mpi )
 DESCRIPTION=Minimal Abstraction Layer for Object-oriented C/C++ programs
 EAPI=7
 HOMEPAGE=http://www.fetk.org/codes/maloc/index.html
-IUSE=doc mpi static-libs
+IUSE=doc mpi
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/maloc-1.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9218f46978774e8f82aeb1da18cb1f89
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=82d228ad26492722ecfc89fef04455ed
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.5 b/metadata/md5-cache/dev-libs/marisa-0.2.5
index 56fb9c8cac42..f8f5a186f2ba 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.5
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.5
@@ -1,4 +1,4 @@
-BDEPEND=python? ( 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-lang/swig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=python? ( 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-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=python? ( 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(-)] )
 DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.5.tar.gz -> marisa-0.2.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	d8655e1387589a2e1930339b1627d5c1	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c35b890a583ed7b127a18e669957d827
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.6 b/metadata/md5-cache/dev-libs/marisa-0.2.6
index 696ec53d2e5c..136f939f0b2c 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.6
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.6
@@ -1,4 +1,4 @@
-BDEPEND=python? ( 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-lang/swig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=python? ( 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-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=python? ( 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(-)] )
 DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.6.tar.gz -> marisa-0.2.6.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	d8655e1387589a2e1930339b1627d5c1	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9a0b4112aed00b916b4dfaeb72068bee
diff --git a/metadata/md5-cache/dev-libs/marisa-9999 b/metadata/md5-cache/dev-libs/marisa-9999
index 151241f2a79e..7300c50e3edc 100644
--- a/metadata/md5-cache/dev-libs/marisa-9999
+++ b/metadata/md5-cache/dev-libs/marisa-9999
@@ -1,4 +1,4 @@
-BDEPEND=python? ( 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-lang/swig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( 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-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=python? ( 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(-)] )
 DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python? ( 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? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77b6ae521e5134a8420679ec199fb8b7
diff --git a/metadata/md5-cache/dev-libs/mathjax-2.7.0 b/metadata/md5-cache/dev-libs/mathjax-2.7.0
index 9008516a3597..2504736a5171 100644
--- a/metadata/md5-cache/dev-libs/mathjax-2.7.0
+++ b/metadata/md5-cache/dev-libs/mathjax-2.7.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax/archive/2.7.0.tar.gz -> mathjax-2.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dcb8a6671e1cd2fc34331e7c0f0932a6
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=93063b7add57ea5a6b4936857420f888
diff --git a/metadata/md5-cache/dev-libs/mathjax-2.7.4 b/metadata/md5-cache/dev-libs/mathjax-2.7.4
index a50b04ba9526..a0f0a9063523 100644
--- a/metadata/md5-cache/dev-libs/mathjax-2.7.4
+++ b/metadata/md5-cache/dev-libs/mathjax-2.7.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax/archive/2.7.4.tar.gz -> mathjax-2.7.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dcb8a6671e1cd2fc34331e7c0f0932a6
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=93063b7add57ea5a6b4936857420f888
diff --git a/metadata/md5-cache/dev-libs/mathjax-2.7.7 b/metadata/md5-cache/dev-libs/mathjax-2.7.7
index 6c83772bcb53..4411847248fa 100644
--- a/metadata/md5-cache/dev-libs/mathjax-2.7.7
+++ b/metadata/md5-cache/dev-libs/mathjax-2.7.7
@@ -10,4 +10,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax/archive/2.7.7.tar.gz -> mathjax-2.7.7.tar.gz
 _eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=af33fa58dddbeed5fd72c0c3326c9b72
+_md5_=960c1607b6700d0ad442e73471937835
diff --git a/metadata/md5-cache/dev-libs/mimetic-0.9.8 b/metadata/md5-cache/dev-libs/mimetic-0.9.8
index ca5afc89756f..847dc2e420d3 100644
--- a/metadata/md5-cache/dev-libs/mimetic-0.9.8
+++ b/metadata/md5-cache/dev-libs/mimetic-0.9.8
@@ -1,12 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=C++ MIME library designed to be easy to use and integrate, fast and efficient.
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.codesink.org/mimetic_mime_library.html
 IUSE=doc examples
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.codesink.org/download/mimetic-0.9.8.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=291d949e0c8f8e3c1350d9a325afd236
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7757a1b6706302cac797e51e3fe203ed
diff --git a/metadata/md5-cache/dev-libs/miniz-2.1.0-r2 b/metadata/md5-cache/dev-libs/miniz-2.1.0-r2
index bd284bce4a83..815fddcc9b1d 100644
--- a/metadata/md5-cache/dev-libs/miniz-2.1.0-r2
+++ b/metadata/md5-cache/dev-libs/miniz-2.1.0-r2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/richgel999/miniz/archive/2.1.0.tar.gz -> miniz-2.1.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=507af81056ea007e4aea2a0f1ae25849
diff --git a/metadata/md5-cache/dev-libs/miniz-9999 b/metadata/md5-cache/dev-libs/miniz-9999
index 3849affc8763..fddd71ba2203 100644
--- a/metadata/md5-cache/dev-libs/miniz-9999
+++ b/metadata/md5-cache/dev-libs/miniz-9999
@@ -7,5 +7,5 @@ IUSE=examples static-libs
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51df71e46b9f5f7b5f4507c4192fa2cc
diff --git a/metadata/md5-cache/dev-libs/mm-1.4.2-r2 b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
index f8f8c9daa9f1..97c56141fa52 100644
--- a/metadata/md5-cache/dev-libs/mm-1.4.2-r2
+++ b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install prepare test
 DESCRIPTION=Shared Memory Abstraction Library
 EAPI=6
 HOMEPAGE=http://www.ossp.org/pkg/lib/mm/
-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=mm
 SLOT=1.2
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/mm/mm-1.4.2.tar.gz
-_md5_=459cecdb940dfa2067a31168b03e65d3
+_md5_=53922d8616e956d9eef670b46b47eb6f
diff --git a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0 b/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0
index 34397e74d905..60e1f3464324 100644
--- a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0
+++ b/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/msgpack
 SLOT=0
 SRC_URI=https://github.com/rcsb/mmtf-cpp/archive/v1.0.0.tar.gz -> mmtf-cpp-1.0.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f08877a23a7038f1d23685891d2946bf
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.16.2 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.16.2
index b257dab12b55..39fd7cb1d2e9 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.16.2
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.16.2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=x86? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.16.2/mongo-c-driver-1.16.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab1035fe91745a27837ee5e6a631e208
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.17.0 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.17.0
index 23710cf6964a..51be4856b653 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.17.0
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=x86? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.17.0/mongo-c-driver-1.17.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=722a43af2de99e6ed74b25934384e5c0
diff --git a/metadata/md5-cache/dev-libs/mpc-1.2.1 b/metadata/md5-cache/dev-libs/mpc-1.2.1
index 9f31f0a1577a..0ade8bd1fe59 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.2.1
+++ b/metadata/md5-cache/dev-libs/mpc-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=7
 HOMEPAGE=http://mpc.multiprecision.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.0.0: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(-)?,static-libs?] >=dev-libs/mpfr-4.1.0: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(-)?,static-libs?]
 SLOT=0/3
 SRC_URI=mirror://gnu/mpc/mpc-1.2.1.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cb6fb0b6c0aac82a1288320cb3898b2b
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f2a55024954242c81b021800f0848649
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.1.0 b/metadata/md5-cache/dev-libs/mpfr-4.1.0
index 302a7220bc2c..eaa8f7ba5a6f 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.1.0
+++ b/metadata/md5-cache/dev-libs/mpfr-4.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=7
 HOMEPAGE=https://www.mpfr.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.0.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(-)?,static-libs?]
 SLOT=0/6
 SRC_URI=https://www.mpfr.org/mpfr-4.1.0/mpfr-4.1.0.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a87aec809829f34d6e91dd38e6f95bd7
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d3d5aaceea7966d0203fa163f34b538d
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.3.0 b/metadata/md5-cache/dev-libs/msgpack-3.3.0
index 036d2b20580e..5a1a490371c2 100644
--- a/metadata/md5-cache/dev-libs/msgpack-3.3.0
+++ b/metadata/md5-cache/dev-libs/msgpack-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=460fb896c6e1f1a3d98780e9e6ff0edb
diff --git a/metadata/md5-cache/dev-libs/mxml-3.2 b/metadata/md5-cache/dev-libs/mxml-3.2
index 8e44f8740ea4..6a5813f65801 100644
--- a/metadata/md5-cache/dev-libs/mxml-3.2
+++ b/metadata/md5-cache/dev-libs/mxml-3.2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare test
 DESCRIPTION=A small XML parsing library that you can use to read XML data files or strings
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=Mini-XML
 SLOT=0
 SRC_URI=https://github.com/michaelrsweet/mxml/archive/v3.2.tar.gz -> mxml-3.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3e4a24de1de70658003c4953444c72b1
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b06e75691cd0a178b9dc8d330045a433
diff --git a/metadata/md5-cache/dev-libs/nanomsg-1.1.5 b/metadata/md5-cache/dev-libs/nanomsg-1.1.5
index b683379ee0cf..8a0aeb6d994d 100644
--- a/metadata/md5-cache/dev-libs/nanomsg-1.1.5
+++ b/metadata/md5-cache/dev-libs/nanomsg-1.1.5
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0/5.0.0
 SRC_URI=https://github.com/nanomsg/nanomsg/archive/1.1.5.tar.gz -> nanomsg-1.1.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb1aa8e71a111d5bcfcf56c182a316d7
diff --git a/metadata/md5-cache/dev-libs/ncnn-20200226 b/metadata/md5-cache/dev-libs/ncnn-20200226
index d906482a0fa6..df693d1c4d69 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20200226
+++ b/metadata/md5-cache/dev-libs/ncnn-20200226
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-util/glslang dev-util/vulkan-headers media-libs/vulkan-loader
 SLOT=0
 SRC_URI=https://github.com/Tencent/ncnn/archive/20200226.tar.gz -> ncnn-20200226.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad362c980db8c1f22f0242d262bbeea0
diff --git a/metadata/md5-cache/dev-libs/ncnn-20200413 b/metadata/md5-cache/dev-libs/ncnn-20200413
index c4e10375c42b..2e1e8a4462be 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20200413
+++ b/metadata/md5-cache/dev-libs/ncnn-20200413
@@ -10,5 +10,5 @@ RDEPEND=dev-util/glslang dev-util/vulkan-headers media-libs/vulkan-loader
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Tencent/ncnn/archive/20200413.tar.gz -> ncnn-20200413.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf32539b0441c675fdeb98f8fb688390
diff --git a/metadata/md5-cache/dev-libs/ncnn-20200727 b/metadata/md5-cache/dev-libs/ncnn-20200727
index 1f12992e7925..9b04180bb58f 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20200727
+++ b/metadata/md5-cache/dev-libs/ncnn-20200727
@@ -10,5 +10,5 @@ RDEPEND=dev-util/glslang dev-util/vulkan-headers media-libs/vulkan-loader
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Tencent/ncnn/archive/20200727.tar.gz -> ncnn-20200727.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf32539b0441c675fdeb98f8fb688390
diff --git a/metadata/md5-cache/dev-libs/ncnn-20210322 b/metadata/md5-cache/dev-libs/ncnn-20210322
new file mode 100644
index 000000000000..413fba87cea7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ncnn-20210322
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/glslang dev-util/vulkan-headers media-libs/vulkan-loader
+DESCRIPTION=A high-performance neural network inference framework
+EAPI=7
+HOMEPAGE=https://github.com/Tencent/ncnn
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-util/glslang dev-util/vulkan-headers media-libs/vulkan-loader
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Tencent/ncnn/archive/20210322.tar.gz -> ncnn-20210322.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a4f8959a5ddd4a95c8ce126edcf8fe8a
diff --git a/metadata/md5-cache/dev-libs/nettle-3.6-r2 b/metadata/md5-cache/dev-libs/nettle-3.6-r2
index 9f47f15cddbf..96a37fbd686b 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.6-r2
+++ b/metadata/md5-cache/dev-libs/nettle-3.6-r2
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[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(-)?] )
 DESCRIPTION=Low-level cryptographic library
 EAPI=7
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 IUSE=+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha 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 ~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 ~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=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/8-6
 SRC_URI=mirror://gnu/nettle/nettle-3.6.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=777cd39c095a90740f7adbe980a9d3d7
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b6b9c06f5ad191cf63b4004a0d1a419d
diff --git a/metadata/md5-cache/dev-libs/nettle-3.6-r3 b/metadata/md5-cache/dev-libs/nettle-3.6-r3
index b2cb1bd64e96..6242d00f2c48 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.6-r3
+++ b/metadata/md5-cache/dev-libs/nettle-3.6-r3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( sys-apps/texinfo ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( sys-apps/texinfo ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[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(-)?] )
 DESCRIPTION=Low-level cryptographic library
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,
 RESTRICT=!test? ( test )
 SLOT=0/8-6
 SRC_URI=mirror://gnu/nettle/nettle-3.6.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ed46e382855f4a1f30ea7806d54c97e7
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=902a51dde9dbb389d60f3c684b83ce2b
diff --git a/metadata/md5-cache/dev-libs/nettle-3.7.1 b/metadata/md5-cache/dev-libs/nettle-3.7.1
index c90248eebb5d..bd74099727b0 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.7.1
+++ b/metadata/md5-cache/dev-libs/nettle-3.7.1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( sys-apps/texinfo ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( sys-apps/texinfo ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[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(-)?] )
 DESCRIPTION=Low-level cryptographic library
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,
 RESTRICT=!test? ( test )
 SLOT=0/8-6
 SRC_URI=mirror://gnu/nettle/nettle-3.7.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5e0fa8d483440cf8bf8f091f40925350
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9563f3baa9c5a14009b861c76e3b3bdf
diff --git a/metadata/md5-cache/dev-libs/nettle-3.7.2 b/metadata/md5-cache/dev-libs/nettle-3.7.2
index 9e0ed232e718..6d1b4568debb 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.7.2
+++ b/metadata/md5-cache/dev-libs/nettle-3.7.2
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( sys-apps/texinfo ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( sys-apps/texinfo ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[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(-)?] )
 DESCRIPTION=Low-level cryptographic library
 EAPI=7
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 IUSE=+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha 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 ~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=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/8-6
 SRC_URI=mirror://gnu/nettle/nettle-3.7.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5e0fa8d483440cf8bf8f091f40925350
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=05ecad08767b2a3996c977b7ea40624b
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.21-r1 b/metadata/md5-cache/dev-libs/newt-0.52.21-r1
index 99f3c563558d..dea895718141 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.21-r1
+++ b/metadata/md5-cache/dev-libs/newt-0.52.21-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=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-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 DESCRIPTION=Redhat's Newt windowing toolkit development files
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.pagure.org/newt/newt-0.52.21.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9cd8cde29516b133ff61d1dfcc5daad5
diff --git a/metadata/md5-cache/dev-libs/nmeap-0.3-r1 b/metadata/md5-cache/dev-libs/nmeap-0.3-r1
index 7fc7b19163e9..15589e459712 100644
--- a/metadata/md5-cache/dev-libs/nmeap-0.3-r1
+++ b/metadata/md5-cache/dev-libs/nmeap-0.3-r1
@@ -1,5 +1,5 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile install prepare
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Extensible NMEA-0183 (GPS) data parser in standard C
 EAPI=7
 HOMEPAGE=http://nmeap.sourceforge.net/
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/nmeap/nmeap-0.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9a25fd7315b127bfe88a4d6b6a8caec1
+_md5_=d63e1c5381acbae50e650305834a92fa
diff --git a/metadata/md5-cache/dev-libs/npth-1.6-r1 b/metadata/md5-cache/dev-libs/npth-1.6-r1
index 9d107cbd3c58..877f805b9f0c 100644
--- a/metadata/md5-cache/dev-libs/npth-1.6-r1
+++ b/metadata/md5-cache/dev-libs/npth-1.6-r1
@@ -1,11 +1,11 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=New GNU Portable Threads Library
 EAPI=7
 HOMEPAGE=https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
-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=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.6.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6306d0a5eb564144bbe43fd20c8634be
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2318ec7dc94fc410bfcf3b3924ef711b
diff --git a/metadata/md5-cache/dev-libs/nsgenbind-0.8-r1 b/metadata/md5-cache/dev-libs/nsgenbind-0.8-r1
index cb10087cdc38..10e3e2100df4 100644
--- a/metadata/md5-cache/dev-libs/nsgenbind-0.8-r1
+++ b/metadata/md5-cache/dev-libs/nsgenbind-0.8-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Generate Javascript-to-DOM bindings from w3c webidl files
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
 SLOT=0/0.8
 SRC_URI=https://download.netsurf-browser.org/libs/releases/nsgenbind-0.8-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2bfea36f94f18a8e8759803ec1d2b243
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	af8fe1901b583a379a6a32af919cea05	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1e9fab78fad484b733631b68f81a4019
diff --git a/metadata/md5-cache/dev-libs/nspr-4.26 b/metadata/md5-cache/dev-libs/nspr-4.26
deleted file mode 100644
index 49e30d67840b..000000000000
--- a/metadata/md5-cache/dev-libs/nspr-4.26
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Netscape Portable Runtime
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/nspr/
-IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.26/src/nspr-4.26.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bfe998c3d6dd738c92f69947089b6827
diff --git a/metadata/md5-cache/dev-libs/nspr-4.27 b/metadata/md5-cache/dev-libs/nspr-4.27
deleted file mode 100644
index aeb0f58349df..000000000000
--- a/metadata/md5-cache/dev-libs/nspr-4.27
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Netscape Portable Runtime
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/nspr/
-IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.27/src/nspr-4.27.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=36bf29e93056adadfbfd73980ea75d51
diff --git a/metadata/md5-cache/dev-libs/nspr-4.28 b/metadata/md5-cache/dev-libs/nspr-4.28
deleted file mode 100644
index 4dcd7eca980b..000000000000
--- a/metadata/md5-cache/dev-libs/nspr-4.28
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Netscape Portable Runtime
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/nspr/
-IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.28/src/nspr-4.28.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bfe998c3d6dd738c92f69947089b6827
diff --git a/metadata/md5-cache/dev-libs/nspr-4.29 b/metadata/md5-cache/dev-libs/nspr-4.29
deleted file mode 100644
index 812e89d18050..000000000000
--- a/metadata/md5-cache/dev-libs/nspr-4.29
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Netscape Portable Runtime
-EAPI=7
-HOMEPAGE=https://www.mozilla.org/projects/nspr/
-IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.29/src/nspr-4.29.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9dca15b3002bdf88ff687e57f1bd152c
diff --git a/metadata/md5-cache/dev-libs/nspr-4.30 b/metadata/md5-cache/dev-libs/nspr-4.30
index 58841409af88..d31f8f8685a7 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.30
+++ b/metadata/md5-cache/dev-libs/nspr-4.30
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Netscape Portable Runtime
 EAPI=7
 HOMEPAGE=https://www.mozilla.org/projects/nspr/
 IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.30/src/nspr-4.30.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e31a0647481cf26e9ea25f880db15693
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e481efa9319f7fd2257a706ea541d8f7
diff --git a/metadata/md5-cache/dev-libs/nss-3.62 b/metadata/md5-cache/dev-libs/nss-3.62
deleted file mode 100644
index 99d4b9bb260c..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.62
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
-IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_62_RTM/src/nss-3.62.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb467ed23ecd9607b011653107b81c68
diff --git a/metadata/md5-cache/dev-libs/nss-3.58-r2 b/metadata/md5-cache/dev-libs/nss-3.63.1
index 5a4514ac4310..e66b5c7ef690 100644
--- a/metadata/md5-cache/dev-libs/nss-3.58-r2
+++ b/metadata/md5-cache/dev-libs/nss-3.63.1
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=7
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 RESTRICT=test
 SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_58_RTM/src/nss-3.58.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3172672cbe041d32e31c108159192c0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_63_1_RTM/src/nss-3.63.1.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc7cae0807d0227d359fa9d5796761be
diff --git a/metadata/md5-cache/dev-libs/nss-3.63 b/metadata/md5-cache/dev-libs/nss-3.64
index 6b45312036c8..46fe7b2893ad 100644
--- a/metadata/md5-cache/dev-libs/nss-3.63
+++ b/metadata/md5-cache/dev-libs/nss-3.64
@@ -9,6 +9,6 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 RESTRICT=test
 SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_63_RTM/src/nss-3.63.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb467ed23ecd9607b011653107b81c68
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_64_RTM/src/nss-3.64.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=582108b66f9ae34b4a54d9a0a02e79b3
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.5 b/metadata/md5-cache/dev-libs/nss-pem-1.0.5
index ab01e03df064..810a40b4b9b6 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.5
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.5
@@ -10,5 +10,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.5/nss-pem-1.0.5.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b6fb766b6b8d28c8aa508ff893c1ac7
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.6 b/metadata/md5-cache/dev-libs/nss-pem-1.0.6
index 84b9519a90ae..b7e68e62a1fa 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.6
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.6
@@ -10,5 +10,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.6/nss-pem-1.0.6.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb01f658d69e65c5ae661bd51fa52302
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.7 b/metadata/md5-cache/dev-libs/nss-pem-1.0.7
index a2624db49172..97bc04207130 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.7
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=PEM file reader for Network Security Services (NSS)
 EAPI=7
 HOMEPAGE=https://github.com/kdudka/nss-pem
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x64-solaris
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris
 LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.7/nss-pem-1.0.7.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=890e6ed2688bd8a5802d01c1970d3398
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4e642cb29dbd91d47ad9619f954ed9d
diff --git a/metadata/md5-cache/dev-libs/nsync-1.20.1 b/metadata/md5-cache/dev-libs/nsync-1.20.1
index 8cf412a1da0d..8f1c0b83b3a1 100644
--- a/metadata/md5-cache/dev-libs/nsync-1.20.1
+++ b/metadata/md5-cache/dev-libs/nsync-1.20.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/nsync/archive/1.20.1.tar.gz -> nsync-1.20.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d0d8c692b2cbb5f499c6782d9c3af0f
diff --git a/metadata/md5-cache/dev-libs/nsync-1.24.0 b/metadata/md5-cache/dev-libs/nsync-1.24.0
index f04302878e00..796ca6f06e7b 100644
--- a/metadata/md5-cache/dev-libs/nsync-1.24.0
+++ b/metadata/md5-cache/dev-libs/nsync-1.24.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/nsync/archive/1.24.0.tar.gz -> nsync-1.24.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a26f98839b524ebbbf2d42f85391332e
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3 b/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3
index 25ed7e71140a..94c18a9dd6a1 100644
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=|| ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-util/opencl-headers
 DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-util/opencl-headers !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
 SLOT=0
 SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.2.12.tar.gz -> ocl-icd-2.2.12.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ef4474a161eed409ffa09c5cdd50dfdf
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.2.14 b/metadata/md5-cache/dev-libs/ocl-icd-2.2.14
index e584b1cd572f..1199865a75ef 100644
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.2.14
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.2.14
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=|| ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-util/opencl-headers-2020.12.18
 DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-util/opencl-headers-2020.12.18 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
 SLOT=0
 SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.2.14.tar.gz -> ocl-icd-2.2.14.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f739e9e4d0475659aa348b58bbfe272
diff --git a/metadata/md5-cache/dev-libs/onigmo-6.1.3 b/metadata/md5-cache/dev-libs/onigmo-6.1.3
index 0b14e23edaac..4315d6e21863 100644
--- a/metadata/md5-cache/dev-libs/onigmo-6.1.3
+++ b/metadata/md5-cache/dev-libs/onigmo-6.1.3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Onigmo is a regular expressions library forked from Oniguruma
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD-2
 SLOT=0/6
 SRC_URI=https://github.com/k-takata/Onigmo/releases/download/Onigmo-6.1.3/onigmo-6.1.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ccd23e36fb12fedac3bb5a5328e5967f
diff --git a/metadata/md5-cache/dev-libs/onigmo-6.2.0 b/metadata/md5-cache/dev-libs/onigmo-6.2.0
index 2c73efe195b6..3558d050999f 100644
--- a/metadata/md5-cache/dev-libs/onigmo-6.2.0
+++ b/metadata/md5-cache/dev-libs/onigmo-6.2.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Onigmo is a regular expressions library forked from Oniguruma
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD-2
 SLOT=0/6
 SRC_URI=https://github.com/k-takata/Onigmo/releases/download/Onigmo-6.2.0/onigmo-6.2.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8acc57d176314f3948c3fe3a433c02d3
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.6-r1 b/metadata/md5-cache/dev-libs/oniguruma-6.9.6-r1
index 142beb0b1877..91ac2e73861d 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.6-r1
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.6-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Regular expression library for different character encodings
 EAPI=7
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=crnl-as-line-terminator 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 ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.6/onig-6.9.6.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e6b5ff355aa6b10cb461a67196dc1f1f
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a2af9efbdd61e218fc0686742fe27548
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.7 b/metadata/md5-cache/dev-libs/oniguruma-6.9.7
new file mode 100644
index 000000000000..11a57da446dc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Regular expression library for different character encodings
+EAPI=7
+HOMEPAGE=https://github.com/kkos/oniguruma
+IUSE=crnl-as-line-terminator 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 ~x86-solaris
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.7/onig-6.9.7.tar.gz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8558b8513fea566be5375fcbecb6ef92
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1 b/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
new file mode 100644
index 000000000000..77c6647dd2aa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Regular expression library for different character encodings
+EAPI=7
+HOMEPAGE=https://github.com/kkos/oniguruma
+IUSE=crnl-as-line-terminator 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 ~x86-solaris
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.7.1/onig-6.9.7.1.tar.gz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d03560ac7bab2ae35e6c65b114033353
diff --git a/metadata/md5-cache/dev-libs/oniguruma-9999 b/metadata/md5-cache/dev-libs/oniguruma-9999
index a057852da501..82e0aae5fc0c 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-9999
+++ b/metadata/md5-cache/dev-libs/oniguruma-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Regular expression library for different character encodings
 EAPI=7
@@ -7,5 +7,5 @@ IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_m
 LICENSE=BSD-2
 PROPERTIES=live
 SLOT=0/5
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d9690b41ea7b9af7ed7b34636ab3e4a1
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
index 11aeed2d9587..efa76acd07e7 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[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/spirv-llvm-translator:10=[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=10
 SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-1.tar.gz -> opencl-clang-10.0.0.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=889574872c884c7f5fd28ff9a25edff7
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
index b526c3c19340..d8b2386f86ff 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[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/spirv-llvm-translator-10.0.0_p20200909:10=[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=10
 SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-2.tar.gz -> opencl-clang-10.0.0.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c04a100a7c06f0e6a9be219aac58951
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-11.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-11.0.0
index b7fe99f66611..50ce1d70b2e9 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-11.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-11.0.0
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/clang-11.0.1:11=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11=[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/spirv-llvm-translator-11.0.0:11=[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=11
 SRC_URI=https://github.com/intel/opencl-clang/archive/v11.0.0.tar.gz -> opencl-clang-11.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c50bad7465865f57ddb3a888e2633197
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222 b/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222
index ccb28ba8d848..e0c24ec19154 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222
+++ b/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-util/spirv-llvm-translator-11.0.0:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/clang-11.1.0:11=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11=[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=11
 SRC_URI=https://github.com/intel/opencl-clang/archive/c67648d41df00ea8ee9d701d17299b86f86f0321.tar.gz -> opencl-clang-11.1.0_pre20201222.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83c749cbbb048d741eb5bfb4b8fa0264
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
deleted file mode 100644
index 7d3ad53014ad..000000000000
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/opencl-headers !app-eselect/eselect-opencl !dev-libs/ocl-icd
-DESCRIPTION=Official Khronos OpenCL ICD Loader
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/OpenCL-ICD-Loader
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/opencl-headers !app-eselect/eselect-opencl !dev-libs/ocl-icd
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2020.03.13.tar.gz -> opencl-icd-loader-2020.03.13.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=913ee998c63a2fa22dee58672f02a2dc
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.06.16 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.06.16
index 103fb2682ca2..479e39269331 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.06.16
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.06.16
@@ -11,5 +11,5 @@ RDEPEND=dev-util/opencl-headers !app-eselect/eselect-opencl !dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2020.06.16.tar.gz -> opencl-icd-loader-2020.06.16.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=913ee998c63a2fa22dee58672f02a2dc
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1 b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1
deleted file mode 100644
index a7bdbd1867fa..000000000000
--- a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=tpm? ( app-crypt/trousers ) !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= )
-DESCRIPTION=PKCS#11 provider cryptographic hardware
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/opencryptoki
-IUSE=debug libressl +tpm
-KEYWORDS=~amd64 ~arm ~arm64 ~s390 ~x86
-LICENSE=CPL-0.5
-RDEPEND=tpm? ( app-crypt/trousers ) !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/opencryptoki/3.6.1/opencryptoki-3.6.1.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ff5817c66ec7e5138f34090667795981
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1-r1 b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1-r1
new file mode 100644
index 000000000000..0c01f4269fea
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=tpm? ( app-crypt/trousers ) !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= )
+DESCRIPTION=PKCS#11 provider cryptographic hardware
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/opencryptoki
+IUSE=debug libressl +tpm
+KEYWORDS=~amd64 ~arm ~arm64 ~s390 ~x86
+LICENSE=CPL-0.5
+RDEPEND=tpm? ( app-crypt/trousers ) !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) acct-group/pkcs11
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/opencryptoki/3.6.1/opencryptoki-3.6.1.tgz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2a1e0898a4f93b15d914161d6dee7878
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r4 b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
index e73370cb30e7..190c0911e301 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r4
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
@@ -4,11 +4,11 @@ DEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 )
 DESCRIPTION=library for accessing smart card terminals
 EAPI=7
 HOMEPAGE=https://github.com/OpenSC/openct/wiki
-IUSE=doc pcsc-lite usb debug
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+IUSE=doc debug pcsc-lite usb
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aa8a8c22a80f42ce715e0276f7328184
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6f7a9e46824c768cc1de38186b5c79ac
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r5 b/metadata/md5-cache/dev-libs/openct-0.6.20-r5
new file mode 100644
index 000000000000..de4d5c8cf427
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r5
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0=
+DESCRIPTION=library for accessing smart card terminals
+EAPI=7
+HOMEPAGE=https://github.com/OpenSC/openct/wiki
+IUSE=doc debug pcsc-lite usb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0= acct-group/openct acct-user/openctd
+SLOT=0
+SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f59e636585d4486fa492ef0b688f8346
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.2-r1 b/metadata/md5-cache/dev-libs/openobex-1.7.2-r1
deleted file mode 100644
index bea36833559b..000000000000
--- a/metadata/md5-cache/dev-libs/openobex-1.7.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Implementation of the OBEX protocol used for transferring data to mobile devices
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/openobex/
-IUSE=bluetooth doc irda usb
-KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
-SLOT=0/2
-SRC_URI=mirror://sourceforge/openobex/1.7.2/openobex-1.7.2-Source.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e17d910158e8410b5b9e17d0e84e0acc
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.2-r2 b/metadata/md5-cache/dev-libs/openobex-1.7.2-r2
index 9a184b0d4ad9..3dabe5ddbef9 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.2-r2
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.2-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.2/openobex-1.7.2-Source.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d29c3771deed310e81edf612a76311d7
diff --git a/metadata/md5-cache/dev-libs/opensc-0.21.0 b/metadata/md5-cache/dev-libs/opensc-0.21.0
index c869f66012e3..4f64abfec898 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.21.0
+++ b/metadata/md5-cache/dev-libs/opensc-0.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e6199c717b28e7aea1ef85927913aa3f
diff --git a/metadata/md5-cache/dev-libs/opensc-0.21.0-r1 b/metadata/md5-cache/dev-libs/opensc-0.21.0-r1
index e65c174d833f..ccc6904e3fc8 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.21.0-r1
+++ b/metadata/md5-cache/dev-libs/opensc-0.21.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=490c8d1b176a82122a18a384fe7b8b65
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2u b/metadata/md5-cache/dev-libs/openssl-1.0.2u
index a37bda4f3aaf..5eb51271c5d1 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2u
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2u
@@ -5,12 +5,12 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=7
 HOMEPAGE=https://www.openssl.org/
 IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2u.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=63a9518e734c19429e1a826183ed4c2b
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5cd68fb71fa0e66b9d699ba159406558
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1i b/metadata/md5-cache/dev-libs/openssl-1.1.1i
deleted file mode 100644
index 42da76338f34..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1i
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1i.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e9640fc7b0dad7dbf83cd85a756154b7
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1j b/metadata/md5-cache/dev-libs/openssl-1.1.1j
deleted file mode 100644
index dd71a087bdf6..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1j
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1j.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2888acdac2bf7464ada248f23dd33def
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1k b/metadata/md5-cache/dev-libs/openssl-1.1.1k
index fc80f96d118e..44987a406a5d 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1k
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1k
@@ -5,12 +5,12 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=7
 HOMEPAGE=https://www.openssl.org/
 IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) !<net-misc/openssh-8.0_p1-r3
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1k.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e4dfdd02100b0d57887fb82311bdc3d
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4c3f0adac096caefa1831e1a38d2121c
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r1 b/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r1
index b23ea763f179..0ff1b0f67cef 100644
--- a/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r1
+++ b/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r1
@@ -10,5 +10,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=!bindist? ( bindist ) test
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c4b6284e88d10d89168a040245b620e6
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=72d69e085b564aec563e123814e826f6
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r1 b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r1
index 4c22b5d6b1b5..44f9e6730d80 100644
--- a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r1
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r1
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 RESTRICT=!bindist? ( bindist ) test
 SLOT=1.0.0
 SRC_URI=mirror://openssl/source/openssl-1.0.2u.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) https://dev.gentoo.org/~whissi/dist/openssl/openssl-compat-1.0.2u-versioned-symbols.patch.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3614aa5cc63894397f73c44cdc5c79e2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f4466dfa3a1fd70d2f51286983a94163
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
index b24cb6e288aa..b30891d49a3c 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=perl? ( dev-lang/perl:= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) )
+DEPEND=perl? ( dev-lang/perl:= ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) )
 DESCRIPTION=An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID
 EAPI=6
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
@@ -10,5 +10,5 @@ RDEPEND=perl? ( dev-lang/perl:= ) php? ( !dev-php/pecl-uuid ) php? ( php_targets
 REQUIRED_USE=php? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 ) )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7cbcef9a5f2578f607ec08d8e374e5a
diff --git a/metadata/md5-cache/dev-libs/pakchois-0.4-r2 b/metadata/md5-cache/dev-libs/pakchois-0.4-r2
index 2eb225376e57..e30fc5207f7c 100644
--- a/metadata/md5-cache/dev-libs/pakchois-0.4-r2
+++ b/metadata/md5-cache/dev-libs/pakchois-0.4-r2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://www.manyfish.co.uk/pakchois/pakchois-0.4.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=78941e605621168ed6f3ca3bb10eb693
diff --git a/metadata/md5-cache/dev-libs/papi-6.0.0.1 b/metadata/md5-cache/dev-libs/papi-6.0.0.1
index 9f43174172b8..6c4c4ea33a30 100644
--- a/metadata/md5-cache/dev-libs/papi-6.0.0.1
+++ b/metadata/md5-cache/dev-libs/papi-6.0.0.1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/libpfm[static-libs] virtual/mpi virtual/fortran
 DESCRIPTION=Performance Application Programming Interface
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libpfm[static-libs] virtual/mpi virtual/fortran
 SLOT=0
 SRC_URI=http://icl.cs.utk.edu/projects/papi/downloads/papi-6.0.0.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	fortran-2	b4796813ccda91c9c0d3463fc90aa969	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	fortran-2	b4796813ccda91c9c0d3463fc90aa969	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=08b3f51cc2a5e9ef0e12be68ed20696d
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0 b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
index 40d93033e524..cc593bbf2637 100644
--- a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
+++ b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=compile
 DESCRIPTION=pcc compiler support libs
 EAPI=5
 HOMEPAGE=http://pcc.ludd.ltu.se
@@ -6,5 +6,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-libs-1.1.0.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d67af51e9e5e36e88b5d767b2313663e
+_md5_=de097444e874a8e47fa96d46fc634d52
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-9999 b/metadata/md5-cache/dev-libs/pcc-libs-9999
index 9927cfc2f739..fc58777d866e 100644
--- a/metadata/md5-cache/dev-libs/pcc-libs-9999
+++ b/metadata/md5-cache/dev-libs/pcc-libs-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile unpack
 DEPEND=dev-vcs/cvs
 DESCRIPTION=pcc compiler support libs
 EAPI=5
@@ -6,5 +6,5 @@ HOMEPAGE=http://pcc.ludd.ltu.se
 LICENSE=BSD
 PROPERTIES=live
 SLOT=0
-_eclasses_=cvs	e4da99a0528be81320ec609333490bef	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f62045d654c8fd764faf1906ea7f683f
+_eclasses_=cvs	8f8740beb4ce1deaae8393cfc28d2ed1
+_md5_=fa94f9728bf1258945bc8a668e5625e7
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1 b/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
index ecae2a9f755a..0b109418212d 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
+++ b/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/2.8.3.tar.gz -> pegtl-2.8.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1325f8091fe496305a545de28548cca
diff --git a/metadata/md5-cache/dev-libs/pegtl-3.2.0 b/metadata/md5-cache/dev-libs/pegtl-3.2.0
index f89213bfaab6..549e1022f585 100644
--- a/metadata/md5-cache/dev-libs/pegtl-3.2.0
+++ b/metadata/md5-cache/dev-libs/pegtl-3.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.0.tar.gz -> pegtl-3.2.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5c6c5de8b323358a81687aa8b7ffd85
diff --git a/metadata/md5-cache/dev-libs/pigpio-79 b/metadata/md5-cache/dev-libs/pigpio-79
index 09476a6ee51d..63efc523796d 100644
--- a/metadata/md5-cache/dev-libs/pigpio-79
+++ b/metadata/md5-cache/dev-libs/pigpio-79
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/v79.tar.gz -> pigpio-79.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d5b5ef7879679890bfcdbc7e08f5fac1
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
index bd497fb0b62b..7196f0c8956f 100644
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/plasma-wayland-protocols/1.1.1/plasma-wayland-protocols-1.1.1.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b79ee1a6a9f965bf5373c0d1f2b35a2
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.2.1 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.2.1
new file mode 100644
index 000000000000..217b414b118f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.2.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=Plasma Specific Protocols for Wayland
+EAPI=7
+HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-v1.2.1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f12731f4a6a79bb06169471b9ea40b33
diff --git a/metadata/md5-cache/dev-libs/pmdk-1.9.2 b/metadata/md5-cache/dev-libs/pmdk-1.9.2
index 16609a8bd7c5..0814fecfb167 100644
--- a/metadata/md5-cache/dev-libs/pmdk-1.9.2
+++ b/metadata/md5-cache/dev-libs/pmdk-1.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-block/ndctl:= sys-block/libfabric:=
 SLOT=0/1
 SRC_URI=https://github.com/pmem/pmdk/releases/download/1.9.2/pmdk-1.9.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e03fe2f349bb232cc6a6577d4e2523f6
diff --git a/metadata/md5-cache/dev-libs/poco-1.10.1 b/metadata/md5-cache/dev-libs/poco-1.10.1
index 4973f5fb4bf7..c38cf81aad8e 100644
--- a/metadata/md5-cache/dev-libs/poco-1.10.1
+++ b/metadata/md5-cache/dev-libs/poco-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mon
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.10.1-release.tar.gz -> poco-1.10.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3826eff26de8cf75b627491d08e9196b
diff --git a/metadata/md5-cache/dev-libs/poco-1.9.0-r2 b/metadata/md5-cache/dev-libs/poco-1.9.0-r2
index 7487ea48357f..8ffcc49fa9de 100644
--- a/metadata/md5-cache/dev-libs/poco-1.9.0-r2
+++ b/metadata/md5-cache/dev-libs/poco-1.9.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mon
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.9.0-release.tar.gz -> poco-1.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5729311e2a514cedefaada47869cff02
diff --git a/metadata/md5-cache/dev-libs/popt-1.16-r2 b/metadata/md5-cache/dev-libs/popt-1.16-r2
index 63d65f711bca..d2000bac561d 100644
--- a/metadata/md5-cache/dev-libs/popt-1.16-r2
+++ b/metadata/md5-cache/dev-libs/popt-1.16-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Parse Options - Command line parser
 EAPI=5
 HOMEPAGE=http://rpm5.org/
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://rpm5.org/files/popt/popt-1.16.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0851861c88098b68917003d2c2b43953
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7962cceac97e2da1611513f464f0d135
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
index 1c3267daa089..584b4036f357 100644
--- a/metadata/md5-cache/dev-libs/popt-1.18
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -5,10 +5,10 @@ DESCRIPTION=Parse Options - Command line parser
 EAPI=7
 HOMEPAGE=https://github.com/rpm-software-management/popt
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e74f171e0f083f90b5b5500a6adddab1
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a3f38421b1574c1f4b0578b7716360e3
diff --git a/metadata/md5-cache/dev-libs/ppl-1.2-r3 b/metadata/md5-cache/dev-libs/ppl-1.2-r3
index d57928bcd882..c5b238e9b9e7 100644
--- a/metadata/md5-cache/dev-libs/ppl-1.2-r3
+++ b/metadata/md5-cache/dev-libs/ppl-1.2-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk ) app-arch/xz-utils sys-devel/m4
 DESCRIPTION=The Parma Polyhedra Library for numerical analysis of complex systems
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk )
 RESTRICT=!test? ( test )
 SLOT=0/4.14
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/ppl-1.2-r3-disable-boeing-tests.patch
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=cb10394fe8760140f962f069f0221a5a
diff --git a/metadata/md5-cache/dev-libs/processor-trace-2.0 b/metadata/md5-cache/dev-libs/processor-trace-2.0
index 90539c371805..899cfa5123fe 100644
--- a/metadata/md5-cache/dev-libs/processor-trace-2.0
+++ b/metadata/md5-cache/dev-libs/processor-trace-2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/01org/processor-trace/archive/v2.0.tar.gz -> processor-trace-2.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7eafac36a3c4ad4dc2e53a2b2fb7b307
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.13.0 b/metadata/md5-cache/dev-libs/protobuf-3.13.0
index 4a9f40eea953..ceb08652e932 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.13.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.13.0
@@ -1,15 +1,15 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0c2af5167e2d036495619964c185b4c1
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=12781bef23e7bb9c022fbb6b75d88c38
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.14.0 b/metadata/md5-cache/dev-libs/protobuf-3.14.0
index 2a94d0756fb8..4d6cb2ce5409 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.14.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.14.0
@@ -1,15 +1,15 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d434eb3cab2c166fb2ff0a759f65972
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=91347db80be29324712c3167eaf07d27
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.12.2 b/metadata/md5-cache/dev-libs/protobuf-3.15.0
index 8bf429b1efe4..a1922684f2e5 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.12.2
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.0
@@ -1,15 +1,15 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
-SLOT=0/23
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.2.tar.gz -> protobuf-3.12.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1a513b9681f4070f670de835d12a4f1a
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.0.tar.gz -> protobuf-3.15.0.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.12.4 b/metadata/md5-cache/dev-libs/protobuf-3.15.1
index d712e08923fa..11bc65411c2e 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.12.4
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.1
@@ -1,15 +1,15 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
-SLOT=0/23
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> protobuf-3.12.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6945bba11ec6d12701f9c1b548e3ef1f
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.1.tar.gz -> protobuf-3.15.1.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.2 b/metadata/md5-cache/dev-libs/protobuf-3.15.2
new file mode 100644
index 000000000000..684bcd4448b1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.2
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.2.tar.gz -> protobuf-3.15.2.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.3 b/metadata/md5-cache/dev-libs/protobuf-3.15.3
new file mode 100644
index 000000000000..d3be8f3c4fbf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.3
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.3.tar.gz -> protobuf-3.15.3.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.4 b/metadata/md5-cache/dev-libs/protobuf-3.15.4
new file mode 100644
index 000000000000..e3ed3e2d2b92
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.4
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.4.tar.gz -> protobuf-3.15.4.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.5 b/metadata/md5-cache/dev-libs/protobuf-3.15.5
new file mode 100644
index 000000000000..5588bf3baed7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.5
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz -> protobuf-3.15.5.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.6 b/metadata/md5-cache/dev-libs/protobuf-3.15.6
new file mode 100644
index 000000000000..3f26818a09bf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.6
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.6.tar.gz -> protobuf-3.15.6.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.7 b/metadata/md5-cache/dev-libs/protobuf-3.15.7
new file mode 100644
index 000000000000..292c7ed8a3ca
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.7
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.7.tar.gz -> protobuf-3.15.7.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.8 b/metadata/md5-cache/dev-libs/protobuf-3.15.8
new file mode 100644
index 000000000000..a358dcab726e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.15.8
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.8.tar.gz -> protobuf-3.15.8.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c4c29dc5650c5e35f3535acdf1af89d
diff --git a/metadata/md5-cache/dev-libs/protobuf-9999 b/metadata/md5-cache/dev-libs/protobuf-9999
index ba1534d595e5..4c56b720bec3 100644
--- a/metadata/md5-cache/dev-libs/protobuf-9999
+++ b/metadata/md5-cache/dev-libs/protobuf-9999
@@ -1,4 +1,4 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/26
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7a73e2c99a93c0a4dc3547e634eb2f6
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=57521c6257da88e29ae29913528c6f73
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.3 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
index 7fc95d4d2f5a..513a9c945c85 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-libs/protobuf-3:0 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-libs/protobuf-3:0 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Protocol Buffers implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/protobuf-c/protobuf-c
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.3/protobuf-c-1.3.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=55d1c0ddca76a8fc9e985ee8b4340fb2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f814b605fb444b13a58df82a15902a33
diff --git a/metadata/md5-cache/dev-libs/pslib-0.4.5 b/metadata/md5-cache/dev-libs/pslib-0.4.5
index 5bdbeebd058d..dcfec181c5f8 100644
--- a/metadata/md5-cache/dev-libs/pslib-0.4.5
+++ b/metadata/md5-cache/dev-libs/pslib-0.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) dev-lang/perl >=dev-libs/glib-2 dev-util/intltool dev-perl/XML-Parser >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) dev-lang/perl >=dev-libs/glib-2 dev-util/intltool dev-perl/XML-Parser sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=pslib is a C-library to create PostScript files on the fly
 EAPI=6
 HOMEPAGE=http://pslib.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/pslib/pslib-0.4.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=826396099657e4ee285f360c6ddaaa26
diff --git a/metadata/md5-cache/dev-libs/ptexenc-1.3.8_p20200406 b/metadata/md5-cache/dev-libs/ptexenc-1.3.8_p20200406
index 891fba2fad96..bab2a06ffbc9 100644
--- a/metadata/md5-cache/dev-libs/ptexenc-1.3.8_p20200406
+++ b/metadata/md5-cache/dev-libs/ptexenc-1.3.8_p20200406
@@ -5,10 +5,10 @@ DESCRIPTION=Library for Japanese pTeX providing a better way of handling charact
 EAPI=7
 HOMEPAGE=http://tutimura.ath.cx/ptexlive/?ptexenc
 IUSE=iconv static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20200406-source.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4dd4f4164db8ced6cb2b9d2ac2aa29e2
+_md5_=a8f03ea409d1989af017ba61d3a8de01
diff --git a/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325 b/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
new file mode 100644
index 000000000000..8b3e796c8845
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
+DESCRIPTION=Library for Japanese pTeX providing a better way of handling character encodings
+EAPI=7
+HOMEPAGE=http://tutimura.ath.cx/ptexlive/?ptexenc
+IUSE=iconv static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=36f9581280f27f8a3f56dcf15b47e065
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.10 b/metadata/md5-cache/dev-libs/pugixml-1.10
deleted file mode 100644
index da353f0a592e..000000000000
--- a/metadata/md5-cache/dev-libs/pugixml-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
-EAPI=7
-HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13d7d866484e14e56f3d14c5bb118969
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.11.3 b/metadata/md5-cache/dev-libs/pugixml-1.11.3
deleted file mode 100644
index e32f00f38c34..000000000000
--- a/metadata/md5-cache/dev-libs/pugixml-1.11.3
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
-EAPI=7
-HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.11.3/pugixml-1.11.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2aa12b32accf74839077af7f56ec3880
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.11.4 b/metadata/md5-cache/dev-libs/pugixml-1.11.4
index 78d2a1cd755e..fe997b6ddbc7 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.11.4
+++ b/metadata/md5-cache/dev-libs/pugixml-1.11.4
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linu
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.11.4/pugixml-1.11.4.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08ec901620e71db3cad269f2faa4d50c
diff --git a/metadata/md5-cache/dev-libs/pugixml-9999 b/metadata/md5-cache/dev-libs/pugixml-9999
index 6c5c35a2b20e..b80b366fd345 100644
--- a/metadata/md5-cache/dev-libs/pugixml-9999
+++ b/metadata/md5-cache/dev-libs/pugixml-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b6486055cfafc303fc7d867fbd3c21b
diff --git a/metadata/md5-cache/dev-libs/qqwing-1.3.3 b/metadata/md5-cache/dev-libs/qqwing-1.3.3
index 841d43edb13e..3e084c3ff692 100644
--- a/metadata/md5-cache/dev-libs/qqwing-1.3.3
+++ b/metadata/md5-cache/dev-libs/qqwing-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Sudoku puzzle generator and solver
 EAPI=5
 HOMEPAGE=https://qqwing.com
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/stephenostermiller/qqwing/archive/v1.3.3.tar.gz -> qqwing-1.3.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be983c930cb1b60ccc6e2b96c00b2b95
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=900b503abbc2dc1b823710d698c12588
diff --git a/metadata/md5-cache/dev-libs/qqwing-1.3.4 b/metadata/md5-cache/dev-libs/qqwing-1.3.4
index bd6944860c3f..5c2e108d651f 100644
--- a/metadata/md5-cache/dev-libs/qqwing-1.3.4
+++ b/metadata/md5-cache/dev-libs/qqwing-1.3.4
@@ -6,5 +6,5 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=GPL-2+
 SLOT=0/2
 SRC_URI=https://qqwing.com/qqwing-1.3.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9c4c39a481bec1eb374dbcda3a9a198
+_eclasses_=ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=16898f691439fb80e03d24d41ddb7e46
diff --git a/metadata/md5-cache/dev-libs/qrosscore-0.3.2 b/metadata/md5-cache/dev-libs/qrosscore-0.3.2
index adb417844814..7a7f568276f8 100644
--- a/metadata/md5-cache/dev-libs/qrosscore-0.3.2
+++ b/metadata/md5-cache/dev-libs/qrosscore-0.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/designer:5 dev-qt/qtscript:5
 SLOT=0
 SRC_URI=https://github.com/0xd34df00d/Qross/archive/0.3.2.tar.gz -> qrosscore-0.3.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a305522aa18cac434374239cb8294ae
diff --git a/metadata/md5-cache/dev-libs/qrosscore-9999 b/metadata/md5-cache/dev-libs/qrosscore-9999
index 6bcc86a67d12..da17be3b9295 100644
--- a/metadata/md5-cache/dev-libs/qrosscore-9999
+++ b/metadata/md5-cache/dev-libs/qrosscore-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/designer:5 dev-qt/qtscript:5
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b575660a6f530cbb292809f648fa1532
diff --git a/metadata/md5-cache/dev-libs/qtcompress-0_p20180513 b/metadata/md5-cache/dev-libs/qtcompress-0_p20180513
index bf2b3d6b7554..2f553051fd67 100644
--- a/metadata/md5-cache/dev-libs/qtcompress-0_p20180513
+++ b/metadata/md5-cache/dev-libs/qtcompress-0_p20180513
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0/5.11.0
 SRC_URI=https://github.com/nezticle/qtcompress/archive/23f8831826cd72aedf99fc3699148b6c994fd677.tar.gz -> qtcompress-0_p20180513.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=e65860a1cb35ef74682063dc4751fa13
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.10.0 b/metadata/md5-cache/dev-libs/qtkeychain-0.10.0
index c9a58eb167ed..4a7c7690fa38 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.10.0
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.10.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.10.0.tar.gz -> qtkeychain-0.10.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80d81e39519a93e56541583b1df77f73
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.11.1 b/metadata/md5-cache/dev-libs/qtkeychain-0.11.1
index c1bad8efff99..61e17a85c1ff 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.11.1
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.11.1
@@ -5,10 +5,10 @@ DESCRIPTION=Qt API for storing passwords securely
 EAPI=7
 HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
 IUSE=gnome-keyring
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.11.1.tar.gz -> qtkeychain-0.11.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=19ee52f59d7a5cafbd8d68a3b6637293
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3e938ed38f30bf7affb4c5503f4a6ad
diff --git a/metadata/md5-cache/dev-libs/quazip-0.9.1 b/metadata/md5-cache/dev-libs/quazip-0.9.1
deleted file mode 100644
index 2ac9459d5190..000000000000
--- a/metadata/md5-cache/dev-libs/quazip-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
-DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
-EAPI=7
-HOMEPAGE=https://stachenov.github.io/quazip/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
-SLOT=0
-SRC_URI=https://github.com/stachenov/quazip/archive/v0.9.1.tar.gz -> quazip-0.9.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acf222271a92f173a10660beef25ae6e
diff --git a/metadata/md5-cache/dev-libs/quazip-1.1-r1 b/metadata/md5-cache/dev-libs/quazip-1.1-r1
index 92843f9b8958..1e157d53c182 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.1-r1
+++ b/metadata/md5-cache/dev-libs/quazip-1.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 EAPI=7
 HOMEPAGE=https://stachenov.github.io/quazip/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] !=dev-libs/quazip-1.1-r0:1
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.1.tar.gz -> quazip-1.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ded02a22be9043c37bf1dea65a95d7b
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82cf792d4900f37e676ec451c687ce25
diff --git a/metadata/md5-cache/dev-libs/raft-0.10.0 b/metadata/md5-cache/dev-libs/raft-0.10.0
index 0cae5532edec..cae11be9e281 100644
--- a/metadata/md5-cache/dev-libs/raft-0.10.0
+++ b/metadata/md5-cache/dev-libs/raft-0.10.0
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/libuv
 DESCRIPTION=C implementation of the Raft consensus protocol
 EAPI=7
 HOMEPAGE=https://github.com/canonical/raft
 IUSE=test zfs
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-libs/libuv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/canonical/raft/archive/v0.10.0.tar.gz -> raft-0.10.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2f0d0e00b6f00aa852247b7deb6af826
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4b9e2a8ee745b147f77425e370057d63
diff --git a/metadata/md5-cache/dev-libs/raft-0.9.25 b/metadata/md5-cache/dev-libs/raft-0.9.25
deleted file mode 100644
index 6495892d48c4..000000000000
--- a/metadata/md5-cache/dev-libs/raft-0.9.25
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libuv
-DESCRIPTION=C implementation of the Raft consensus protocol
-EAPI=7
-HOMEPAGE=https://github.com/canonical/raft
-IUSE=test
-KEYWORDS=amd64 ~arm64
-LICENSE=LGPL-3-with-linking-exception
-RDEPEND=dev-libs/libuv
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/canonical/raft/archive/v0.9.25.tar.gz -> raft-0.9.25.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=847dd95b26209db246479329ea7c4f7f
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
index d6bd545f12c9..3a7028ba57d0 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72309a17f2dd97e50bbee08318abeb5d
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3
index 15832c5bd5b0..9285bf64d4a1 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77b8ecbaefcee254eccff1d411208aaf
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index 317bdff69020..060f1dcdc849 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28661ba2a1a338bcda34db7779f9675e
diff --git a/metadata/md5-cache/dev-libs/rapidxml-1.13 b/metadata/md5-cache/dev-libs/rapidxml-1.13
deleted file mode 100644
index ba05525b2769..000000000000
--- a/metadata/md5-cache/dev-libs/rapidxml-1.13
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Fast XML parser
-EAPI=5
-HOMEPAGE=http://rapidxml.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=Boost-1.0 MIT
-SLOT=0
-SRC_URI=mirror://sourceforge/rapidxml/rapidxml-1.13.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=836655c6d64e5967cb17cada66f4bb15
diff --git a/metadata/md5-cache/dev-libs/rapidxml-1.13-r1 b/metadata/md5-cache/dev-libs/rapidxml-1.13-r1
index 72ace5c6e90c..3d4121843f06 100644
--- a/metadata/md5-cache/dev-libs/rapidxml-1.13-r1
+++ b/metadata/md5-cache/dev-libs/rapidxml-1.13-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=install prepare
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
 DESCRIPTION=Fast XML parser
-EAPI=5
+EAPI=7
 HOMEPAGE=http://rapidxml.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=Boost-1.0 MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/rapidxml/rapidxml-1.13.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=935e9e4d8e2271ec91d0b23cad005230
+_md5_=ead8f958c0cc5d25de045b869b698399
diff --git a/metadata/md5-cache/dev-libs/rccl-4.0.0-r2 b/metadata/md5-cache/dev-libs/rccl-4.0.0-r2
index 35b5cf33b974..d3186ec8f4f4 100644
--- a/metadata/md5-cache/dev-libs/rccl-4.0.0-r2
+++ b/metadata/md5-cache/dev-libs/rccl-4.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-util/hip-4.0*
 SLOT=0
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-4.0.0.tar.gz -> rccl-4.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f17730cd34e1091bd9f40c9e4ed4c1c1
diff --git a/metadata/md5-cache/dev-libs/re2-0.2020.11.01 b/metadata/md5-cache/dev-libs/re2-0.2020.11.01
index 0de9b2c7ea9a..4282a0967dda 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2020.11.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2020.11.01
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=icu? ( dev-libs/icu: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/9
 SRC_URI=https://github.com/google/re2/archive/2020-11-01.tar.gz -> re2-2020-11-01.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=53bd2c07614ae6227e9fe0cdb9e87c78
diff --git a/metadata/md5-cache/dev-libs/re2-0.2021.02.02 b/metadata/md5-cache/dev-libs/re2-0.2021.02.02
index ecf064d16ebf..76386893f0dd 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2021.02.02
+++ b/metadata/md5-cache/dev-libs/re2-0.2021.02.02
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=icu? ( dev-libs/icu: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/9
 SRC_URI=https://github.com/google/re2/archive/2021-02-02.tar.gz -> re2-2021-02-02.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b91b28884802f9231c648eeaeece7f92
diff --git a/metadata/md5-cache/dev-libs/re2-0.2021.04.01 b/metadata/md5-cache/dev-libs/re2-0.2021.04.01
new file mode 100644
index 000000000000..681413188ca2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/re2-0.2021.04.01
@@ -0,0 +1,14 @@
+BDEPEND=icu? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=icu? ( dev-libs/icu: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(-)?] )
+DESCRIPTION=An efficient, principled regular expression library
+EAPI=7
+HOMEPAGE=https://github.com/google/re2
+IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=icu? ( dev-libs/icu: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/9
+SRC_URI=https://github.com/google/re2/archive/2021-04-01.tar.gz -> re2-2021-04-01.tar.gz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b91b28884802f9231c648eeaeece7f92
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.17-r2 b/metadata/md5-cache/dev-libs/redland-1.0.17-r2
index 92d238b784b9..da3593da34d6 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.17-r2
+++ b/metadata/md5-cache/dev-libs/redland-1.0.17-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( dev-db/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.17.tar.gz
-_eclasses_=db-use	5b886219e6035ca01d8b1c58eba91679	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=fa497054769abdf70eb3babaf4a412d2
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
index 06703fe1b7dc..22a0995b7fa4 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/sed virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+BDEPEND=sys-apps/sed virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/redland-1.0.14 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) python? ( 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] ) ) ruby? ( dev-lang/ruby:* dev-ruby/log4r ) php? ( php_targets_php7-2? ( dev-lang/php:7.2[-threads] ) php_targets_php7-3? ( dev-lang/php:7.3[-threads] ) php_targets_php7-4? ( dev-lang/php:7.4[-threads] ) ) >=dev-lang/swig-2 test? ( >=dev-libs/redland-1.0.14[berkdb] ) php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DESCRIPTION=Language bindings for Redland
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=083e65f108d98d6b5d8fc3039ec19ed1
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.8.0 b/metadata/md5-cache/dev-libs/rinutils-0.8.0
index 1741842a31f7..445d2854ef5c 100644
--- a/metadata/md5-cache/dev-libs/rinutils-0.8.0
+++ b/metadata/md5-cache/dev-libs/rinutils-0.8.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Set of C headers containing macros and static functions
 EAPI=7
 HOMEPAGE=https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.8.0/rinutils-0.8.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05efdde22487396c94f43181d16c5a88
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4c4432ae97d69369e88c2d9d1c4cd01e
diff --git a/metadata/md5-cache/dev-libs/rlog-1.4 b/metadata/md5-cache/dev-libs/rlog-1.4
index 68651c0de298..9a2a5383bd28 100644
--- a/metadata/md5-cache/dev-libs/rlog-1.4
+++ b/metadata/md5-cache/dev-libs/rlog-1.4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DESCRIPTION=A C++ logging library
 EAPI=7
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~ppc sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://rlog.googlecode.com/files/rlog-1.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=51e905a8c4f7f23daabfb79a82c86dad
diff --git a/metadata/md5-cache/dev-libs/rocclr-3.10.0 b/metadata/md5-cache/dev-libs/rocclr-3.10.0
index a075702669f6..b2ce5ed33b3a 100644
--- a/metadata/md5-cache/dev-libs/rocclr-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocclr-3.10.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-3.10.0 >=dev-libs/rocr-runtime-3.10.0
 SLOT=0/3.10
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.10.0.tar.gz -> rocclr-3.10.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.10.0.tar.gz -> rocm-opencl-runtime-3.10.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42fbc29b244b38ebf46de85ff27a698d
diff --git a/metadata/md5-cache/dev-libs/rocclr-3.8.0 b/metadata/md5-cache/dev-libs/rocclr-3.8.0
index d98b05f620a4..d501285369ef 100644
--- a/metadata/md5-cache/dev-libs/rocclr-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocclr-3.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocr-runtime-3.8.0
 SLOT=0/3.8
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.8.0.tar.gz -> rocclr-3.8.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.8.0.tar.gz -> rocm-opencl-runtime-3.8.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42fbc29b244b38ebf46de85ff27a698d
diff --git a/metadata/md5-cache/dev-libs/rocclr-3.9.0 b/metadata/md5-cache/dev-libs/rocclr-3.9.0
index 7bd94f60821d..44b84ab5b489 100644
--- a/metadata/md5-cache/dev-libs/rocclr-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocclr-3.9.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocr-runtime-3.9.0
 SLOT=0/3.9
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.9.0.tar.gz -> rocclr-3.9.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.9.0.tar.gz -> rocm-opencl-runtime-3.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42fbc29b244b38ebf46de85ff27a698d
diff --git a/metadata/md5-cache/dev-libs/rocclr-4.0.0 b/metadata/md5-cache/dev-libs/rocclr-4.0.0
index 4a76e74047ef..b4524ba1b877 100644
--- a/metadata/md5-cache/dev-libs/rocclr-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocclr-4.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-4.0.0 >=dev-libs/rocr-runtime-4.0.0
 SLOT=0/4.0
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.0.0.tar.gz -> rocclr-4.0.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.0.0.tar.gz -> rocm-opencl-runtime-4.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7759fa1190858641100723e587dd30b4
diff --git a/metadata/md5-cache/dev-libs/rocclr-4.1.0 b/metadata/md5-cache/dev-libs/rocclr-4.1.0
new file mode 100644
index 000000000000..e7a29e3dc38a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocclr-4.1.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocm-comgr-4.1.0 virtual/opengl >=dev-util/rocm-cmake-4.1.0
+DESCRIPTION=Radeon Open Compute Common Language Runtime
+EAPI=7
+HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocr-runtime-4.1.0
+SLOT=0/4.1
+SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.1.0.tar.gz -> rocclr-4.1.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.1.0.tar.gz -> rocm-opencl-runtime-4.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d7a7ce6f7d2b20373e0889c5dc9c79a
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1 b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
index 933f9bbe08aa..8b423dac9ae5 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags:= dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.14.6.tar.gz -> rocksdb-6.14.6.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40d6460fc18fc81febcb0d8e8977cb27
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.15.5 b/metadata/md5-cache/dev-libs/rocksdb-6.15.5
index 7396e2c56102..1d3ead37acc6 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.15.5
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.15.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.15.5.tar.gz -> rocksdb-6.15.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab611f734b8735ab2d4257172bf869f8
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.17.3 b/metadata/md5-cache/dev-libs/rocksdb-6.17.3
index 6c256f7b7e53..ae6f263a00d6 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.17.3
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.17.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.17.3.tar.gz -> rocksdb-6.17.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab611f734b8735ab2d4257172bf869f8
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-3.10.0 b/metadata/md5-cache/dev-libs/rocm-comgr-3.10.0
index 164b9868ca95..47f7cea14076 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-3.10.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-3.10.0 >=sys-devel/llvm-roc-3.10.0:=
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.10.0.tar.gz -> rocm-comgr-3.10.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=240b3e4819452e393942c318099a9775
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0 b/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
index 2c4cf74e2101..299c54a48e21 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-3.9.0 >=sys-devel/llvm-roc-3.9.0:=
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.9.0.tar.gz -> rocm-comgr-3.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=240b3e4819452e393942c318099a9775
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-4.0.0 b/metadata/md5-cache/dev-libs/rocm-comgr-4.0.0
index a5819e19a937..afb378d685f3 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-4.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-4.0.0 >=sys-devel/llvm-roc-4.0.0:=
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.0.0.tar.gz -> rocm-comgr-4.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=240b3e4819452e393942c318099a9775
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-4.1.0 b/metadata/md5-cache/dev-libs/rocm-comgr-4.1.0
new file mode 100644
index 000000000000..22a94b532884
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-4.1.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocm-device-libs-4.1.0 >=sys-devel/llvm-roc-4.1.0:=
+DESCRIPTION=Radeon Open Compute Code Object Manager
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/rocm-device-libs-4.1.0 >=sys-devel/llvm-roc-4.1.0:=
+SLOT=0/4.1
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.1.0.tar.gz -> rocm-comgr-4.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=839c5c83d9f1a63d994fdac115dd1a0c
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.10.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.10.0
index 9e2ed99be24d..a9252e4b1e9f 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.10.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.10.0:=
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.10.0.tar.gz -> rocm-device-libs-3.10.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5cbe443b21909418c0dca55037023a65
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
index 91d5cfc2aad0..bf2a22571722 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.7.0:=
 SLOT=0/3.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.7.0.tar.gz -> rocm-device-libs-3.7.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99f5867f03ec583d1ea39eb62b32a088
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
index 36e7b920daed..2d60983dea70 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.8.0:=
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.8.0.tar.gz -> rocm-device-libs-3.8.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99f5867f03ec583d1ea39eb62b32a088
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
index b97fb798ff3a..8f9960ed6902 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.9.0:=
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.9.0.tar.gz -> rocm-device-libs-3.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5cbe443b21909418c0dca55037023a65
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-4.0.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-4.0.0
index f50e280239ba..206527781448 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-4.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-4.0.0:=
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.0.0.tar.gz -> rocm-device-libs-4.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5cbe443b21909418c0dca55037023a65
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-4.1.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-4.1.0
new file mode 100644
index 000000000000..a6e470349957
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-4.1.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-devel/llvm-roc-4.1.0:=
+DESCRIPTION=Radeon Open Compute Device Libraries
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=sys-devel/llvm-roc-4.1.0:=
+SLOT=0/4.1
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.1.0.tar.gz -> rocm-device-libs-4.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70d3a3f649d4a4c04edb5bcdcbe2170b
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-9999 b/metadata/md5-cache/dev-libs/rocm-device-libs-9999
index 148e1fde6cae..48b840d398a6 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-9999
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/rocr-runtime sys-devel/llvm-roc:=
 SLOT=0/9999
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4c1e0e3c92a41ad9132b9c95edf47e8
diff --git a/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0 b/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
index 05fdeb4a7160..cd18cccbd61e 100644
--- a/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/rocr-runtime
 SLOT=0/2.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-2.7.0.tar.gz -> rocm-hostcall-2.7.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=731ea371f522d3707dc0844408393875
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
index 2d8f1610b6a2..9d481c638605 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-3.10.0 >=dev-libs/rocclr-3.10.0 >=dev-libs/rocm-comgr-3.10.0 >=dev-libs/rocm-device-libs-3.10.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.10.0.tar.gz -> rocm-opencl-runtime-3.10.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e88e8242d534d36a992e247ccb08d6b2
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
index ce6f4661c075..c1dad00bdd30 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocclr-3.8.0 >=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocm-device-libs-3.8.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.8.0.tar.gz -> rocm-opencl-runtime-3.8.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91f9a58483259de08729e02b5592f708
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
index 0f7d04731604..e17e09ec0af7 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocclr-3.9.0 >=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocm-device-libs-3.9.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.9.0.tar.gz -> rocm-opencl-runtime-3.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=792e2e57ee5b94053068f5b6299f6dd7
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
index e78ece9dae0e..8b1166033ee4 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-4.0.0 >=dev-libs/rocclr-4.0.0 >=dev-libs/rocm-comgr-4.0.0 >=dev-libs/rocm-device-libs-4.0.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-4.0.0.tar.gz -> rocm-opencl-runtime-4.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3e8de828ae9a1e640338b1a52a943f8
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0
new file mode 100644
index 000000000000..0e0dc3d74e90
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/rocm-cmake-4.1.0 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocclr-4.1.0 >=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocm-device-libs-4.1.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT
+RDEPEND=>=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocclr-4.1.0 >=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocm-device-libs-4.1.0 >=virtual/opencl-3 media-libs/mesa
+SLOT=0/4.1
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-4.1.0.tar.gz -> rocm-opencl-runtime-4.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3e8de828ae9a1e640338b1a52a943f8
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.10.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.10.0
index 26af968eba32..63141de0a448 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.10.0
@@ -1,13 +1,13 @@
 BDEPEND=app-editors/vim-core dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-3.10.0 >=dev-libs/rocm-device-libs-3.10.0
+DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.10.0 >=dev-libs/roct-thunk-interface-3.10.0 >=dev-libs/rocm-device-libs-3.10.0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=sys-process/numactl dev-libs/elfutils:=
+RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.10.0
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.10.0.tar.gz -> rocr-runtime-3.10.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6019e18a1dd3158164024462e7c5d79e
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=584663b0aaeda812ae922ecd6b56ae1a
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
index d88657a09683..cb989e1ee3e9 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
@@ -1,13 +1,13 @@
 BDEPEND=app-editors/vim-core dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-3.8.0 ~dev-libs/rocm-device-libs-3.8.0
+DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.8.0 >=dev-libs/roct-thunk-interface-3.8.0 ~dev-libs/rocm-device-libs-3.8.0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=sys-process/numactl dev-libs/elfutils:=
+RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.8.0
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.8.0.tar.gz -> rocr-runtime-3.8.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b657e1196b2b14373026181947b3fc53
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a8f68614662470fd7df6278daae8ca13
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0
index 524d0ddbaee5..c80501123d67 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0
@@ -1,13 +1,13 @@
 BDEPEND=app-editors/vim-core dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-3.9.0 >=dev-libs/rocm-device-libs-3.9.0
+DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.9.0 >=dev-libs/roct-thunk-interface-3.9.0 >=dev-libs/rocm-device-libs-3.9.0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=sys-process/numactl dev-libs/elfutils:=
+RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.9.0
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.9.0.tar.gz -> rocr-runtime-3.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6019e18a1dd3158164024462e7c5d79e
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=584663b0aaeda812ae922ecd6b56ae1a
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-4.0.0 b/metadata/md5-cache/dev-libs/rocr-runtime-4.0.0
index 6a6acc8d3bd6..7c18934049e0 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-4.0.0
@@ -1,13 +1,13 @@
 BDEPEND=app-editors/vim-core dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-4.0.0 >=dev-libs/rocm-device-libs-4.0.0
+DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-4.0.0 >=dev-libs/roct-thunk-interface-4.0.0 >=dev-libs/rocm-device-libs-4.0.0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=sys-process/numactl dev-libs/elfutils:=
+RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-4.0.0
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-4.0.0.tar.gz -> rocr-runtime-4.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6019e18a1dd3158164024462e7c5d79e
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=584663b0aaeda812ae922ecd6b56ae1a
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-4.1.0 b/metadata/md5-cache/dev-libs/rocr-runtime-4.1.0
new file mode 100644
index 000000000000..2f28679c8653
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-4.1.0
@@ -0,0 +1,14 @@
+BDEPEND=app-editors/vim-core dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-4.1.0 >=dev-libs/roct-thunk-interface-4.1.0 >=dev-libs/rocm-device-libs-4.1.0
+DESCRIPTION=Radeon Open Compute Runtime
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-4.1.0
+SLOT=0/4.1
+SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-4.1.0.tar.gz -> rocr-runtime-4.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=db36b0edcb1e4cf1e63ba5c9cb9e0b30
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-9999 b/metadata/md5-cache/dev-libs/rocr-runtime-9999
index 1c0d33241aeb..139d773c6dec 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-9999
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-9999
@@ -1,12 +1,13 @@
 BDEPEND=app-editors/vim-core dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-9999 >=dev-libs/rocm-device-libs-9999
+DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-9999 >=dev-libs/roct-thunk-interface-9999 >=dev-libs/rocm-device-libs-9999
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+IUSE=debug
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=sys-process/numactl dev-libs/elfutils:=
+RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-9999
 SLOT=0/9999
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48a106492a94ad193f0e0864bbc712b0
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=db36b0edcb1e4cf1e63ba5c9cb9e0b30
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
index bba28a376f8a..859677a0edda 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.0.0.tar.gz -> roct-thunk-interface-4.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0820c596b5b21ead35d3f465ab7a6b6e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
index 1f91ee964c1f..c5453bdc5939 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.1.0.tar.gz -> roct-thunk-interface-4.1.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23a5754c6c89e3f511a2a72e38f6d62e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999 b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
index 1893fa780cf6..832d0a3dc364 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-process/numactl
 SLOT=0/9999
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/s2n-0.10.21-r1 b/metadata/md5-cache/dev-libs/s2n-0.10.21-r1
index 5d75672447d5..0ea628f22248 100644
--- a/metadata/md5-cache/dev-libs/s2n-0.10.21-r1
+++ b/metadata/md5-cache/dev-libs/s2n-0.10.21-r1
@@ -11,5 +11,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[static-libs=] ) libressl? ( dev-libs/li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/s2n/archive/v0.10.21.tar.gz -> s2n-0.10.21.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0f185d4c673c55730c02a618591ad5f
diff --git a/metadata/md5-cache/dev-libs/s2n-1.0.0 b/metadata/md5-cache/dev-libs/s2n-1.0.0
new file mode 100644
index 000000000000..95584a5ca94a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/s2n-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0=[static-libs=] ) libressl? ( dev-libs/libressl:0=[static-libs=] )
+DESCRIPTION=Simple, small, fast and secure C99 implementation of the TLS/SSL protocols
+EAPI=7
+HOMEPAGE=https://github.com/awslabs/s2n
+IUSE=libressl static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:0=[static-libs=] ) libressl? ( dev-libs/libressl:0=[static-libs=] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/awslabs/s2n/archive/v1.0.0.tar.gz -> s2n-1.0.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=425d6b998841fa1b7d1890bf47ea8f5f
diff --git a/metadata/md5-cache/dev-libs/satyr-0.31 b/metadata/md5-cache/dev-libs/satyr-0.31
index 78a00e778376..599d6af24f88 100644
--- a/metadata/md5-cache/dev-libs/satyr-0.31
+++ b/metadata/md5-cache/dev-libs/satyr-0.31
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/gperf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig dev-util/gperf sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python? ( 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-libs/elfutils-0.158 dev-libs/json-c:= dev-libs/nettle:=
 DESCRIPTION=Satyr is a collection of low-level algorithms for program failure processing
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0/4
 SRC_URI=https://github.com/abrt/satyr/archive/0.31/satyr-0.31.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0b5cdcdb40207f75389c0fc1557d29bc
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.2.0 b/metadata/md5-cache/dev-libs/sdformat-9.2.0
index 75692a54bd1d..b26b21f8e7b5 100644
--- a/metadata/md5-cache/dev-libs/sdformat-9.2.0
+++ b/metadata/md5-cache/dev-libs/sdformat-9.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
 SLOT=0/9
 SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.2.0.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=561ac5d3b5fdd3371f25dab2f5a241f3
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.3.0 b/metadata/md5-cache/dev-libs/sdformat-9.3.0
index db66b5f4f51a..c2c9bc1fa588 100644
--- a/metadata/md5-cache/dev-libs/sdformat-9.3.0
+++ b/metadata/md5-cache/dev-libs/sdformat-9.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
 SLOT=0/9
 SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.3.0.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=561ac5d3b5fdd3371f25dab2f5a241f3
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.10 b/metadata/md5-cache/dev-libs/serd-0.30.10
index e57070680bba..aa68080f1c53 100644
--- a/metadata/md5-cache/dev-libs/serd-0.30.10
+++ b/metadata/md5-cache/dev-libs/serd-0.30.10
@@ -10,5 +10,5 @@ LICENSE=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.30.10.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91
 _md5_=6a1ff5577d9d5d65b7448ad9f3277e62
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.7.1 b/metadata/md5-cache/dev-libs/simdjson-0.7.1
index dcc906107a39..a6e4327cf1ee 100644
--- a/metadata/md5-cache/dev-libs/simdjson-0.7.1
+++ b/metadata/md5-cache/dev-libs/simdjson-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/simdjson/simdjson/archive/v0.7.1.tar.gz -> simdjson-0.7.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b5c09d761e0dd99b30957c28dd51200
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4e2dae7fb557f4f591bd2e232f316916
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.8.1 b/metadata/md5-cache/dev-libs/simdjson-0.8.1
deleted file mode 100644
index f26df5545e46..000000000000
--- a/metadata/md5-cache/dev-libs/simdjson-0.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/file sys-apps/findutils sys-apps/grep dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=tools? ( dev-libs/cxxopts:= )
-DESCRIPTION=SIMD accelerated C++ JSON library
-EAPI=7
-HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
-IUSE=test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Boost-1.0
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/4
-SRC_URI=https://github.com/simdjson/simdjson/archive/v0.8.1.tar.gz -> simdjson-0.8.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7dfbc8484a3c30abf2e1cf32459198d
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.8.2 b/metadata/md5-cache/dev-libs/simdjson-0.8.2
index a8331fed0ef9..aac0b196ec36 100644
--- a/metadata/md5-cache/dev-libs/simdjson-0.8.2
+++ b/metadata/md5-cache/dev-libs/simdjson-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/simdjson/simdjson/archive/v0.8.2.tar.gz -> simdjson-0.8.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7dfbc8484a3c30abf2e1cf32459198d
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce8f4a6a2bb1dc42a12f2d14b8658f7d
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.9.1 b/metadata/md5-cache/dev-libs/simdjson-0.9.2
index 24537290208c..98e82ae6facd 100644
--- a/metadata/md5-cache/dev-libs/simdjson-0.9.1
+++ b/metadata/md5-cache/dev-libs/simdjson-0.9.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
 IUSE=test tools
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Boost-1.0
+LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/8
-SRC_URI=https://github.com/simdjson/simdjson/archive/v0.9.1.tar.gz -> simdjson-0.9.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b9095615d090e75bdd10f40c864f199
+SRC_URI=https://github.com/simdjson/simdjson/archive/v0.9.2.tar.gz -> simdjson-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67eb8aadad0ea88d66cb0ec278ef4f6a
diff --git a/metadata/md5-cache/dev-libs/sink-0.8.0-r2 b/metadata/md5-cache/dev-libs/sink-0.8.0-r2
index 08eb9cc40846..3207309101a3 100644
--- a/metadata/md5-cache/dev-libs/sink-0.8.0-r2
+++ b/metadata/md5-cache/dev-libs/sink-0.8.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-db/lmdb:= dev-libs/flatbuffers >=dev-libs/kasync-0.3:5 >=dev-libs/xa
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/sink/0.8.0/src/sink-0.8.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a950f293ed17d4eada3f8d9d2a9f8365
diff --git a/metadata/md5-cache/dev-libs/smack-0.5.0 b/metadata/md5-cache/dev-libs/smack-0.5.0
index 859928f8fbc7..a43fc5f7e64c 100644
--- a/metadata/md5-cache/dev-libs/smack-0.5.0
+++ b/metadata/md5-cache/dev-libs/smack-0.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/snappy dev-libs/boost
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~patrick/smack-0.5.0.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a5e9df1514806ff9314c1e0c95e6191
diff --git a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325 b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
index 4d8f11787244..8470f8182fdf 100644
--- a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
+++ b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
@@ -3,9 +3,9 @@ DESCRIPTION=All you need to include the snowball stemming algorithms into a C pr
 EAPI=5
 HOMEPAGE=https://snowballstem.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/libstemmer_c-20140325.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0404314603173521808ad35da0b01717
+_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=a9f66f47e67f665547b3439adf58bec6
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.8 b/metadata/md5-cache/dev-libs/sord-0.16.8-r1
index c019a848392a..3d2e1484a1e6 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.8
+++ b/metadata/md5-cache/dev-libs/sord-0.16.8-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.8.tar.bz2
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
-_md5_=7aa8281e30fd5723daab0f4df3f4976f
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91
+_md5_=cf0ae49f16780aa437a508fa52af9ac8
diff --git a/metadata/md5-cache/dev-libs/sord-9999 b/metadata/md5-cache/dev-libs/sord-9999
index d1fc541cf6cc..c17b29d71db0 100644
--- a/metadata/md5-cache/dev-libs/sord-9999
+++ b/metadata/md5-cache/dev-libs/sord-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91
 _md5_=b40f30d7ff092da95b2b5d3fcdcc16d7
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.8.2 b/metadata/md5-cache/dev-libs/spdlog-1.8.2
index d627e9553335..2e5eef62dcf3 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.8.2
+++ b/metadata/md5-cache/dev-libs/spdlog-1.8.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libfmt-6.1.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.8.2.tar.gz -> spdlog-1.8.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb244f0a3b35acd27ca34cf9b21c4772
diff --git a/metadata/md5-cache/dev-libs/spdlog-9999 b/metadata/md5-cache/dev-libs/spdlog-9999
index d31a2ea456ec..4fdd1d40055e 100644
--- a/metadata/md5-cache/dev-libs/spdlog-9999
+++ b/metadata/md5-cache/dev-libs/spdlog-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/libfmt-6.1.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a956dd35239cd2d56b93368b5be7c2b9
diff --git a/metadata/md5-cache/dev-libs/spsdeclib-5.1-r1 b/metadata/md5-cache/dev-libs/spsdeclib-5.1-r1
index 3374ec352ce2..85b33dd68e82 100644
--- a/metadata/md5-cache/dev-libs/spsdeclib-5.1-r1
+++ b/metadata/md5-cache/dev-libs/spsdeclib-5.1-r1
@@ -1,6 +1,5 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Kryoflux SPS Decoder Library
 EAPI=7
 HOMEPAGE=https://www.kryoflux.com/
@@ -8,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=Kryoflux-MAME
 SLOT=0
 SRC_URI=https://www.kryoflux.com/download/spsdeclib_5.1_source.zip
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8a4bee90b17f452e8d9535efd9c368ee
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=41973fcff0ba5c13c5e796cd46bafc4d
diff --git a/metadata/md5-cache/dev-libs/squareball-0.2.0 b/metadata/md5-cache/dev-libs/squareball-0.2.0
index 18358eeb76f2..62ba9235c9ef 100644
--- a/metadata/md5-cache/dev-libs/squareball-0.2.0
+++ b/metadata/md5-cache/dev-libs/squareball-0.2.0
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/pkgconfig test? ( dev-util/cmocka ) doc? ( app-doc/doxygen )
+DEPEND=test? ( dev-util/cmocka )
 DESCRIPTION=A general-purpose library for C99
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/rafaelmartins/squareball
 IUSE=doc test static-libs
 KEYWORDS=~amd64 ~x86
@@ -9,5 +10,4 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/squareball/releases/download/v0.2.0/squareball-0.2.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c77674093a06963c69da0f02aac2fac2
+_md5_=86efb22f888a7aa14da55fd702a954e1
diff --git a/metadata/md5-cache/dev-libs/squareball-9999 b/metadata/md5-cache/dev-libs/squareball-9999
index 1d7719f8a6fb..35ccc0ee8cd4 100644
--- a/metadata/md5-cache/dev-libs/squareball-9999
+++ b/metadata/md5-cache/dev-libs/squareball-9999
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/pkgconfig test? ( dev-util/cmocka ) doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=test? ( dev-util/cmocka )
 DESCRIPTION=A general-purpose library for C99
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/rafaelmartins/squareball
 IUSE=doc test static-libs
 LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c77674093a06963c69da0f02aac2fac2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0ce23fdc99f1102b65ca73f7dc1572b6
diff --git a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1 b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
index 15d9997f5cf5..ab9d5a0a5003 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
+++ b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( gcc-plugin? ( dev-scheme/guile ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( gcc-plugin? ( dev-scheme/guile ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
 DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=6
 HOMEPAGE=http://starpu.gforge.inria.fr/
@@ -10,5 +10,5 @@ RDEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/37744/starpu-1.2.6.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0905ad01780542c7a18a29399d1914d
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24-r3 b/metadata/md5-cache/dev-libs/stfl-0.24-r3
index 12def4522db5..45f70601c5b3 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24-r3
+++ b/metadata/md5-cache/dev-libs/stfl-0.24-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79382f8a9bb4bce495aeaed033fbb79c
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=24da50f81897046e40771f54d60467b4
diff --git a/metadata/md5-cache/dev-libs/stp-2.3.3 b/metadata/md5-cache/dev-libs/stp-2.3.3
index 3ff0f6c33306..ca02bfc8ca72 100644
--- a/metadata/md5-cache/dev-libs/stp-2.3.3
+++ b/metadata/md5-cache/dev-libs/stp-2.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= sci-mathematics/minisat
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stp/stp/archive/2.3.3.tar.gz -> stp-2.3.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad6b1e168714f4a3069c4e650c9d29d3
diff --git a/metadata/md5-cache/dev-libs/template-glib-3.34.0 b/metadata/md5-cache/dev-libs/template-glib-3.34.0
index 53ffdf9599ef..1bec5bfbce07 100644
--- a/metadata/md5-cache/dev-libs/template-glib-3.34.0
+++ b/metadata/md5-cache/dev-libs/template-glib-3.34.0
@@ -1,4 +1,4 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/glib-utils sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/glib-utils sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:= dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Templating library for GLib
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/template-glib/3.34/template-glib-3.34.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=873adb6fae4333c5a44dba15dd8a785d
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
deleted file mode 100644
index d9b570e3f32a..000000000000
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=Simple and small C++ XML parser
-EAPI=6
-HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
-IUSE=debug doc static-libs +stl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a044141273e2f48394320abb1ff818d3
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
index 45ca78b078be..982c8dda4845 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
@@ -1,12 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=install prepare
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Simple and small C++ XML parser
 EAPI=7
 HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
 IUSE=debug doc static-libs +stl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3268dd3d145f29018d59c89de8e92759
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3305578b2480be15edb7b948795a8cea
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-7.1.0 b/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
index cf6d9c45f875..777bdf1ca3c0 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
+++ b/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/leethomason/tinyxml2/archive/7.1.0.tar.gz -> tinyxml2-7.1.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=134f3c70d1d973798d8c1df312d24686
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-8.0.0 b/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
index 11190ac8b35a..4ac48c277167 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
+++ b/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/leethomason/tinyxml2/archive/8.0.0.tar.gz -> tinyxml2-8.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c036a57a81f84d85d1422213ed60672c
diff --git a/metadata/md5-cache/dev-libs/tntnet-2.2.1 b/metadata/md5-cache/dev-libs/tntnet-2.2.1
index 83bc8ac76b02..7f8a1af0accb 100644
--- a/metadata/md5-cache/dev-libs/tntnet-2.2.1
+++ b/metadata/md5-cache/dev-libs/tntnet-2.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( dev-libs/openssl:0= ) ) virtual/pkgconfig app-arch/zip >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( dev-libs/openssl:0= ) ) virtual/pkgconfig app-arch/zip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Modular, multithreaded web application server extensible with C++
 EAPI=5
 HOMEPAGE=http://www.tntnet.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-2.2.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46e4f8608df1508a2951a09321e8a653
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=074f38c4607ce5e3655ee8cbc51dafa0
diff --git a/metadata/md5-cache/dev-libs/tntnet-2.2.1-r3 b/metadata/md5-cache/dev-libs/tntnet-2.2.1-r3
index ae55c5c9101a..adc028c271e8 100644
--- a/metadata/md5-cache/dev-libs/tntnet-2.2.1-r3
+++ b/metadata/md5-cache/dev-libs/tntnet-2.2.1-r3
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/zip virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 DESCRIPTION=Modular, multithreaded web application server extensible with C++
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-2.2.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d9232a59b4b0df92659b2bb132d46b3e
diff --git a/metadata/md5-cache/dev-libs/tntnet-3.0 b/metadata/md5-cache/dev-libs/tntnet-3.0
index 7a2efdf91135..416cacf7a381 100644
--- a/metadata/md5-cache/dev-libs/tntnet-3.0
+++ b/metadata/md5-cache/dev-libs/tntnet-3.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-arch/zip >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig app-arch/zip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/cxxtools-3.0 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 DESCRIPTION=Modular, multithreaded web application server extensible with C++
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/cxxtools-3.0 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-3.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3c18126e369870ee786030858996bee5
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.5 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.5
index debbccf46feb..541272d99b0a 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.5
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.56:2 quvi? ( >=media-libs/libquvi-0.9.1:0= ) archive?
 RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.5.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c9706f0facf69821ab391782dbb34be
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.4 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.4
deleted file mode 100644
index 585e74cf3325..000000000000
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.19.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
-EAPI=7
-HOMEPAGE=https://github.com/tree-sitter/tree-sitter
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.4.tar.gz -> tree-sitter-0.19.4.tar.gz
-_md5_=b45e4e8dbf77ac54e52dbb3ba8cc6afb
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.4-r1 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.4-r1
new file mode 100644
index 000000000000..b1ba834f606d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.19.4-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
+EAPI=7
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.4.tar.gz -> tree-sitter-0.19.4-r1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9ba5846f1245d54540aa06904dd0320c
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-9999 b/metadata/md5-cache/dev-libs/tree-sitter-9999
index e2170327419d..9a8e6e256273 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-9999
+++ b/metadata/md5-cache/dev-libs/tree-sitter-9999
@@ -1,10 +1,10 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
 EAPI=7
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=fb0d05231060f5fc714d35343d2c4962
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0b96d63ba6f8900e8deb4fd5fe3cb098
diff --git a/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2 b/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
index 98d6081b6633..cd36183784c7 100644
--- a/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
+++ b/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
@@ -1,7 +1,8 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DEPEND=test? ( dev-util/cppunit )
 DESCRIPTION=Tiny Vector Matrix library using Expression Templates
-EAPI=5
+EAPI=7
 HOMEPAGE=http://tvmet.sourceforge.net/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -9,5 +10,4 @@ LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvmet/tvmet-1.7.2.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3d981cb91c2e718c2db9dc7f3a192dbe
+_md5_=0d3b5a157ba9dbfe785b89d26a02eed0
diff --git a/metadata/md5-cache/dev-libs/ucl-1.03-r1 b/metadata/md5-cache/dev-libs/ucl-1.03-r1
index b50641d8041f..be7773dfb462 100644
--- a/metadata/md5-cache/dev-libs/ucl-1.03-r1
+++ b/metadata/md5-cache/dev-libs/ucl-1.03-r1
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=!!dev-libs/libucl >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!!dev-libs/libucl
 DESCRIPTION=the UCL Compression Library
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.oberhumer.com/opensource/ucl/
 IUSE=static-libs
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0ba01b88eb83842fb972b977ef2af2d9
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=827b1619b303836baf3239e951035553
diff --git a/metadata/md5-cache/dev-libs/ucommon-7.0.0 b/metadata/md5-cache/dev-libs/ucommon-7.0.0
index 4ef5aa3768a5..eafeee80843b 100644
--- a/metadata/md5-cache/dev-libs/ucommon-7.0.0
+++ b/metadata/md5-cache/dev-libs/ucommon-7.0.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Portable C++ runtime for threads and sockets
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0/8
 SRC_URI=mirror://gnu/commoncpp/ucommon-7.0.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6ef4dc28a5dfb0c09adbb2b0c02c104c
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7.2-r1 b/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
index ba0ea82e9828..d92deb1ca1bc 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
+++ b/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) test? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) test? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Disassembler library for the x86/-64 architecture sets
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a85514a0d510e3befaa69e6cd38874b5
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.0.0 b/metadata/md5-cache/dev-libs/unibilium-2.0.0
index 5bbb561e36ef..9254e0ef9e31 100644
--- a/metadata/md5-cache/dev-libs/unibilium-2.0.0
+++ b/metadata/md5-cache/dev-libs/unibilium-2.0.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=LGPL-3+ MIT
 SLOT=0/4
 SRC_URI=https://github.com/mauke/unibilium/archive/v2.0.0.tar.gz -> unibilium-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9553102d19cca4daccdf05936805423d
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.1.0 b/metadata/md5-cache/dev-libs/unibilium-2.1.0
index bfc5cfd0beba..12804fd8ba3a 100644
--- a/metadata/md5-cache/dev-libs/unibilium-2.1.0
+++ b/metadata/md5-cache/dev-libs/unibilium-2.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-3+ MIT
 SLOT=0/4
 SRC_URI=https://github.com/neovim/unibilium/archive/v2.1.0.tar.gz -> unibilium-2.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e106f461e46897c304f44a01a3f80346
diff --git a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2 b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
index b04d2aa406de..9d2887c47557 100644
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
+++ b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v2.0.0.tar.gz -> unittest++-2.0.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f74156c4c00d76270fd3b10fbca85e8
diff --git a/metadata/md5-cache/dev-libs/univalue-1.0.5 b/metadata/md5-cache/dev-libs/univalue-1.0.5
index 1737c80a4ea9..09e0a7643999 100644
--- a/metadata/md5-cache/dev-libs/univalue-1.0.5
+++ b/metadata/md5-cache/dev-libs/univalue-1.0.5
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=C++ universal value object and JSON library
 EAPI=7
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://codeload.github.com/jgarzik/univalue/tar.gz/v1.0.5 -> univalue-1.0.5.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a62ef64a400ddbc55dec1648b44295a2
diff --git a/metadata/md5-cache/dev-libs/univalue-9999 b/metadata/md5-cache/dev-libs/univalue-9999
index 19da4bff39b9..d82517e43e9b 100644
--- a/metadata/md5-cache/dev-libs/univalue-9999
+++ b/metadata/md5-cache/dev-libs/univalue-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
 DESCRIPTION=C++ universal value object and JSON library
 EAPI=7
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jgarzik/univalue
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=39d69bbce39eae00244118c77ce41674
diff --git a/metadata/md5-cache/dev-libs/urdfdom-1.0.4 b/metadata/md5-cache/dev-libs/urdfdom-1.0.4
index 3259f42a6278..1df47810087a 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-1.0.4
+++ b/metadata/md5-cache/dev-libs/urdfdom-1.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=[threads]
 SLOT=0/1
 SRC_URI=https://github.com/ros/urdfdom/archive/1.0.4.tar.gz -> urdfdom-1.0.4.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b85594c2f8e164c7b66aabb17c558d30
diff --git a/metadata/md5-cache/dev-libs/urdfdom-9999 b/metadata/md5-cache/dev-libs/urdfdom-9999
index 36e1820c1d00..995e07cc168a 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=[threads]
 SLOT=0/1
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=470398175dcc8906bfd8a7b54b592956
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5 b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
index 2cb849c955ee..dd8fe57071a4 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/ros/urdfdom_headers/archive/1.0.5.tar.gz -> urdfdom_headers-1.0.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e626cff919cd3e3db041542e3fd9a2d
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-9999 b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
index b35e1747749e..8c6b70d2b68f 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://ros.org/wiki/urdf
 LICENSE=BSD
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e626cff919cd3e3db041542e3fd9a2d
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.4 b/metadata/md5-cache/dev-libs/uriparser-0.9.4
index 24375d3ee4c4..fe73cc02f003 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.9.4
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.4
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( unicode )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.4/uriparser-0.9.4.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fda3fe0f37bfd68013db0b0634a6a0ee
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.5 b/metadata/md5-cache/dev-libs/uriparser-0.9.5
index e2a6ed637a90..aebd77920e72 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.9.5
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.5
@@ -11,5 +11,5 @@ REQUIRED_USE=qt5? ( doc ) test? ( unicode )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.5/uriparser-0.9.5.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05e82b27bdec4fe9c528d48f3d30874e
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.12.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.12.2-r1
index 4cef8d6ce3e6..c12de1a18591 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.12.1
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.12.2-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure test
+DEFINED_PHASES=configure install test
 DEPEND=test? ( sys-process/time )
 DESCRIPTION=userspace RCU (read-copy-update) library
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/6
-SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.12.1.tar.bz2
-_md5_=69117757b0bf3358ab970fe3a89d2dda
+SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.12.2.tar.bz2
+_md5_=55e8716cd2ccd319da3331a12e87407e
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.1 b/metadata/md5-cache/dev-libs/utfcpp-3.1
index 7238387a4444..ab2d43b6a562 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-3.1
+++ b/metadata/md5-cache/dev-libs/utfcpp-3.1
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.1.tar.gz -> utfcpp-3.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e65923fbdab16b983168bac7272ea8a
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.1.1 b/metadata/md5-cache/dev-libs/utfcpp-3.1.1
index 24b89f3b0705..623b07c4b1c6 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-3.1.1
+++ b/metadata/md5-cache/dev-libs/utfcpp-3.1.1
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.1.1.tar.gz -> utfcpp-3.1.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1fadcd3d5dacceedef9caf3a24e2f098
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.1.2 b/metadata/md5-cache/dev-libs/utfcpp-3.1.2
index f44ff78942d4..a7c1b8b88fd7 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-3.1.2
+++ b/metadata/md5-cache/dev-libs/utfcpp-3.1.2
@@ -5,10 +5,10 @@ DESCRIPTION=UTF-8 C++ library
 EAPI=7
 HOMEPAGE=https://github.com/nemtrif/utfcpp
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.1.2.tar.gz -> utfcpp-3.1.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fadcd3d5dacceedef9caf3a24e2f098
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=121337046235e695af875dee5e10a2fa
diff --git a/metadata/md5-cache/dev-libs/utfcpp-9999 b/metadata/md5-cache/dev-libs/utfcpp-9999
index c46eb68a72d5..4b05121ea75c 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-9999
+++ b/metadata/md5-cache/dev-libs/utfcpp-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c697ec8967082a44db5b15ae625e7f7
diff --git a/metadata/md5-cache/dev-libs/uthash-2.3.0 b/metadata/md5-cache/dev-libs/uthash-2.3.0
index 30ca7fe03b61..d6fb8277a468 100644
--- a/metadata/md5-cache/dev-libs/uthash-2.3.0
+++ b/metadata/md5-cache/dev-libs/uthash-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=An easy-to-use hash implementation for C programmers
 EAPI=7
 HOMEPAGE=https://troydhanson.github.io/uthash/index.html
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD-1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/troydhanson/uthash/archive/v2.3.0.tar.gz -> uthash-2.3.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=499f98298f6923d248127f30bf29ea8a
+_md5_=1ecb0c3a7fec9212a3c861ded3c7d334
diff --git a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1 b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
index f8c159872877..ef1fd9d3e841 100644
--- a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
+++ b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
@@ -1,10 +1,11 @@
-DEFINED_PHASES=prepare
+BDEPEND=sys-devel/libtool
+DEFINED_PHASES=compile configure prepare
 DESCRIPTION=Library that supports Base64 (MIME), uuencode, xxencode and binhex coding
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c94ed77abc7423e3927b5b157ca42e4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9d9728d751e5d84b4588daa3555b4ec4
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.12 b/metadata/md5-cache/dev-libs/vala-common-0.48.12
index 48024efd37f3..9617b5d92a4e 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.12
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.12
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.12.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
-_md5_=8409b9b9fd5358118e5ea36acc248780
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
+_md5_=da6ad15548d4fe220e8205b7f77eb564
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.6 b/metadata/md5-cache/dev-libs/vala-common-0.48.6
deleted file mode 100644
index 1eea9a558170..000000000000
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.6
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Build infrastructure for packages that use Vala
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.6.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
-_md5_=d4f023cc9574a2b58fa62c17d2dd4869
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.9 b/metadata/md5-cache/dev-libs/vala-common-0.48.9
deleted file mode 100644
index 01417e3c0900..000000000000
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.9
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Build infrastructure for packages that use Vala
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.9.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
-_md5_=80ec047d000767b1553e9f7211be6d1c
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.50.2 b/metadata/md5-cache/dev-libs/vala-common-0.50.2
index 1186416fdb93..da902128c88b 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.50.2
+++ b/metadata/md5-cache/dev-libs/vala-common-0.50.2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.50/vala-0.50.2.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
 _md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.11 b/metadata/md5-cache/dev-libs/vala-common-0.52.2
index eb880a1a9ab0..6edf4c8a6c80 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.11
+++ b/metadata/md5-cache/dev-libs/vala-common-0.52.2
@@ -6,6 +6,6 @@ HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
-SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.11.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
-_md5_=a88da6d0887f1c58b41cf0533978aa3d
+SRC_URI=mirror://gnome/sources/vala/0.52/vala-0.52.2.tar.xz
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
+_md5_=d5a7b280170aa12348ef73ce245e9b64
diff --git a/metadata/md5-cache/dev-libs/vc-1.4.1 b/metadata/md5-cache/dev-libs/vc-1.4.1
index 1db39811b939..afb0406c962a 100644
--- a/metadata/md5-cache/dev-libs/vc-1.4.1
+++ b/metadata/md5-cache/dev-libs/vc-1.4.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/VcDevel/Vc/archive/1.4.1.tar.gz -> vc-1.4.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a31361398043453f1cf515c1271f8859
diff --git a/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904 b/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
index f72c8947ade2..f9d798228153 100644
--- a/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
+++ b/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/830067832d4af0fbd5710e9a45669a02fcfb7c3f.tar.gz -> vc-intrinsics-0_p20200904.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	96482dd3973a93c32659252dfeba1433	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5b9aff9177091ef0437b665eaa82fe3
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.4 b/metadata/md5-cache/dev-libs/voikko-fi-2.4
index 76f05cad415c..eba3f3b4b575 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.4
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/foma dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.4.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.4.tar.gz.asc )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=ec4f7b7ed382221148d379e75e3be811
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.12-r3 b/metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
index abef2d214a1e..322c14fd538f 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext test? ( dev-libs/nss[utils] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gettext test? ( dev-libs/nss[utils] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
 DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
 DESCRIPTION=Library for manipulating and storing storage volume encryption keys
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.12.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1be85fb89cc232a85354ff2be501d0bf
diff --git a/metadata/md5-cache/dev-libs/wayland-1.18.0 b/metadata/md5-cache/dev-libs/wayland-1.18.0
deleted file mode 100644
index 2c95e2308c13..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-1.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 sys-apps/grep[pcre] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Wayland protocol libraries
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
-IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<media-libs/mesa-18.1.1-r1
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.18.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4be9c9e1f31cd352b2de260e58ff37e5
diff --git a/metadata/md5-cache/dev-libs/wayland-1.19.0 b/metadata/md5-cache/dev-libs/wayland-1.19.0
index 2d188364315f..79511dba2eb3 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.19.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.19.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.19.0.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=55951575fc2d43725d2b82a0aee29d34
diff --git a/metadata/md5-cache/dev-libs/wayland-9999 b/metadata/md5-cache/dev-libs/wayland-9999
index 2c337090f7a2..6e723c3fb974 100644
--- a/metadata/md5-cache/dev-libs/wayland-9999
+++ b/metadata/md5-cache/dev-libs/wayland-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=399dad37133e326d1753cb2bd1fcd202
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.20 b/metadata/md5-cache/dev-libs/wayland-protocols-1.20
index 047885f372be..68d098ee2af5 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.20
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.20
@@ -4,9 +4,9 @@ DEPEND=dev-libs/wayland
 DESCRIPTION=Wayland protocol files
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.20.tar.xz
-_md5_=bebc571cfee1da69d1e2a926629a1632
+_md5_=4e9031b73a18436db2f258beba2f0bc1
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-9999 b/metadata/md5-cache/dev-libs/wayland-protocols-9999
index ecb1a7d8ba68..12d6d69808e0 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-9999
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare test unpack
 DEPEND=dev-libs/wayland
 DESCRIPTION=Wayland protocol files
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/wayland
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d4947e6f9dd0e2aff9d1bc7008850400
diff --git a/metadata/md5-cache/dev-libs/weston-8.0.0 b/metadata/md5-cache/dev-libs/weston-8.0.0
deleted file mode 100644
index d801b0198213..000000000000
--- a/metadata/md5-cache/dev-libs/weston-8.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( =media-video/pipewire-0.2*:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-DESCRIPTION=Wayland reference compositor
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
-IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=amd64 arm x86
-LICENSE=MIT CC-BY-SA-3.0
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( =media-video/pipewire-0.2*:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/weston-8.0.0.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e811b6eabc77770c38ee4477b033a4e
diff --git a/metadata/md5-cache/dev-libs/weston-9.0.0 b/metadata/md5-cache/dev-libs/weston-9.0.0
index 07795c42adcd..a2a51519f19b 100644
--- a/metadata/md5-cache/dev-libs/weston-9.0.0
+++ b/metadata/md5-cache/dev-libs/weston-9.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? (
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-9.0.0.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f28bf808cec12e60c7c3e53d1bce2495
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0353e555ed14797bf6a13b7564b8de03
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index d51496244642..46c102ccdc4b 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-p
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9bb4a1f780a49a992233661a05a0aaff
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc955d7d10d6b023f374291e476cbd79
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.25 b/metadata/md5-cache/dev-libs/xapian-1.2.25
index 0cb7929858c0..93e90f02f8ed 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.25
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.25
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/1.2.22
 SRC_URI=https://oligarchy.co.uk/xapian/1.2.25/xapian-core-1.2.25.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3d07db5d0754eae5b4da59715d104ee3
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=83f9b157bb73cff6164123adace79d93
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.17 b/metadata/md5-cache/dev-libs/xapian-1.4.17
index 8cba343d961a..aa644a6c6a86 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.17
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.17/xapian-core-1.4.17.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ff3ef077137c94ba9f53e94481118386
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=66e3887a28a2c99d2db95b16d2be8acc
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.18 b/metadata/md5-cache/dev-libs/xapian-1.4.18
index 620e1f6ca111..c3e6b1fd680b 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.18
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-core-1.4.18.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c0c0aaa749893ba6d8aabc123e2d4f9
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2037a6d390a441284f7136dd3f7fe629
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
index 87e4a442e316..0e0d36ed3832 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
 DEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DESCRIPTION=SWIG and JNI bindings for Xapian
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) ruby? ( || ( ruby_targets_ruby25 ruby_targets_ruby26 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-bindings-1.4.18.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=41a7a2ac3b48bf90bbf38129c8d5d987
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	ruby-ng	97084adc24921dfedde619aafdc14100	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=55de08a6aadcb1cba9f156002b828550
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.3-r2 b/metadata/md5-cache/dev-libs/xerces-c-3.2.3-r2
index 88728e635097..0bbedb3cf975 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.3-r2
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.3-r2
@@ -11,5 +11,5 @@ RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b0a7a68c126830cd721e46cea5ac001
diff --git a/metadata/md5-cache/dev-libs/xerces-c-9999 b/metadata/md5-cache/dev-libs/xerces-c-9999
index 5ba87018d1c0..6e980bb11538 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-9999
+++ b/metadata/md5-cache/dev-libs/xerces-c-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85c9f6acd77b7332b38f2aedaf9d0f7a
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r2 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r2
index 7c88a680e29d..be320715cf2d 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r2
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r2
@@ -4,12 +4,12 @@ DESCRIPTION=A lightweigt RPC library based on XML and HTTP
 EAPI=7
 HOMEPAGE=http://xmlrpc-c.sourceforge.net/
 IUSE=abyss +cgi +curl +cxx +libxml2 threads test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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=BSD
 RDEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( abyss curl cxx )
 RESTRICT=!test? ( test )
 SLOT=0/4.51
 SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.51.06.tgz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8e2e59326f5ad138d3410feb3a2bf101
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f3210359d45b6f16a0ef9e7f3135cf64
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.31 b/metadata/md5-cache/dev-libs/xmlsec-1.2.31
index c9abbbcf29a2..226d4e3dc142 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.31
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.31
@@ -5,11 +5,11 @@ DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting
 EAPI=7
 HOMEPAGE=https://www.aleksey.com/xmlsec
 IUSE=doc gcrypt gnutls libressl nss +openssl static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.31.tar.gz
-_md5_=fac678f89e0f5724f3c7dd704889de89
+_md5_=8f720baac147830ad18ab45eb5117d9f
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.7.3 b/metadata/md5-cache/dev-libs/xxhash-0.7.3
index 87d8b2226bcb..05b3acc31870 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.7.3
+++ b/metadata/md5-cache/dev-libs/xxhash-0.7.3
@@ -3,9 +3,9 @@ DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=7
 HOMEPAGE=http://www.xxhash.net
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.7.3.tar.gz -> xxhash-0.7.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=aabeb6b3c4a4f89c5b87cedc49770461
+_md5_=549b0947ef3a728b1905e13bef76f29c
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.8.0 b/metadata/md5-cache/dev-libs/xxhash-0.8.0
index ecf84902fa56..e2ddc3e4a17a 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.8.0
+++ b/metadata/md5-cache/dev-libs/xxhash-0.8.0
@@ -3,9 +3,9 @@ DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=7
 HOMEPAGE=http://www.xxhash.net
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.8.0.tar.gz -> xxhash-0.8.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c560f7f8b0eb961f5580d1b677b5b598
+_md5_=549b0947ef3a728b1905e13bef76f29c
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r3 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
index 07298ce18f9a..91d8bbc02396 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x8
 LICENSE=ISC
 SLOT=0/2
 SRC_URI=https://github.com/lloyd/yajl/tarball/2.1.0 -> yajl-2.1.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c600e28b53cc1650835d5fe656180ec4
diff --git a/metadata/md5-cache/dev-libs/yaz-3.0.53 b/metadata/md5-cache/dev-libs/yaz-3.0.53
index 94ad7b149820..e0393139d9a8 100644
--- a/metadata/md5-cache/dev-libs/yaz-3.0.53
+++ b/metadata/md5-cache/dev-libs/yaz-3.0.53
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2 dev-libs/libxslt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl:0 >=sys-devel/libtool-2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-lang/tcl:0 sys-devel/bison >=sys-devel/libtool-2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libxml2 dev-libs/libxslt sys-libs/readline:= sys-libs/ncurses:= virtual/libintl !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 DESCRIPTION=C/C++ toolkit for Z39.50v3 clients and servers
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.indexdata.dk/yaz
-IUSE=debug icu libressl tcpd ziffy
+IUSE=debug icu gnutls tcpd ziffy
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
 LICENSE=BSD GPL-2
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt sys-libs/readline:= sys-libs/ncurses:= virtual/libintl !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-3.0.53.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=720964f40f85453eae06bcf07f8c5038
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9a08a19da65845a538336b28a318198d
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.15 b/metadata/md5-cache/dev-libs/zlog-1.2.15
new file mode 100644
index 000000000000..4b9a2c2bdec7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/zlog-1.2.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DESCRIPTION=A reliable, thread safe, clear-model, pure C logging library.
+EAPI=7
+HOMEPAGE=http://hardysimpson.github.io/zlog/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.15.tar.gz -> zlog-v1.2.15.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=78b62ed22ae261264a0d8fda2ab3a683
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
deleted file mode 100644
index b01176929b44..000000000000
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
-DESCRIPTION=C client interface to Zookeeper server
-EAPI=5
-HOMEPAGE=https://zookeeper.apache.org/
-IUSE=doc static-libs test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b912e2974d800d9bed99290f458a304
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8
deleted file mode 100644
index f6070505cb5a..000000000000
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
-DESCRIPTION=C client interface to Zookeeper server
-EAPI=5
-HOMEPAGE=https://zookeeper.apache.org/
-IUSE=doc static-libs test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.8/zookeeper-3.4.8.tar.gz
-_md5_=726e3967ba030d286fe29bed7bf89bdd
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9
deleted file mode 100644
index 7f79350bcff5..000000000000
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
-DESCRIPTION=C client interface to Zookeeper server
-EAPI=5
-HOMEPAGE=https://zookeeper.apache.org/
-IUSE=doc static-libs test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.9/zookeeper-3.4.9.tar.gz
-_md5_=726e3967ba030d286fe29bed7bf89bdd
diff --git a/metadata/md5-cache/dev-libs/zthread-2.3.2-r4 b/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
index e05e740993b5..9feb6fa83cc0 100644
--- a/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
+++ b/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
@@ -1,12 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=platform-independent multi-threading and synchronization library for C++
-EAPI=6
+EAPI=7
 HOMEPAGE=http://zthread.sourceforge.net/
-IUSE=debug doc kernel_linux static-libs
+IUSE=debug doc kernel_linux
 KEYWORDS=~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f747c35a91d7e84d5ac2b1234986a59
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8c22a36547a7ac8140847802a16d470c
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.72 b/metadata/md5-cache/dev-libs/zziplib-0.13.72
index 2c193937b3f4..9b64d6f1c756 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.72
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.72
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight library for extracting data from files archived in a sin
 EAPI=7
 HOMEPAGE=https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/
 IUSE=sdl static-libs
-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=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0/13
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz -> zziplib-0.13.72.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a52835e32f8ca00a6daf73b41772f1b
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c4eaba4b0986391d7576e6a97ff64f9
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /metadata/md5-cache/dev-libs
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)