2021-09-03 02:07:26 UTC

46 files changed, 126 insertions, 130 deletions

diff --git a/metadata/md5-cache/app-accessibility/flite-2.2 b/metadata/md5-cache/app-accessibility/flite-2.2
index b5cb57489ae7..4e5f032d7afe 100644
--- a/metadata/md5-cache/app-accessibility/flite-2.2
+++ b/metadata/md5-cache/app-accessibility/flite-2.2
@@ -4,7 +4,7 @@ DEPEND=pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 DESCRIPTION=Flite text to speech engine
 EAPI=7
 HOMEPAGE=http://www.festvox.org/flite/ https://github.com/festvox/flite
-INHERIT=autotools multilib-minimal
+INHERIT=autotools multilib-minimal toolchain-funcs
 IUSE=alsa oss pulseaudio voices 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 ~riscv sparc x86
 LICENSE=BSD freetts public-domain regexp-UofT BSD-2
@@ -12,4 +12,4 @@ RDEPEND=pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 SLOT=0
 SRC_URI=https://github.com/festvox/flite/archive/v2.2.tar.gz -> flite-2.2.tar.gz voices? ( http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_ben_rm.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_ad.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_dp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_kt.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_hin_ab.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_kan_plv.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_mar_aup.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_mar_slp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_pan_amp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tam_sdr.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_kpn.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_sk.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_ss.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_aew.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ahw.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_aup.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_awb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_axb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_bdl.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_clb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_eey.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_fem.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_gka.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_jmk.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ksp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ljm.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_lnh.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_rms.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_rxr.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_slp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_slt.flitevox )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091
-_md5_=395f2dd193de3c11356911116b887a7f
+_md5_=c5fc91305f9f478074023d4f2327beb3
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
index 00c7efbde608..7cbe0074cf9f 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
@@ -3,7 +3,7 @@ DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:=
 DESCRIPTION=Kernel driver for AMD Ryzen's System Management Unit
 EAPI=7
 HOMEPAGE=https://github.com/leogx9r/ryzen_smu
-INHERIT=linux-mod linux-info
+INHERIT=linux-mod linux-info toolchain-funcs
 IUSE=kernel_linux kernel_linux dist-kernel kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 SLOT=0
 SRC_URI=https://github.com/leogx9r/ryzen_smu/archive/v0.1.2.tar.gz -> ryzen_smu-0.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	linux-mod	873e79efd3a33022105f4e29ce7244ae
-_md5_=9ee7a9a54882c0756a86572f4fcabba0
+_md5_=9486d976fea85e594fd963530cac8935
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
index 00947b2288e0..ecdc806513a9 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
@@ -3,7 +3,7 @@ DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:=
 DESCRIPTION=Kernel driver for AMD Ryzen's System Management Unit
 EAPI=7
 HOMEPAGE=https://github.com/leogx9r/ryzen_smu
-INHERIT=linux-mod linux-info
+INHERIT=linux-mod linux-info toolchain-funcs
 IUSE=kernel_linux kernel_linux dist-kernel kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/ryzen_smu/ryzen_smu-0.1.2_p20210627.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	linux-mod	873e79efd3a33022105f4e29ce7244ae
-_md5_=98d57297c7863e3c6b0b08b0fda2ff7d
+_md5_=e216386080ee2a2a293422c9ade4c058
diff --git a/metadata/md5-cache/app-arch/engrampa-1.24.2 b/metadata/md5-cache/app-arch/engrampa-1.24.2
index 5592bb02f0ba..fb946b09efd2 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.24.2
+++ b/metadata/md5-cache/app-arch/engrampa-1.24.2
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs
 DESCRIPTION=Engrampa archive manager for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-INHERIT=mate readme.gentoo-r1
+INHERIT=mate optfeature readme.gentoo-r1
 IUSE=caja magic packagekit
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) virtual/libintl !!app-arch/mate-file-archiver
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/engrampa-1.24.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	libtool	241a8f577b9781a42a7421e53448a44e	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	b5c48cddff1da36a205d924d722b28c9	xdg-utils	27f9a2f19502b925ac117bd657aa2979	gnome2-utils	355c758ccc0d6df60d43a066640e642c	xdg	6024fbc93167fad782e2032933654857	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnuconfig	262062cef0ba4f22b397193da514a350	autotools	c7052b276346587968d52ea8eaf5aca1	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	mate	553f2bcf70c72d62970c216e3a74c24d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=8f57ed5db049b62ef035fbdbdbfa2841
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	libtool	241a8f577b9781a42a7421e53448a44e	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	b5c48cddff1da36a205d924d722b28c9	xdg-utils	27f9a2f19502b925ac117bd657aa2979	gnome2-utils	355c758ccc0d6df60d43a066640e642c	xdg	6024fbc93167fad782e2032933654857	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnuconfig	262062cef0ba4f22b397193da514a350	autotools	c7052b276346587968d52ea8eaf5aca1	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	mate	553f2bcf70c72d62970c216e3a74c24d	optfeature	30ce9dec2b8943338c9b015bd32bac6a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=633f602d1779b6b0bea9a120e9377327
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
index 0e127fd24a63..43d79a40f5d1 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/editorconfig/editorconfig-core-c/
 INHERIT=cmake
 IUSE=cli doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre2:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.4.tar.gz -> editorconfig-core-c-0.12.4.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	11fee991ab428a3370e5c20fa8231fb6
