2021-04-12 23:20:23 UTC

156 files changed, 407 insertions, 315 deletions

diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
index f99a340b7ca5..927db12e0567 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 INHERIT=gnome.org meson multilib-minimal virtualx xdg
 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 test
-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=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[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.32: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/atk-2.36.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(-)?] >=app-accessibility/at-spi2-core-2.33.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=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.38/at-spi2-atk-2.38.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=34ba26f2b38d4648ff5eadd81b97edac
+_md5_=ff50b1de923ca5825c912e43eea0018a
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.38.0 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.38.0
index 43fa1bc2a3f9..0aa8472da5fc 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.38.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.38.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 INHERIT=gnome.org meson multilib-minimal systemd virtualx xdg
 IUSE=X 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 test
-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=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[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.36: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:= ) X? ( x11-libs/libX11[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/libXtst[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/libXi[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/at-spi2-core/2.38/at-spi2-core-2.38.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=a7b75416a9e248abbe796c27226efa6a
+_md5_=b40eaaa63850e1ded5c2c9cffa30f044
diff --git a/metadata/md5-cache/app-accessibility/orca-3.36.6 b/metadata/md5-cache/app-accessibility/orca-3.36.6
index affc0258ebea..04e5f15504ea 100644
--- a/metadata/md5-cache/app-accessibility/orca-3.36.6
+++ b/metadata/md5-cache/app-accessibility/orca-3.36.6
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Orca
 INHERIT=gnome2 python-single-r1
 IUSE=+braille python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-accessibility/at-spi2-atk-2.34:2 >=app-accessibility/at-spi2-core-2.36:2[introspection] >=dev-libs/atk-2.36 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_7? ( dev-python/gst-python:1.0[python_targets_python3_7(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_8(-)] ) braille? ( python_single_target_python3_7? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_7(-)] dev-libs/liblouis[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_8(-)] dev-libs/liblouis[python,python_targets_python3_8(-)] ) ) dev-libs/atk[introspection] python_single_target_python3_7? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_7(-)] >=dev-python/pyatspi-2.36[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_8(-)] >=dev-python/pyatspi-2.36[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/3.36/orca-3.36.6.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=b47a2bdc7dabed86a1336d5889b7e729
+_md5_=580136fe448ef1cecf538520e67c290a
diff --git a/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3 b/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
index 7b14c2244746..0f2e80fe248d 100644
--- a/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
+++ b/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
@@ -1,4 +1,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
+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 unpack
 DEPEND=!app-admin/gamin net-libs/libtirpc net-nds/rpcbind
 DESCRIPTION=FAM, the File Alteration Monitor
@@ -12,4 +12,4 @@ RDEPEND=!app-admin/gamin net-libs/libtirpc net-nds/rpcbind
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fam/fam_2.7.0.orig.tar.gz mirror://debian/pool/main/f/fam/fam_2.7.0-17.3.diff.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=1f2b41f69cfa35f713b982e77ec77974
+_md5_=ba102c746b027f5be40478c9208f2523
diff --git a/metadata/md5-cache/app-crypt/gcr-3.38.1 b/metadata/md5-cache/app-crypt/gcr-3.38.1
index 79074d8a9603..1b5a57f0ab77 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.38.1
+++ b/metadata/md5-cache/app-crypt/gcr-3.38.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gcr
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=gtk gtk-doc +introspection test +vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=app-crypt/gnupg
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=app-crypt/p11-kit-0.19.0 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) >=sys-apps/dbus-1 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.38/gcr-3.38.1.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	vala	5fab64090cefe75c5df431cefa0b653d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=a9cf7fcb6d4df2b8b47a4935398af173
+_md5_=e482c36010bafaeaaace5811087d0efd
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.20.4 b/metadata/md5-cache/app-crypt/libsecret-0.20.4
index 81eb0a929145..f7d4bbd87320 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.20.4
+++ b/metadata/md5-cache/app-crypt/libsecret-0.20.4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 INHERIT=gnome2 meson multilib-minimal python-any-r1 vala virtualx
 IUSE=+crypt gtk-doc +introspection 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 test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.44: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.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.20/libsecret-0.20.4.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	17241a11501065ff3651350040875aa9	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=b02280989602700a627e2759144ad949
+_md5_=8d2d8c804faa5010b9f66ee6fab7abf9
diff --git a/metadata/md5-cache/app-editors/dhex-0.69 b/metadata/md5-cache/app-editors/dhex-0.69
index b9875a8738b3..c8f85ecc2a9e 100644
--- a/metadata/md5-cache/app-editors/dhex-0.69
+++ b/metadata/md5-cache/app-editors/dhex-0.69
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=sys-libs/ncurses:=
 DESCRIPTION=ncurses-based hex-editor with diff mode
@@ -10,4 +11,4 @@ RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://www.dettus.net/dhex/dhex_0.69.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=f0ef937a489741d87ea7f2246bd4ec70
+_md5_=dfeb788fa8c65cdc09d011c95b1856c4
diff --git a/metadata/md5-cache/app-editors/levee-3.5a b/metadata/md5-cache/app-editors/levee-3.5a
index 0e6374b4290e..b3d00f3b6eb8 100644
--- a/metadata/md5-cache/app-editors/levee-3.5a
+++ b/metadata/md5-cache/app-editors/levee-3.5a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!app-text/lv sys-libs/ncurses:0=
+DEPEND=!app-text/lv sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=Really tiny vi clone, for things like rescue disks
 EAPI=5
 HOMEPAGE=http://www.pell.chi.il.us/~orc/Code/
@@ -10,4 +10,4 @@ RDEPEND=!app-text/lv sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.pell.chi.il.us/~orc/Code/levee/levee-3.5a.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=b8df87aa20659cea0fa303f13187671c
+_md5_=ac370e24bb09a617dc85d29a999f49f6
diff --git a/metadata/md5-cache/app-editors/sandy-0.4-r1 b/metadata/md5-cache/app-editors/sandy-0.4-r1
index f8af9fc300ed..e05759691b1e 100644
--- a/metadata/md5-cache/app-editors/sandy-0.4-r1
+++ b/metadata/md5-cache/app-editors/sandy-0.4-r1
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=an ncurses text editor with an easy-to-read, hackable C source
@@ -11,4 +12,4 @@ RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://git.suckless.org/sandy/snapshot/sandy-0.4.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=32ecedb1dc354b6fcd708d6b26b46f9a
+_md5_=811f9a823d412460003eaa7dd7eb7d74
diff --git a/metadata/md5-cache/app-misc/ckermit-8.0.211-r4 b/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
index a28ae34587ea..c9ff1ba9e56d 100644
--- a/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
+++ b/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= )
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= ) ncurses? ( virtual/pkgconfig )
 DESCRIPTION=combined serial and network communication software package
 EAPI=5
 HOMEPAGE=http://www.kermitproject.org/
@@ -11,4 +11,4 @@ RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= ) net-dialup/lrzsz
 SLOT=0
 SRC_URI=ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=b0a51033117266c6a8b436f0a46e7b37
+_md5_=049f20960f56bb76a26f3469604eb143
diff --git a/metadata/md5-cache/app-misc/ckermit-9.0.302 b/metadata/md5-cache/app-misc/ckermit-9.0.302
index 64ae35dcba30..78aff62c55ef 100644
--- a/metadata/md5-cache/app-misc/ckermit-9.0.302
+++ b/metadata/md5-cache/app-misc/ckermit-9.0.302
@@ -1,3 +1,4 @@
+BDEPEND=ncurses? ( virtual/pkgconfig )
 DEFINED_PHASES=compile install prepare
 DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= )
 DESCRIPTION=combined serial and network communication software package
@@ -11,4 +12,4 @@ RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= ) net-dialup/lrzsz
 SLOT=0
 SRC_URI=ftp://kermit.columbia.edu/kermit/archives/cku302.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=9eba783821267029370c9018d9676b47
+_md5_=c2f0b6c608ff8d5ef7e11630f428bef4
diff --git a/metadata/md5-cache/app-misc/geoclue-2.5.7 b/metadata/md5-cache/app-misc/geoclue-2.5.7
index 68ca8bbca9c4..08992197149c 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.5.7
+++ b/metadata/md5-cache/app-misc/geoclue-2.5.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home
 INHERIT=meson systemd vala xdg
 IUSE=+introspection gtk-doc modemmanager vala zeroconf
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.14.0 >=net-libs/libsoup-2.42.0:2.4 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) modemmanager? ( >=net-misc/modemmanager-1.6 ) zeroconf? ( >=net-dns/avahi-0.6.10[dbus] ) x11-libs/libnotify acct-user/geoclue sys-apps/dbus
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.0
 SRC_URI=https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.5.7/geoclue-2.5.7.tar.bz2
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=7288aeb5ec49a3638092382b4126700a
+_md5_=303bc1bb49c01f49e61954fc0e727e4d
diff --git a/metadata/md5-cache/app-misc/sl-5.02 b/metadata/md5-cache/app-misc/sl-5.02
index 053b44c0aaf8..07cc33f3b730 100644
--- a/metadata/md5-cache/app-misc/sl-5.02
+++ b/metadata/md5-cache/app-misc/sl-5.02
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=sophisticated graphical program which corrects your miss typing
 EAPI=6
 HOMEPAGE=http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html https://github.com/mtoyoda/sl/
+INHERIT=toolchain-funcs
 IUSE=l10n_ja
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Toyoda
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/mtoyoda/sl/archive/5.02.tar.gz -> sl-5.02.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2dac816db5747d7df9ca5832466cadcc
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3bc489b3a32a258d69832601cce3c4f3
diff --git a/metadata/md5-cache/app-misc/vcp-2.2-r2 b/metadata/md5-cache/app-misc/vcp-2.2-r2
index 93c0433dc37f..50e972e4ec6f 100644
--- a/metadata/md5-cache/app-misc/vcp-2.2-r2
+++ b/metadata/md5-cache/app-misc/vcp-2.2-r2
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Copy files/directories in a curses interface
@@ -10,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://members.iinet.net.au/~lynx/vcp/vcp-2.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=c00f64f74ac511f2b93b5730863edb00
+_md5_=94e8c5c3c56273f6aefdb4db1fe576ad
diff --git a/metadata/md5-cache/app-text/enchant-2.2.15-r1 b/metadata/md5-cache/app-text/enchant-2.2.15-r1
index 7b3f02a9768f..6c6fd4502789 100644
--- a/metadata/md5-cache/app-text/enchant-2.2.15-r1
+++ b/metadata/md5-cache/app-text/enchant-2.2.15-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=7
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell test voikko
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) voikko? ( dev-libs/libvoikko )
 REQUIRED_USE=|| ( hunspell aspell )
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz
-_md5_=2fe0daa61dca73d7bbd4fabf4f251d98
+_md5_=3cff348ab950cc74db0bda01db75b1ee
diff --git a/metadata/md5-cache/app-text/gspell-1.8.4 b/metadata/md5-cache/app-text/gspell-1.8.4
index 5e9fd922304d..42d5c018d3c4 100644
--- a/metadata/md5-cache/app-text/gspell-1.8.4
+++ b/metadata/md5-cache/app-text/gspell-1.8.4
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gspell
 INHERIT=gnome2 vala virtualx
 IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-text/iso-codes >=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gspell/1.8/gspell-1.8.4.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=3097a3dbd628f4d4720e09de6f7eaa46
+_md5_=c5a885572bd12b40f0f75c6abb268885
diff --git a/metadata/md5-cache/app-text/iso-codes-4.5.0 b/metadata/md5-cache/app-text/iso-codes-4.5.0
index 2af435c95932..2878a48db6b7 100644
--- a/metadata/md5-cache/app-text/iso-codes-4.5.0
+++ b/metadata/md5-cache/app-text/iso-codes-4.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=ISO language, territory, currency, script codes and their translatio
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
 INHERIT=python-any-r1
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/iso-codes-4.5.0/iso-codes-iso-codes-4.5.0.tar.gz -> iso-codes-4.5.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=70a569ecb873108cda7023937b63a033
+_md5_=37111faf28c2ee13e42ebeb4a9ad86e6
diff --git a/metadata/md5-cache/dev-cpp/mm-common-1.0.2 b/metadata/md5-cache/dev-cpp/mm-common-1.0.2
index 122705695a49..d3d26b373ff7 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-1.0.2
+++ b/metadata/md5-cache/dev-cpp/mm-common-1.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
 EAPI=7
 HOMEPAGE=https://www.gtkmm.org/
 INHERIT=gnome.org meson
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/mm-common/1.0/mm-common-1.0.2.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
-_md5_=1a6b82476af17ce9d6dfb276362bf48a
+_md5_=96b2506d26eec9d1057672fdef7c24c4
diff --git a/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4 b/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
index dcc2bd2a4a2e..03dcdea1578a 100644
--- a/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
+++ b/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DEPEND=virtual/libusb:1
 DESCRIPTION=Tool to communicate with Samsung SMDK boards
 EAPI=7
 HOMEPAGE=http://www.fluff.org/ben/smdk/tools/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/libusb:1
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v0.20.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=03e3c4eb87a7b42c47067f178f7762a3
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=0e91334ef78f885ea9dde3f5ac4ab35d
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2020.04-r2 b/metadata/md5-cache/dev-embedded/u-boot-tools-2020.04-r2
index bd75779147c9..ee35835fd60e 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2020.04-r2
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2020.04-r2
@@ -1,11 +1,12 @@
-BDEPEND=sys-devel/bison sys-devel/flex
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=utilities for working with Das U-Boot
 EAPI=7
 HOMEPAGE=https://www.denx.de/wiki/U-Boot/WebHome
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2020.04.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2563d3bfb5fa770b6ae2aaff4b617920
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=bf0f71d959de76f68e1a894ec9fa30c5
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2021.04_rc2 b/metadata/md5-cache/dev-embedded/u-boot-tools-2021.04_rc2
index e0bb8dd2ffe9..1897275b61eb 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2021.04_rc2
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2021.04_rc2
@@ -1,13 +1,14 @@
-BDEPEND=sys-devel/bison sys-devel/flex
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/openssl:0=
 DESCRIPTION=utilities for working with Das U-Boot
 EAPI=7
 HOMEPAGE=https://www.denx.de/wiki/U-Boot/WebHome
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0=
 SLOT=0
 SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2021.04-rc2.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c703020b641880a6e70421a9f53ba7c5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=62e371ebf3385d9fac844bddf1d84d1f