-_md5_=42ef00a5759cf0ed8f37e5c8267037a7
+_md5_=54a5f954f3a370942374220da65a091e
diff --git a/metadata/md5-cache/dev-lang/mujs-1.1.2 b/metadata/md5-cache/dev-lang/mujs-1.1.2
index bfe18137c614..d4a87a6956ba 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.1.2
+++ b/metadata/md5-cache/dev-lang/mujs-1.1.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:0=
+DEPEND=sys-libs/readline:=
 DESCRIPTION=An embeddable JavaScript interpreter in C
 EAPI=7
 HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
-INHERIT=flag-o-matic multilib toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=ISC
-RDEPEND=sys-libs/readline:0=
+RDEPEND=sys-libs/readline:=
 SLOT=0/1.1.2
 SRC_URI=https://mujs.com/downloads/mujs-1.1.2.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=94a2d15555e9d12795ca039afd1b401f
+_md5_=4e8c912d6e8c7a22d572f9940c97d14f
diff --git a/metadata/md5-cache/dev-lang/mujs-1.1.3 b/metadata/md5-cache/dev-lang/mujs-1.1.3
index 4297938df909..8d5cb61e627d 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.1.3
+++ b/metadata/md5-cache/dev-lang/mujs-1.1.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:0=
+DEPEND=sys-libs/readline:=
 DESCRIPTION=An embeddable JavaScript interpreter in C
 EAPI=7
 HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
-INHERIT=flag-o-matic multilib toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=ISC
-RDEPEND=sys-libs/readline:0=
+RDEPEND=sys-libs/readline:=
 SLOT=0/1.1.3
 SRC_URI=https://mujs.com/downloads/mujs-1.1.3.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=954ac0db1996c31d75e76ea4ee82859a
+_md5_=14a0b6a841f70053ea5917d0e1f6c57f
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1 b/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
index 24c23dd8ef10..713c62a72d21 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro https://pypi.org/project/PyQt5/
 INHERIT=multibuild python-r1 qmake-utils
 IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network opengl positioning printsupport sensors serialport speech sql +ssl svg testlib webchannel websockets widgets x11extras xmlpatterns python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.25:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.4.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1
-_md5_=42d4e7395dcb881804d8e31dbc1ddde1
+_md5_=8aa2b0d7741f0917641d9b5f97413ffb
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0 b/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
index e66cf598be08..64b9f881e6b0 100644
--- a/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
+++ b/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0/12
 SRC_URI=mirror://pypi/P/PyQt5-sip/PyQt5_sip-12.9.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	distutils-r1	5e8c25e37e261f4306d82487f673a1bf