diff --git a/metadata/md5-cache/dev-java/openjdk-8.272_p10 b/metadata/md5-cache/dev-java/openjdk-8.272_p10
index cda02dcb2cea..bb8df54065b3 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.272_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.272_p10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 DESCRIPTION=Open source implementation of the Java programming language
 EAPI=6
 HOMEPAGE=https://openjdk.java.net
@@ -12,4 +12,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u272-ga.tar.bz2 -> openjdk-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u272-ga.tar.bz2 -> openjdk-corba-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u272-ga.tar.bz2 -> openjdk-hotspot-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u272-ga.tar.bz2 -> openjdk-jaxp-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u272-ga.tar.bz2 -> openjdk-jaxws-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u272-ga.tar.bz2 -> openjdk-jdk-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u272-ga.tar.bz2 -> openjdk-langtools-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u272-ga.tar.bz2 -> openjdk-nashorn-8.272_p10.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.272_p10.tar.bz2 )
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	1b9686c0df06500159478dfaf5c21338	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=271baa33eb2ba608bc5caeb65c6626f2
+_md5_=738c51ee210044ff0a8e0927958bedc7
diff --git a/metadata/md5-cache/dev-java/openjdk-8.282_p08-r1 b/metadata/md5-cache/dev-java/openjdk-8.282_p08-r1
index 7458b6accc75..7524cd097e4f 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.282_p08-r1
+++ b/metadata/md5-cache/dev-java/openjdk-8.282_p08-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 DESCRIPTION=Open source implementation of the Java programming language
 EAPI=6
 HOMEPAGE=https://openjdk.java.net
@@ -12,4 +12,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u282-ga.tar.bz2 -> openjdk-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u282-ga.tar.bz2 -> openjdk-corba-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u282-ga.tar.bz2 -> openjdk-hotspot-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u282-ga.tar.bz2 -> openjdk-jaxp-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u282-ga.tar.bz2 -> openjdk-jaxws-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u282-ga.tar.bz2 -> openjdk-jdk-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u282-ga.tar.bz2 -> openjdk-langtools-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u282-ga.tar.bz2 -> openjdk-nashorn-8.282_p08.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.282_p08.tar.bz2 )
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	1b9686c0df06500159478dfaf5c21338	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=97fb165d5d91630a0b4cf4f96b31940a
+_md5_=893d86a8c1b5cbe4cb0100c6ff47a99d
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.4 b/metadata/md5-cache/dev-lang/ghc-8.10.4
index cc8cabecc6c9..163dd925ee06 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.4
@@ -1,6 +1,6 @@
 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 postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=7
 HOMEPAGE=https://www.haskell.org/ghc/
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.10.4
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	2f31876646b777a7851b22816735765c	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	check-reqs	97b90bd8fb799993925e6b3a683184e5
-_md5_=31622e2537eb93910f24ea30869b83b1
+_md5_=e6e3f6507b1f6eb300c3365ad631b385
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.4 b/metadata/md5-cache/dev-lang/ghc-8.8.4
index 4eafc5d94247..46e4da326063 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.8.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.8.4
@@ -1,6 +1,6 @@
 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 postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=7
 HOMEPAGE=https://www.haskell.org/ghc/
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.8.4
 SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	2f31876646b777a7851b22816735765c	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	check-reqs	97b90bd8fb799993925e6b3a683184e5
-_md5_=01b59aa1e9f628a62621cc588299e2fe
+_md5_=487465ec5d677fab975a036ae7ed80b6
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.1 b/metadata/md5-cache/dev-lang/ghc-9.0.1
index 4df440115867..607893ec8fb7 100644
--- a/metadata/md5-cache/dev-lang/ghc-9.0.1
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.1
@@ -1,6 +1,6 @@
 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 postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=7
 HOMEPAGE=https://www.haskell.org/ghc/
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/9.0.1
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.1/ghc-9.0.1-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.1/ghc-9.0.1-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-9.0.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-9.0.1-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	2f31876646b777a7851b22816735765c	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	check-reqs	97b90bd8fb799993925e6b3a683184e5
-_md5_=1c415907b9c46a4e22776978a635f5ce
+_md5_=5ec47a1035ed66685fb40f0e3717479c
diff --git a/metadata/md5-cache/dev-lang/swig-4.0.0 b/metadata/md5-cache/dev-lang/swig-4.0.0
index e0bfbfe010dd..707ee0bb5361 100644
--- a/metadata/md5-cache/dev-lang/swig-4.0.0
+++ b/metadata/md5-cache/dev-lang/swig-4.0.0
@@ -1,8 +1,9 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib ) virtual/pkgconfig
 DESCRIPTION=Simplified Wrapper and Interface Generator
 EAPI=7
 HOMEPAGE=http://www.swig.org/
+INHERIT=toolchain-funcs
 IUSE=ccache doc pcre
 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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ BSD BSD-2
@@ -10,5 +11,5 @@ RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/swig/swig-4.0.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9788d69ac16119880419da3348b37282
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d224942edeb86ee42bbb500267b8ebda
diff --git a/metadata/md5-cache/dev-lang/swig-4.0.2 b/metadata/md5-cache/dev-lang/swig-4.0.2
index 31a244f6c3b2..b6a48a45ca98 100644
--- a/metadata/md5-cache/dev-lang/swig-4.0.2
+++ b/metadata/md5-cache/dev-lang/swig-4.0.2
@@ -1,14 +1,15 @@
 DEFINED_PHASES=configure install
-DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+DEPEND=virtual/pkgconfig pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 DESCRIPTION=Simplified Wrapper and Interface Generator
 EAPI=7
 HOMEPAGE=http://www.swig.org/ https://github.com/swig/swig
+INHERIT=toolchain-funcs
 IUSE=ccache doc pcre
 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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ BSD BSD-2
-RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+RDEPEND=virtual/pkgconfig pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/swig/swig-4.0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=122296e28805b5636e1cfc0c92960595
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=6f4a45478f740a779127d1e88a419ad6
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.10 b/metadata/md5-cache/dev-lang/tk-8.6.10
index 4fb7d0af5aa3..e0c60995fbb6 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.10
+++ b/metadata/md5-cache/dev-lang/tk-8.6.10
@@ -1,4 +1,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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXt-1.1.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(-)?] truetype? ( >=x11-libs/libXft-2.3.1-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.10: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(-)?] !aqua? ( x11-base/xorg-proto )
 DESCRIPTION=Tk Widget Set
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.10-src.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=135895edaa342523f62b6f55d4269767
+_md5_=473d089382a1fd5975a283530eeb2806
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.11 b/metadata/md5-cache/dev-lang/tk-8.6.11
index 1f3079437ee3..13c16f480ba0 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.11
+++ b/metadata/md5-cache/dev-lang/tk-8.6.11
@@ -1,4 +1,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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXt-1.1.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(-)?] truetype? ( >=x11-libs/libXft-2.3.1-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.11: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(-)?] !aqua? ( x11-base/xorg-proto )
 DESCRIPTION=Tk Widget Set
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.11-src.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=85a856ac2cc62a914006bcf9b1f9e54d
+_md5_=515a8bef78294242628db3bb0b14923d
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.11.1 b/metadata/md5-cache/dev-lang/tk-8.6.11.1
index 757dd48f5185..2f17590bcbee 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.11.1
+++ b/metadata/md5-cache/dev-lang/tk-8.6.11.1
@@ -1,4 +1,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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXt-1.1.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(-)?] truetype? ( >=x11-libs/libXft-2.3.1-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.11: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(-)?] !aqua? ( x11-base/xorg-proto )
 DESCRIPTION=Tk Widget Set
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.11.1-src.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=2c0c75657f47838d3debcd3caaf5fc76
+_md5_=5cc51c4242c68a9ee880e4bf66b75612
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.8 b/metadata/md5-cache/dev-lang/tk-8.6.8
index 0538600a0206..ae310df92441 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.8
+++ b/metadata/md5-cache/dev-lang/tk-8.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXt-1.1.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(-)?] truetype? ( >=x11-libs/libXft-2.3.1-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.8: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(-)?] !aqua? ( x11-base/xorg-proto ) 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 )
+DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXt-1.1.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(-)?] truetype? ( >=x11-libs/libXft-2.3.1-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.8: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/pkgconfig !aqua? ( x11-base/xorg-proto ) 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 )
 DESCRIPTION=Tk Widget Set
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.8-src.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=dffc8c6c0ba6891ca751661f21c3619e
+_md5_=fd3dc5573cc9ca1a833e8f893a744ac0
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.9 b/metadata/md5-cache/dev-lang/tk-8.6.9
index f8677387d9f6..7b68ef9eed5f 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.9
+++ b/metadata/md5-cache/dev-lang/tk-8.6.9
@@ -1,4 +1,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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXt-1.1.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(-)?] truetype? ( >=x11-libs/libXft-2.3.1-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.9: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(-)?] !aqua? ( x11-base/xorg-proto )
 DESCRIPTION=Tk Widget Set
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.9-src.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=3be5a6b01857390d1f0ccef0bfe7038e
+_md5_=da149d62b9aea6d378a30caa2453621d
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.9.1 b/metadata/md5-cache/dev-lang/tk-8.6.9.1
index 24683be6c076..5b01aada9dcd 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.9.1
+++ b/metadata/md5-cache/dev-lang/tk-8.6.9.1
@@ -1,4 +1,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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXt-1.1.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(-)?] truetype? ( >=x11-libs/libXft-2.3.1-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.9: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(-)?] !aqua? ( x11-base/xorg-proto )
 DESCRIPTION=Tk Widget Set
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.9.1-src.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=83ae9db8519e2ba345cd09a933da837a
+_md5_=5262439d17e434352408a878f6c328c2
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.24 b/metadata/md5-cache/dev-lang/vala-0.40.24
index 4b8105ac9b8b..a12bdc3ca15e 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.24
+++ b/metadata/md5-cache/dev-lang/vala-0.40.24
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 INHERIT=gnome2
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.24 valadoc? ( >=media-gfx/graphviz-2.16 )
 RESTRICT=!test? ( test )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.24.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=e0ec47fe29d7b8dcf51ba8fce96dfc55
+_md5_=2d11f5910c8464f362479f6429f4b225
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.12 b/metadata/md5-cache/dev-lang/vala-0.48.12
index 761e7867cb9c..eaa2ec1c408b 100644
--- a/metadata/md5-cache/dev-lang/vala-0.48.12
+++ b/metadata/md5-cache/dev-lang/vala-0.48.12
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 INHERIT=gnome2
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.12 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.48
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.12.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=3a20f31b4fd43c40b2c5b856e23e88b0
+_md5_=83e9f2611db3e01886abb68c27b1bc02
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 96bbc4a312bf..230b887f768e 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.18
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.18
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 INHERIT=xdg meson
 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_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
-_md5_=2b86adb7ea1018ec2ef619c7d76882f4
+_md5_=70f48ac5da1729b7d3cf240b38dbe99e
diff --git a/metadata/md5-cache/dev-libs/gjs-1.66.2 b/metadata/md5-cache/dev-libs/gjs-1.66.2
index a8afa817217b..c9ff8ce9b281 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.66.2
+++ b/metadata/md5-cache/dev-libs/gjs-1.66.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 INHERIT=gnome.org meson virtualx
 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	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=0de286297e0b8cc1d1560acad3bd18d7
+_md5_=769dcef46164a8f52600516a988ad6e1
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 f9a69ab07446..faa91857c1aa 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 INHERIT=gnome.org meson python-single-r1 toolchain-funcs xdg
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.66/gobject-introspection-1.66.1.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=e769d733eba95e8c02b43b96de2100bb
+_md5_=90de816da9c8f612ccc7136654df7668
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 cbdbb90e9b28..9ea56b2f99ff 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
@@ -4,10 +4,10 @@ DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 INHERIT=gnome.org
-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	df5c6c53843e1be0aad724138e78bbc3
-_md5_=69ac55acc456d1ab34b880583da240e1
+_md5_=d10c82cc64c26a0f7f229b57c91c9caf
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.6.0 b/metadata/md5-cache/dev-libs/json-glib-1.6.0
index 83a2a2e441c8..7531d0c656c4 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.6.0
+++ b/metadata/md5-cache/dev-libs/json-glib-1.6.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
 INHERIT=gnome.org meson multilib-minimal xdg-utils
 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.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cf49e24a302c58a9f16157435b1b440
+_md5_=22cf8fbf9141658a6681074882eaad02
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 43a3d2f00779..0b5e4509ed5d 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
@@ -11,4 +11,4 @@ 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=bc8d1a4bac80bd1187163c5152f43db2
+_md5_=2042fb5f77f3721e3e5f3b94ae520bb5
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.13 b/metadata/md5-cache/dev-libs/libgdata-0.17.13
index c89eedae803a..4da5d4b9d400 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.13
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.13
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
 INHERIT=gnome.org meson vala xdg
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.13.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=31477829fa58d3e4dfe414f4c9b583ce
+_md5_=838aef94b686ee81e93d8b50ac238831
diff --git a/metadata/md5-cache/dev-libs/libgudev-234 b/metadata/md5-cache/dev-libs/libgudev-234
index 0c380302496c..50598114a3ed 100644
--- a/metadata/md5-cache/dev-libs/libgudev-234
+++ b/metadata/md5-cache/dev-libs/libgudev-234
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 INHERIT=gnome2 multilib-minimal
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=ce3418660ac504a9b086d85802b31d50
+_md5_=3f76c296283ca7640d197a2a609ce4b9
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.5 b/metadata/md5-cache/dev-libs/libmanette-0.2.5
index 0dcd2bffa6c3..d9f7c77391ee 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.5
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
 INHERIT=gnome.org gnome2-utils meson vala xdg
 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_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	vala	5fab64090cefe75c5df431cefa0b653d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=9ec9bcfb9eb49d3df4a89d071c0d4856