-_md5_=8e0fed663f09ac3dde8f1a9a16c54c72
+_md5_=14fe579a6bffc533f8408cdcc2e3ac60
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
index 42ccc882526e..87e7995d0304 100644
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
+++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/
 INHERIT=python-r1 qmake-utils
 IUSE=debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/PyQt5-5.15.4[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQtWebEngine/PyQtWebEngine-5.15.4.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1
-_md5_=529dffed4727fe1d781f73079e0a695d
+_md5_=ebc4860a66f8405f39199286c5ad63fa
diff --git a/metadata/md5-cache/dev-python/QtPy-1.9.0-r5 b/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
index 0799ff57980d..37557d167cf3 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
+++ b/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/qtpy/
 INHERIT=distutils-r1 virtualx
 IUSE=+pyqt5 pyside2 declarative designer gui help location multimedia network opengl positioning printsupport sensors serialport speech sql svg testlib webchannel webengine websockets widgets x11extras xml xmlpatterns test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=pyqt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[declarative?,designer?,gui?,help?,location?] dev-python/PyQt5[multimedia?,network?,opengl?,positioning?] dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?] dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?] dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?] webengine? ( dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) pyside2? ( python_targets_python3_8? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) python_targets_python3_9? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( pyqt5 pyside2 ) python_targets_python3_10? ( pyqt5 !pyside2 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.9.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	distutils-r1	5e8c25e37e261f4306d82487f673a1bf	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=94b22362e0bf6c728060152b7992f608
+_md5_=3960afd8560b56525da3981ac7805680
diff --git a/metadata/md5-cache/dev-python/pyside2-5.15.2-r1 b/metadata/md5-cache/dev-python/pyside2-5.15.2-r1
index cf8429b18ed1..65afc6157f14 100644
--- a/metadata/md5-cache/dev-python/pyside2-5.15.2-r1
+++ b/metadata/md5-cache/dev-python/pyside2-5.15.2-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake python-r1 virtualx
 IUSE=3d charts concurrent datavis designer gles2-only +gui help location multimedia +network positioning printsupport qml quick script scripttools scxml sensors speech sql svg test testlib webchannel webengine websockets +widgets x11extras xml xmlpatterns python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/shiboken2-5.15.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5= dev-qt/qtopengl:5= dev-qt/qtserialport:5= 3d? ( >=dev-qt/qt3d-5.15:5[qml?] ) charts? ( >=dev-qt/qtcharts-5.15:5[qml?] ) concurrent? ( >=dev-qt/qtconcurrent-5.15:5 ) datavis? ( >=dev-qt/qtdatavis3d-5.15:5[qml?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[jpeg,gles2-only?] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[qml?,widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5[qml?] ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) qml? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) script? ( >=dev-qt/qtscript-5.15:5 ) scxml? ( >=dev-qt/qtscxml-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5[qml?] ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5[qml?] ) webengine? ( >=dev-qt/qtwebengine-5.15:5[widgets?] ) websockets? ( >=dev-qt/qtwebsockets-5.15:5[qml?] ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xml? ( >=dev-qt/qtxml-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5[qml?] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) 3d? ( gui network ) charts? ( widgets ) datavis? ( gui ) designer? ( widgets xml ) gles2-only? ( gui ) help? ( widgets ) location? ( positioning ) multimedia? ( gui network ) printsupport? ( widgets ) qml? ( gui network ) quick? ( qml ) scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) testlib? ( widgets ) webengine? ( location quick widgets? ( gui network printsupport webchannel ) ) websockets? ( network ) widgets? ( gui ) x11extras? ( gui )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	11fee991ab428a3370e5c20fa8231fb6	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=3140aa159994ff167b89141d536061df
+_md5_=28f36b854a507fa7a953ad80b70dd99c
diff --git a/metadata/md5-cache/dev-python/pyside2-tools-5.15.2 b/metadata/md5-cache/dev-python/pyside2-tools-5.15.2
index 4c4d72980e1d..1423706aba72 100644
--- a/metadata/md5-cache/dev-python/pyside2-tools-5.15.2
+++ b/metadata/md5-cache/dev-python/pyside2-tools-5.15.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake python-r1
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyside2-5.15.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	11fee991ab428a3370e5c20fa8231fb6	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4
-_md5_=21b3807468e0ddcb6e9254632f121f6a
+_md5_=d044617ca994955d160c93e590a3f010
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1 b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
index ee92047fa93d..13b32b964675 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake llvm python-r1 toolchain-funcs
 IUSE=+docstrings numpy test vulkan python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	11fee991ab428a3370e5c20fa8231fb6	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4
-_md5_=ec61e2c150168e681f41eb13c13d2d99
+_md5_=1f30dd1198648eadd76eb103e460b897
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.0.1-r1 b/metadata/md5-cache/dev-python/werkzeug-2.0.1-r1
index 9c27b7fbcda6..fe9420346fc3 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/werkzeug-2.0.1-r1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://werkzeug.palletsprojects.com/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/2.0.1.tar.gz -> werkzeug-2.0.1.gh.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	distutils-r1	5e8c25e37e261f4306d82487f673a1bf
-_md5_=ab2f7de2980fdfb11fcccf2443402438
+_md5_=17c3a57b75a0980109eb3ed545f7f53d
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
index 5c916391bd7c..f175b0308a66 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/luislavena/rake-compiler
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.1.tar.gz -> rake-compiler-1.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54
-_md5_=6487647b02295188611d8a6b74e56f45
+_md5_=a272b5673f3eb632538b268207ff4bb4
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.4-r1 b/metadata/md5-cache/media-gfx/exiv2-0.27.4-r1
index 8ab931556c18..f632a9dfc410 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.4-r1
+++ b/metadata/md5-cache/media-gfx/exiv2-0.27.4-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.exiv2.org/
 INHERIT=cmake-multilib python-any-r1
 IUSE=doc examples nls +png test webready +xmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-cpp/gtest ) webready? ( >net-libs/libssh-0.9.1[sftp,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/27
 SRC_URI=https://exiv2.org/builds/exiv2-0.27.4-Source.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	11fee991ab428a3370e5c20fa8231fb6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-any-r1	13f6d423c5c5bc519a9b552654cc745f
-_md5_=6f1f57515b6f38102067b7bd9f97d1dd
+_md5_=6874fdd59078803ed8d37146167b531b
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.14 b/metadata/md5-cache/net-dialup/rp-pppoe-3.14
index 36396b5adf14..73ebada01a23 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.14
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.14
@@ -4,12 +4,12 @@ DEPEND=>=sys-kernel/linux-headers-2.6.25 net-dialup/ppp:= tk? ( dev-lang/tk:= )
 DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 EAPI=7
 HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/
-INHERIT=autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
+INHERIT=autotools readme.gentoo-r1 toolchain-funcs
 IUSE=tk
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp:= tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-3.14.tar.gz https://github.com/paulusmack/ppp/archive/ppp-2.4.8.tar.gz https://dev.gentoo.org/~polynomial-c/dist/rp-pppoe-3.14-patches-01.tar.xz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=2a357ce8227edfa40ce136c1a28fe6dc
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=33074120343f077be49ad8d432e87e83
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.15 b/metadata/md5-cache/net-dialup/rp-pppoe-3.15
index 62b13347493d..81dad048ee3a 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.15
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.15
@@ -4,12 +4,12 @@ DEPEND=>=sys-kernel/linux-headers-2.6.25 net-dialup/ppp:= sys-apps/iproute2 tk?
 DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 EAPI=7
 HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/
-INHERIT=autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
+INHERIT=autotools readme.gentoo-r1 toolchain-funcs
 IUSE=tk
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-3.15.tar.gz https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/dist/rp-pppoe-3.14-patches-01.tar.xz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=9638eb2f9f70d4112c286a3f412c67d9
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=361ba77a26a83de2bd1ac39a4cfb849f
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.7 b/metadata/md5-cache/net-firewall/iptables-1.8.7
index 9caa15d03038..46b18889a3ed 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.8.7
+++ b/metadata/md5-cache/net-firewall/iptables-1.8.7
@@ -4,12 +4,12 @@ DEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-lib
 DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
 EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/iptables/
-INHERIT=multilib systemd toolchain-funcs autotools flag-o-matic usr-ldscript
+INHERIT=systemd toolchain-funcs autotools flag-o-matic usr-ldscript
 IUSE=conntrack ipv6 netlink nftables pcap static-libs split-usr
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.6:0= ) pcap? ( net-libs/libpcap ) >=app-eselect/eselect-iptables-20200508 nftables? ( net-misc/ethertypes ) !<net-firewall/ebtables-2.0.11-r1 !<net-firewall/arptables-0.0.5-r1
 SLOT=0/1.8.3
 SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.7.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	systemd	c846b9e02ac8293bfc9ca38a195c2a18	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=1bf78fe5241841c317f70d3a3324de2e
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=a3cb94a1ddcc43f228af45e01cd50dc2
diff --git a/metadata/md5-cache/sys-apps/gawk-5.1.0 b/metadata/md5-cache/sys-apps/gawk-5.1.0
index 470703d65641..19c29276035f 100644
--- a/metadata/md5-cache/sys-apps/gawk-5.1.0
+++ b/metadata/md5-cache/sys-apps/gawk-5.1.0
@@ -4,12 +4,10 @@ DEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:
 DESCRIPTION=GNU awk pattern-matching language
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
-INHERIT=toolchain-funcs
 IUSE=mpfr nls readline
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-5.1.0.tar.xz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=731ff2ff829184b2b04c69c353107789
+_md5_=2cbaaf86f1ca99616ba775b9fdff0479
diff --git a/metadata/md5-cache/sys-apps/kbd-2.4.0 b/metadata/md5-cache/sys-apps/kbd-2.4.0
index a0604f823831..b94a94d79748 100644
--- a/metadata/md5-cache/sys-apps/kbd-2.4.0
+++ b/metadata/md5-cache/sys-apps/kbd-2.4.0
@@ -4,7 +4,6 @@ DEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
 DESCRIPTION=Keyboard and console utilities
 EAPI=7
 HOMEPAGE=http://kbd-project.org/
-INHERIT=pam
 IUSE=nls pam test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
@@ -12,5 +11,4 @@ RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.4.0.tar.xz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=5f9f20b69989efe7cd878f5c7699b75a
+_md5_=6a8e8b7d6c1c982f5c084d6effb2cbc7
diff --git a/metadata/md5-cache/sys-apps/kbd-9999 b/metadata/md5-cache/sys-apps/kbd-9999
index d267330b0c2f..8139dfe1d437 100644
--- a/metadata/md5-cache/sys-apps/kbd-9999
+++ b/metadata/md5-cache/sys-apps/kbd-9999
@@ -4,12 +4,12 @@ DEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
 DESCRIPTION=Keyboard and console utilities
 EAPI=7
 HOMEPAGE=http://kbd-project.org/
-INHERIT=pam autotools git-r3
+INHERIT=autotools git-r3
 IUSE=nls pam test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
 RESTRICT=test
 SLOT=0
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=57b88345b5d7cdfe35fc7612c5bafb17
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
+_md5_=cc8fe127c3fa8534bf5aedcd3c953ac8
diff --git a/metadata/md5-cache/sys-apps/memtest86+-5.31b b/metadata/md5-cache/sys-apps/memtest86+-5.31b
index da5d829cf000..09877766e2fe 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-5.31b
+++ b/metadata/md5-cache/sys-apps/memtest86+-5.31b
@@ -4,12 +4,12 @@ DEPEND=floppy? ( sys-fs/mtools )
 DESCRIPTION=Memory tester based on memtest86
 EAPI=7
 HOMEPAGE=http://www.memtest.org/
-INHERIT=mount-boot eutils toolchain-funcs
+INHERIT=mount-boot toolchain-funcs
 IUSE=+boot floppy iso serial
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=floppy? ( sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/5.31b/memtest86+-5.31b.tar.gz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=6571e5d3b2da618a502023919b166677
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
+_md5_=2c69f8949efc994ff5c8c3bd51df5c51
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.42 b/metadata/md5-cache/sys-apps/razercfg-0.42
index c5edee804ce1..89bd181c96a5 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.42
+++ b/metadata/md5-cache/sys-apps/razercfg-0.42
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-e
 DESCRIPTION=Utility for advanced configuration of Razer mice
 EAPI=7
 HOMEPAGE=https://bues.ch/cms/hacking/razercfg.html https://github.com/mbuesch/razer
-INHERIT=cmake python-single-r1 systemd tmpfiles udev
+INHERIT=cmake python-single-r1 systemd tmpfiles udev xdg-utils
 IUSE=gui +udev python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://bues.ch/razercfg/razercfg-0.42.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	udev	0a92682c0f65a60d01453db598fc6490
-_md5_=89fe8ec275c8da0813a0fb64e0ff4a59
+_md5_=38e24595147480c58e218a551881c804
diff --git a/metadata/md5-cache/sys-block/buffer-1.19-r4 b/metadata/md5-cache/sys-block/buffer-1.19-r4
index 37e062d4e03e..5de4bea8ac91 100644
--- a/metadata/md5-cache/sys-block/buffer-1.19-r4
+++ b/metadata/md5-cache/sys-block/buffer-1.19-r4
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
-DESCRIPTION=a tapedrive tool for speeding up reading from and writing to tape
+DESCRIPTION=A tapedrive tool for speeding up reading from and writing to tape
 EAPI=7
 HOMEPAGE=http://www.microwerks.net/~hugo/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/b/buffer/buffer_1.19.orig.tar.gz mirror://debian/pool/main/b/buffer/buffer_1.19-12.debian.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=63f777672fc52c92817250660abdc7f7
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
+_md5_=cebad6306a2777597a0f9ae96e9d8e0e
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.9-r1 b/metadata/md5-cache/sys-cluster/glusterfs-7.9-r1
index e18455a69bbd..aa19305a920d 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.9-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.9-r1
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+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 postinst postrm prepare setup test
 DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
-INHERIT=autotools elisp-common python-single-r1 systemd
+INHERIT=autotools elisp-common python-single-r1 tmpfiles
 IUSE=debug emacs +fuse +georeplication infiniband ipv6 +libtirpc rsyslog static-libs +syslog test +xml python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)]
+RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] virtual/tmpfiles
 REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ipv6? ( libtirpc )
 RESTRICT=test
 SLOT=0/7
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.9/glusterfs-7.9.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	systemd	c846b9e02ac8293bfc9ca38a195c2a18
-_md5_=c7773980f910055656071aad38e7e38d
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=69497e5ae22e045ae6f502348ce6d59b
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.3-r1 b/metadata/md5-cache/sys-cluster/glusterfs-8.3-r1
index 670703298a21..7a5ea9fee1f0 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.3-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.3-r1
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+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 postinst postrm prepare setup test
 DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
-INHERIT=autotools elisp-common python-single-r1 systemd
+INHERIT=autotools elisp-common python-single-r1 tmpfiles
 IUSE=debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)]
+RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] virtual/tmpfiles
 REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) xml ) ipv6? ( libtirpc )
 RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.3/glusterfs-8.3.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	systemd	c846b9e02ac8293bfc9ca38a195c2a18
-_md5_=924102ee1f463b22354c4f3af29b448c
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=9bf3ec1e1b260e5e75728f062babfc52
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.4-r1 b/metadata/md5-cache/sys-cluster/glusterfs-8.4-r1
index 37e6ebbe1b5b..d855747d7b2e 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.4-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.4-r1
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+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 postinst postrm prepare setup test
 DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
-INHERIT=autotools elisp-common python-single-r1 systemd
+INHERIT=autotools elisp-common python-single-r1 tmpfiles
 IUSE=debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)]
+RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] virtual/tmpfiles
 REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) xml ) ipv6? ( libtirpc )
 RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.4/glusterfs-8.4.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	systemd	c846b9e02ac8293bfc9ca38a195c2a18
-_md5_=924102ee1f463b22354c4f3af29b448c
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=9bf3ec1e1b260e5e75728f062babfc52
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-9.1-r1 b/metadata/md5-cache/sys-cluster/glusterfs-9.1-r1
index a099e2a0e041..42a94fffccdb 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-9.1-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-9.1-r1
@@ -1,17 +1,17 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+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 postinst postrm prepare setup test
 DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/liburing:= sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