+_md5_=3410101b9ae9d95c816bfac24da1efd8
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
index be7a9515ddb5..fd5a9602cdd7 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/libpwquality/libpwquality
 INHERIT=pam python-r1 toolchain-funcs usr-ldscript
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=2aa22b582db95527e783f147518ca338
+_md5_=c85d053829d819e2ae91ccdfd0223089
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.6 b/metadata/md5-cache/dev-libs/libsigc++-2.10.6
index e32e910ce5de..5f3d1036b51e 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.6
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
 INHERIT=flag-o-matic gnome.org meson multilib-minimal
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=1b3c30d9ad1e9ece35d2e2a7b6298b8e
+_md5_=703206327f2f17ce2cfeb2df70919adf
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 e1ebd90dc8ea..924279447d9d 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.12
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.12
@@ -4,9 +4,9 @@ DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 INHERIT=gnome.org
-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	df5c6c53843e1be0aad724138e78bbc3
-_md5_=3d34314891381688c1f1e6a6c811ac7c
+_md5_=f35d813a3acd37ac883a923d96f77dba
diff --git a/metadata/md5-cache/dev-ml/cudf-0.9 b/metadata/md5-cache/dev-ml/cudf-0.9
index b1f1423732ad..1813eb72b601 100644
--- a/metadata/md5-cache/dev-ml/cudf-0.9
+++ b/metadata/md5-cache/dev-ml/cudf-0.9
@@ -1,8 +1,10 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare test
 DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 test? ( dev-ml/ounit2 ) dev-ml/ocamlbuild dev-lang/perl
 DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
 EAPI=7
 HOMEPAGE=http://www.mancoosi.org/cudf/
+INHERIT=multilib toolchain-funcs
 IUSE=+ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-3
@@ -11,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/36602/cudf-0.9.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c23509134e7697d85af99bd1b1c829bf
+_md5_=186f78c20bb341454a0cf0c82a84be5c
diff --git a/metadata/md5-cache/dev-perl/Quota-1.7.2-r1 b/metadata/md5-cache/dev-perl/Quota-1.7.2-r1
index 7329828664f5..33d85964b670 100644
--- a/metadata/md5-cache/dev-perl/Quota-1.7.2-r1
+++ b/metadata/md5-cache/dev-perl/Quota-1.7.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-fs/quota[rpc] net-libs/libtirpc virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEPEND=sys-fs/quota[rpc] net-libs/libtirpc virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl
 DESCRIPTION=Perl interface to file system quotas
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Quota
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/quota[rpc] net-libs/libtirpc dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMZO/Quota-1.7.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=54845b4c134458b528a97dced9bab558
+_md5_=72aba253d7866b4bd2a2384547a9a87e
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.9 b/metadata/md5-cache/dev-python/html5-parser-0.4.9
index e24a498b0a95..55759804ecaf 100644
--- a/metadata/md5-cache/dev-python/html5-parser-0.4.9
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.9
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[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(-)] 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(-)]
+BDEPEND=dev-python/setuptools[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(-)] virtual/pkgconfig 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
 DEPEND=dev-libs/libxml2:=
 DESCRIPTION=Fast C based HTML 5 parsing for python
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/html5-parser/html5-parser-0.4.9.tar.gz -> html5-parser-0.4.9.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=325755c67d09a16b4a1411e829423614
+_md5_=5f786871e871fc39262c0a11ae532254
diff --git a/metadata/md5-cache/dev-python/pillow-8.1.2 b/metadata/md5-cache/dev-python/pillow-8.1.2
index 090b24641ab8..4ce886818537 100644
--- a/metadata/md5-cache/dev-python/pillow-8.1.2
+++ b/metadata/md5-cache/dev-python/pillow-8.1.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/imagemagick[png] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/imagemagick[png] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= )
 DESCRIPTION=Python Imaging Library (fork)
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.1.2.tar.gz -> pillow-8.1.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=abfdce323cafde66092da7d95811db5b
+_md5_=cb72c6df362d4045921c64f158fc446f
diff --git a/metadata/md5-cache/dev-python/pillow-8.2.0 b/metadata/md5-cache/dev-python/pillow-8.2.0
index ac7316ff9f2c..13d222730029 100644
--- a/metadata/md5-cache/dev-python/pillow-8.2.0
+++ b/metadata/md5-cache/dev-python/pillow-8.2.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= )
 DESCRIPTION=Python Imaging Library (fork)
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.2.0.tar.gz -> pillow-8.2.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=800b143e79667ebfbb7601650630be2d
+_md5_=cd7f758f6ff8d2d1ee9ce8e9fa0496db
diff --git a/metadata/md5-cache/dev-python/pygobject-3.38.0 b/metadata/md5-cache/dev-python/pygobject-3.38.0
index 4507bcb46cb6..13b5ec7870d8 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.38.0
+++ b/metadata/md5-cache/dev-python/pygobject-3.38.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://pygobject.readthedocs.io/
 INHERIT=gnome.org meson python-r1 virtualx xdg
 IUSE=+cairo examples test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-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+
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[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-libs/cairo[glib] )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.38/pygobject-3.38.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-r1	26e4ad0a4190b14f70973dc253e86535	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=ec5b55dba4be6258f882c22ec2043036
+_md5_=32477c593601b74c2cd2da6ab6847ff3
diff --git a/metadata/md5-cache/dev-util/cunit-2.1_p3 b/metadata/md5-cache/dev-util/cunit-2.1_p3
index 5664fe53255c..76d366c4e090 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1_p3
+++ b/metadata/md5-cache/dev-util/cunit-2.1_p3
@@ -1,4 +1,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
+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=ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=C Unit Test Framework
@@ -12,4 +12,4 @@ RDEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,ab
 SLOT=0
 SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-3.tar.bz2
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=f636d365c42d8662d9b1215c12cef7f5
+_md5_=0919d56b4f3321af7b961f9fb3b4e6e0
diff --git a/metadata/md5-cache/dev-util/editorconfig-geany-0.2 b/metadata/md5-cache/dev-util/editorconfig-geany-0.2
index e440f20d74ae..e6c4f8eb7876 100644
--- a/metadata/md5-cache/dev-util/editorconfig-geany-0.2
+++ b/metadata/md5-cache/dev-util/editorconfig-geany-0.2
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
 DEPEND=app-text/editorconfig-core-c:= dev-util/geany
 DESCRIPTION=EditorConfig plugin for Geany
 EAPI=7
 HOMEPAGE=https://github.com/editorconfig/editorconfig-geany/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-text/editorconfig-core-c:=
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-geany/archive/v0.2.tar.gz -> editorconfig-geany-0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=031d32c204d40b372902026872d6a81a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=869bf02c2dec60e4649753bbbd4f398c
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89-r1
index 71f0d9efdbf6..211f0db7c5ec 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89-r1
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare test unpack
 DEPEND=~dev-util/nvidia-cuda-toolkit-10.2.89 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= !prefix? ( >=x11-drivers/nvidia-drivers-440.33.01[uvm(+)] ) mpi? ( virtual/mpi ) )
 DESCRIPTION=NVIDIA CUDA Software Development Kit
@@ -12,4 +13,4 @@ RESTRICT=test
 SLOT=0/10.2.89
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	cuda	c2f1b334711bbbf2130f339636dc7515	portability	c10bdc40668533b1faf15b1d89df0303	unpacker	517f16af48ee3ab88180dd58b5143213
-_md5_=2a3c2933e9e54ea8356ff2e4067c6b98
+_md5_=61ee58020557a37f6fe2fde3a5e5a5aa
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
index 2666545e8217..db9647ad4df6 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-375.26[uvm(+)] mpi? ( virtual/mpi ) )
+DEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-375.26[uvm(+)] mpi? ( virtual/mpi ) ) virtual/pkgconfig
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=6
 HOMEPAGE=https://developer.nvidia.com/cuda-zone
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	cuda	c2f1b334711bbbf2130f339636dc7515	portability	c10bdc40668533b1faf15b1d89df0303	unpacker	517f16af48ee3ab88180dd58b5143213	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=2cf012673a96f34d0e96912edd47cdde
+_md5_=855e9d2cbaa697f805b7c15e8f9100e1
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88-r1
index d0da6c29fa57..4e3b9dca08f0 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-396.24[uvm(+)] mpi? ( virtual/mpi ) )
+DEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-396.24[uvm(+)] mpi? ( virtual/mpi ) ) virtual/pkgconfig
 DESCRIPTION=NVIDIA CUDA Software Development Kit
 EAPI=6
 HOMEPAGE=https://developer.nvidia.com/cuda-zone
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	cuda	c2f1b334711bbbf2130f339636dc7515	portability	c10bdc40668533b1faf15b1d89df0303	unpacker	517f16af48ee3ab88180dd58b5143213	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=ddcebbed2a3dffb2ed2eba19d51f1327
+_md5_=a0e8b1d5a4710a8d7b081e9582e4146e
diff --git a/metadata/md5-cache/dev-util/perf-5.10.16 b/metadata/md5-cache/dev-util/perf-5.10.16
index c73654b17b72..1b3f0ac2d4b4 100644
--- a/metadata/md5-cache/dev-util/perf-5.10.16
+++ b/metadata/md5-cache/dev-util/perf-5.10.16
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+BDEPEND=dev-util/patchutils sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
 DEFINED_PHASES=compile install prepare pretend setup test unpack
 DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) 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(-)] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils >=sys-kernel/linux-headers-4.19 java? ( virtual/jdk ) !!sys-devel/llvm:0
 DESCRIPTION=Userland tools for Linux Performance Counters
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.16.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=fa036b36e3fdd7b6d12d1612b1a9e983
+_md5_=3513aacc6d62bac0ce0d3057b6e04aa6
diff --git a/metadata/md5-cache/dev-util/perf-5.11 b/metadata/md5-cache/dev-util/perf-5.11
index 5d7ceba91d79..6c040a96eece 100644
--- a/metadata/md5-cache/dev-util/perf-5.11
+++ b/metadata/md5-cache/dev-util/perf-5.11
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
 DEFINED_PHASES=compile install prepare pretend setup test unpack
 DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) 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(-)] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils >=sys-kernel/linux-headers-4.19 java? ( virtual/jdk ) !!sys-devel/llvm:0
 DESCRIPTION=Userland tools for Linux Performance Counters
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=fa036b36e3fdd7b6d12d1612b1a9e983
+_md5_=3513aacc6d62bac0ce0d3057b6e04aa6
diff --git a/metadata/md5-cache/dev-util/perf-5.8 b/metadata/md5-cache/dev-util/perf-5.8
index 5d2344a1bd5c..98a433330caa 100644
--- a/metadata/md5-cache/dev-util/perf-5.8
+++ b/metadata/md5-cache/dev-util/perf-5.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) 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(-)] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils >=sys-kernel/linux-headers-4.19 sys-devel/bison sys-devel/flex java? ( virtual/jdk ) doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time ) !!sys-devel/llvm:0
+DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) 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(-)] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils >=sys-kernel/linux-headers-4.19 sys-devel/bison sys-devel/flex virtual/pkgconfig java? ( virtual/jdk ) doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time ) !!sys-devel/llvm:0
 DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=74e57687f1d29aa852134d2dac565ab4
+_md5_=0a8f67cb049350972c7412b38114fe52
diff --git a/metadata/md5-cache/dev-util/perf-5.9.9 b/metadata/md5-cache/dev-util/perf-5.9.9
index 5afb0ab78ed5..5aee359c3ffa 100644
--- a/metadata/md5-cache/dev-util/perf-5.9.9
+++ b/metadata/md5-cache/dev-util/perf-5.9.9
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+BDEPEND=dev-util/patchutils sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
 DEFINED_PHASES=compile install prepare pretend setup test unpack
 DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) 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(-)] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils >=sys-kernel/linux-headers-4.19 java? ( virtual/jdk ) !!sys-devel/llvm:0
 DESCRIPTION=Userland tools for Linux Performance Counters
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.9.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=ad8f44a301ceab735d6f8c5ce55ebb76
+_md5_=c5724cb8bc008a6d28414adedb52cd5b
diff --git a/metadata/md5-cache/dev-util/radare2-5.2.0 b/metadata/md5-cache/dev-util/radare2-5.2.0
new file mode 100644
index 000000000000..9ae30f44ee53
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-5.2.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libzip dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=7
+HOMEPAGE=http://www.radare.org
+INHERIT=bash-completion-r1 toolchain-funcs
+IUSE=ssl libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libzip dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://github.com/radareorg/radare2/archive/5.2.0.tar.gz -> radare2-5.2.0.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
+_md5_=f1798d527aa038cd47e8925c6dfde83d
diff --git a/metadata/md5-cache/dev-util/wiggle-0.9-r1 b/metadata/md5-cache/dev-util/wiggle-0.9-r1
index cf1922ec2085..82e495139755 100644
--- a/metadata/md5-cache/dev-util/wiggle-0.9-r1
+++ b/metadata/md5-cache/dev-util/wiggle-0.9-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/groff test? ( sys-process/time )
+BDEPEND=sys-apps/groff virtual/pkgconfig test? ( sys-process/time )
 DEFINED_PHASES=compile install prepare
 DEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
 DESCRIPTION=Tool for applying patches that patch cannot apply because of conflicting changes
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://neil.brown.name/wiggle/wiggle-0.9.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=0bceca3ee09a1e9d5316a1702be28df4
+_md5_=bb5d9842193fbd81ebcaf2ca6e9e0099
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-rsp-hle-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-rsp-hle-2.5.9
index f9e0032f6f53..04e2085db6ec 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-rsp-hle-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-rsp-hle-2.5.9
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
 DEPEND=>=games-emulation/mupen64plus-core-2.5.9:0=
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, HLE RSP plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:0=
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-rsp-hle/releases/download/2.5.9/mupen64plus-rsp-hle-src-2.5.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6c1359b06a43cb8028e3ab77526891f6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=250183d8dfdcd92b570df20704919861
diff --git a/metadata/md5-cache/games-puzzle/braincurses-1.1.0 b/metadata/md5-cache/games-puzzle/braincurses-1.1.0
index 3ff02784f24c..cc3996968c03 100644
--- a/metadata/md5-cache/games-puzzle/braincurses-1.1.0
+++ b/metadata/md5-cache/games-puzzle/braincurses-1.1.0
@@ -1,10 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:=
 DESCRIPTION=A version of the classic game Mastermind
 EAPI=7
 HOMEPAGE=https://github.com/bderrly/braincurses
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://github.com/bderrly/braincurses/archive/1.1.0.tar.gz -> braincurses-1.1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bd6f36d468d8da207236b1331a3c4522
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=60a292f1033df3662fab7e06f90a92b1
diff --git a/metadata/md5-cache/games-puzzle/gnurobbo-0.68 b/metadata/md5-cache/games-puzzle/gnurobbo-0.68
index fe9846410591..6a6d3be92f19 100644
--- a/metadata/md5-cache/games-puzzle/gnurobbo-0.68
+++ b/metadata/md5-cache/games-puzzle/gnurobbo-0.68
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
 DESCRIPTION=Robbo, a popular Atari XE/XL game ported to Linux
 EAPI=7
 HOMEPAGE=http://gnurobbo.sourceforge.net/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 BitstreamVera
 RDEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
 SLOT=0
 SRC_URI=mirror://sourceforge/gnurobbo/gnurobbo-0.68-source.tar.gz https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/0.68+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> gnurobbo-0.68-single-variable-declarations.patch
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c906090ab4143c1a922311ca050ece76
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=ecf152afbfa4780c409e4956a18077dc
diff --git a/metadata/md5-cache/games-strategy/tornado-1.4-r2 b/metadata/md5-cache/games-strategy/tornado-1.4-r2
index 8e6bd8474738..5f6a24d33d7a 100644
--- a/metadata/md5-cache/games-strategy/tornado-1.4-r2
+++ b/metadata/md5-cache/games-strategy/tornado-1.4-r2
@@ -1,13 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=nls? ( sys-devel/gettext )
+DEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=Clone of a C64 game - destroy the opponent's house
 EAPI=6
 HOMEPAGE=https://github.com/kouya/tornado
+INHERIT=toolchain-funcs
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/kouya/tornado/archive/v1.4.tar.gz -> tornado-1.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cc8617958c760538824c67ea411449a8
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=9300fcdc7b755a07b6c5390ce5438e4c
diff --git a/metadata/md5-cache/games-util/joystick-1.6.1 b/metadata/md5-cache/games-util/joystick-1.6.1
index 86bf56bba664..ec24ef1bf9e2 100644
--- a/metadata/md5-cache/games-util/joystick-1.6.1
+++ b/metadata/md5-cache/games-util/joystick-1.6.1
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
 DEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
 DESCRIPTION=joystick testing utilities
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
+INHERIT=toolchain-funcs
 IUSE=sdl udev
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2 udev? ( virtual/udev )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.6.1.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cce65e49999beddb0d6d64b8e38f3a91
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=248fc7abedcf5ea50bda2b518ea541e2
diff --git a/metadata/md5-cache/games-util/joystick-1.7.0 b/metadata/md5-cache/games-util/joystick-1.7.0
index 3e28f5c0636d..516768ab81d2 100644
--- a/metadata/md5-cache/games-util/joystick-1.7.0
+++ b/metadata/md5-cache/games-util/joystick-1.7.0
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
 DEPEND=sdl? ( media-libs/libsdl2:0[video] ) !<x11-libs/tslib-1.0-r2
 DESCRIPTION=joystick testing utilities
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
+INHERIT=toolchain-funcs
 IUSE=sdl udev
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl2:0[video] ) !<x11-libs/tslib-1.0-r2 udev? ( virtual/udev )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.7.0.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1510a052f91e39088fe7c7caa2a7f0cf
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=fb5b9b5fd349c8916245d92a33a7d255
diff --git a/metadata/md5-cache/gnome-base/gdm-3.36.4-r1 b/metadata/md5-cache/gnome-base/gdm-3.36.4-r1
index 7b77d8f99a3b..1d40b6909109 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.36.4-r1
+++ b/metadata/md5-cache/gnome-base/gdm-3.36.4-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GDM
 INHERIT=desktop gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev
 IUSE=accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44:2 dev-libs/libgudev >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-base/xorg-server x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 sys-libs/pam sys-apps/keyutils:= elogind? ( >=sys-auth/elogind-239.3[pam] ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) sys-auth/pambase[elogind?,systemd?] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) acct-group/gdm acct-user/gdm >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd[pam] )
 REQUIRED_USE=^^ ( elogind systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.36/gdm-3.36.4.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=9cbb83887481c2586417111b376b5102
+_md5_=a5ca6f1e7c851f54ee10d85399a5a02c
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.38.3 b/metadata/md5-cache/gnome-base/gnome-control-center-3.38.3
index 3f5116628e42..ed05febdd0cb 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.38.3
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.38.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
 INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
 IUSE=+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
 RDEPEND=>=gui-libs/libhandy-1:1= gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-sound/pulseaudio-2.0[glib] >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 >=gnome-base/gnome-desktop-3.27.90:3= >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-3.37.0 dev-libs/libxml2:2 >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy flickr? ( >=media-libs/grilo-0.3.0:0.3= ) >=x11-libs/gtk+-3.22.0:3[X,wayland=] cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) v4l? ( >=media-video/cheese-3.28.0 ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.0 >=net-misc/networkmanager-1.20.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.1.24 net-libs/libsoup:2.4 media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret media-libs/gsound >=dev-libs/libpwquality-1.2.2 systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.38/gnome-control-center-3.38.3.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-3.38.3-patchset.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=c4fc8577e583cffca391b17310a4f539
+_md5_=8dcf437c3a0a3b2c9fcad6ee7f7e9b74
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.38.3 b/metadata/md5-cache/gnome-base/gnome-desktop-3.38.3
index 57f14d2c6caa..ac3adee14628 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.38.3
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.38.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
 INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=debug gtk-doc +introspection seccomp systemd udev
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
 SLOT=3/19
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.38/gnome-desktop-3.38.3.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=d7ff63cd965e70828a73c265ad21fd36
+_md5_=54f271e826e0e68164c84f392be6b88b
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.38.0 b/metadata/md5-cache/gnome-base/gnome-session-3.38.0
index 4f632a857927..f0ca313221c0 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.38.0
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.38.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
 INHERIT=desktop gnome.org gnome2-utils meson xdg
 IUSE=doc elogind systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.38/gnome-session-3.38.0.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=b146d7eb23ae949a33b48f3586c97f54
+_md5_=e17514545b166a7e4986e4d4f5dba76b
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1
index 6c6db2319e48..616b83c235a0 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-settings-daemon
 INHERIT=gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
 IUSE=+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.56:2 >=gnome-base/gnome-desktop-3.34.2:3= >=gnome-base/gsettings-desktop-schemas-3.35.91 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-3.9.5:2= colord? ( >=x11-misc/colord-1.3.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= x11-libs/libX11 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 sys-apps/dbus[user-session] ) gnome-base/dconf elogind? ( sys-auth/elogind ) !<gnome-base/gnome-session-3.33.90 !<gnome-base/gdm-3.33.90 !<gnome-extra/gnome-shell-extensions-3.34.1 !<gnome-base/gnome-flashback-3.33.1
 REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) wayland? ( udev )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.38/gnome-settings-daemon-3.38.1.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	meson	e43eef9331f54965a573ed380854ff47	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=f2f6f0bfecd18b88fe9db7527fe66f5f
+_md5_=ec250b4095c1a9e15af1af6a6b59d636
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.38.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.38.3
index cd3ff1f67c65..c2d7a91ee926 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.38.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.38.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 INHERIT=gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.65.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.38.0:0/7[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:0/0.3 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.38/gnome-shell-3.38.3.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=06b818b47ca90facbf3832f92ba001cd
+_md5_=3a69ceb9f04bdb8a2ace993497a5e68d
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0
index afac31c96638..dcfa5b7cdde5 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0
@@ -6,9 +6,9 @@ EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=+introspection
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.38/gsettings-desktop-schemas-3.38.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=b97b7ec946af817e5724bc40475f9e05
+_md5_=339a7e682a379c2f85ad4f96809ba748
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.50.3 b/metadata/md5-cache/gnome-base/librsvg-2.50.3
index 911f629f5adf..f0b84599afd6 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.50.3
+++ b/metadata/md5-cache/gnome-base/librsvg-2.50.3
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
 INHERIT=gnome2 multilib-minimal rust-toolchain vala
 IUSE=+introspection +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=amd64 arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/cairo-1.16.0[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9: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(-)?] >=x11-libs/gdk-pixbuf-2.20: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(-)?] >=dev-libs/glib-2.50.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(-)?] >=media-libs/harfbuzz-2.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(-)?] >=dev-libs/libxml2-2.9.1-r4: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(-)?] >=x11-libs/pango-1.38.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.50/librsvg-2.50.3.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	rust-toolchain	9535ce5fa1388d814251dbd7663f0942	vala	5fab64090cefe75c5df431cefa0b653d
-_md5_=403dd6fed946c8eaaa7f0200629faeff
+_md5_=5d9317a628f12deac9378a517545d077
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.38.4 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.38.4
index 83c233a25f2f..f948f9e2dd37 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.38.4
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.38.4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 INHERIT=cmake db-use flag-o-matic gnome2 systemd vala virtualx
 IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
 RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/62-25-20
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.38/evolution-data-server-3.38.4.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	db-use	063d3e7add942762a8203b52ec3066c2	libtool	f143db5a74ccd9ca28c1234deffede96	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=28cacd1fbf031a864f729fbce03f106f
+_md5_=b0b22d975061d3bcfd5dfa842c11152b
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-13.0.4 b/metadata/md5-cache/gnome-extra/gucharmap-13.0.4
index 64dff526d655..0e6ac5bb8cc8 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-13.0.4
+++ b/metadata/md5-cache/gnome-extra/gucharmap-13.0.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 INHERIT=gnome2-utils meson vala xdg
 IUSE=debug +introspection gtk-doc vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-3+
 RDEPEND==app-i18n/unicode-data-13.0* >=dev-libs/glib-2.32:2 media-libs/freetype:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/pango-1.42.4-r2[introspection?]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/13.0.4/gucharmap-13.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	vala	5fab64090cefe75c5df431cefa0b653d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=bff1213cb7dfac47b4822f8f4030b18d
+_md5_=28359b4e485c08da17fb88c0931fe1de
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.47 b/metadata/md5-cache/gnome-extra/libgsf-1.14.47
index 9e1282eb6039..deea3d82af80 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.47
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.47
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://developer.gnome.org/gsf/
 INHERIT=gnome2
 IUSE=bzip2 gtk +introspection
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.47.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=26e75dfdba526da8a39420da550a4186
+_md5_=2597c7ec82e0df9327da84d0eda9b0ef
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.20.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.20.0
index 91f818d47c68..a1150f210cf7 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.20.0
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.20.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 INHERIT=gnome.org meson xdg
 IUSE=appindicator modemmanager selinux teamd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.20/network-manager-applet-1.20.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=64a97114fb43c0f43939391c812bc410
+_md5_=6fc836fbc110ab22b38ec9b7b77683bc
diff --git a/metadata/md5-cache/gui-libs/libhandy-1.0.3 b/metadata/md5-cache/gui-libs/libhandy-1.0.3
index f1843ccab343..ef9ad6562151 100644
--- a/metadata/md5-cache/gui-libs/libhandy-1.0.3
+++ b/metadata/md5-cache/gui-libs/libhandy-1.0.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libhandy/
 INHERIT=gnome.org meson xdg vala virtualx
 IUSE=examples glade gtk-doc +introspection test +vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libhandy/1.0/libhandy-1.0.3.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=4607ed13f1b15a8bdcb9bd0cf73712bf
+_md5_=3cd20c8d141cadd8d775f0ce2d433a6e
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.301 b/metadata/md5-cache/media-fonts/cantarell-0.301
index 2dce615effe3..5e2f0960bac9 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.301
+++ b/metadata/md5-cache/media-fonts/cantarell-0.301
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
 INHERIT=font gnome.org meson
 IUSE=X
-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=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.301/cantarell-fonts-0.301.tar.xz
 _eclasses_=font	0667878c2b594871023dd1833d05996f	gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
-_md5_=d5cdabe62f9b668a73c9270847684d0c
+_md5_=104a5b64c437cb26c7cc92e084a17e6c
diff --git a/metadata/md5-cache/media-libs/gmmlib-21.1.1 b/metadata/md5-cache/media-libs/gmmlib-21.1.1
new file mode 100644
index 000000000000..7aca0ee942c4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gmmlib-21.1.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Intel Graphics Memory Management Library
+EAPI=7
+HOMEPAGE=https://github.com/intel/gmmlib
+INHERIT=cmake-multilib
+IUSE=test +custom-cflags 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
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-21.1.1.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999
+_md5_=029956512524a00b96e37a0d276c2295
diff --git a/metadata/md5-cache/media-libs/graphene-1.10.2-r1 b/metadata/md5-cache/media-libs/graphene-1.10.2-r1
index 88900118931a..74c9e6da0bea 100644
--- a/metadata/md5-cache/media-libs/graphene-1.10.2-r1
+++ b/metadata/md5-cache/media-libs/graphene-1.10.2-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://ebassi.github.io/graphene/
 INHERIT=xdg-utils meson multilib-minimal python-any-r1
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +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=MIT
 RDEPEND=>=dev-libs/glib-2.30.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:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.10.2/graphene-1.10.2.tar.xz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=b77f4ae7f454fd4a0b7ccc110843cda1