-INHERIT=autotools elisp-common python-single-r1 systemd
+INHERIT=autotools elisp-common python-single-r1 tmpfiles
 IUSE=debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/liburing:= sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)]
+RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/liburing:= sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) dev-libs/openssl:=[-bindist(-)] virtual/tmpfiles
 REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) xml ) ipv6? ( libtirpc )
 RESTRICT=test
 SLOT=0/9
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/9/9.1/glusterfs-9.1.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	systemd	c846b9e02ac8293bfc9ca38a195c2a18
-_md5_=6490271ab5ff8a24de24089b7f15260b
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=e6032c288f71ea34004425d27ce8110c
diff --git a/metadata/md5-cache/sys-fs/cryptmount-5.3.3 b/metadata/md5-cache/sys-fs/cryptmount-5.3.3
index 76141019be87..2e14317bf449 100644
--- a/metadata/md5-cache/sys-fs/cryptmount-5.3.3
+++ b/metadata/md5-cache/sys-fs/cryptmount-5.3.3
@@ -1,10 +1,10 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+BDEPEND=nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure prepare setup
 DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) luks? ( sys-fs/cryptsetup ) openssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) virtual/libiconv virtual/libintl sys-kernel/linux-headers
 DESCRIPTION=A utility for management and user-mode mounting of encrypted filesystems
 EAPI=7
 HOMEPAGE=http://cryptmount.sourceforge.net/
-INHERIT=linux-info systemd
+INHERIT=linux-info
 IUSE=argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
@@ -12,5 +12,5 @@ RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) luks? ( sys-fs/cryptsetup ) openssl? (
 REQUIRED_USE=luks? ( gcrypt ) openssl? ( gcrypt )
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptmount/cryptmount-5.3.3.tar.gz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	systemd	c846b9e02ac8293bfc9ca38a195c2a18
-_md5_=4dd727355aa5b01600130c218b9d0d0f
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b
+_md5_=6c4beee0a99c7e6b75cde0bbaccbe268
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.6 b/metadata/md5-cache/sys-fs/zfs-0.8.6
index b4cb2bed660b..06f21adc977f 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.6
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.6
@@ -4,7 +4,7 @@ DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-lib
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
-INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info systemd toolchain-funcs udev usr-ldscript
+INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info systemd udev usr-ldscript
 IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
 KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-2 CDDL MIT
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	distutils-r1	5e8c25e37e261f4306d82487f673a1bf	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	fac9fc514a517caeef5d45bf5a60411b	systemd	c846b9e02ac8293bfc9ca38a195c2a18	udev	0a92682c0f65a60d01453db598fc6490	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=3de69a6a7380de70ad8fe6f4bb608ea7
+_md5_=11efe6f227b37b5b260dbd3a35259899
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.5 b/metadata/md5-cache/sys-fs/zfs-2.0.5
index 85d4cf49194c..d76fc64acca1 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.0.5
+++ b/metadata/md5-cache/sys-fs/zfs-2.0.5
@@ -4,7 +4,7 @@ DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-lib
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
-INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript verify-sig
+INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript verify-sig
 IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr verify-sig
 KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-2 CDDL MIT
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/4
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	distutils-r1	5e8c25e37e261f4306d82487f673a1bf	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	fac9fc514a517caeef5d45bf5a60411b	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	udev	0a92682c0f65a60d01453db598fc6490	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=ca0cfe7ba19661ca66a4db6208c58104
+_md5_=8301136651b04320dd07e41f358038b1
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.0 b/metadata/md5-cache/sys-fs/zfs-2.1.0
index febbbc7f573c..d762c5fe574a 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.0
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.0
@@ -4,7 +4,7 @@ DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-lib
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
-INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript verify-sig
+INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript verify-sig
 IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr verify-sig
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD-2 CDDL MIT
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	distutils-r1	5e8c25e37e261f4306d82487f673a1bf	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	fac9fc514a517caeef5d45bf5a60411b	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	udev	0a92682c0f65a60d01453db598fc6490	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=bb1f6ff3ed5f597057c1a5abc2e93e11
+_md5_=813ecd5e734b55cbe3269bc873933103
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 80d5db0761ba..7c9b257de9f7 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -4,7 +4,7 @@ DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-lib
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
-INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript git-r3 linux-mod
+INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript git-r3 linux-mod
 IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr kernel_linux kernel_linux dist-kernel
 LICENSE=BSD-2 CDDL MIT
 PROPERTIES=live
@@ -13,4 +13,4 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/5
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4	distutils-r1	5e8c25e37e261f4306d82487f673a1bf	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	fac9fc514a517caeef5d45bf5a60411b	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	udev	0a92682c0f65a60d01453db598fc6490	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-mod	873e79efd3a33022105f4e29ce7244ae
-_md5_=463c8a23291ddf488f1740c9b5b4a4c2
+_md5_=83af753c5f901ad740fe015091734076
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
index c7910bf9b458..788de5d7e19f 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
@@ -3,13 +3,13 @@ DEPEND=!build? ( sys-apps/sed )
 DESCRIPTION=Raspberry Pi kernel sources
 EAPI=6
 HOMEPAGE=https://github.com/raspberrypi/linux
-INHERIT=kernel-2 eapi7-ver
-IUSE=symlink build
+INHERIT=kernel-2 eapi7-ver linux-info
+IUSE=symlink build kernel_linux
 KEYWORDS=~arm ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.11_p20210201
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20210201-1.tar.gz -> linux-5.10.11_p20210201-raspberrypi.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	kernel-2	d8a3a628167e2c39356a8bed53aa2c18
-_md5_=d0380caac1d34c67e6098390a73074bf
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	kernel-2	d8a3a628167e2c39356a8bed53aa2c18	linux-info	fac9fc514a517caeef5d45bf5a60411b
+_md5_=f408429b8eb45b734c4b4bd49ea7da9d
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
index 96e45d0bfae1..327cd3831063 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
@@ -3,13 +3,13 @@ DEPEND=!build? ( sys-apps/sed )
 DESCRIPTION=Raspberry Pi kernel sources
 EAPI=6
 HOMEPAGE=https://github.com/raspberrypi/linux
-INHERIT=kernel-2 eapi7-ver
-IUSE=symlink build
+INHERIT=kernel-2 eapi7-ver linux-info
+IUSE=symlink build kernel_linux
 KEYWORDS=~arm ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.79_p20201201-r1
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20201201-1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	kernel-2	d8a3a628167e2c39356a8bed53aa2c18
-_md5_=6ba6316e29200e170550333f6501eded
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	kernel-2	d8a3a628167e2c39356a8bed53aa2c18	linux-info	fac9fc514a517caeef5d45bf5a60411b
+_md5_=513f8481a3f12153bd34040a052635b2
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.20 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.20
index 073a3c6be5cf..dee011b9259d 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.20
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.20
@@ -4,7 +4,7 @@ DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
 DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
 EAPI=7
 HOMEPAGE=https://github.com/besser82/libxcrypt
-INHERIT=multibuild python-any-r1 multilib-minimal
+INHERIT=multibuild multilib python-any-r1 multilib-minimal
 IUSE=+compat split-usr +static-libs system test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ public-domain BSD BSD-2
@@ -13,5 +13,5 @@ REQUIRED_USE=split-usr? ( system )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.20-autotools.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	08d890890f70fe0096093016e55438d5	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091
-_md5_=a3fc657103fe990cea0e33576167241e
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091
+_md5_=d6d04dd4457c80318ed6ab0ab47cd6e7
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.25 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.25
index 2f1c11769ab6..9aa60dce7f6b 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.25
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.25
@@ -4,7 +4,7 @@ DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(
 DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
 EAPI=7
 HOMEPAGE=https://github.com/besser82/libxcrypt
-INHERIT=multibuild python-any-r1 multilib-minimal
+INHERIT=multibuild multilib python-any-r1 multilib-minimal
 IUSE=+compat split-usr +static-libs system test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ public-domain BSD BSD-2
@@ -13,5 +13,5 @@ REQUIRED_USE=split-usr? ( system )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.25-autotools.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	08d890890f70fe0096093016e55438d5	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091
-_md5_=f94c62a9821b6d5a5e0faededc60df61
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091
+_md5_=b50a15a6251bb53712e1ee28b9483e58
diff --git a/metadata/md5-cache/sys-libs/readline-8.1_p1-r1 b/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
index 77c39580625d..7688f7cfc798 100644
--- a/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
+++ b/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_x
 DESCRIPTION=Another cute console display library
 EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-INHERIT=flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+INHERIT=flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
 IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_
 SLOT=0/8
 SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001 mirror://gnu/readline/readline-8.1-patches/readline81-001
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=3c878405db7b20181d058af83397a40b
+_md5_=352c754a30bc413daf5638ab0ab989ce
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
index a253d568e3d5..5841c94b1d75 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
@@ -4,12 +4,12 @@ DEPEND=>=sys-apps/util-linux-2.23[tty-helpers(-)] cgi? ( >=media-libs/gd-1.8.4 )
 DESCRIPTION=APC UPS daemon with integrated tcp/ip remote shutdown
 EAPI=7
 HOMEPAGE=http://www.apcupsd.org/
-INHERIT=linux-info flag-o-matic systemd udev tmpfiles
+INHERIT=linux-info systemd udev tmpfiles
 IUSE=snmp +usb +modbus cgi gnome kernel_linux kernel_linux
 KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.23[tty-helpers(-)] cgi? ( >=media-libs/gd-1.8.4 ) modbus? ( usb? ( virtual/libusb:0 ) ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) virtual/mailx virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	udev	0a92682c0f65a60d01453db598fc6490	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=f20c0947a9b10d270b27046c9bf2f5cf
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	systemd	c846b9e02ac8293bfc9ca38a195c2a18	udev	0a92682c0f65a60d01453db598fc6490	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=8ed24b2e306c88796fe9cb7a4373084a
diff --git a/metadata/md5-cache/sys-power/sispmctl-4.1-r1 b/metadata/md5-cache/sys-power/sispmctl-4.1-r1
index 3a5ed906c7a8..c9670bba6f92 100644
--- a/metadata/md5-cache/sys-power/sispmctl-4.1-r1
+++ b/metadata/md5-cache/sys-power/sispmctl-4.1-r1
@@ -4,12 +4,12 @@ DEPEND=virtual/libusb:0
 DESCRIPTION=GEMBIRD SiS-PM control utility
 EAPI=7
 HOMEPAGE=http://sispmctl.sourceforge.net/
-INHERIT=bash-completion-r1 systemd udev
+INHERIT=systemd udev
 IUSE=static-libs
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 acct-group/sispmctl
 SLOT=0
 SRC_URI=mirror://sourceforge/sispmctl/sispmctl-4.1.tar.gz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	systemd	c846b9e02ac8293bfc9ca38a195c2a18	udev	0a92682c0f65a60d01453db598fc6490
-_md5_=b4218aebbd6d323ff70625c8d964155d
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	udev	0a92682c0f65a60d01453db598fc6490
+_md5_=1ad012c3a4c12e7aad8a218cedaf2e10
diff --git a/metadata/md5-cache/sys-process/at-3.2.2-r2 b/metadata/md5-cache/sys-process/at-3.2.2-r2
index 2bdfcc1b6fe4..5c9ed1b9107e 100644
--- a/metadata/md5-cache/sys-process/at-3.2.2-r2
+++ b/metadata/md5-cache/sys-process/at-3.2.2-r2
@@ -4,7 +4,7 @@ DEPEND=acct-group/at acct-user/at virtual/mta pam? ( sys-libs/pam )
 DESCRIPTION=Queues jobs for later execution
 EAPI=7
 HOMEPAGE=http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html
-INHERIT=autotools flag-o-matic pam systemd
+INHERIT=autotools pam systemd
 IUSE=pam selinux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=acct-group/at acct-user/at virtual/mta pam? ( sys-libs/pam ) virtual/mta
 SLOT=0
 SRC_URI=http://software.calhariz.com/at/at_3.2.2.orig.tar.gz mirror://debian/pool/main/a/at/at_3.2.2.orig.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	c846b9e02ac8293bfc9ca38a195c2a18
-_md5_=61fce2656f6a96ddd02f2549037af80a
+_md5_=cb5e97c97d401c649df431cc049db168
diff --git a/metadata/md5-cache/sys-process/criu-3.14-r2 b/metadata/md5-cache/sys-process/criu-3.14-r2
index aaa8b19393cc..b23c28c718a2 100644
--- a/metadata/md5-cache/sys-process/criu-3.14-r2
+++ b/metadata/md5-cache/sys-process/criu-3.14-r2
@@ -3,7 +3,7 @@ DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-
 DESCRIPTION=utility to checkpoint/restore a process tree
 EAPI=7
 HOMEPAGE=https://criu.org/
-INHERIT=toolchain-funcs linux-info flag-o-matic python-r1
+INHERIT=toolchain-funcs linux-info python-r1
 IUSE=doc selinux setproctitle static-libs kernel_linux python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.14.tar.bz2
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4
-_md5_=367d4cc6ad0824537759b525ee021182
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4
+_md5_=453c08817ad3d828731e9c52f4f414be
diff --git a/metadata/md5-cache/sys-process/criu-3.15 b/metadata/md5-cache/sys-process/criu-3.15
index 8d80206e444a..28f9d1838ae3 100644
--- a/metadata/md5-cache/sys-process/criu-3.15
+++ b/metadata/md5-cache/sys-process/criu-3.15
@@ -3,7 +3,7 @@ DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_
 DESCRIPTION=utility to checkpoint/restore a process tree
 EAPI=7
 HOMEPAGE=https://criu.org/
-INHERIT=toolchain-funcs linux-info flag-o-matic python-r1
+INHERIT=toolchain-funcs linux-info python-r1
 IUSE=doc selinux setproctitle static-libs kernel_linux python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ppc64
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.15.tar.bz2
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4
-_md5_=3f86379df5a26c31643976cee55673f0
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	fac9fc514a517caeef5d45bf5a60411b	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e574a3642f886323f18f867ecc4d91c4
+_md5_=e7874e0428b5c93f8c3cfc423f64150c
diff --git a/metadata/md5-cache/x11-misc/xvfb-run-1.20.10.3 b/metadata/md5-cache/x11-misc/xvfb-run-1.20.10.3
index a11e89bde4c0..18dbd1a2ffb5 100644
--- a/metadata/md5-cache/x11-misc/xvfb-run-1.20.10.3
+++ b/metadata/md5-cache/x11-misc/xvfb-run-1.20.10.3
@@ -3,9 +3,9 @@ DEPEND=dev-util/patchutils
 DESCRIPTION=Run a command in a virtual X server environment
 EAPI=7
 HOMEPAGE=https://packages.debian.org/sid/xvfb
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=x11-apps/xauth x11-base/xorg-server[xvfb]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_1.20.10-3.diff.gz
-_md5_=f4786b0666903b9076e537f81ee3aac1
+_md5_=84704f6e5a102351187f87be853ad758