+_md5_=662602ade221951e751102c29e92769e
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.26 b/metadata/md5-cache/media-libs/libgphoto2-2.5.26
index 0ee18046a8c7..37439d3f72e5 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.26
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.26
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.gphoto.org/
 INHERIT=multilib multilib-minimal udev
 IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=acct-group/plugdev >=dev-libs/libxml2-2.9.1-r4: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/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] )
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.26.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=87ef4a6d1e662f6bae3c097a9cf01b21
+_md5_=6dbf503a50ba3e7c9f193641aa16aecc
diff --git a/metadata/md5-cache/media-libs/netpbm-10.76.00 b/metadata/md5-cache/media-libs/netpbm-10.76.00
index cc0a7cf145b8..a35a1c4a112b 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.76.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.76.00
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils sys-devel/flex
+BDEPEND=app-arch/xz-utils sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
 DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
@@ -12,4 +12,4 @@ RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-lib
 SLOT=0
 SRC_URI=mirror://gentoo/netpbm-10.76.00.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=851d927852fd25791d873a02584b3eb1
+_md5_=6516f91df18320c550ddd5a3fc385a05
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.7-r1 b/metadata/md5-cache/media-sound/deadbeef-1.8.7-r1
index 77cc4344e976..fad87ee01b50 100644
--- a/metadata/md5-cache/media-sound/deadbeef-1.8.7-r1
+++ b/metadata/md5-cache/media-sound/deadbeef-1.8.7-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm 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
+BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm 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 postinst postrm preinst prepare
 DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
 SLOT=0
 SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.8.7.tar.bz2
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	l10n	8cdd85e169b835d518bc2fd59f780d8e	edos2unix	33e347e171066657f91f8b0c72ec8773	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=bc0f0298df9809b268a50eafed5c3838
+_md5_=45903b71dd9d6cec6bfd18f82d74598c
diff --git a/metadata/md5-cache/media-video/libva-utils-2.11.1 b/metadata/md5-cache/media-video/libva-utils-2.11.1
index 5e8f81cbabee..c12e21fa3305 100644
--- a/metadata/md5-cache/media-video/libva-utils-2.11.1
+++ b/metadata/md5-cache/media-video/libva-utils-2.11.1
@@ -5,13 +5,13 @@ DESCRIPTION=Collection of utilities and tests for VA-API
 EAPI=7
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=autotools
-IUSE=+drm examples putsurface test test_va_api +vainfo wayland X
+IUSE=+drm examples putsurface test test-va-api +vainfo wayland X
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libva-2.11.0:=[drm?,wayland?,X?] wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 )
-REQUIRED_USE=|| ( drm wayland X ) putsurface? ( || ( wayland X ) ) || ( examples putsurface test_va_api vainfo )
+REQUIRED_USE=|| ( drm wayland X ) putsurface? ( || ( wayland X ) ) || ( examples putsurface test-va-api vainfo )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/libva-utils/archive/2.11.1.tar.gz -> libva-utils-2.11.1.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=05cc27f6567803d25f3e0ec0a7bb7f8b
+_md5_=aeac62c2869ba7557795caee47a36136
diff --git a/metadata/md5-cache/media-video/libva-utils-9999 b/metadata/md5-cache/media-video/libva-utils-9999
index 38dc7343a2c2..dc800be74ced 100644
--- a/metadata/md5-cache/media-video/libva-utils-9999
+++ b/metadata/md5-cache/media-video/libva-utils-9999
@@ -5,12 +5,12 @@ DESCRIPTION=Collection of utilities and tests for VA-API
 EAPI=7
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=autotools git-r3
-IUSE=+drm examples putsurface test test_va_api +vainfo wayland X
+IUSE=+drm examples putsurface test test-va-api +vainfo wayland X
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=~x11-libs/libva-9999:=[drm?,wayland?,X?] wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 )
-REQUIRED_USE=|| ( drm wayland X ) putsurface? ( || ( wayland X ) ) || ( examples putsurface test_va_api vainfo )
+REQUIRED_USE=|| ( drm wayland X ) putsurface? ( || ( wayland X ) ) || ( examples putsurface test-va-api vainfo )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=9b2ecb57a04f20beea265ceadfec15a8
+_md5_=619f3091ea55d9da314e2a8ee6860e28
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.22 b/metadata/md5-cache/media-video/pipewire-0.3.22
index a2013c0d6109..cd9924ddccb9 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.22
+++ b/metadata/md5-cache/media-video/pipewire-0.3.22
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://pipewire.org/
 INHERIT=meson
 IUSE=bluetooth debug doc ffmpeg gstreamer jack sdl sndfile systemd test vulkan X
-KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/alsa-lib-1.1.7 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) sdl? ( media-libs/libsdl2 ) sndfile? ( >=media-libs/libsndfile-1.0.20 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.22.tar.gz -> pipewire-0.3.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
-_md5_=ec4bec7670c3dce344bfcad37047dc03
+_md5_=71e4020e2990d5bb3ccfed8f61b15868
diff --git a/metadata/md5-cache/net-analyzer/ipguard-1.04-r1 b/metadata/md5-cache/net-analyzer/ipguard-1.04-r1
index 4dbe65b166c1..91883ee7591e 100644
--- a/metadata/md5-cache/net-analyzer/ipguard-1.04-r1
+++ b/metadata/md5-cache/net-analyzer/ipguard-1.04-r1
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=Tool designed to protect LAN IP adress space by ARP spoofing
 EAPI=7
 HOMEPAGE=http://ipguard.deep.perm.ru/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=http://ipguard.deep.perm.ru/files/ipguard-1.04.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4e5941f637e9d60567a040b5e9bbde49
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=4d2707493d613fb683601bd3fe5e5e90
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8 b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
index 461629a9109b..c0addc2278cb 100644
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
+++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
@@ -1,4 +1,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
+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/libpcap sys-libs/db:*
 DESCRIPTION=Reports network interface statistics
@@ -12,4 +12,4 @@ RDEPEND=net-libs/libpcap sys-libs/db:*
 SLOT=0
 SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz mirror://debian/pool/main/t/tcpstat/tcpstat_1.5-8.debian.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=447aa6d91b35b6cba7ba376f1b51f476
+_md5_=0b748e919ff54ff92e95ae8bec4d6a39
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2 b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
index cf4c96d30699..135d353535d2 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
@@ -1,4 +1,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
+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=sys-libs/ncurses:*
 DESCRIPTION=An extremely configurable ftp client
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=https://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=fb8bc0778e6f6fca275a83aec134d2f7
+_md5_=ecc65c8796e7947afeafa30bec1696b8
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.66.0 b/metadata/md5-cache/net-libs/glib-networking-2.66.0
index e5ea6c3ed751..24f9de8d87b5 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.66.0
+++ b/metadata/md5-cache/net-libs/glib-networking-2.66.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/glib-networking/
 INHERIT=gnome.org gnome2-utils meson multilib-minimal xdg
 IUSE=+gnome +libproxy +ssl 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 ~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+
 RDEPEND=>=dev-libs/glib-2.64.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(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) >=net-libs/gnutls-3.6.5:=[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? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.66/glib-networking-2.66.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=74ec83754e5c805031e76f2c62fb5bd1
+_md5_=c6d9be0a6da427eba541ca92bf870c4d
diff --git a/metadata/md5-cache/net-libs/libmbim-1.24.4 b/metadata/md5-cache/net-libs/libmbim-1.24.4
index a8e15052e75e..4180dc4f6467 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.24.4
+++ b/metadata/md5-cache/net-libs/libmbim-1.24.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim
 INHERIT=multilib
 IUSE=udev
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.48:2 udev? ( dev-libs/libgudev:= )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.24.4.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7c0fc9fed295dffc4c53ff59cf6dd57b
+_md5_=3ab9fd3e45f0db18d383c589964062eb
diff --git a/metadata/md5-cache/net-libs/libqmi-1.26.6 b/metadata/md5-cache/net-libs/libqmi-1.26.6
index 39f485eed036..c02fb30add37 100644
--- a/metadata/md5-cache/net-libs/libqmi-1.26.6
+++ b/metadata/md5-cache/net-libs/libqmi-1.26.6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
 INHERIT=multilib
 IUSE=doc +mbim
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
 SLOT=0/5.7
 SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.26.6.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1e559e9d6a3e5cdef84531c1bb37905a
+_md5_=d0f27ce7d9be57c6c8ffc2f2541a26d4
diff --git a/metadata/md5-cache/net-libs/nodejs-12.21.0 b/metadata/md5-cache/net-libs/nodejs-12.21.0
index 223e2ac26171..4c72840bdef3 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.21.0
+++ b/metadata/md5-cache/net-libs/nodejs-12.21.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/12
 SRC_URI=https://nodejs.org/dist/v12.21.0/node-v12.21.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8749c4de4defcb33228222fef9adde9f
+_md5_=112887de15cc9890959be7d571457886
diff --git a/metadata/md5-cache/net-libs/nodejs-14.16.0 b/metadata/md5-cache/net-libs/nodejs-14.16.0
index 34af96992302..a770af6175ae 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.16.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.16.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.16.0/node-v14.16.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4dcb534f1769762665268f7202c5823
+_md5_=ed7deb2ce4ecf66d6384556aa9fb7538
diff --git a/metadata/md5-cache/net-libs/nodejs-15.11.0 b/metadata/md5-cache/net-libs/nodejs-15.11.0
index 66a5247c9ae3..db935b0e7902 100644
--- a/metadata/md5-cache/net-libs/nodejs-15.11.0
+++ b/metadata/md5-cache/net-libs/nodejs-15.11.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/15
 SRC_URI=https://nodejs.org/dist/v15.11.0/node-v15.11.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a93073d1fe7716cc6d9a0eccc7eaf2fc
+_md5_=28c4f81ea3b09e856c68d22da69546cf
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index d37bff4bb713..e91d4a3aa426 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b9841d5f402d70c0030dd6d9794669d
+_md5_=29fc825623e76886709b78785663a6cd
diff --git a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2 b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
index 44af63291c27..e6727934c53c 100644
--- a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
+++ b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
@@ -1,4 +1,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
+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
 DEPEND=sys-libs/ncurses app-arch/sharutils net-mail/mailbase
 DESCRIPTION=Metamail (with Debian patches) - Generic MIME package
@@ -12,4 +12,4 @@ RDEPEND=app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
 SLOT=0
 SRC_URI=http://ftp.funet.fi/pub/unix/mail/metamail/mm2.7.tar.Z mirror://debian/pool/main/m/metamail/metamail_2.7-53.diff.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=9387669917a47e80a48cb5d1bb6110d4
+_md5_=1c90bc0ba42c4a2c3696a334a417d5c1
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9.3.4 b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
index 1362c6fa0c7f..ddfd24f93cb4 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9.3.4
+++ b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 INHERIT=systemd toolchain-funcs
 IUSE=debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.3.4.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=f214c442c93429819ce397f2e7087052
+_md5_=1e5c65e7870842b9987c52ee912d0be9
diff --git a/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2 b/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
index 0c2401604296..120eea3084a6 100644
--- a/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
+++ b/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=gtk? ( dev-libs/glib:2= x11-libs/gtk+:2= )
 DESCRIPTION=Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=gtk
@@ -10,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( dev-libs/glib:2= x11-libs/gtk+:2= )
 SLOT=0
 SRC_URI=mirror://gentoo/ipsorc-2.0.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=778ddfb7a9d0701c083492082a16556b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=a69a54776243a7557e3e60db8ed20525
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
index 40917438ceb6..7d68a0f964c1 100644
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
 INHERIT=gnome.org
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=CC-PD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20201225/mobile-broadband-provider-info-20201225.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
-_md5_=c44503530c8744026814f21635df0d40
+_md5_=ab9d9dfcc765573e4e90515ca84bc1a8
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.14.8 b/metadata/md5-cache/net-misc/modemmanager-1.14.8
index 75f5e011e07c..df9d0a5377db 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.14.8
+++ b/metadata/md5-cache/net-misc/modemmanager-1.14.8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
 INHERIT=gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
 IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.26.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
 REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.14.8.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	vala	5fab64090cefe75c5df431cefa0b653d
-_md5_=a272f0469affe6ba1c7dede4cbc89116
+_md5_=87ee0290548d7a0ac4b0c283c5a37b10
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.28.0-r1 b/metadata/md5-cache/net-misc/networkmanager-1.28.0-r1
index 79d458150f2e..5b02efb0f1cf 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.28.0-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.28.0-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 INHERIT=bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
 IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux 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 ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[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/curl-7.24 net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.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(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.28/NetworkManager-1.28.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	libtool	f143db5a74ccd9ca28c1234deffede96	gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	udev	452708c3f55cf6e918b045adb949a9e6	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=3766b7d29e9144cae65d6973505a82d3
+_md5_=de487dc6bb805f676f3d61402de13f53
diff --git a/metadata/md5-cache/net-misc/olsrd-0.9.6.1 b/metadata/md5-cache/net-misc/olsrd-0.9.6.1
index 6aa621e798cb..bb3d9f45aa61 100644
--- a/metadata/md5-cache/net-misc/olsrd-0.9.6.1
+++ b/metadata/md5-cache/net-misc/olsrd-0.9.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
+DEPEND=virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
 DESCRIPTION=An implementation of the Optimized Link State Routing protocol
 EAPI=6
 HOMEPAGE=http://www.olsr.org/
@@ -7,8 +7,8 @@ INHERIT=eutils multilib toolchain-funcs versionator
 IUSE=gtk pud
 KEYWORDS=amd64 x86
 LICENSE=BSD LGPL-2.1
-RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
+RDEPEND=virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
 SLOT=0
 SRC_URI=http://www.olsr.org/releases/0.9/olsrd-0.9.6.1.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=a97d9cc7769781e2f82c84f05bd4c827
+_md5_=39cecf0be12a8afb3c5708632ff1f778
diff --git a/metadata/md5-cache/net-misc/olsrd-0.9.8 b/metadata/md5-cache/net-misc/olsrd-0.9.8
index d86bbff84151..44cec72d624b 100644
--- a/metadata/md5-cache/net-misc/olsrd-0.9.8
+++ b/metadata/md5-cache/net-misc/olsrd-0.9.8
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
+DEPEND=virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
 DESCRIPTION=An implementation of the Optimized Link State Routing protocol
 EAPI=7
 HOMEPAGE=http://www.olsr.org/
+INHERIT=multilib toolchain-funcs
 IUSE=gtk pud
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD LGPL-2.1
-RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
+RDEPEND=virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
 SLOT=0
 SRC_URI=https://github.com/OLSR/olsrd/archive/v0.9.8.tar.gz -> olsrd-0.9.8.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e48196d9108849d733b61fdbd1c308f2
+_md5_=ab330fa6bc6ce2f96446206ee0184750
diff --git a/metadata/md5-cache/net-wireless/dump1090-4.0 b/metadata/md5-cache/net-wireless/dump1090-4.0
index 9f3394c71d80..d6f0d452b57b 100644
--- a/metadata/md5-cache/net-wireless/dump1090-4.0
+++ b/metadata/md5-cache/net-wireless/dump1090-4.0
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-libs/ncurses:=[tinfo] virtual/libusb:1 bladerf? ( net-wireless/bladerf:= ) rtlsdr? ( net-wireless/rtl-sdr:= )
 DESCRIPTION=simple Mode S decoder for RTLSDR devices
 EAPI=7
 HOMEPAGE=https://github.com/flightaware/dump1090
+INHERIT=toolchain-funcs
 IUSE=bladerf +rtlsdr
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:=[tinfo] virtual/libusb:1 bladerf? ( net-wireless/bladerf:= ) rtlsdr? ( net-wireless/rtl-sdr:= )
 SLOT=0
 SRC_URI=https://github.com/flightaware/dump1090/archive/v4.0.tar.gz -> dump1090-4.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=280d39f35b087f455cebeaf5323aa799
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e65609567d162af3f7dafb75b7a5c1d2
diff --git a/metadata/md5-cache/net-wireless/dump1090-9999 b/metadata/md5-cache/net-wireless/dump1090-9999
index fae59e0e9c6b..38eef6b57a82 100644
--- a/metadata/md5-cache/net-wireless/dump1090-9999
+++ b/metadata/md5-cache/net-wireless/dump1090-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=sys-libs/ncurses:=[tinfo] virtual/libusb:1 bladerf? ( net-wireless/bladerf:= ) rtlsdr? ( net-wireless/rtl-sdr:= )
 DESCRIPTION=simple Mode S decoder for RTLSDR devices
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=sys-libs/ncurses:=[tinfo] virtual/libusb:1 bladerf? ( net-wireless/bladerf:= ) rtlsdr? ( net-wireless/rtl-sdr:= )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=c2fae47661dcf186af1aeda66edf9dfc
+_md5_=4ce7111fd7c0495c0d7172d7c58e1381
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.3 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.3
index 04fcae50c79d..a5c8e432593b 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.3
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeBluetooth
 INHERIT=gnome.org gnome2-utils meson udev xdg
 IUSE=gtk-doc +introspection
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7.0 virtual/libudev introspection? ( >=dev-libs/gobject-introspection-1.54:= ) acct-group/plugdev virtual/udev >=net-wireless/bluez-5
 SLOT=2/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.34/gnome-bluetooth-3.34.3.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=95e3ff0ff8b2b8bd30b9c032a12bef3b
+_md5_=3f02dcd385b16e1e181cb892e8bdef63
diff --git a/metadata/md5-cache/sci-astronomy/montage-5.0 b/metadata/md5-cache/sci-astronomy/montage-5.0
index a701c6363e08..bbbd82077582 100644
--- a/metadata/md5-cache/sci-astronomy/montage-5.0
+++ b/metadata/md5-cache/sci-astronomy/montage-5.0
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
 DEPEND=media-libs/freetype:2= sci-astronomy/wcstools:0= sci-libs/cfitsio:0= virtual/jpeg:0 mpi? ( virtual/mpi )
 DESCRIPTION=Toolkit for assembling FITS images into mosaics
@@ -11,4 +12,4 @@ RDEPEND=media-libs/freetype:2= sci-astronomy/wcstools:0= sci-libs/cfitsio:0= vir
 SLOT=0
 SRC_URI=http://montage.ipac.caltech.edu/download/Montage_v5.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=846d02302181c71c4008b283c3e180bf
+_md5_=f250a4861e24c1dafca1cb577dc2026c
diff --git a/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2 b/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
index 52f33b166d11..e4e08ca5356e 100644
--- a/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
+++ b/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/ncurses:0= gtk? ( x11-libs/gtk+:2 ) xforms? ( x11-libs/xforms ) xplanet? ( x11-misc/xplanet[truetype] ) 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
+DEPEND=sys-libs/ncurses:0= gtk? ( x11-libs/gtk+:2 ) xforms? ( x11-libs/xforms ) xplanet? ( x11-misc/xplanet[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
 DESCRIPTION=Satellite tracking and orbital prediction
 EAPI=6
 HOMEPAGE=https://www.qsl.net/kd2bd/predict.html
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0= gtk? ( x11-libs/gtk+:2 ) xforms? ( x11-libs/xforms )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/predict/predict_2.2.3.orig.tar.gz mirror://debian/pool/main/p/predict/predict_2.2.3-3.1.diff.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=0b11b977daabbe8c650b3e44108df01b
+_md5_=d83fe25071b79248ca594086e893585a
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2 b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
index a682d8570d61..e69c2e70c4de 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= X? ( media-libs/fontconfig x11-libs/motif:0= x11-libs/libICE x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXt )
+DEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= X? ( media-libs/fontconfig x11-libs/motif:0= x11-libs/libICE x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXt ) virtual/pkgconfig
 DESCRIPTION=Development toolkit and applications for computational biology, including BLAST
 EAPI=5
 HOMEPAGE=https://www.ncbi.nlm.nih.gov/
@@ -11,4 +11,4 @@ RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= X? ( media-libs/fontc
 SLOT=0
 SRC_URI=ftp://ftp.ncbi.nlm.nih.gov/blast/executables/release/2.2.26/ncbi.tar.gz -> ncbi-tools-2.2.26.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=8bcc533f96e3c3fe8bf6e5b090a4dacd
+_md5_=11d9d9931cdc16e4b30aa72b3d5d3c79
diff --git a/metadata/md5-cache/sci-chemistry/tinker-8.2.1 b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
index 3d52b71dea88..e67075191cf4 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-8.2.1
+++ b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=>=virtual/jdk-1.6 virtual/pkgconfig virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Molecular modeling package that includes force fields, such as AMBER and CHARMM
 EAPI=6
 HOMEPAGE=http://dasher.wustl.edu/tinker/
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-8.2.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
-_md5_=f5c8e4b651fff9dc3a4d051350f5c72f
+_md5_=9880e4681acf0d7e538e93103a2c14c3
diff --git a/metadata/md5-cache/sci-libs/cdf-3.5.0.2 b/metadata/md5-cache/sci-libs/cdf-3.5.0.2
index 5fbeed2a1bb3..05e58aeeb39c 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.5.0.2
+++ b/metadata/md5-cache/sci-libs/cdf-3.5.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=java? ( >=virtual/jre-1.5:= ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=java? ( >=virtual/jre-1.5:= ) ncurses? ( sys-libs/ncurses:0= ) ncurses? ( virtual/pkgconfig ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Common Data Format I/O library for multi-dimensional data sets
 EAPI=5
 HOMEPAGE=https://cdf.gsfc.nasa.gov
@@ -11,4 +11,4 @@ RDEPEND=java? ( >=virtual/jre-1.5:= ) ncurses? ( sys-libs/ncurses:0= ) java? ( >
 SLOT=0
 SRC_URI=http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_0-dist-cdf.tar.gz java? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_0-dist-java.tar.gz ) doc? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350crm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350frm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf35ifd.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350prm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350ug.pdf java? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350jrm.pdf ) )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
-_md5_=1d067a54c193b189876d4afa9c73d425
+_md5_=4b80221519c375fc00302a41670bda4c
diff --git a/metadata/md5-cache/sci-libs/gsl-2.5-r1 b/metadata/md5-cache/sci-libs/gsl-2.5-r1
index 4fbeba766497..6747656595cb 100644
--- a/metadata/md5-cache/sci-libs/gsl-2.5-r1
+++ b/metadata/md5-cache/sci-libs/gsl-2.5-r1
@@ -1,4 +1,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
+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
 DEPEND=cblas-external? ( virtual/cblas:= )
 DESCRIPTION=The GNU Scientific Library
@@ -12,4 +12,4 @@ RDEPEND=cblas-external? ( virtual/cblas:= )
 SLOT=0/23
 SRC_URI=mirror://gnu/gsl/gsl-2.5.tar.gz https://dev.gentoo.org/~mgorny/dist/gsl-2.3-cblas.patch.bz2
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=ed5c721b58a6f61e638f176a84246e89
+_md5_=a4163c3aa4ec569de82672bdd454de9f
diff --git a/metadata/md5-cache/sys-apps/busybox-1.32.1 b/metadata/md5-cache/sys-apps/busybox-1.32.1
index ef2589772c4d..738724f381cc 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.32.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.32.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= virtual/pkgconfig static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
 DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=7
 HOMEPAGE=https://www.busybox.net/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=cd366ca6629d97c468041affdfda26d1
+_md5_=3281572bc04ff091a3d9f84b4c2265dc
diff --git a/metadata/md5-cache/sys-apps/busybox-1.33.0 b/metadata/md5-cache/sys-apps/busybox-1.33.0
index cdb0303bea38..7433edc6741d 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.33.0
+++ b/metadata/md5-cache/sys-apps/busybox-1.33.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= virtual/pkgconfig static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
 DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=7
 HOMEPAGE=https://www.busybox.net/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.33.0.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=4524928b4d92514398bd182a3c818c1a
+_md5_=a5d2027fe6003ae95f3d4a24485b3cac
diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999
index 6f0c41510f51..2f62c52c133d 100644
--- a/metadata/md5-cache/sys-apps/busybox-9999
+++ b/metadata/md5-cache/sys-apps/busybox-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/pkgconfig static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
 DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=7
 HOMEPAGE=https://www.busybox.net/
@@ -13,4 +13,4 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=b559b52f753bdf9e8ffde28b3ef125da
+_md5_=c845742d366ef5485fc30198f7e4e776
diff --git a/metadata/md5-cache/sys-apps/dtc-1.5.0 b/metadata/md5-cache/sys-apps/dtc-1.5.0
index 3109c306299c..55a245da6c3d 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.5.0
+++ b/metadata/md5-cache/sys-apps/dtc-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-devel/bison sys-devel/flex
+DEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DESCRIPTION=Open Firmware device tree compiler
 EAPI=6
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/dtc/dtc-1.5.0.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=eb472a8b145a3a2847784053359c9e5f
+_md5_=86e391ac7fd008a07b37bd0a5c8fc61a
diff --git a/metadata/md5-cache/sys-apps/ethq-0.5.0 b/metadata/md5-cache/sys-apps/ethq-0.5.0
index a76fec959cb4..21f50cb13ed3 100644
--- a/metadata/md5-cache/sys-apps/ethq-0.5.0
+++ b/metadata/md5-cache/sys-apps/ethq-0.5.0
@@ -1,14 +1,16 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare test
-DEPEND=sys-libs/ncurses:0
+DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Ethernet NIC Queue stats viewer
 EAPI=7
 HOMEPAGE=https://github.com/isc-projects/ethq
+INHERIT=toolchain-funcs
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=sys-libs/ncurses:0
+RDEPEND=sys-libs/ncurses:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/isc-projects/ethq/archive/v0_5_0.tar.gz -> ethq-0_5_0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=28a5fa1d1fd9dde08aa15d0bc02fa468
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d0d161d6ea9e9a2f28ebdf6789718422
diff --git a/metadata/md5-cache/sys-apps/ethq-0.6.1 b/metadata/md5-cache/sys-apps/ethq-0.6.1
index e459295c8df3..d90f4c4e2a9b 100644
--- a/metadata/md5-cache/sys-apps/ethq-0.6.1
+++ b/metadata/md5-cache/sys-apps/ethq-0.6.1
@@ -1,14 +1,16 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare test
-DEPEND=sys-libs/ncurses:0
+DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Ethernet NIC Queue stats viewer
 EAPI=7
 HOMEPAGE=https://github.com/isc-projects/ethq
+INHERIT=toolchain-funcs
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=sys-libs/ncurses:0
+RDEPEND=sys-libs/ncurses:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/isc-projects/ethq/archive/v0_6_1.tar.gz -> ethq-0_6_1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ec58b58325ad7d688a046b0456b0f47a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=aef54ba74d168af1971b04b1f143d6f3
diff --git a/metadata/md5-cache/sys-apps/ethq-9999 b/metadata/md5-cache/sys-apps/ethq-9999
index e7be669221c9..34228a1219d4 100644
--- a/metadata/md5-cache/sys-apps/ethq-9999
+++ b/metadata/md5-cache/sys-apps/ethq-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare test unpack
 DEPEND=sys-libs/ncurses:0
 DESCRIPTION=Ethernet NIC Queue stats viewer
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:0
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=0b58a8fcc7913bb206056d04092ba90d
+_md5_=11f90f0bee02dbaa79ec52f7b311009f
diff --git a/metadata/md5-cache/sys-apps/flashrom-9999 b/metadata/md5-cache/sys-apps/flashrom-9999
index c862277095ae..93647f54bd1e 100644
--- a/metadata/md5-cache/sys-apps/flashrom-9999
+++ b/metadata/md5-cache/sys-apps/flashrom-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install unpack
 DEPEND=!static? ( atahpt? ( sys-apps/pciutils ) atapromise? ( sys-apps/pciutils ) atavia? ( sys-apps/pciutils ) ch341a-spi? ( virtual/libusb:1 ) dediprog? ( virtual/libusb:1 ) developerbox-spi? ( virtual/libusb:1 ) digilent-spi? ( virtual/libusb:1 ) drkaiser? ( sys-apps/pciutils ) ft2232-spi? ( dev-embedded/libftdi:1= ) gfxnvidia? ( sys-apps/pciutils ) internal? ( sys-apps/pciutils ) it8212? ( sys-apps/pciutils ) jlink-spi? ( dev-embedded/libjaylink ) nic3com? ( sys-apps/pciutils ) nicintel-eeprom? ( sys-apps/pciutils ) nicintel-spi? ( sys-apps/pciutils ) nicintel? ( sys-apps/pciutils ) nicnatsemi? ( sys-apps/pciutils ) nicrealtek? ( sys-apps/pciutils ) ogp-spi? ( sys-apps/pciutils ) pickit2-spi? ( virtual/libusb:0 ) rayer-spi? ( sys-apps/pciutils ) satamv? ( sys-apps/pciutils ) satasii? ( sys-apps/pciutils ) stlinkv3-spi? ( virtual/libusb:1 ) usbblaster-spi? ( dev-embedded/libftdi:1= ) ) static? ( atahpt? ( sys-apps/pciutils[static-libs(+)] ) atapromise? ( sys-apps/pciutils[static-libs(+)] ) atavia? ( sys-apps/pciutils[static-libs(+)] ) ch341a-spi? ( virtual/libusb:1[static-libs(+)] ) dediprog? ( virtual/libusb:1[static-libs(+)] ) developerbox-spi? ( virtual/libusb:1[static-libs(+)] ) digilent-spi? ( virtual/libusb:1[static-libs(+)] ) drkaiser? ( sys-apps/pciutils[static-libs(+)] ) ft2232-spi? ( dev-embedded/libftdi:1=[static-libs(+)] ) gfxnvidia? ( sys-apps/pciutils[static-libs(+)] ) internal? ( sys-apps/pciutils[static-libs(+)] ) it8212? ( sys-apps/pciutils[static-libs(+)] ) jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] ) nic3com? ( sys-apps/pciutils[static-libs(+)] ) nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] ) nicintel-spi? ( sys-apps/pciutils[static-libs(+)] ) nicintel? ( sys-apps/pciutils[static-libs(+)] ) nicnatsemi? ( sys-apps/pciutils[static-libs(+)] ) nicrealtek? ( sys-apps/pciutils[static-libs(+)] ) ogp-spi? ( sys-apps/pciutils[static-libs(+)] ) pickit2-spi? ( virtual/libusb:0[static-libs(+)] ) rayer-spi? ( sys-apps/pciutils[static-libs(+)] ) satamv? ( sys-apps/pciutils[static-libs(+)] ) satasii? ( sys-apps/pciutils[static-libs(+)] ) stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] ) usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] ) ) sys-apps/diffutils
 DESCRIPTION=Utility for reading, writing, erasing and verifying flash ROM chips
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=!static? ( atahpt? ( sys-apps/pciutils ) atapromise? ( sys-apps/pciutils ) atavia? ( sys-apps/pciutils ) ch341a-spi? ( virtual/libusb:1 ) dediprog? ( virtual/libusb:1 ) developerbox-spi? ( virtual/libusb:1 ) digilent-spi? ( virtual/libusb:1 ) drkaiser? ( sys-apps/pciutils ) ft2232-spi? ( dev-embedded/libftdi:1= ) gfxnvidia? ( sys-apps/pciutils ) internal? ( sys-apps/pciutils ) it8212? ( sys-apps/pciutils ) jlink-spi? ( dev-embedded/libjaylink ) nic3com? ( sys-apps/pciutils ) nicintel-eeprom? ( sys-apps/pciutils ) nicintel-spi? ( sys-apps/pciutils ) nicintel? ( sys-apps/pciutils ) nicnatsemi? ( sys-apps/pciutils ) nicrealtek? ( sys-apps/pciutils ) ogp-spi? ( sys-apps/pciutils ) pickit2-spi? ( virtual/libusb:0 ) rayer-spi? ( sys-apps/pciutils ) satamv? ( sys-apps/pciutils ) satasii? ( sys-apps/pciutils ) stlinkv3-spi? ( virtual/libusb:1 ) usbblaster-spi? ( dev-embedded/libftdi:1= ) ) !internal-dmi? ( sys-apps/dmidecode )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=eae0b8528221756f85bbbc15bda294c9
+_md5_=c11b48317109b4121e174553472817df
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20201015 b/metadata/md5-cache/sys-apps/osinfo-db-20201015
index feee910c7711..6ae8c35850da 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-20201015
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20201015
@@ -3,8 +3,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=osinfo database files
 EAPI=7
 HOMEPAGE=https://libosinfo.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20201015.tar.xz
-_md5_=ecb140bebe0113da7406754746926076
+_md5_=4c88c68a44f876cd33e69e54bafc1acb
diff --git a/metadata/md5-cache/sys-apps/spu-tools-2.3.0.136 b/metadata/md5-cache/sys-apps/spu-tools-2.3.0.136
index 44f98381d38e..1da4367c4cdf 100644
--- a/metadata/md5-cache/sys-apps/spu-tools-2.3.0.136
+++ b/metadata/md5-cache/sys-apps/spu-tools-2.3.0.136
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=sys-libs/ncurses:0= sys-apps/help2man
+DEPEND=sys-libs/ncurses:0= sys-apps/help2man virtual/pkgconfig
 DESCRIPTION=CELL spu ps and top alike utilities
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/libspe
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/libspe/spu-tools-2.3.0.136.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=8be1ef0273e7af4033cd525f3fc73a8e
+_md5_=680142141573697f600f0ae516dd0139
diff --git a/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1 b/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
index 1a3763c7c901..ddfbfa1cbcae 100644
--- a/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
+++ b/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= dev-libs/libzip:= !minimal? ( dev-libs/libyaml:= app-arch/xz-utils:= ) ) elibc_musl? ( sys-libs/fts-standalone ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)] dev-libs/libzip:=[static-libs(+)] !minimal? ( dev-libs/libyaml:=[static-libs(+)] app-arch/xz-utils:=[static-libs(+)] ) ) app-crypt/trousers
+DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= dev-libs/libzip:= !minimal? ( dev-libs/libyaml:= app-arch/xz-utils:= ) ) elibc_musl? ( sys-libs/fts-standalone ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)] dev-libs/libzip:=[static-libs(+)] !minimal? ( dev-libs/libyaml:=[static-libs(+)] app-arch/xz-utils:=[static-libs(+)] ) ) app-crypt/trousers virtual/pkgconfig
 DESCRIPTION=Chrome OS verified boot tools
 EAPI=6
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot
@@ -11,4 +11,4 @@ RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libre
 SLOT=0
 SRC_URI=mirror://gentoo/vboot-utils-72_p20181229.tar.xz https://dev.gentoo.org/~zmedico/dist/vboot-utils-72_p20181229.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=88dbda403a12288ccb244f7221de60e4
+_md5_=11598b492418d85f20827087b831f59c
diff --git a/metadata/md5-cache/sys-cluster/charm-6.8.2 b/metadata/md5-cache/sys-cluster/charm-6.8.2
index a9061bb7a40b..2ee73a940008 100644
--- a/metadata/md5-cache/sys-cluster/charm-6.8.2
+++ b/metadata/md5-cache/sys-cluster/charm-6.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=mpi? ( virtual/mpi ) net-libs/libtirpc virtual/fortran
+DEPEND=mpi? ( virtual/mpi ) net-libs/libtirpc virtual/pkgconfig virtual/fortran
 DESCRIPTION=Message-passing parallel language and runtime system
 EAPI=5
 HOMEPAGE=http://charm.cs.uiuc.edu/
@@ -12,4 +12,4 @@ REQUIRED_USE=cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebu
 SLOT=0
 SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.8.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=aa46f6c704c30e136cf42c1374470e41
+_md5_=42add106f123b62c37ee2628393600b4
diff --git a/metadata/md5-cache/sys-devel/gdb-10.1 b/metadata/md5-cache/sys-devel/gdb-10.1
index 7c551e80d219..8063d5fbc298 100644
--- a/metadata/md5-cache/sys-devel/gdb-10.1
+++ b/metadata/md5-cache/sys-devel/gdb-10.1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) test? ( dev-util/dejagnu )
+BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
 DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib lzma? ( app-arch/xz-utils ) 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] ) ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
 DESCRIPTION=GNU debugger
@@ -14,4 +14,4 @@ RESTRICT=ia64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-10.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-10.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=03d25032797703d1d5169f1f9620d3f3
+_md5_=cd6fd9f6ac52eabaf101da791e91520f
diff --git a/metadata/md5-cache/sys-devel/gdb-9999 b/metadata/md5-cache/sys-devel/gdb-9999
index c285c0864be5..6c9a4ec758b5 100644
--- a/metadata/md5-cache/sys-devel/gdb-9999
+++ b/metadata/md5-cache/sys-devel/gdb-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) test? ( dev-util/dejagnu ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc source-highlight? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( dev-util/dejagnu ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare setup unpack
 DEPEND=dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib lzma? ( app-arch/xz-utils ) 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] ) ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
 DESCRIPTION=GNU debugger
@@ -14,4 +14,4 @@ RESTRICT=ia64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=1854a0dd50fed59dca6a1a0e50901ea1
+_md5_=31a8a84d7142efca288f79dfe0f0fccc
diff --git a/metadata/md5-cache/www-client/netsurf-3.10-r4 b/metadata/md5-cache/www-client/netsurf-3.10-r4
index 877bebe45552..8a1b515286df 100644
--- a/metadata/md5-cache/www-client/netsurf-3.10-r4
+++ b/metadata/md5-cache/www-client/netsurf-3.10-r4
@@ -1,4 +1,4 @@
-BDEPEND=duktape? ( app-editors/vim-core ) dev-libs/check dev-perl/HTML-Parser >=dev-util/netsurf-buildsystem-1.7-r1
+BDEPEND=duktape? ( app-editors/vim-core ) dev-libs/check dev-perl/HTML-Parser >=dev-util/netsurf-buildsystem-1.7-r1 virtual/pkgconfig
 DEFINED_PHASES=compile install prepare test
 DESCRIPTION=a free, open source web browser
 EAPI=7
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( fbcon gtk gtk2 ) duktape? ( javascript )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.10-src.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	af8fe1901b583a379a6a32af919cea05	desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=637d0b790265591f103be62abc1b3f42
+_md5_=c3107a1b10ff78b83274abd50980c782
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.2.0 b/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
index 30f9ce464c9f..5e77e2c2dda4 100644
--- a/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.2.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/software/colord/
 INHERIT=meson vala
 IUSE=doc +introspection vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/glib-2.28:2 x11-libs/gtk+:3[introspection?] >=x11-misc/colord-0.1.27:=[introspection?,vala?]
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-gtk-0.2.0.tar.xz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d
-_md5_=03548329b435473c028cdadcd06c64ef
+_md5_=9d7e1a074dba1cf48d9111150c7fd704
diff --git a/metadata/md5-cache/x11-libs/libclxclient-3.9.2 b/metadata/md5-cache/x11-libs/libclxclient-3.9.2
index bd2cd0c700f6..5a165dbfb5bd 100644
--- a/metadata/md5-cache/x11-libs/libclxclient-3.9.2
+++ b/metadata/md5-cache/x11-libs/libclxclient-3.9.2
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=dev-libs/libclthreads media-libs/freetype:2 x11-libs/libX11 x11-libs/libXft
 DESCRIPTION=C++ wrapper library around the X Window System API
 EAPI=7
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/index.html
+INHERIT=multilib toolchain-funcs
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libclthreads media-libs/freetype:2 x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-3.9.2.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=675461ec764e25b3886ff8882b116e48
+_md5_=d175ba532ac8aebc18143b6139fcd80b
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.3 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.3
new file mode 100644
index 000000000000..b41fa8208555
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/gmmlib-21.1.1 >=x11-libs/libva-2.11.0[X?]
+DESCRIPTION=Intel Media Driver for VAAPI (iHD)
+EAPI=7
+HOMEPAGE=https://github.com/intel/media-driver
+INHERIT=cmake
+IUSE=+custom-cflags set-as-default test X
+KEYWORDS=~amd64
+LICENSE=MIT BSD
+RDEPEND=>=media-libs/gmmlib-21.1.1 >=x11-libs/libva-2.11.0[X?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/media-driver/archive/intel-media-21.1.3.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
+_md5_=4280973574be76cdbf821aba4184808a
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-9999 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-9999
index 19f7f8642958..5b530d0566db 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-intel-media-driver-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/gmmlib-20.4.1 >=x11-libs/libva-2.10.0[X?]
+DEPEND=>=media-libs/gmmlib-21.1.1 >=x11-libs/libva-2.11.0[X?]
 DESCRIPTION=Intel Media Driver for VAAPI (iHD)
 EAPI=7
 HOMEPAGE=https://github.com/intel/media-driver
@@ -8,8 +8,8 @@ INHERIT=cmake git-r3
 IUSE=+custom-cflags set-as-default test X
 LICENSE=MIT BSD
 PROPERTIES=live
-RDEPEND=>=media-libs/gmmlib-20.4.1 >=x11-libs/libva-2.10.0[X?]
+RDEPEND=>=media-libs/gmmlib-21.1.1 >=x11-libs/libva-2.11.0[X?]
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=9bddfa091ece987fb394c4c7b51d2544
+_md5_=4280973574be76cdbf821aba4184808a
diff --git a/metadata/md5-cache/x11-libs/vte-0.62.3 b/metadata/md5-cache/x11-libs/vte-0.62.3
index c73edba32c6c..583c91b216c9 100644
--- a/metadata/md5-cache/x11-libs/vte-0.62.3
+++ b/metadata/md5-cache/x11-libs/vte-0.62.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
 INHERIT=gnome.org meson vala xdg
 IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-3+
 RDEPEND=>=x11-libs/gtk+-3.24.14:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.62/vte-0.62.3.tar.xz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.62.1-command-notify.patch.xz )
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=e5e5cc7e162f65e8461fa799b4926744
+_md5_=4cc66d5f7d4b7de73c810e0df22e5462
diff --git a/metadata/md5-cache/x11-misc/accessx-0951-r2 b/metadata/md5-cache/x11-misc/accessx-0951-r2
index fdec1168e2f3..cd2c40e42cbb 100644
--- a/metadata/md5-cache/x11-misc/accessx-0951-r2
+++ b/metadata/md5-cache/x11-misc/accessx-0951-r2
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext dev-lang/tk:0=
+DEPEND=x11-libs/libX11 x11-libs/libXext dev-lang/tk:0= virtual/pkgconfig
 DESCRIPTION=Interface to the XKEYBOARD extension in X11
 EAPI=6
 HOMEPAGE=http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext dev-lang/tk:0=
 SLOT=0
 SRC_URI=http://cmos-eng.rehab.uiuc.edu/accessx/software/accessx0951.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e3c32c385546ab566e19e150f6a9da77
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=16d0cefb57971ffc9f3f3beda5886633
diff --git a/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3 b/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
index 11f6565167ed..193824e41d57 100644
--- a/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
+++ b/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 x11-base/xorg-server x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXtst dev-util/intltool sys-devel/gettext
+DEPEND=dev-cpp/gtkmm:3.0 dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 x11-base/xorg-server x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXtst dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=a gesture-recognition application for X11
 EAPI=6
 HOMEPAGE=https://sourceforge.net/apps/trac/easystroke/
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 x1
 SLOT=0
 SRC_URI=mirror://sourceforge/project/easystroke/easystroke/0.6.0/easystroke-0.6.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=b2735b39618d1620b677d5b7a670ab40
+_md5_=38c809b31862151263586a3333384ee5
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1 b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
index b2c4b39c695b..3d95d5944ec7 100644
--- a/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
+++ b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=Simple Virtual Keyboard
@@ -11,4 +12,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.1.tar.gz
 _eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=1c4f9cea487648e96336ef379dc695bf
+_md5_=98a5dcc1a0667d070626539a9ebe2eab
diff --git a/metadata/md5-cache/x11-misc/xbattbar-1.4.9 b/metadata/md5-cache/x11-misc/xbattbar-1.4.9
index 371a0c9c8887..71b03890a59f 100644
--- a/metadata/md5-cache/x11-misc/xbattbar-1.4.9
+++ b/metadata/md5-cache/x11-misc/xbattbar-1.4.9
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
 DEPEND=dev-lang/perl x11-libs/libX11
 DESCRIPTION=Advanced Power Management battery status display for X
@@ -10,4 +11,4 @@ RDEPEND=dev-lang/perl x11-libs/libX11 !ppc? ( >=sys-power/acpi-1.5 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xbattbar/xbattbar_1.4.9.orig.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=54e77e724712859065b5058cf04909de
+_md5_=c8fd82c10508696e766080807c4e063a
diff --git a/metadata/md5-cache/x11-misc/xdesktopwaves-1.4 b/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
index cd619a8e75c1..7dd3e812dd29 100644
--- a/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
+++ b/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXext x11-base/xorg-proto
+DEPEND=x11-libs/libXext virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=A cellular automata setting the background of your X Windows desktop under water
 EAPI=7
 HOMEPAGE=http://xdesktopwaves.sourceforge.net/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/xdesktopwaves/xdesktopwaves-1.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d8c37b5e79c5bc64290f0d2753a5e8fa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=4c1a14f3a2509745b08b98f2722271c2
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1 b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
index 8249cc227244..99c0611e07c3 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXinerama x11-libs/libxkbcommon x11-base/xorg-proto
+DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXinerama x11-libs/libxkbcommon virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=Simulate keyboard input and mouse activity, move and resize windows
 EAPI=6
 HOMEPAGE=https://www.semicomplete.com/projects/xdotool/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jordansissel/xdotool/releases/download/v3.20160805.1/xdotool-3.20160805.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=9e2786d444f972df88d4faed4d94d269
+_md5_=310c2e36ff2e53d4b833eb595bc0dcc4
diff --git a/metadata/md5-cache/x11-misc/xidle-26052015 b/metadata/md5-cache/x11-misc/xidle-26052015
index 9e53d24cbf42..ed9447cf66e3 100644
--- a/metadata/md5-cache/x11-misc/xidle-26052015
+++ b/metadata/md5-cache/x11-misc/xidle-26052015
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver
+DEPEND=virtual/pkgconfig
 DESCRIPTION=Monitors inactivity in X and runs the specified program when a timeout occurs
 EAPI=6
 HOMEPAGE=http://www.freebsdsoftware.org/x11/xidle.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=BSD-2
 RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://distcache.freebsd.org/local-distfiles/novel/xidle-26052015.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=98b8584f36cfec700c71b5df6f15713a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=1de90e53fc6b3d6afdd5674ec97d4303
diff --git a/metadata/md5-cache/x11-misc/xowl-9999 b/metadata/md5-cache/x11-misc/xowl-9999
index 96a1c12ac198..212edc134859 100644
--- a/metadata/md5-cache/x11-misc/xowl-9999
+++ b/metadata/md5-cache/x11-misc/xowl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=X11 Obstinate Window Lister
 EAPI=6
 HOMEPAGE=https://github.com/seanpringle/xowl
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=e33b819d9971dfb751faaccd64dde89e
+_md5_=8726a85410c680b66868b6e9e42cf092
diff --git a/metadata/md5-cache/x11-terms/kterm-6.2.0-r6 b/metadata/md5-cache/x11-terms/kterm-6.2.0-r6
index d918a632af28..04830511eced 100644
--- a/metadata/md5-cache/x11-terms/kterm-6.2.0-r6
+++ b/metadata/md5-cache/x11-terms/kterm-6.2.0-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile Xaw3d? ( x11-libs/libXaw3d ) x11-misc/gccmakedep x11-misc/imake
+DEPEND=app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile Xaw3d? ( x11-libs/libXaw3d ) virtual/pkgconfig x11-misc/gccmakedep x11-misc/imake
 DESCRIPTION=Japanese Kanji X Terminal
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -11,4 +11,4 @@ RDEPEND=app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-lib
 SLOT=0
 SRC_URI=mirror://gentoo/kterm-6.2.0.tar.gz mirror://gentoo/kterm-6.2.0-wpi.patch.gz mirror://gentoo/kterm-6.2.0.ext02.patch.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=14b683c72053cb9fdcaa6daf0ee366ba
+_md5_=3e13a1d28771ec2a8bee0a5505274f5d
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.38.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.38.0
index ed5828034e85..3c52a48d1808 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.38.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.38.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 INHERIT=gnome2
 IUSE=branding
-KEYWORDS=amd64 arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=99df2e48a5b9044824df04f17634e880
+_md5_=b7bfcc6a28ec45f3bbff4e003f6f3856
diff --git a/metadata/md5-cache/x11-wm/mutter-3.38.3-r1 b/metadata/md5-cache/x11-wm/mutter-3.38.3-r1
index 4c7ffbffa49d..f75576ea2f36 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.38.3-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.38.3-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 INHERIT=gnome.org gnome2-utils meson virtualx xdg
 IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11 >=media-libs/graphene-1.9.3[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.30[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-3.37.2[introspection?] >=dev-libs/glib-2.61.1:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.7 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.0:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=mirror://gnome/sources/mutter/3.38/mutter-3.38.3.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.38.3-r1-patchset.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=ced78aaffdfa8e97e360791ae0733516
+_md5_=a7e46a0fbf52f56e934561bf622235db
diff --git a/metadata/md5-cache/x11-wm/spectrwm-3.4.1 b/metadata/md5-cache/x11-wm/spectrwm-3.4.1
index d045a4e8cc8e..08bbb20dcc24 100644
--- a/metadata/md5-cache/x11-wm/spectrwm-3.4.1
+++ b/metadata/md5-cache/x11-wm/spectrwm-3.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=elibc_musl? ( sys-libs/queue-standalone ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXt x11-libs/xcb-util
+DEPEND=elibc_musl? ( sys-libs/queue-standalone ) virtual/pkgconfig x11-libs/libX11 x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXt x11-libs/xcb-util
 DESCRIPTION=Small dynamic tiling window manager for X11
 EAPI=7
 HOMEPAGE=https://github.com/conformal/spectrwm
@@ -10,4 +10,4 @@ RDEPEND=x11-misc/dmenu
 SLOT=0
 SRC_URI=https://github.com/conformal/spectrwm/archive/SPECTRWM_3_4_1.tar.gz -> spectrwm-3.4.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0675afa5c6a8f6f88cc20c0a55649068
+_md5_=6725fd32a72b2692ca863693c9e27fe8
diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999
index ac6ab089b9e5..b8bdb00767f7 100644
--- a/metadata/md5-cache/x11-wm/xoat-9999
+++ b/metadata/md5-cache/x11-wm/xoat-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare unpack
 DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 DESCRIPTION=X Obstinate Asymmetric Tiler
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=b365628b38fbf283c9e1facbe888bf33
+_md5_=9f8fe0e64eaa3e8298fd251a28de0fa4
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index dee247de44a6..ac9e5ffa2dbc 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -11036,7 +11036,7 @@ dev-util/qbs 1.16.0 1.18.0: Modern build tool for software projects
 dev-util/qdevicemonitor 1.0.1-r2 9999: Crossplatform log viewer for Android, iOS and text files
 dev-util/qstlink2 1.2.3: GUI and CLI ST-Link V2(Debugger/Programmer) client
 dev-util/quilt 0.66 0.66-r1 9999: quilt patch manager
-dev-util/radare2 4.5.1-r1 5.1.1 9999: unix-like reverse engineering framework and commandline tools
+dev-util/radare2 4.5.1-r1 5.1.1 5.2.0 9999: unix-like reverse engineering framework and commandline tools
 dev-util/ragel 6.10 7.0.0.12 7.0.3 7.0.4: Compiles finite state machines from regular languages into executable code
 dev-util/rats 2.4: RATS - Rough Auditing Tool for Security
 dev-util/rbtools 1.0.3 2.0: Command line tools for use with Review Board
@@ -13225,7 +13225,7 @@ media-libs/glm 0.9.9.5 0.9.9.7 0.9.9.8 0.9.9.8-r1: OpenGL Mathematics
 media-libs/glpng 1.46-r1: OpenGL PNG image library
 media-libs/glu 9.0.1 9999: The OpenGL Utility Library
 media-libs/glyr 1.0.10: Music related metadata searchengine, both with commandline interface and C API
-media-libs/gmmlib 20.2.2 20.2.5 20.3.2 20.4.1 9999: Intel Graphics Memory Management Library
+media-libs/gmmlib 20.2.2 20.2.5 20.3.2 20.4.1 21.1.1 9999: Intel Graphics Memory Management Library
 media-libs/gmtk 1.0.9: GTK+ widget and function libraries for gnome-mplayer
 media-libs/gnonlin 1.4.0-r1: Set of GStreamer elements to ease the creation of non-linear multimedia editors
 media-libs/graphene 1.10.2 1.10.2-r1: A thin layer of types for graphic libraries
@@ -18469,7 +18469,7 @@ x11-libs/libtinynotify-systemwide 0.1 9999: A system-wide notifications module f
 x11-libs/libva 2.5.0-r1 2.6.1 2.7.1 2.8.0 2.9.0 2.9.1 2.10.0 2.11.0 9999: Video Acceleration (VA) API for Linux
 x11-libs/libva-compat 1.8.3: Video Acceleration (VA) API for Linux
 x11-libs/libva-intel-driver 2.4.1 9999: HW video decode support for Intel integrated graphics
-x11-libs/libva-intel-media-driver 20.1.1-r2 20.2.0-r2 20.4.5 21.1.2_pre 9999: Intel Media Driver for VAAPI (iHD)
+x11-libs/libva-intel-media-driver 20.1.1-r2 20.2.0-r2 20.4.5 21.1.2_pre 21.1.3 9999: Intel Media Driver for VAAPI (iHD)
 x11-libs/libva-vdpau-driver 0.7.4-r5: VDPAU Backend for Video Acceleration (VA) API
 x11-libs/libvdpau 1.4 99999: VDPAU wrapper and trace libraries
 x11-libs/libwnck 2.31.0 2.31.0-r1 3.36.0: A window navigation construction kit
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0afc107844c5..2163f11ba8fc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 12 Apr 2021 23:05:18 +0000
+Mon, 12 Apr 2021 23:20:23 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1d48f5dd0688..6d3dc987ddbc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4957,7 +4957,7 @@ media-video/kino:gpac - Enable GPAC support when exporting to 3GPP format
 media-video/libva-utils:drm - Enables VA/DRM API support.
 media-video/libva-utils:examples - Build and install decode, encode, videoprocess and other VA-API examples.
 media-video/libva-utils:putsurface - Build and install putsurface tool.
-media-video/libva-utils:test_va_api - Install test_va_api tool for thorough testing of the installed VA-API.
+media-video/libva-utils:test-va-api - Install test_va_api tool for thorough testing of the installed VA-API.
 media-video/libva-utils:vainfo - Build and install vainfo tool.
 media-video/mjpegtools:sdlgfx - Enables y4mhist to display a graphical histogram
 media-video/mjpg-streamer:input-control - Plugin giving ability to control camera movement (only specific cameras)