gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /metadata/md5-cache/dev-libs
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
803 files changed, 2037 insertions, 1880 deletions
diff --git a/metadata/md5-cache/dev-libs/9libs-1.0-r4 b/metadata/md5-cache/dev-libs/9libs-1.0-r4
index 42a2762ae4fa..b8d114b68379 100644
--- a/metadata/md5-cache/dev-libs/9libs-1.0-r4
+++ b/metadata/md5-cache/dev-libs/9libs-1.0-r4
@@ -9,5 +9,5 @@ LICENSE=PLAN9
 RDEPEND=>=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0
 SLOT=0
 SRC_URI=https://www.netlib.org/research/9libs/9libs-1.0.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b50ee59d9506da8d277eaaa6ca978315
diff --git a/metadata/md5-cache/dev-libs/FP16-2021.03.20 b/metadata/md5-cache/dev-libs/FP16-2021.03.20
new file mode 100644
index 000000000000..670f17174445
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/FP16-2021.03.20
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/psimd
+DESCRIPTION=conversion to/from half-precision floating point formats
+EAPI=8
+HOMEPAGE=https://github.com/Maratyszcza/FP16/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/psimd
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Maratyszcza/FP16/archive/0a92994d729ff76a58f692d3028ca1b64b145d91.tar.gz -> FP16-2021.03.20.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f0dabe1756f20ab13e766565d56dcb35
diff --git a/metadata/md5-cache/dev-libs/FXdiv-2020.12.09 b/metadata/md5-cache/dev-libs/FXdiv-2020.12.09
new file mode 100644
index 000000000000..56718673a096
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/FXdiv-2020.12.09
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Division via fixed-point multiplication by inverse
+EAPI=8
+HOMEPAGE=https://github.com/Maratyszcza/FXdiv/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.tar.gz -> FXdiv-2020.12.09.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2ac137b75b7c99da73d0631c134a0abd
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2 b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
index 50c53803140a..5ffd0c4d77e5 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= virtual
 DESCRIPTION=ICE middleware C++ library and generator tools
 EAPI=7
 HOMEPAGE=https://zeroc.com/products/ice
+INHERIT=db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
 IUSE=debug doc examples +readline mono php python ruby test php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby26
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.5.tar.gz -> Ice-3.6.5.tar.gz doc? ( https://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	db-use	867a9246a45efc09934e0f8e3380c813	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	db-use	867a9246a45efc09934e0f8e3380c813	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a9e4ad486e9713ff011a481d0cf623eb
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c07d718bb54f..dfe5ed00003a 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r2 b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r2
index 62f211022c7f..ddbffddb766f 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r2
+++ b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r2
@@ -3,11 +3,12 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl?
 DESCRIPTION=OpenNI SDK
 EAPI=7
 HOMEPAGE=https://github.com/OpenNI/OpenNI
+INHERIT=toolchain-funcs multilib java-pkg-opt-2
 IUSE=doc java opengl java
 KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/OpenNI/OpenNI/archive/Stable-1.5.7.10.tar.gz -> OpenNI-1.5.7.10.tar.gz
-_eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f1eb57314934a6c145d474bc6003470c
diff --git a/metadata/md5-cache/dev-libs/OpenNI-9999 b/metadata/md5-cache/dev-libs/OpenNI-9999
index 3b9c7e9a7fc3..c70237cd4b76 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI-9999
@@ -4,10 +4,11 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl?
 DESCRIPTION=OpenNI SDK
 EAPI=7
 HOMEPAGE=https://github.com/OpenNI/OpenNI
+INHERIT=git-r3 toolchain-funcs multilib java-pkg-opt-2
 IUSE=doc java opengl java
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8151ac3529ddb9e6170637152854109d
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1 b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
index 46ae65eeb8e4..1491b72e1ede 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
+++ b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/free
 DESCRIPTION=OpenNI2 SDK
 EAPI=7
 HOMEPAGE=https://structure.io/openni
+INHERIT=toolchain-funcs multilib java-pkg-opt-2 flag-o-matic
 IUSE=doc java neon opengl static-libs java
 KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/occipital/OpenNI2/archive/2.2-beta2.tar.gz -> OpenNI2-2.2_beta2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ddef1f7c0858b4722aaa07b074c2e754
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999
index 4acb0896e217..0090293ef25e 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI2-9999
@@ -4,10 +4,11 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/free
 DESCRIPTION=OpenNI2 SDK
 EAPI=7
 HOMEPAGE=https://structure.io/openni
+INHERIT=git-r3 toolchain-funcs multilib java-pkg-opt-2 flag-o-matic
 IUSE=doc java neon opengl static-libs java
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=21a62bd7506e946145177b606b781960
diff --git a/metadata/md5-cache/dev-libs/aml-0.2.0 b/metadata/md5-cache/dev-libs/aml-0.2.0
deleted file mode 100644
index 3b13a43d096d..000000000000
--- a/metadata/md5-cache/dev-libs/aml-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=event timer executor loop
-EAPI=7
-HOMEPAGE=https://github.com/any1/aml/
-IUSE=examples
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://github.com/any1/aml/archive/v0.2.0.tar.gz -> aml-0.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=9a324cc909d75ea7adc24bf02097896e
diff --git a/metadata/md5-cache/dev-libs/aml-0.2.1 b/metadata/md5-cache/dev-libs/aml-0.2.1
index 8fda91f736a2..9eb28a8e84f0 100644
--- a/metadata/md5-cache/dev-libs/aml-0.2.1
+++ b/metadata/md5-cache/dev-libs/aml-0.2.1
@@ -4,10 +4,11 @@ DEPEND=elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=Event timer executor loop
 EAPI=8
 HOMEPAGE=https://github.com/any1/aml/
+INHERIT=meson
 IUSE=examples
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/any1/aml/archive/v0.2.1.tar.gz -> aml-0.2.1.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c54d6956d8edb0a5799f301c5cbc430b
diff --git a/metadata/md5-cache/dev-libs/aml-9999 b/metadata/md5-cache/dev-libs/aml-9999
index ac228917752b..c6c02cdddd70 100644
--- a/metadata/md5-cache/dev-libs/aml-9999
+++ b/metadata/md5-cache/dev-libs/aml-9999
@@ -4,9 +4,10 @@ DEPEND=elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=Event timer executor loop
 EAPI=8
 HOMEPAGE=https://github.com/any1/aml/
+INHERIT=meson git-r3
 IUSE=examples
 LICENSE=ISC
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c54d6956d8edb0a5799f301c5cbc430b
diff --git a/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1 b/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
index 8cebfc0ebad3..9c5ef2dc3a36 100644
--- a/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
+++ b/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3a50c8244be71c0f785c2193c726621a
diff --git a/metadata/md5-cache/dev-libs/appstream-0.14.6 b/metadata/md5-cache/dev-libs/appstream-0.14.6
index 4adc09d6b28f..71d6bab4f225 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.14.6
+++ b/metadata/md5-cache/dev-libs/appstream-0.14.6
@@ -4,6 +4,7 @@ DEPEND=dev-db/lmdb:= >=dev-libs/glib-2.58:2 dev-libs/libxml2:2 dev-libs/libyaml
 DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux ecosystem
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
+INHERIT=meson xdg-utils
 IUSE=apt doc +introspection qt5 test
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+ GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.58:2 dev-libs/libxml2:2 dev-libs/libyaml
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.14.6.tar.xz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1a304d26e4198078b0766d19b0370b55
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.18-r1 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.18-r1
index 38806248f9c0..8f3136b2aa58 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.18-r1
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.18-r1
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive:= >=net-
 DESCRIPTION=Provides GObjects and helper methods to read and write AppStream metadata
 EAPI=7
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
+INHERIT=xdg meson
 IUSE=gtk-doc fonts +introspection stemmer
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive:= >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer:= ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.18.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=136a48bfb843126bb21d8e9cb916c4f6
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.3-r7 b/metadata/md5-cache/dev-libs/apr-1.6.3-r7
index 269a4eef0a82..f68351b82995 100644
--- a/metadata/md5-cache/dev-libs/apr-1.6.3-r7
+++ b/metadata/md5-cache/dev-libs/apr-1.6.3-r7
@@ -3,11 +3,12 @@ DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) >=sys-deve
 DESCRIPTION=Apache Portable Runtime Library
 EAPI=6
 HOMEPAGE=https://apr.apache.org/
+INHERIT=autotools libtool toolchain-funcs
 IUSE=doc older-kernels-compatibility selinux static-libs +urandom
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.6
 SRC_URI=mirror://apache/apr/apr-1.6.3.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ae905e6ec38febac78c77e1ace08460e
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.5-r4 b/metadata/md5-cache/dev-libs/apr-1.6.5-r4
index a31c43efe973..6194a85f046b 100644
--- a/metadata/md5-cache/dev-libs/apr-1.6.5-r4
+++ b/metadata/md5-cache/dev-libs/apr-1.6.5-r4
@@ -3,11 +3,12 @@ DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) >=sys-deve
 DESCRIPTION=Apache Portable Runtime Library
 EAPI=6
 HOMEPAGE=https://apr.apache.org/
+INHERIT=autotools libtool toolchain-funcs
 IUSE=doc older-kernels-compatibility selinux static-libs +urandom
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.6
 SRC_URI=mirror://apache/apr/apr-1.6.5.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4b77fbeb20d29d8025b21e769f286bba
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0-r4 b/metadata/md5-cache/dev-libs/apr-1.7.0-r4
index 0b5275c28b46..f5955ac492e2 100644
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r4
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0-r4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.7
 SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=284a757d0cc092b97e75b696349159cd
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r8 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r8
index eed24be10b58..b729711134d5 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r8
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.6.2:1= dev-libs/expat virtual/libcrypt:= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	db-use	867a9246a45efc09934e0f8e3380c813	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	db-use	867a9246a45efc09934e0f8e3380c813	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=79b034af5019a7dc6a11658255cf50ed
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index 4a5f17b3fe3d..5a6344096347 100644
--- a/metadata/md5-cache/dev-libs/atcore-1.0.0
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-qt/qtserialport-5.12.3:5 gui? ( >=dev-qt/qtcharts-5.12.3:5 >=dev-qt
 DESCRIPTION=API to manage the serial connection between the computer and 3D Printers
 EAPI=7
 HOMEPAGE=https://atelier.kde.org/
+INHERIT=ecm kde.org
 IUSE=doc gui test debug test
 KEYWORDS=~amd64
 LICENSE=|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )
@@ -11,5 +12,5 @@ RDEPEND=>=dev-qt/qtserialport-5.12.3:5 gui? ( >=dev-qt/qtcharts-5.12.3:5 >=dev-q
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1e50ca7ebb68bec4ea41ba8d189940ba
diff --git a/metadata/md5-cache/dev-libs/atk-2.36.0 b/metadata/md5-cache/dev-libs/atk-2.36.0
index 0708074421da..54e4d6e8acbd 100644
--- a/metadata/md5-cache/dev-libs/atk-2.36.0
+++ b/metadata/md5-cache/dev-libs/atk-2.36.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
+INHERIT=gnome.org meson-multilib xdg
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.36/atk-2.36.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=84e9872b94de397c5fcce2a8e5a4303a
diff --git a/metadata/md5-cache/dev-libs/atk-2.38.0 b/metadata/md5-cache/dev-libs/atk-2.38.0
index 5094cbe513e6..33879ea12c4c 100644
--- a/metadata/md5-cache/dev-libs/atk-2.38.0
+++ b/metadata/md5-cache/dev-libs/atk-2.38.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Accessibility
+INHERIT=gnome.org meson-multilib xdg
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.38/atk-2.38.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3bc057bdcb14fc778a9e59e7d8170bde
diff --git a/metadata/md5-cache/dev-libs/avro-c-1.9.1-r1 b/metadata/md5-cache/dev-libs/avro-c-1.9.1-r1
index 2f93ff0d742a..3abb1d93ba8f 100644
--- a/metadata/md5-cache/dev-libs/avro-c-1.9.1-r1
+++ b/metadata/md5-cache/dev-libs/avro-c-1.9.1-r1
@@ -4,10 +4,11 @@ DEPEND=app-arch/snappy >=dev-libs/jansson-2.3:= sys-libs/zlib
 DESCRIPTION=c library for the apache avro data serialization system
 EAPI=7
 HOMEPAGE=https://avro.apache.org/
+INHERIT=cmake
 KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=app-arch/snappy >=dev-libs/jansson-2.3:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=72718e54a1c1acb6cb9ce9d50884e4d2
diff --git a/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5 b/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
index 9ace87b926d1..b16e64a32237 100644
--- a/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
+++ b/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/aws-c-common-0.4.62:=[static-libs=] >=dev-libs/openssl-1.1.1:=
 DESCRIPTION=Crypto Abstraction Layer: Cross-Platform C99 wrapper for cryptography primitives
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-c-cal
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-cal/archive/v0.4.5.tar.gz -> aws-c-cal-0.4.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b81f7ddf56c463c1b962d2e8dadab894
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.4.62 b/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
index 61add84a504f..0b3a89eac340 100644
--- a/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
+++ b/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Core c99 package for AWS SDK for C
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-c-common
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.4.62.tar.gz -> aws-c-common-0.4.62.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a66498e95e23ed07f7f9417d3a0aadd6
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.5.2 b/metadata/md5-cache/dev-libs/aws-c-common-0.5.2
index d0e9200eddbd..c7f8aa754ebb 100644
--- a/metadata/md5-cache/dev-libs/aws-c-common-0.5.2
+++ b/metadata/md5-cache/dev-libs/aws-c-common-0.5.2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Core c99 package for AWS SDK for C
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-c-common
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.5.2.tar.gz -> aws-c-common-0.5.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b2e32b5994b51a5bffbc240e9e3fcda6
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
index 1b813a9aeb0d..9c8e994dcf9e 100644
--- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/aws-c-common-0.4.62:=[static-libs=] >=dev-libs/aws-c-io-0.7.0:
 DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-c-event-stream
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.2.5.tar.gz -> aws-c-event-stream-0.2.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cee1abee2bc3d454e3448f41d7fc733d
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7
index 720ca98727e3..fcfb47493cd0 100644
--- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/aws-c-io-0.9.2:=
 DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-c-event-stream
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.2.7.tar.gz -> aws-c-event-stream-0.2.7.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=adee10f5729f537db49c920bbf80d04b
diff --git a/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1 b/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
index fcfcc2d13118..8f573bbeb475 100644
--- a/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
+++ b/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/aws-c-cal-0.4.5:=[static-libs=] >=dev-libs/aws-c-common-0.4.62
 DESCRIPTION=AWS SDK for C module, handles IO and TLS work for application protocols
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-c-io
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-io/archive/v0.7.0.tar.gz -> aws-c-io-0.7.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e916c93e8c9faf05f849c17441ebe946
diff --git a/metadata/md5-cache/dev-libs/aws-c-io-0.9.2 b/metadata/md5-cache/dev-libs/aws-c-io-0.9.2
index 458e30fe07d1..2dcd80dae0fd 100644
--- a/metadata/md5-cache/dev-libs/aws-c-io-0.9.2
+++ b/metadata/md5-cache/dev-libs/aws-c-io-0.9.2
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/aws-c-cal-0.4.5:=[static-libs=] >=dev-libs/aws-c-common-0.5.2:
 DESCRIPTION=AWS SDK for C module, handles IO and TLS work for application protocols
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-c-io
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-io/archive/v0.9.2.tar.gz -> aws-c-io-0.9.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=42b360ca127d36a98b3098778e318fb9
diff --git a/metadata/md5-cache/dev-libs/aws-checksums-0.1.10 b/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
index 63ef9fd01932..91474af0f355 100644
--- a/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
+++ b/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
 DESCRIPTION=Cross-Platform HW accelerated CRC32c and CRC32 with software fallbacks
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/aws-checksums
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-checksums/archive/v0.1.10.tar.gz -> aws-checksums-0.1.10.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=216c4cf499e6dbae4fa3f929a1454be7
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
index c90c8e4f16f9..6e987b3da9be 100644
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
+++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
@@ -4,6 +4,7 @@ DEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( d
 DESCRIPTION=AWS SDK for C++
 EAPI=7
 HOMEPAGE=https://aws.amazon.com/sdk-for-cpp/
+INHERIT=cmake python-single-r1
 IUSE=+http pulseaudio +rtti +ssl static-libs test unity-build access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe translate waf python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.8.105.tar.gz -> aws-sdk-cpp-1.8.105.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9ffe8a831a43298b4244c9f028359f5d
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160
index 8ca0505df127..289ccb672958 100644
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160
+++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160
@@ -4,6 +4,7 @@ DEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( d
 DESCRIPTION=AWS SDK for C++
 EAPI=7
 HOMEPAGE=https://aws.amazon.com/sdk-for-cpp/
+INHERIT=cmake python-single-r1
 IUSE=+http pulseaudio +rtti +ssl static-libs test unity-build access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe translate waf wellarchitected python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.8.160.tar.gz -> aws-sdk-cpp-1.8.160.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=145acad26bbb236eb5eb3e76fa630b9f
diff --git a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524 b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
deleted file mode 100644
index 34887bb955a9..000000000000
--- a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Fork of zlib-like interface to fast block compression (LZ4 or FastLZ) libraries
-EAPI=8
-HOMEPAGE=https://github.com/bareos/fastlzlib
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-1 BSD-2
-RDEPEND=!app-arch/lz4
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/bareos-fastlzlib-0_pre20150524.zip
-_md5_=169d56dbb65dc5114256e579cc5e9ccb
diff --git a/metadata/md5-cache/dev-libs/bitset-2.8.4-r3 b/metadata/md5-cache/dev-libs/bitset-2.8.4-r3
index 795b74911917..007bf3834829 100644
--- a/metadata/md5-cache/dev-libs/bitset-2.8.4-r3
+++ b/metadata/md5-cache/dev-libs/bitset-2.8.4-r3
@@ -11,5 +11,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools:= ) jemalloc? ( >=dev-libs/jemallo
 REQUIRED_USE=?? ( jemalloc tcmalloc )
 SLOT=0
 SRC_URI=https://github.com/chriso/bitset/archive/2.8.4.tar.gz -> bitset-2.8.4.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ec9184baa9f595d5a99735eadfa736b2
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-8.2.0 b/metadata/md5-cache/dev-libs/boehm-gc-8.2.0
new file mode 100644
index 000000000000..bf707df8b22d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boehm-gc-8.2.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
+EAPI=7
+HOMEPAGE=https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/
+INHERIT=multilib-minimal libtool
+IUSE=cxx +large static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~loong
+LICENSE=boehm-gc
+RDEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/ivmai/bdwgc/releases/download/v8.2.0/gc-8.2.0.tar.gz https://dev.gentoo.org/~xen0n/distfiles/boehm-gc-8.2.0-fix-headers-install.patch.xz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=a122832659f44fb39b8ba1df34a2aaf5
diff --git a/metadata/md5-cache/dev-libs/boost-1.77.0-r4 b/metadata/md5-cache/dev-libs/boost-1.77.0-r4
deleted file mode 100644
index f98236c6629e..000000000000
--- a/metadata/md5-cache/dev-libs/boost-1.77.0-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/boost-build-1.77-r2
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Boost Libraries for C++
-EAPI=8
-HOMEPAGE=https://www.boost.org/
-IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=Boost-1.0
-RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-RESTRICT=test
-SLOT=0/1.77.0
-SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/dev-libs/boost/boost-1.77.0-patches-1.tar.xz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cbe9b2bbf888ecb31c1e51964a7392c7
diff --git a/metadata/md5-cache/dev-libs/boost-1.78.0-r2 b/metadata/md5-cache/dev-libs/boost-1.78.0-r2
index 69d9ee56c97a..b29e64930c27 100644
--- a/metadata/md5-cache/dev-libs/boost-1.78.0-r2
+++ b/metadata/md5-cache/dev-libs/boost-1.78.0-r2
@@ -4,13 +4,14 @@ DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12
 DESCRIPTION=Boost Libraries for C++
 EAPI=8
 HOMEPAGE=https://www.boost.org/
+INHERIT=flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=Boost-1.0
 RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=test
 SLOT=0/1.78.0
 SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8c254f445002df6ef5457c8e069ac83b
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=582b1d329a6835ec35f143cee5149142
diff --git a/metadata/md5-cache/dev-libs/boost-1.79.0 b/metadata/md5-cache/dev-libs/boost-1.79.0
index af827bdc8fba..d29234441222 100644
--- a/metadata/md5-cache/dev-libs/boost-1.79.0
+++ b/metadata/md5-cache/dev-libs/boost-1.79.0
@@ -4,12 +4,14 @@ DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12
 DESCRIPTION=Boost Libraries for C++
 EAPI=8
 HOMEPAGE=https://www.boost.org/
+INHERIT=flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=Boost-1.0
 RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=test
 SLOT=0/1.79.0
 SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e7ac8596d72e11f3567087ece49d552c
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e47d7d4aaf9007d41fe43294a71959f5
diff --git a/metadata/md5-cache/dev-libs/botan-2.18.2-r1 b/metadata/md5-cache/dev-libs/botan-2.18.2-r1
deleted file mode 100644
index 7a04a7b604c5..000000000000
--- a/metadata/md5-cache/dev-libs/botan-2.18.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 doc? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) ( >=dev-lang/python-3.9.9-r1:3.9 doc? ( dev-python/sphinx[python_targets_python3_9(-)] ) ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 doc? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) ) verify-sig? ( sec-keys/openpgp-keys-botan ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install test unpack
-DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) ssl? ( dev-libs/openssl:= ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
-DESCRIPTION=C++ crypto library
-EAPI=8
-HOMEPAGE=https://botan.randombit.net/
-IUSE=doc boost bzip2 lzma python ssl static-libs sqlite zlib cpu_flags_arm_aes cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_rdrand cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) ssl? ( dev-libs/openssl:= ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=2/2.18
-SRC_URI=https://botan.randombit.net/releases/Botan-2.18.2.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.18.2.tar.xz.asc )
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=8a8660bdb1e8f87d65adfd7529f91789
diff --git a/metadata/md5-cache/dev-libs/botan-2.19.1 b/metadata/md5-cache/dev-libs/botan-2.19.1
index c3c71603b4c3..dec0b7ee0906 100644
--- a/metadata/md5-cache/dev-libs/botan-2.19.1
+++ b/metadata/md5-cache/dev-libs/botan-2.19.1
@@ -4,6 +4,7 @@ DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lz
 DESCRIPTION=C++ crypto library
 EAPI=8
 HOMEPAGE=https://botan.randombit.net/
+INHERIT=python-r1 toolchain-funcs verify-sig
 IUSE=doc boost bzip2 lzma python ssl static-libs sqlite zlib cpu_flags_arm_aes cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_rdrand cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
 LICENSE=BSD-2
@@ -11,5 +12,5 @@ RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) l
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=2/2.19
 SRC_URI=https://botan.randombit.net/releases/Botan-2.19.1.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.19.1.tar.xz.asc )
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=1353632f3763a1b1bb5e9e4e94a3b7f2
diff --git a/metadata/md5-cache/dev-libs/boxfort-0.1.1 b/metadata/md5-cache/dev-libs/boxfort-0.1.1
index 9a68799e7dc8..4b0511a74366 100644
--- a/metadata/md5-cache/dev-libs/boxfort-0.1.1
+++ b/metadata/md5-cache/dev-libs/boxfort-0.1.1
@@ -4,11 +4,12 @@ DEPEND=test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-util/cram[python_t
 DESCRIPTION=Convenient & cross-platform sandboxing C library
 EAPI=8
 HOMEPAGE=https://github.com/Snaipe/BoxFort
+INHERIT=meson python-any-r1
 IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 -riscv ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/BoxFort/archive/v0.1.1.tar.gz -> boxfort-0.1.1.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8c40fe9db2f6b34741130f10cfa02ca1
diff --git a/metadata/md5-cache/dev-libs/boxfort-0.1.4 b/metadata/md5-cache/dev-libs/boxfort-0.1.4
index a990bd1ca208..38b1d17f051a 100644
--- a/metadata/md5-cache/dev-libs/boxfort-0.1.4
+++ b/metadata/md5-cache/dev-libs/boxfort-0.1.4
@@ -4,11 +4,12 @@ DEPEND=test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-util/cram[python_t
 DESCRIPTION=Convenient & cross-platform sandboxing C library
 EAPI=8
 HOMEPAGE=https://github.com/Snaipe/BoxFort
+INHERIT=meson python-any-r1
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 -riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 -riscv -s390 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/BoxFort/archive/v0.1.4.tar.gz -> boxfort-0.1.4.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=818372ddce67958c424402c18eb81859
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=dbda07775c026b75bf63b1f8014f23b5
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.21.1 b/metadata/md5-cache/dev-libs/c-blosc-1.21.1
index 55e1e8867037..0218d87e7231 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.21.1
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.21.1
@@ -4,6 +4,7 @@ DEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys
 DESCRIPTION=Blocking, shuffling and lossless compression library
 EAPI=8
 HOMEPAGE=https://www.blosc.org/
+INHERIT=cmake
 IUSE=+lz4 +snappy test zlib zstd
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sy
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.21.1.tar.gz -> c-blosc-1.21.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a61215ea07f5a55f09593a3cbac62a47
diff --git a/metadata/md5-cache/dev-libs/cJSON-1.7.15 b/metadata/md5-cache/dev-libs/cJSON-1.7.15
index 55c8e3bb2b46..ebf49bfc103e 100644
--- a/metadata/md5-cache/dev-libs/cJSON-1.7.15
+++ b/metadata/md5-cache/dev-libs/cJSON-1.7.15
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Ultralightweight JSON parser in ANSI C
 EAPI=7
 HOMEPAGE=https://github.com/DaveGamble/cJSON
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DaveGamble/cJSON/archive/v1.7.15.tar.gz -> cJSON-1.7.15.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ab98b6f5bee33149b849817606c1f850
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=61083cd58ef4e03afce9638fa16cec7f
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.9.1 b/metadata/md5-cache/dev-libs/capnproto-0.9.1
index 3f2178ea0b1c..9f66868e3e33 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.9.1
+++ b/metadata/md5-cache/dev-libs/capnproto-0.9.1
@@ -4,6 +4,7 @@ DEPEND=ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib:0= ) test? ( dev-cpp/g
 DESCRIPTION=RPC/Serialization system with capabilities support
 EAPI=8
 HOMEPAGE=https://capnproto.org
+INHERIT=cmake flag-o-matic
 IUSE=+ssl test zlib
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib:0= )
 RESTRICT=!test? ( test )
 SLOT=0/091
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.9.1.tar.gz -> capnproto-0.9.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b561ad6598f47b2fd88db12a06ab05a9
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2 b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
index d10f6d7ab063..b776ece4de1e 100644
--- a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=disassembly/disassembler framework + bindings
 EAPI=7
 HOMEPAGE=http://www.capstone-engine.org/
+INHERIT=cmake distutils-r1 toolchain-funcs
 IUSE=python static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://github.com/aquynh/capstone/archive/4.0.2.tar.gz -> capstone-4.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=18641c549b167ffb9c63bdc74810e303
diff --git a/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r1 b/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r1
new file mode 100644
index 000000000000..ddfca22e592c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=disassembly/disassembler framework + bindings
+EAPI=8
+HOMEPAGE=http://www.capstone-engine.org/
+INHERIT=cmake distutils-r1 toolchain-funcs
+IUSE=python test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=https://github.com/aquynh/capstone/archive/5.0-rc2.tar.gz -> capstone-5.0_rc2.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8816fb5bb1c53d717d60048d351b3d1d
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20160131-r1 b/metadata/md5-cache/dev-libs/cdk-5.0.20160131-r1
deleted file mode 100644
index 96020996f83c..000000000000
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20160131-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses:=[unicode(+)?]
-DESCRIPTION=A library of curses widgets
-EAPI=6
-HOMEPAGE=https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots
-IUSE=examples static-libs unicode
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=sys-libs/ncurses:=[unicode(+)?]
-SLOT=0/6
-SRC_URI=ftp://ftp.invisible-island.net/cdk/cdk-5.0-20160131.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=308a4ea5c037b712fcd40daa9534302e
diff --git a/metadata/md5-cache/dev-libs/cereal-1.3.0-r2 b/metadata/md5-cache/dev-libs/cereal-1.3.0-r2
index 4c6f9bfe7307..4585314c2c02 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.3.0-r2
+++ b/metadata/md5-cache/dev-libs/cereal-1.3.0-r2
@@ -4,11 +4,12 @@ DEPEND=test? ( dev-libs/boost )
 DESCRIPTION=Header-only C++11 serialization library
 EAPI=7
 HOMEPAGE=https://uscilab.github.io/cereal/
+INHERIT=cmake
 IUSE=+doc test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz -> cereal-1.3.0.tar.gz https://dev.gentoo.org/~expeditioneer/patches/cereal-1.3.0-fix-doctest.patch
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2d5475407ab2a06a18a883b925aeeb25
diff --git a/metadata/md5-cache/dev-libs/cereal-1.3.2 b/metadata/md5-cache/dev-libs/cereal-1.3.2
index 4937a153919a..d9a01bbcfe4e 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.3.2
+++ b/metadata/md5-cache/dev-libs/cereal-1.3.2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Header-only C++11 serialization library
 EAPI=8
 HOMEPAGE=https://uscilab.github.io/cereal/
+INHERIT=cmake
 IUSE=doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.3.2.tar.gz -> cereal-1.3.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=824d9305ce992f9676c39a9be5e332d5
diff --git a/metadata/md5-cache/dev-libs/cereal-1.3.2-r2 b/metadata/md5-cache/dev-libs/cereal-1.3.2-r2
index 28cd720a6a2f..b2fbc4b074eb 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.3.2-r2
+++ b/metadata/md5-cache/dev-libs/cereal-1.3.2-r2
@@ -4,11 +4,12 @@ DEPEND=dev-libs/rapidjson
 DESCRIPTION=Header-only C++11 serialization library
 EAPI=8
 HOMEPAGE=https://uscilab.github.io/cereal/
+INHERIT=cmake
 IUSE=doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.3.2.tar.gz -> cereal-1.3.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9fc1647c941f6b9531475a8706de35a5
diff --git a/metadata/md5-cache/dev-libs/cgilib-0.7-r1 b/metadata/md5-cache/dev-libs/cgilib-0.7-r1
index db968c84b5d0..9001d3b0df52 100644
--- a/metadata/md5-cache/dev-libs/cgilib-0.7-r1
+++ b/metadata/md5-cache/dev-libs/cgilib-0.7-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.infodrom.org/projects/cgilib/download/cgilib-0.7.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=65f22e3733b0c16801bacf3760d2336c
diff --git a/metadata/md5-cache/dev-libs/cgreen-1.3.0 b/metadata/md5-cache/dev-libs/cgreen-1.3.0
index 7f4a1604525c..7dbf81b647a0 100644
--- a/metadata/md5-cache/dev-libs/cgreen-1.3.0
+++ b/metadata/md5-cache/dev-libs/cgreen-1.3.0
@@ -4,10 +4,11 @@ DEPEND=sys-libs/glibc:=
 DESCRIPTION=Unit test and mocking framework for C and C++
 EAPI=7
 HOMEPAGE=https://cgreen-devs.github.io/
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=sys-libs/glibc:=
 SLOT=0
 SRC_URI=https://github.com/cgreen-devs/cgreen/archive/1.3.0.tar.gz -> cgreen-1.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8e0562a8ad3d0972b4008f1559580e96
diff --git a/metadata/md5-cache/dev-libs/check-0.15.2-r1 b/metadata/md5-cache/dev-libs/check-0.15.2-r1
index d70a329994e4..c10ed7944151 100644
--- a/metadata/md5-cache/dev-libs/check-0.15.2-r1
+++ b/metadata/md5-cache/dev-libs/check-0.15.2-r1
@@ -4,12 +4,13 @@ DEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=A unit test framework for C
 EAPI=7
 HOMEPAGE=https://libcheck.github.io/check/
+INHERIT=cmake-multilib
 IUSE=doc subunit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=ppc? ( test ) ppc64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libcheck/check/archive/0.15.2.tar.gz -> check-0.15.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=24ae0d315c5ed404bf9f343224202906
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e65c1a01e5dadbe0b111ab5b4dcaea3f
diff --git a/metadata/md5-cache/dev-libs/chmlib-0.40-r1 b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
index d4925e21794d..2de54fd2a9cf 100644
--- a/metadata/md5-cache/dev-libs/chmlib-0.40-r1
+++ b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.jedrea.com/chmlib/chmlib-0.40.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a0b615bc3aefb62c3d5ae4bc80bca6a8
diff --git a/metadata/md5-cache/dev-libs/clhpp-2.0.15 b/metadata/md5-cache/dev-libs/clhpp-2.0.15
index db1b07a9d32d..777833933a31 100644
--- a/metadata/md5-cache/dev-libs/clhpp-2.0.15
+++ b/metadata/md5-cache/dev-libs/clhpp-2.0.15
@@ -4,10 +4,11 @@ DEPEND=virtual/opencl
 DESCRIPTION=Khronos OpenCL C++ bindings
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-CLHPP/
+INHERIT=cmake
 KEYWORDS=amd64 x86
 LICENSE=Khronos-CLHPP
 RDEPEND=virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.15.tar.gz -> clhpp-2.0.15.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f291edcff7dc0034c3b8e07aa8e9e299
diff --git a/metadata/md5-cache/dev-libs/clipper-6.4.2 b/metadata/md5-cache/dev-libs/clipper-6.4.2
index eb4ec6ce9c7a..232997e86cee 100644
--- a/metadata/md5-cache/dev-libs/clipper-6.4.2
+++ b/metadata/md5-cache/dev-libs/clipper-6.4.2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Polygon and line clipping and offsetting library (C++, C#, Delphi)
 EAPI=7
 HOMEPAGE=http://www.angusj.com/delphi/clipper.php
+INHERIT=cmake
 KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/project/polyclipping/clipper_ver6.4.2.zip -> clipper-6.4.2.zip
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f0a55fdac54144d4e6dd45d32584ff31
diff --git a/metadata/md5-cache/dev-libs/cloog-0.20.0 b/metadata/md5-cache/dev-libs/cloog-0.20.0
index 519439e8e525..43c76eb61dc3 100644
--- a/metadata/md5-cache/dev-libs/cloog-0.20.0
+++ b/metadata/md5-cache/dev-libs/cloog-0.20.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/gmp:= dev-libs/isl:=
 SLOT=0/4
 SRC_URI=https://github.com/periscop/cloog/archive/cloog-0.20.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7ccdaae2b27e883bb7d13351bf21972c
diff --git a/metadata/md5-cache/dev-libs/cloog-9999 b/metadata/md5-cache/dev-libs/cloog-9999
index dd2bf030765f..10e7e3164155 100644
--- a/metadata/md5-cache/dev-libs/cloog-9999
+++ b/metadata/md5-cache/dev-libs/cloog-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/gmp:= dev-libs/isl:=
 SLOT=0/4
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7ccdaae2b27e883bb7d13351bf21972c
diff --git a/metadata/md5-cache/dev-libs/collada-dom-2.5.0 b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
index f20b5c1d7515..627ae528b5cf 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-2.5.0
+++ b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
@@ -3,10 +3,11 @@ DEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpc
 DESCRIPTION=COLLADA Document Object Model (DOM) C++ Library
 EAPI=6
 HOMEPAGE=https://github.com/rdiankov/collada-dom
+INHERIT=cmake-utils flag-o-matic
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx]
 SLOT=0/25
 SRC_URI=https://github.com/rdiankov/collada-dom/archive/v2.5.0.tar.gz -> collada-dom-2.5.0.tar.gz
-_eclasses_=cmake-utils	e86bbd4030632b173a1d50a4916dfb41	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake-utils	f87188bbc572b252f1f7ab26bc72a568	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=168083cece59dcd3d14f1bef534f8c42
diff --git a/metadata/md5-cache/dev-libs/collada-dom-9999 b/metadata/md5-cache/dev-libs/collada-dom-9999
index 54d20c465df3..f6f4eb30066c 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-9999
+++ b/metadata/md5-cache/dev-libs/collada-dom-9999
@@ -3,9 +3,10 @@ DEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2:= dev-libs/lib
 DESCRIPTION=COLLADA Document Object Model (DOM) C++ Library
 EAPI=6
 HOMEPAGE=https://github.com/rdiankov/collada-dom
+INHERIT=cmake-utils flag-o-matic git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2:= dev-libs/libpcre:=[cxx]
 SLOT=0/25
-_eclasses_=cmake-utils	e86bbd4030632b173a1d50a4916dfb41	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake-utils	f87188bbc572b252f1f7ab26bc72a568	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4288cb0a82b74a0a9acd661b81ab5c9c
diff --git a/metadata/md5-cache/dev-libs/console_bridge-1.0.2 b/metadata/md5-cache/dev-libs/console_bridge-1.0.2
index 3cfe80bd1861..279a6def6068 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-1.0.2
+++ b/metadata/md5-cache/dev-libs/console_bridge-1.0.2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:=[threads(+)]
 DESCRIPTION=A ROS-independent package for logging into rosconsole/rosout
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/console_bridge
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/boost:=[threads(+)]
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cppcheck/ament_cppcheck/main.py -> console_bridge-1.0.2-ament-0.9.5-cppcheck.py https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cpplint/ament_cpplint/cpplint.py -> console_bridge-1.0.2-ament-0.9.5-cpplint.py https://github.com/ros/console_bridge/archive/1.0.2.tar.gz -> console_bridge-1.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=523b1bcf815d866598cefdf04ea2d8a4
diff --git a/metadata/md5-cache/dev-libs/console_bridge-9999 b/metadata/md5-cache/dev-libs/console_bridge-9999
index ef99b7cce000..6918af17f2e7 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-9999
+++ b/metadata/md5-cache/dev-libs/console_bridge-9999
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:=[threads(+)]
 DESCRIPTION=A ROS-independent package for logging into rosconsole/rosout
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/console_bridge
+INHERIT=git-r3 cmake
 IUSE=test
 LICENSE=BSD
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/boost:=[threads(+)]
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cppcheck/ament_cppcheck/main.py -> console_bridge-9999-ament-0.9.5-cppcheck.py https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cpplint/ament_cpplint/cpplint.py -> console_bridge-9999-ament-0.9.5-cpplint.py
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=229138a3716bee6e982212ddf6c0036f
diff --git a/metadata/md5-cache/dev-libs/cppcodec-0.2 b/metadata/md5-cache/dev-libs/cppcodec-0.2
index fb90d158ba0b..f4302b1033c8 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-0.2
+++ b/metadata/md5-cache/dev-libs/cppcodec-0.2
@@ -4,11 +4,12 @@ DEPEND=test? ( >=dev-cpp/catch-2.3.0:0 )
 DESCRIPTION=C++11 library to encode/decode base64, base64url, base32, base32hex and hex
 EAPI=8
 HOMEPAGE=https://github.com/tplgy/cppcodec
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tplgy/cppcodec/archive/v0.2.tar.gz -> cppcodec-0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=833f28c3feb25ca9423e7136ddfbdffd
diff --git a/metadata/md5-cache/dev-libs/cppcodec-9999 b/metadata/md5-cache/dev-libs/cppcodec-9999
index cb2e742daa1d..5cb989aef844 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-9999
+++ b/metadata/md5-cache/dev-libs/cppcodec-9999
@@ -4,10 +4,11 @@ DEPEND=test? ( >=dev-cpp/catch-2.3.0:0 )
 DESCRIPTION=C++11 library to encode/decode base64, base64url, base32, base32hex and hex
 EAPI=8
 HOMEPAGE=https://github.com/tplgy/cppcodec
+INHERIT=cmake git-r3
 IUSE=test
 LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=833f28c3feb25ca9423e7136ddfbdffd
diff --git a/metadata/md5-cache/dev-libs/cpuinfo-2022.03.26 b/metadata/md5-cache/dev-libs/cpuinfo-2022.03.26
new file mode 100644
index 000000000000..0a0d1555a48e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cpuinfo-2022.03.26
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CPU INFOrmation library
+EAPI=8
+HOMEPAGE=https://github.com/pytorch/cpuinfo/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytorch/cpuinfo/archive/b40bae27785787b6dd70788986fd96434cf90ae2.tar.gz -> cpuinfo-2022.03.26.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3de9bf46c676e991c87f2125a901a04c
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.0.6-r1 b/metadata/md5-cache/dev-libs/crc32c-1.0.6-r1
index e3a616fa5762..7f25e686ea62 100644
--- a/metadata/md5-cache/dev-libs/crc32c-1.0.6-r1
+++ b/metadata/md5-cache/dev-libs/crc32c-1.0.6-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CRC32C implementation with support for CPU-specific acceleration instructions
 EAPI=7
 HOMEPAGE=https://github.com/google/crc32c
+INHERIT=cmake
 KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/google/crc32c/archive/1.0.6.tar.gz -> crc32c-1.0.6.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b3b9ab22378968f27da1718476a1043b
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.1.1 b/metadata/md5-cache/dev-libs/crc32c-1.1.1
index 99c6a52ad17b..c98757575fef 100644
--- a/metadata/md5-cache/dev-libs/crc32c-1.1.1
+++ b/metadata/md5-cache/dev-libs/crc32c-1.1.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CRC32C implementation with support for CPU-specific acceleration instructions
 EAPI=7
 HOMEPAGE=https://github.com/google/crc32c
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/crc32c/archive/1.1.1.tar.gz -> crc32c-1.1.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=701d568b4fe45c29b62e16026620cc10
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.1.2-r1 b/metadata/md5-cache/dev-libs/crc32c-1.1.2-r1
index 9b3c40e1bb39..3b7f2fc65c68 100644
--- a/metadata/md5-cache/dev-libs/crc32c-1.1.2-r1
+++ b/metadata/md5-cache/dev-libs/crc32c-1.1.2-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CRC32C implementation with support for CPU-specific acceleration instructions
 EAPI=7
 HOMEPAGE=https://github.com/google/crc32c
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/crc32c/archive/1.1.2.tar.gz -> crc32c-1.1.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d5983649c1808e857414da6df87ee360
diff --git a/metadata/md5-cache/dev-libs/criterion-2.4.0 b/metadata/md5-cache/dev-libs/criterion-2.4.0
index ae5d3b2fb2f2..8ce800bc0a2e 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.4.0
+++ b/metadata/md5-cache/dev-libs/criterion-2.4.0
@@ -1,15 +1,16 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-util/cmake virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:= dev-libs/boxfort test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-util/cram[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-util/cram[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-util/cram[python_targets_python3_8(-)] ) ) )
+DEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:= >=dev-libs/boxfort-0.1.4 test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-util/cram[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-util/cram[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-util/cram[python_targets_python3_8(-)] ) ) )
 DESCRIPTION=Cross platform unit testing framework for C and C++
 EAPI=8
 HOMEPAGE=https://github.com/Snaipe/Criterion
+INHERIT=meson python-any-r1
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD-2 MIT ZLIB
 RDEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/archive/refs/tags/v2.4.0.tar.gz -> criterion-2.4.0.tar.gz https://github.com/scottt/debugbreak/archive/6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz -> debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz https://github.com/attractivechaos/klib/archive/cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz -> klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz https://github.com/nanopb/nanopb/archive/c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz -> nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b5eb743e6de7af19635951a630a5933f
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=b38dce55d9487f60a883fa5017b79f2e
diff --git a/metadata/md5-cache/dev-libs/criterion-2.4_pre20211218 b/metadata/md5-cache/dev-libs/criterion-2.4_pre20211218
index 982b0eb0d3a5..e71d022dc9a4 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.4_pre20211218
+++ b/metadata/md5-cache/dev-libs/criterion-2.4_pre20211218
@@ -4,6 +4,7 @@ DEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:= dev-libs/boxfort
 DESCRIPTION=Cross platform unit testing framework for C and C++
 EAPI=8
 HOMEPAGE=https://github.com/Snaipe/Criterion
+INHERIT=meson python-any-r1
 IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD-2 MIT ZLIB
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/archive/a91a69f65006c057812fdd850b100ff28790ea73.tar.gz -> criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz https://github.com/scottt/debugbreak/archive/6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz -> debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz https://github.com/attractivechaos/klib/archive/cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz -> klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz https://github.com/nanopb/nanopb/archive/c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz -> nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5027377ccc65424f75ae2eeb9dee0350
diff --git a/metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1 b/metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1
index 42d3089ac788..4857125e4d10 100644
--- a/metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1
+++ b/metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Lightweight C++ command line option parser
 EAPI=7
 HOMEPAGE=https://github.com/jarro2783/cxxopts
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2.2.1
 SRC_URI=https://github.com/jarro2783/cxxopts/archive/v2.2.1.tar.gz -> cxxopts-2.2.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4789b8d6001868c947b20c9ef2eaf64f
diff --git a/metadata/md5-cache/dev-libs/cxxopts-3.0.0 b/metadata/md5-cache/dev-libs/cxxopts-3.0.0
new file mode 100644
index 000000000000..c978a4977f35
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cxxopts-3.0.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lightweight C++ command line option parser
+EAPI=8
+HOMEPAGE=https://github.com/jarro2783/cxxopts
+INHERIT=cmake
+IUSE=icu test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0/3.0.0
+SRC_URI=https://github.com/jarro2783/cxxopts/archive/v3.0.0.tar.gz -> cxxopts-3.0.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2e9a6ec782a2f608f8ee7a3e95705bdd
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p15 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p15
index a8c4f3f14007..f5589f4d8633 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p15
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p15
@@ -1,14 +1,15 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=sys-apps/pcsc-lite virtual/libusb:1= udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
 DESCRIPTION=REINER SCT cyberJack USB chipcard reader user space driver
 EAPI=8
 HOMEPAGE=https://www.reiner-sct.de/
+INHERIT=autotools toolchain-funcs udev
 IUSE=static-libs threads tools +udev xml
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/pcsc-lite virtual/libusb:1= udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
 SLOT=0
 SRC_URI=https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP15/pcsc-cyberjack_3.99.5final.SP15.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=e601dce90a2bf2e2b64a1e6ddfa1efba
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=05c0d2f8c3dab2047e20e6e0c8af7d90
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r7 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r7
deleted file mode 100644
index 3cb9db1fcc27..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( dev-db/mysql-connector-c:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=7
-HOMEPAGE=https://www.cyrusimap.org/sasl/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( dev-db/mysql-connector-c:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=ldapdb? ( openldap )
-SLOT=2
-SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6-patches.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=646fe56c9a2d038963574b89e0bc7b0f
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.28-r2 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.28-r2
index 52d1580359dd..870a96abd1aa 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.28-r2
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.28-r2
@@ -4,12 +4,13 @@ DEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courier
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=8
 HOMEPAGE=https://www.cyrusimap.org/sasl/
+INHERIT=autotools edos2unix flag-o-matic multilib multilib-minimal pam db-use systemd toolchain-funcs tmpfiles
 IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( dev-db/mysql-connector-c:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sec-policy/selinux-sasl ) virtual/tmpfiles
 REQUIRED_USE=ldapdb? ( openldap )
 SLOT=2
 SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6-patches.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=82e856aa06c2f82a8bf8480e1b5acced
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=834b7d47219a25fc8b9f7ad75a62ac95
diff --git a/metadata/md5-cache/dev-libs/d0_blind_id-1.0 b/metadata/md5-cache/dev-libs/d0_blind_id-1.0
index 214256050bf4..dc5d24f5b446 100644
--- a/metadata/md5-cache/dev-libs/d0_blind_id-1.0
+++ b/metadata/md5-cache/dev-libs/d0_blind_id-1.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0
 SLOT=0
 SRC_URI=https://github.com/divVerent/d0_blind_id/archive/v1.0.tar.gz -> d0_blind_id-1.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9c19cee764a1c09a38743fee5e9d1026
diff --git a/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816 b/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
index 1a4a92bae71b..3e786f4d37f9 100644
--- a/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
+++ b/metadata/md5-cache/dev-libs/darts-0.32h_pre20181117064816
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-l
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/s-yata/darts-clone/archive/e40ce4627526985a7767444b6ed6893ab6ff8983.tar.gz -> darts-0.32h_pre20181117064816.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=24ee984361291d04ac3b05702371c5db
diff --git a/metadata/md5-cache/dev-libs/darts-9999 b/metadata/md5-cache/dev-libs/darts-9999
index 6cb51dad5b63..2c6736d25d37 100644
--- a/metadata/md5-cache/dev-libs/darts-9999
+++ b/metadata/md5-cache/dev-libs/darts-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/s-yata/darts-clone https://code.google.com/archive/p
 LICENSE=BSD-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5d01bb2ad2758ed14731f03dfc88f603
diff --git a/metadata/md5-cache/dev-libs/date-3.0.0 b/metadata/md5-cache/dev-libs/date-3.0.0
index 56f5eee5999c..3e78a7e6504a 100644
--- a/metadata/md5-cache/dev-libs/date-3.0.0
+++ b/metadata/md5-cache/dev-libs/date-3.0.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A date and time library based on the C++11/14/17 <chrono> header
 EAPI=7
 HOMEPAGE=https://github.com/HowardHinnant/date
+INHERIT=cmake
 IUSE=only-c-locale test
 KEYWORDS=~amd64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/HowardHinnant/date/archive/v3.0.0.tar.gz -> date-3.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bd7fbaad72a1288726e3068b7c45c2d1
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.110 b/metadata/md5-cache/dev-libs/dbus-glib-0.110
index 907149d6b368..2158524ded1b 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.110
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.110
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=395dd4857b02c6a4a06291114a29afce
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.112 b/metadata/md5-cache/dev-libs/dbus-glib-0.112
index 0c015dddcf11..a30b6ba81706 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.112
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.112
@@ -4,12 +4,13 @@ DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=D-Bus bindings for glib
 EAPI=7
 HOMEPAGE=https://dbus.freedesktop.org/
+INHERIT=autotools bash-completion-r1 multilib-minimal toolchain-funcs
 IUSE=debug static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4fd1d37d5054c0cb6ae3bfe1efa7311e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=a251fb4be595d3fe8a7ca189d5b70f22
diff --git a/metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1 b/metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1
index 3fe3d50d0939..3126c8f61813 100644
--- a/metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1
+++ b/metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A libc optimized for small size
 EAPI=6
 HOMEPAGE=http://www.fefe.de/dietlibc/
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~patrick/dietlibc-0.34_pre20140729.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e1f4bd60f8ae5203dae847705007fcce
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.6.1 b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
deleted file mode 100644
index d9c3b81fa439..000000000000
--- a/metadata/md5-cache/dev-libs/ding-libs-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=virtual/pkgconfig test? ( dev-libs/check )
-DESCRIPTION=set of utility libraries (mostly used by sssd)
-EAPI=6
-HOMEPAGE=https://pagure.io/SSSD/ding-libs
-IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux
-LICENSE=LGPL-3 GPL-3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.1.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=08bc16028c985948675eb218b4f6e7cf
diff --git a/metadata/md5-cache/dev-libs/distorm3-3.5.2 b/metadata/md5-cache/dev-libs/distorm3-3.5.2
index 1b8f23f185c7..a4380d1d7b05 100644
--- a/metadata/md5-cache/dev-libs/distorm3-3.5.2
+++ b/metadata/md5-cache/dev-libs/distorm3-3.5.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ultimate disassembler library (X86-32, X86-64)
 EAPI=7
 HOMEPAGE=http://www.ragestorm.net/distorm/
+INHERIT=distutils-r1
 IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-4
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distorm3/distorm3-3.5.2.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=72b3478c3d684e1dde2c3f36fd8cbd9c
diff --git a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7 b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
index f02840f79d2c..cf98f0c4a0a3 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
+++ b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=https://dmalloc.com/releases/dmalloc-5.5.2.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0d030e9dd5389dc88d791104d8168315
diff --git a/metadata/md5-cache/dev-libs/dmalloc-999999 b/metadata/md5-cache/dev-libs/dmalloc-999999
index bb75ce2865c5..f1d77ea70742 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-999999
+++ b/metadata/md5-cache/dev-libs/dmalloc-999999
@@ -7,5 +7,5 @@ IUSE=threads
 LICENSE=ISC
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bcba3397768bf275458f7ebcf4784f43
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.2.0 b/metadata/md5-cache/dev-libs/double-conversion-3.2.0
index 55d7bc146219..1b741ee68aef 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.2.0
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.2.0
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubles
 EAPI=8
 HOMEPAGE=https://github.com/google/double-conversion
+INHERIT=cmake
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.2.0.tar.gz -> double-conversion-3.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6719197ce86233262e46c3d89fb02226
diff --git a/metadata/md5-cache/dev-libs/dqlite-1.10.0 b/metadata/md5-cache/dev-libs/dqlite-1.10.0
index 09a2c6d0c67e..a29313530a6a 100644
--- a/metadata/md5-cache/dev-libs/dqlite-1.10.0
+++ b/metadata/md5-cache/dev-libs/dqlite-1.10.0
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/libuv:= >=dev-libs/raft-0.13.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/canonical/dqlite/archive/v1.10.0.tar.gz -> dqlite-1.10.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ac738d81a9525ebc45e311a0a268ae5e
diff --git a/metadata/md5-cache/dev-libs/dqlite-1.9.1 b/metadata/md5-cache/dev-libs/dqlite-1.9.1
index bad66d5ce7f5..bda573c483e5 100644
--- a/metadata/md5-cache/dev-libs/dqlite-1.9.1
+++ b/metadata/md5-cache/dev-libs/dqlite-1.9.1
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/libuv:= dev-libs/raft
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/canonical/dqlite/archive/v1.9.1.tar.gz -> dqlite-1.9.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=14489372f339d752c596182a88634fd0
diff --git a/metadata/md5-cache/dev-libs/eb-4.4.1-r1 b/metadata/md5-cache/dev-libs/eb-4.4.1-r1
index 77b7a8c432e1..bf394c0e91cf 100644
--- a/metadata/md5-cache/dev-libs/eb-4.4.1-r1
+++ b/metadata/md5-cache/dev-libs/eb-4.4.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.1.tar.lzma
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=412befa5d45048e0f2625fbdb6915a3b
diff --git a/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1 b/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1
index bc9a4c10c661..0ee0f0786665 100644
--- a/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1
+++ b/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1
@@ -4,6 +4,7 @@ DEPEND=app-accessibility/at-spi2-core dev-libs/glib:2 dev-libs/libcroco virtual/
 DESCRIPTION=An easy to use virtual keyboard toolkit
 EAPI=7
 HOMEPAGE=https://github.com/ueno/eekboard
+INHERIT=autotools gnome2-utils python-any-r1 vala vcs-snapshot virtualx xdg
 IUSE=doc +introspection libcanberra static-libs +vala +xtest test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/eekboard/archive/e212262f29e022bdf7047861263ceea0c373e916.tar.gz -> eekboard-1.0.8_p20121001.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-snapshot	19dc666868420457132a7514d4621476	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-snapshot	19dc666868420457132a7514d4621476	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8677c608872e8deda9c5d7829bb93e2a
diff --git a/metadata/md5-cache/dev-libs/efl-1.25.1-r13 b/metadata/md5-cache/dev-libs/efl-1.25.1-r13
index 0bd36536e305..cf202646b39a 100644
--- a/metadata/md5-cache/dev-libs/efl-1.25.1-r13
+++ b/metadata/md5-cache/dev-libs/efl-1.25.1-r13
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
+INHERIT=docs lua-single meson python-any-r1 xdg-utils
 IUSE=+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent zeroconf doc lua_single_target_luajit lua_single_target_lua5-1
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ?? ( elogi
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz
-_eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a0d50e62f63f0ac9ea35ccc02cb867a9
diff --git a/metadata/md5-cache/dev-libs/efl-1.26.2 b/metadata/md5-cache/dev-libs/efl-1.26.2
index 7630cfd5f106..0c6d86a5b10d 100644
--- a/metadata/md5-cache/dev-libs/efl-1.26.2
+++ b/metadata/md5-cache/dev-libs/efl-1.26.2
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
+INHERIT=docs lua-single meson python-any-r1 xdg
 IUSE=+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon +fontconfig fribidi gif gnutls glib +gstreamer harfbuzz heif hyphen ibus ico jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent zeroconf doc lua_single_target_luajit lua_single_target_lua5-1
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ?? ( elogi
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.26.2.tar.xz
-_eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b930c37ae00d26d4f13f614127e269a3
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.187 b/metadata/md5-cache/dev-libs/elfutils-0.187
new file mode 100644
index 000000000000..cb96ffd25bfc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/elfutils-0.187
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/flex-2.5.4a sys-devel/m4 nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-elfutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=sys-libs/zlib-1.2.8-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone sys-libs/fts-standalone sys-libs/obstack-standalone ) !dev-libs/libelf valgrind? ( dev-util/valgrind )
+DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
+EAPI=7
+HOMEPAGE=https://sourceware.org/elfutils/
+INHERIT=flag-o-matic multilib-minimal verify-sig
+IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone sys-libs/fts-standalone sys-libs/obstack-standalone ) !dev-libs/libelf
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://sourceware.org/elfutils/ftp/0.187/elfutils-0.187.tar.bz2 https://dev.gentoo.org/~sam/distfiles/dev-libs/elfutils/elfutils-0.187-patches.tar.xz verify-sig? ( https://sourceware.org/elfutils/ftp/0.187/elfutils-0.187.tar.bz2.sig )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=43666f8d4a3611fa1ef129be45608149
diff --git a/metadata/md5-cache/dev-libs/ell-0.46 b/metadata/md5-cache/dev-libs/ell-0.46
deleted file mode 100644
index 7b75bd05f94a..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.46
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( sys-apps/dbus )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=7
-HOMEPAGE=https://01.org/ell
-IUSE=pie 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 ~sparc x86
-LICENSE=LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.46.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=55505beba4359edf0d9a4e0f9a936940
diff --git a/metadata/md5-cache/dev-libs/ell-0.48 b/metadata/md5-cache/dev-libs/ell-0.48
deleted file mode 100644
index a9ea79982189..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.48
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( sys-apps/dbus )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=7
-HOMEPAGE=https://01.org/ell
-IUSE=pie 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 ~sparc x86
-LICENSE=LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.48.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5552fb136c409bc931dfa45fe59f280a
diff --git a/metadata/md5-cache/dev-libs/ell-0.49 b/metadata/md5-cache/dev-libs/ell-0.49
index e036776898d7..68ca46e93865 100644
--- a/metadata/md5-cache/dev-libs/ell-0.49
+++ b/metadata/md5-cache/dev-libs/ell-0.49
@@ -4,10 +4,10 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=pie 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 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.49.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=91e4952944a3aa58986a39ff76596480
+_md5_=704988724fd16ed9a0f2259e79d11311
diff --git a/metadata/md5-cache/dev-libs/ell-0.47 b/metadata/md5-cache/dev-libs/ell-0.50
index b454d2036e18..ba806ddda34d 100644
--- a/metadata/md5-cache/dev-libs/ell-0.47
+++ b/metadata/md5-cache/dev-libs/ell-0.50
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.47.tar.xz
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.50.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=91e4952944a3aa58986a39ff76596480
diff --git a/metadata/md5-cache/dev-libs/ell-9999 b/metadata/md5-cache/dev-libs/ell-9999
index db6d541b4ad0..9afc2db7e970 100644
--- a/metadata/md5-cache/dev-libs/ell-9999
+++ b/metadata/md5-cache/dev-libs/ell-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=91e4952944a3aa58986a39ff76596480
diff --git a/metadata/md5-cache/dev-libs/expat-2.4.6 b/metadata/md5-cache/dev-libs/expat-2.4.6
index f57718dfa5d6..1221f389a6eb 100644
--- a/metadata/md5-cache/dev-libs/expat-2.4.6
+++ b/metadata/md5-cache/dev-libs/expat-2.4.6
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_4_6/expat-2.4.6.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8d7e60607fc6a0d5420c5e896467e7fb
diff --git a/metadata/md5-cache/dev-libs/expat-2.4.7 b/metadata/md5-cache/dev-libs/expat-2.4.7
index 0afdc8166dfb..7703fa2822ed 100644
--- a/metadata/md5-cache/dev-libs/expat-2.4.7
+++ b/metadata/md5-cache/dev-libs/expat-2.4.7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_4_7/expat-2.4.7.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8d7e60607fc6a0d5420c5e896467e7fb
diff --git a/metadata/md5-cache/dev-libs/expat-2.4.8 b/metadata/md5-cache/dev-libs/expat-2.4.8
index 8187454e6d90..1708231d6436 100644
--- a/metadata/md5-cache/dev-libs/expat-2.4.8
+++ b/metadata/md5-cache/dev-libs/expat-2.4.8
@@ -4,9 +4,9 @@ DESCRIPTION=Stream-oriented XML parser library
 EAPI=7
 HOMEPAGE=https://libexpat.github.io/
 IUSE=examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=336fd9db0b4c79e6e72182976e40f5a6
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=3a113468fff734c2cac4bdc2ffe6492d
diff --git a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2 b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
index ac44f181dab5..4220124b2999 100644
--- a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
+++ b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
 LICENSE=FastCGI
 SLOT=0
 SRC_URI=http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ac5bf4e646107922f5180b29e92f54c4
diff --git a/metadata/md5-cache/dev-libs/fddl-20111124-r1 b/metadata/md5-cache/dev-libs/fddl-20111124-r1
index 822645fb98d3..923011a3d5ff 100644
--- a/metadata/md5-cache/dev-libs/fddl-20111124-r1
+++ b/metadata/md5-cache/dev-libs/fddl-20111124-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Free Decision Diagram Library
 EAPI=7
 HOMEPAGE=http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL
+INHERIT=cmake vcs-snapshot
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/fddl-20111124.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ad19b744031dbd9f34e9557d4d8b6485
diff --git a/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2 b/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
index 855be8c87397..94b40798b018 100644
--- a/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
+++ b/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/libsigc++-2.6:2 virtual/pkgconfig
 DESCRIPTION=Loki C++ library from Modern C++ Design
 EAPI=6
 HOMEPAGE=http://www.libferris.com/
+INHERIT=flag-o-matic
 IUSE=static-libs
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libsigc++-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/witme/ferrisloki-3.0.13.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=1eb63cf07350bae268e7641481893a79
diff --git a/metadata/md5-cache/dev-libs/ffcall-2.1 b/metadata/md5-cache/dev-libs/ffcall-2.1
index f63493690d5f..a9da7b8479ab 100644
--- a/metadata/md5-cache/dev-libs/ffcall-2.1
+++ b/metadata/md5-cache/dev-libs/ffcall-2.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Build foreign function call interfaces in embedded interpreter
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libffcall/
+INHERIT=flag-o-matic
 KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libffcall/libffcall-2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2a2a29634f17c5ac91bc5fe96132e658
diff --git a/metadata/md5-cache/dev-libs/ffcall-2.4 b/metadata/md5-cache/dev-libs/ffcall-2.4
index eb2817165e56..51252a1ad168 100644
--- a/metadata/md5-cache/dev-libs/ffcall-2.4
+++ b/metadata/md5-cache/dev-libs/ffcall-2.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Build foreign function call interfaces in embedded interpreter
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libffcall/
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+INHERIT=flag-o-matic
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libffcall/libffcall-2.4.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=439e423aab0157d62d954b47c841c50f
+_md5_=5f69367598d45f70c6fc26dc88327cf8
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1 b/metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1
index fb1d6180f0de..cc7f52047db2 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Memory efficient serialization library
 EAPI=7
 HOMEPAGE=https://google.github.io/flatbuffers/
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/google/flatbuffers/archive/v2.0.0.tar.gz -> flatbuffers-2.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=07abc6c1d499f696bcab9865532c4768
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-2.0.6 b/metadata/md5-cache/dev-libs/flatbuffers-2.0.6
new file mode 100644
index 000000000000..b199e807f19a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/flatbuffers-2.0.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Memory efficient serialization library
+EAPI=8
+HOMEPAGE=https://google.github.io/flatbuffers/
+INHERIT=cmake
+IUSE=static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/google/flatbuffers/archive/v2.0.6.tar.gz -> flatbuffers-2.0.6.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=20f0a8d11e23740fe5cf2885207b3f99
diff --git a/metadata/md5-cache/dev-libs/folks-0.15.4 b/metadata/md5-cache/dev-libs/folks-0.15.4
index fc4acf805dc8..eee1da564597 100644
--- a/metadata/md5-cache/dev-libs/folks-0.15.4
+++ b/metadata/md5-cache/dev-libs/folks-0.15.4
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-li
 DESCRIPTION=Library for aggregating people from multiple sources
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=bluetooth eds +telepathy test utils
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=bluetooth? ( eds )
 RESTRICT=!test? ( test )
 SLOT=0/26
 SRC_URI=mirror://gnome/sources/folks/0.15/folks-0.15.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3fc82fd5eebf3c27b7d8046cf785e88d
diff --git a/metadata/md5-cache/dev-libs/folks-0.15.5 b/metadata/md5-cache/dev-libs/folks-0.15.5
index 41aec9147dc8..e01ababcf9bd 100644
--- a/metadata/md5-cache/dev-libs/folks-0.15.5
+++ b/metadata/md5-cache/dev-libs/folks-0.15.5
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-li
 DESCRIPTION=Library for aggregating people from multiple sources
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=bluetooth eds +telepathy test utils
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=bluetooth? ( eds )
 RESTRICT=!test? ( test )
 SLOT=0/26
 SRC_URI=mirror://gnome/sources/folks/0.15/folks-0.15.5.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5c00224a7cc1037f574ad7fa9621b9b5
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.11 b/metadata/md5-cache/dev-libs/fribidi-1.0.11
index 05c985b14e73..f6299437e162 100644
--- a/metadata/md5-cache/dev-libs/fribidi-1.0.11
+++ b/metadata/md5-cache/dev-libs/fribidi-1.0.11
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=8
 HOMEPAGE=https://fribidi.org/
+INHERIT=meson-multilib
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=555c081adada3f29e71b51c179f9f886
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.12 b/metadata/md5-cache/dev-libs/fribidi-1.0.12
new file mode 100644
index 000000000000..20b3a059cae2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/fribidi-1.0.12
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=A free implementation of the unicode bidirectional algorithm
+EAPI=8
+HOMEPAGE=https://fribidi.org/
+INHERIT=meson-multilib
+IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.12/fribidi-1.0.12.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=010b45abe62414fb0c958a49325e20f5
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.6.0 b/metadata/md5-cache/dev-libs/fstrm-0.6.0
deleted file mode 100644
index cee737627f09..000000000000
--- a/metadata/md5-cache/dev-libs/fstrm-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=utils? ( dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Frame Streams implementation in C
-EAPI=7
-HOMEPAGE=https://github.com/farsightsec/fstrm
-IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=utils? ( dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.6.0.tar.gz -> fstrm-0.6.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5ab9ce66b64e87898ade5eecf6e6f7a0
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.6.1 b/metadata/md5-cache/dev-libs/fstrm-0.6.1
index c5eefe1d13d9..68d913bdf0a9 100644
--- a/metadata/md5-cache/dev-libs/fstrm-0.6.1
+++ b/metadata/md5-cache/dev-libs/fstrm-0.6.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=utils? ( dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.6.1.tar.gz -> fstrm-0.6.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7fdd68308f5384303763ad8e8946713c
diff --git a/metadata/md5-cache/dev-libs/geoip-1.6.12 b/metadata/md5-cache/dev-libs/geoip-1.6.12
index cb368e0b2dc3..0c45842acc5e 100644
--- a/metadata/md5-cache/dev-libs/geoip-1.6.12
+++ b/metadata/md5-cache/dev-libs/geoip-1.6.12
@@ -11,5 +11,5 @@ RDEPEND=net-misc/wget
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-c/archive/v1.6.12.tar.gz -> geoip-1.6.12.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=82353fbdbe048feafebdf58549d4cd67
diff --git a/metadata/md5-cache/dev-libs/geoip-1.6.12-r1 b/metadata/md5-cache/dev-libs/geoip-1.6.12-r1
index 48a1643f8e2f..def3cec903de 100644
--- a/metadata/md5-cache/dev-libs/geoip-1.6.12-r1
+++ b/metadata/md5-cache/dev-libs/geoip-1.6.12-r1
@@ -11,5 +11,5 @@ RDEPEND=net-misc/wget
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-c/archive/v1.6.12.tar.gz -> geoip-1.6.12.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b8921ded686afddc22d8f0d8aca02ca1
diff --git a/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1 b/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
index ba0285000ca1..4dd70f955acd 100644
--- a/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/gf-complete-2.0.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=890939a432d23634afed9e4850acbee9
diff --git a/metadata/md5-cache/dev-libs/gf2x-1.3.0 b/metadata/md5-cache/dev-libs/gf2x-1.3.0
index 3cf72b0f68ab..0179fe03fd33 100644
--- a/metadata/md5-cache/dev-libs/gf2x-1.3.0
+++ b/metadata/md5-cache/dev-libs/gf2x-1.3.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0/3
 SRC_URI=https://gforge.inria.fr/frs/download.php/38243/gf2x-1.3.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3807445676ecd703bbe0d8a37c7fee2c
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.5 b/metadata/md5-cache/dev-libs/girara-0.3.5
index 7f61ed01daa4..d275317052f8 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.5
+++ b/metadata/md5-cache/dev-libs/girara-0.3.5
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11
 DESCRIPTION=UI library that focuses on simplicity and minimalism
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/girara/
+INHERIT=meson virtualx
 IUSE=doc libnotify test test
 KEYWORDS=amd64 arm ~riscv x86
 LICENSE=ZLIB
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=c097e68a6786a1bccf5fca3ce4163661
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.6 b/metadata/md5-cache/dev-libs/girara-0.3.6
index 95788fb3e0c8..3b97363c8daf 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.6
+++ b/metadata/md5-cache/dev-libs/girara-0.3.6
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11
 DESCRIPTION=UI library that focuses on simplicity and minimalism
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/girara/
+INHERIT=meson virtualx
 IUSE=doc libnotify test test
 KEYWORDS=amd64 arm ~riscv x86
 LICENSE=ZLIB
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=c097e68a6786a1bccf5fca3ce4163661
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.7 b/metadata/md5-cache/dev-libs/girara-0.3.7
index 3efffe948276..58383b1162bd 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.7
+++ b/metadata/md5-cache/dev-libs/girara-0.3.7
@@ -4,12 +4,13 @@ DEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11
 DESCRIPTION=UI library that focuses on simplicity and minimalism
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/girara/
+INHERIT=meson virtualx
 IUSE=doc libnotify test test
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+KEYWORDS=amd64 ~arm ~riscv x86
 LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.7.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7b8e1458cfda21d8d397ca14b6c1497e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=7059a09ceb165ab3d1fc278f89b3838f
diff --git a/metadata/md5-cache/dev-libs/girara-9999 b/metadata/md5-cache/dev-libs/girara-9999
index 2bf8a30f0a46..342c869caf3f 100644
--- a/metadata/md5-cache/dev-libs/girara-9999
+++ b/metadata/md5-cache/dev-libs/girara-9999
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 >=x11-libs/pango
 DESCRIPTION=UI library that focuses on simplicity and minimalism
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/girara/
+INHERIT=meson virtualx git-r3
 IUSE=doc libnotify test test
 LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=f50a6c0cbcadd7d7fd332dc525970a96
diff --git a/metadata/md5-cache/dev-libs/gjs-1.64.4 b/metadata/md5-cache/dev-libs/gjs-1.64.4
index 13252163d71d..fddbb55551ea 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.64.4
+++ b/metadata/md5-cache/dev-libs/gjs-1.64.4
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspection
 DESCRIPTION=Javascript bindings for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
+INHERIT=gnome.org meson virtualx
 IUSE=+cairo examples gtk readline +sysprof test test
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspectio
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.64/gjs-1.64.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=307c39c44e85d951a4b7e66ebbf28fe4
diff --git a/metadata/md5-cache/dev-libs/gjs-1.64.5 b/metadata/md5-cache/dev-libs/gjs-1.64.5
index 9c863009fef9..eb224974bb81 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.64.5
+++ b/metadata/md5-cache/dev-libs/gjs-1.64.5
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspection
 DESCRIPTION=Javascript bindings for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
+INHERIT=gnome.org meson virtualx
 IUSE=+cairo examples gtk readline +sysprof test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspectio
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.64/gjs-1.64.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=54dfd012ac24b99697e3870caf63993e
diff --git a/metadata/md5-cache/dev-libs/gjs-1.70.1 b/metadata/md5-cache/dev-libs/gjs-1.70.1
index f2b44278845d..ee8681f71829 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.70.1
+++ b/metadata/md5-cache/dev-libs/gjs-1.70.1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection
 DESCRIPTION=Javascript bindings for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
+INHERIT=flag-o-matic gnome.org meson virtualx
 IUSE=+cairo examples gtk readline sysprof test test
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspectio
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.70/gjs-1.70.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3ab3f1980d2aee9196fbef98ca8a9f0a
diff --git a/metadata/md5-cache/dev-libs/gjs-1.72.0 b/metadata/md5-cache/dev-libs/gjs-1.72.0
index b3006c6d8335..9e78d29517ab 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.72.0
+++ b/metadata/md5-cache/dev-libs/gjs-1.72.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection
 DESCRIPTION=Javascript bindings for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
+INHERIT=flag-o-matic gnome.org meson virtualx
 IUSE=+cairo examples gtk readline sysprof test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspectio
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.72/gjs-1.72.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=63505b6dc2c3c858b96a669d45c10d67
diff --git a/metadata/md5-cache/dev-libs/glib-2.70.4 b/metadata/md5-cache/dev-libs/glib-2.70.4
index 9cb3f9dcc5d9..4bcc393eabee 100644
--- a/metadata/md5-cache/dev-libs/glib-2.70.4
+++ b/metadata/md5-cache/dev-libs/glib-2.70.4
@@ -4,6 +4,7 @@ DEPEND=!<dev-util/gdbus-codegen-2.70.4 >=virtual/libiconv-0-r1[abi_x86_32(-)?,ab
 DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
+INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 IUSE=dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
@@ -13,5 +14,5 @@ REQUIRED_USE=gtk-doc? ( test )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.70/glib-2.70.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=42e307297d5ed6303efa01919d3c2fea
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7846fcfac2f4c4ca45b9fddfe9a1988b
diff --git a/metadata/md5-cache/dev-libs/glib-2.72.0 b/metadata/md5-cache/dev-libs/glib-2.72.0
index 19731dc6ae45..51fb5346e1a2 100644
--- a/metadata/md5-cache/dev-libs/glib-2.72.0
+++ b/metadata/md5-cache/dev-libs/glib-2.72.0
@@ -4,6 +4,7 @@ DEPEND=!<dev-util/gdbus-codegen-2.72.0 >=virtual/libiconv-0-r1[abi_x86_32(-)?,ab
 DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
+INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 IUSE=dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
@@ -13,5 +14,5 @@ REQUIRED_USE=gtk-doc? ( test )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba6b50b406f38ef38489b3f714401d54
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=62b35d35a8f9c0be7f1e287c53062b4a
diff --git a/metadata/md5-cache/dev-libs/glib-2.72.1 b/metadata/md5-cache/dev-libs/glib-2.72.1
index e8d30693dc70..ae2f4933c484 100644
--- a/metadata/md5-cache/dev-libs/glib-2.72.1
+++ b/metadata/md5-cache/dev-libs/glib-2.72.1
@@ -4,8 +4,9 @@ DEPEND=!<dev-util/gdbus-codegen-2.72.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,ab
 DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
+INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 IUSE=dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.72.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -13,5 +14,5 @@ REQUIRED_USE=gtk-doc? ( test )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba6b50b406f38ef38489b3f714401d54
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=76c9b338e0b68a29081089fcacb5dfde
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.23-r1 b/metadata/md5-cache/dev-libs/gmime-2.6.23-r1
index 5fe32f14278b..16f64c246c59 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.23-r1
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.23-r1
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib smime? ( >=app-crypt/gpgme-1.1.6:=
 DESCRIPTION=Library for creating and parsing MIME messages
 EAPI=6
 HOMEPAGE=http://spruce.sourceforge.net/gmime/
+INHERIT=gnome2 vala flag-o-matic
 IUSE=doc smime static-libs test vala
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib smime? ( >=app-crypt/gpgme-1.1.6:
 RESTRICT=!test? ( test )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.23.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8c0e641949c42c89da34ec3184207848
diff --git a/metadata/md5-cache/dev-libs/gmime-3.2.7 b/metadata/md5-cache/dev-libs/gmime-3.2.7
index 73b4a06ff351..e11632ba80bf 100644
--- a/metadata/md5-cache/dev-libs/gmime-3.2.7
+++ b/metadata/md5-cache/dev-libs/gmime-3.2.7
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:=
 DESCRIPTION=Library for creating and parsing MIME messages
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gmime http://spruce.sourceforge.net/gmime/
+INHERIT=flag-o-matic gnome2 vala
 IUSE=crypt doc idn static-libs test +vala
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gmime/3.2/gmime-3.2.7.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=40744830fb04d0521f1c8149d08030e7
diff --git a/metadata/md5-cache/dev-libs/gmp-6.2.1-r2 b/metadata/md5-cache/dev-libs/gmp-6.2.1-r2
index c34145f8a27f..8bf20728c874 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.2.1-r2
+++ b/metadata/md5-cache/dev-libs/gmp-6.2.1-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=7
 HOMEPAGE=https://gmplib.org/
 IUSE=+asm doc +cxx pic static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.2.1/gmp-6.2.1.tar.xz mirror://gnu/gmp/gmp-6.2.1.tar.xz doc? ( https://gmplib.org/gmp-man-6.2.1.pdf ) https://dev.gentoo.org/~sam/distfiles/dev-libs/gmp/gmp-6.2.1-arm64-darwin.patch.bz2
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ebe8a1d0748fff0d5637d9d86fc46f71
+_md5_=42edfa980649e3991a86aaf04c436019
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.70.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
index 458de3a89594..b91cd72f19d0 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/gobject-introspection-common-1.70.0 >=dev-libs/glib-2.58.0:2 d
 DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
+INHERIT=gnome.org meson python-single-r1 xdg
 IUSE=doctool gtk-doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-libs/gobject-introspection/gobject-introspection-1.70.0-meson-0.61.patch.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d44825355b08ad7490dcd529a8a2b0fb
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
index 0127c5ed823d..cb31763eb760 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
@@ -4,13 +4,14 @@ DEPEND=>=dev-libs/gobject-introspection-common-1.72.0 >=dev-libs/glib-2.58.0:2 d
 DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
+INHERIT=gnome.org meson python-single-r1 xdg
 IUSE=doctool gtk-doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-common-1.72.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ) virtual/pkgconfig python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=47cc898d7971f0ee64f2eb603301d169
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=86c7cfd1bf41dc1ab3e06f4a4df335e6
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
index 9371ff1c3cb7..dff3f3b0f9d1 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+INHERIT=gnome.org
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.72.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
-_md5_=24520e6cedb3fdc0791aaed44a291fbd
+_md5_=95d79a6528843668a2ebb05e91193817
diff --git a/metadata/md5-cache/dev-libs/gom-0.4 b/metadata/md5-cache/dev-libs/gom-0.4
index 94ce02b9b28d..978cc5747395 100644
--- a/metadata/md5-cache/dev-libs/gom-0.4
+++ b/metadata/md5-cache/dev-libs/gom-0.4
@@ -1,16 +1,17 @@
 BDEPEND=app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/pygobject-3.16:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) virtual/pkgconfig test? ( x11-libs/gdk-pixbuf:2 )
+DEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pygobject-3.16:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) virtual/pkgconfig test? ( x11-libs/gdk-pixbuf:2 )
 DESCRIPTION=GObject to SQLite object mapper library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gom
-IUSE=gtk-doc +introspection python test python_targets_python3_8 python_targets_python3_9
+INHERIT=gnome.org meson python-r1
+IUSE=gtk-doc +introspection python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/pygobject-3.16:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-REQUIRED_USE=python? ( introspection || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pygobject-3.16:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+REQUIRED_USE=python? ( introspection || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gom/0.4/gom-0.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7428015e5daf11e78e175dd0a728f7e2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=abb30dd98b70fb778ae7b943e97415c7
diff --git a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2 b/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2
index b637cf487ef8..400028e5b84d 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2
+++ b/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/openssl-1.1.1:0= virtual/pkgconfig test? ( dev-lang/perl )
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
 EAPI=7
 HOMEPAGE=https://github.com/gost-engine/engine
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~hppa
 LICENSE=openssl
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/openssl-1.1.1:0=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0.3_p20181031
 SRC_URI=https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> gost-engine-1.1.0.3_p20181031.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=36abe57e5c5616eaa4998890bf242b41
diff --git a/metadata/md5-cache/dev-libs/gost-engine-3.0.0 b/metadata/md5-cache/dev-libs/gost-engine-3.0.0
index 3fe8bb46aa9b..913235a95465 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-3.0.0
+++ b/metadata/md5-cache/dev-libs/gost-engine-3.0.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/openssl-3.0.0:0= virtual/pkgconfig test? ( dev-lang/perl )
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
 EAPI=7
 HOMEPAGE=https://github.com/gost-engine/engine
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~hppa
 LICENSE=openssl
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/openssl-3.0.0:0=
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/gost-engine/engine/archive/v3.0.0.tar.gz -> gost-engine-3.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ff5cafc27f7c395b01b0ae3a3198b215
diff --git a/metadata/md5-cache/dev-libs/gost-engine-9999 b/metadata/md5-cache/dev-libs/gost-engine-9999
index c4ae8408d71e..a0eb112429b1 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-9999
+++ b/metadata/md5-cache/dev-libs/gost-engine-9999
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/openssl-1.1.1:0= virtual/pkgconfig test? ( dev-lang/perl )
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
 EAPI=7
 HOMEPAGE=https://github.com/gost-engine/engine
+INHERIT=cmake git-r3
 IUSE=test
 LICENSE=openssl
 PROPERTIES=live
 RDEPEND=>=dev-libs/openssl-1.1.1:0=
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5c0aae62cc0992fa99c26dea076b7953
diff --git a/metadata/md5-cache/dev-libs/granite-5.2.5-r1 b/metadata/md5-cache/dev-libs/granite-5.2.5-r1
index 3159e1787be9..691f21420be1 100644
--- a/metadata/md5-cache/dev-libs/granite-5.2.5-r1
+++ b/metadata/md5-cache/dev-libs/granite-5.2.5-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+
 DESCRIPTION=Elementary OS library that extends GTK+
 EAPI=7
 HOMEPAGE=https://github.com/elementary/granite
+INHERIT=meson vala xdg
 IUSE=doc test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-3+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elementary/granite/archive/5.2.5.tar.gz -> granite-5.2.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cbddbf369c34892fe459d6c499a3f2da
diff --git a/metadata/md5-cache/dev-libs/granite-6.0.0 b/metadata/md5-cache/dev-libs/granite-6.0.0
index e94d2588b1ef..a6bffc67c215 100644
--- a/metadata/md5-cache/dev-libs/granite-6.0.0
+++ b/metadata/md5-cache/dev-libs/granite-6.0.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/lib
 DESCRIPTION=Elementary OS library that extends GTK+
 EAPI=7
 HOMEPAGE=https://github.com/elementary/granite
+INHERIT=meson vala xdg
 KEYWORDS=amd64 arm x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/libgee:0.8[introspection]
 SLOT=0
 SRC_URI=https://github.com/elementary/granite/archive/6.0.0.tar.gz -> granite-6.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e13b4c5f6cd51dc0074a42ba50532514
diff --git a/metadata/md5-cache/dev-libs/granite-6.2.0 b/metadata/md5-cache/dev-libs/granite-6.2.0
index 9da4dcaddaf9..3a4685fd48b8 100644
--- a/metadata/md5-cache/dev-libs/granite-6.2.0
+++ b/metadata/md5-cache/dev-libs/granite-6.2.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/lib
 DESCRIPTION=Elementary OS library that extends GTK+
 EAPI=7
 HOMEPAGE=https://github.com/elementary/granite
+INHERIT=meson vala xdg
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/libgee:0.8[introspection]
 SLOT=0/6.2.0
 SRC_URI=https://github.com/elementary/granite/archive/6.2.0.tar.gz -> granite-6.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d62767a279567af60f4103b4141f43bb
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.2.0 b/metadata/md5-cache/dev-libs/grantlee-5.2.0
index 569966443006..f8524263f1fb 100644
--- a/metadata/md5-cache/dev-libs/grantlee-5.2.0
+++ b/metadata/md5-cache/dev-libs/grantlee-5.2.0
@@ -4,6 +4,7 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 test? ( dev-qt/qtte
 DESCRIPTION=C++ string template engine based on the Django template system
 EAPI=7
 HOMEPAGE=https://github.com/steveire/grantlee
+INHERIT=cmake virtualx
 IUSE=debug doc test test
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=http://downloads.grantlee.org/grantlee-5.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f9694cfd42526768ff486d5c74dcfb2e
diff --git a/metadata/md5-cache/dev-libs/gtx-0.2.2-r1 b/metadata/md5-cache/dev-libs/gtx-0.2.2-r1
deleted file mode 100644
index 31b8d4f575e9..000000000000
--- a/metadata/md5-cache/dev-libs/gtx-0.2.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2
-DESCRIPTION=Small collection of functions intended to enhance the GLib testing framework
-EAPI=7
-HOMEPAGE=https://launchpad.net/gtx
-IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2
-SLOT=0
-SRC_URI=https://launchpad.net/gtx/trunk/0.2.2/+download/gtx-0.2.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e0de472ec1cc6884420ec2986f117398
diff --git a/metadata/md5-cache/dev-libs/gumbo-0.10.1 b/metadata/md5-cache/dev-libs/gumbo-0.10.1
index 8bcf3124c892..c083cda4d431 100644
--- a/metadata/md5-cache/dev-libs/gumbo-0.10.1
+++ b/metadata/md5-cache/dev-libs/gumbo-0.10.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz -> gumbo-0.10.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b95f86a10ba1d11ecd045d44ec167095
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.11.0 b/metadata/md5-cache/dev-libs/hidapi-0.11.0
index 86a86ae4ad69..214b7ab49605 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.11.0
+++ b/metadata/md5-cache/dev-libs/hidapi-0.11.0
@@ -10,5 +10,5 @@ LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/libusb/hidapi/archive/hidapi-0.11.0.tar.gz -> hidapi-0.11.0.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=db7cc6d5798044220c57e14277208c01
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1 b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
index 65db74f2faa6..f407a851ff75 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
+++ b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
@@ -10,5 +10,5 @@ LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/signal11/hidapi/archive/d17db57b9d4354752e0af42f5f33007a42ef2906.tar.gz -> hidapi-0.8.0_rc1_p20140719.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e2689439aa5d29652240e740b30f3aa7
diff --git a/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1 b/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
index 82618e223e35..38d5589b8226 100644
--- a/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
@@ -3,10 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Library for downloading files via HTTP using the GET method
 EAPI=6
 HOMEPAGE=http://http-fetcher.sourceforge.net
+INHERIT=autotools
 IUSE=debug
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/http-fetcher/http_fetcher-1.1.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3d25196bfbf8cacd7c173764c22d5210
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.4.0 b/metadata/md5-cache/dev-libs/hyperscan-5.4.0
index 5733f7d72979..b601cb1ff7fc 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.4.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.4.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:=
 DESCRIPTION=High-performance regular expression matching library
 EAPI=7
 HOMEPAGE=https://www.hyperscan.io/ https://github.com/intel/hyperscan
+INHERIT=cmake flag-o-matic python-any-r1
 IUSE=cpu_flags_x86_avx2 cpu_flags_x86_ssse3 static-libs
 KEYWORDS=-* amd64 x86
 LICENSE=BSD
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/boost:=
 REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/intel/hyperscan/archive/v5.4.0.tar.gz -> hyperscan-5.4.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6e4406319c9871f211ef3040240a22a4
diff --git a/metadata/md5-cache/dev-libs/icinga-php-library-0.8.1 b/metadata/md5-cache/dev-libs/icinga-php-library-0.8.1
new file mode 100644
index 000000000000..424f2dc424de
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icinga-php-library-0.8.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/php:*
+DESCRIPTION=Icinga PHP libraries for Icinga Web 2
+EAPI=7
+HOMEPAGE=https://github.com/Icinga/icinga-php-library
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/Icinga/icinga-php-library/archive/refs/tags/v0.8.1.tar.gz -> icinga-php-library-0.8.1.tar.gz
+_md5_=12c24a24ad328d436b471806775a4d80
diff --git a/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0-r1 b/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0-r1
index 115b72201676..fa6e51312dd7 100644
--- a/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0-r1
+++ b/metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=dev-lang/php:*
 DESCRIPTION=Icinga PHP libraries for Icinga Web 2
 EAPI=7
-HOMEPAGE=https://github.com/Icinga/icinga-php-library
+HOMEPAGE=https://github.com/Icinga/icinga-php-thirdparty
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga-php-thirdparty/archive/refs/tags/v0.10.0.tar.gz -> icinga-php-thirdparty-0.10.0.tar.gz
-_md5_=5d7922a8f16e8d98cca2960ac2d34989
+_md5_=bd535436525418e923c7cd42e879198c
diff --git a/metadata/md5-cache/dev-libs/icu-70.1-r1 b/metadata/md5-cache/dev-libs/icu-70.1-r1
index 8f9cd92bc94b..6a5eac013a4c 100644
--- a/metadata/md5-cache/dev-libs/icu-70.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-70.1-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=International Components for Unicode
 EAPI=8
 HOMEPAGE=https://icu.unicode.org/
+INHERIT=autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 SLOT=0/70.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e399b465baac233e8ab993ea4b89e6ab
diff --git a/metadata/md5-cache/dev-libs/icu-71.1 b/metadata/md5-cache/dev-libs/icu-71.1
index ca0c9d16c4b5..0ccfb6959ada 100644
--- a/metadata/md5-cache/dev-libs/icu-71.1
+++ b/metadata/md5-cache/dev-libs/icu-71.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=International Components for Unicode
 EAPI=8
 HOMEPAGE=https://icu.unicode.org/
+INHERIT=autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig
 IUSE=debug doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/71.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz.asc )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=2d74c7e5dfab2d5ed9c2733f9e01126d
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=fa0d0a3662eb9ce0590268017eaa4eda
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-70.1 b/metadata/md5-cache/dev-libs/icu-layoutex-70.1
index c3ff4c36c1df..9c76d4f47617 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-70.1
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-70.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=~dev-libs/icu-70.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/70.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2d3d2d1771636ea7ef83dd7127f9599c
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-71.1 b/metadata/md5-cache/dev-libs/icu-layoutex-71.1
index aa2bf40aca53..571b6a916bc7 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-71.1
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-71.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-libs/icu-71.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RESTRICT=!test? ( test )
 SLOT=0/71.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz.asc )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=b9b8fe383544126e93d2b9fd8479c2a5
diff --git a/metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1 b/metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
index 53f5b737c830..8ae387a74c57 100644
--- a/metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
+++ b/metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
@@ -10,5 +10,5 @@ LICENSE=icu
 RDEPEND=>=dev-libs/icu-58.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/behdad/icu-le-hb/archive/1.0.3.tar.gz -> icu-le-hb-1.0.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=73ba41d008c5250797bc8684d71154ca
diff --git a/metadata/md5-cache/dev-libs/igraph-0.8.5 b/metadata/md5-cache/dev-libs/igraph-0.8.5
index 9c66883b8db9..55ea364dc504 100644
--- a/metadata/md5-cache/dev-libs/igraph-0.8.5
+++ b/metadata/md5-cache/dev-libs/igraph-0.8.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
 SLOT=0/0
 SRC_URI=https://github.com/igraph/igraph/releases/download/0.8.5/igraph-0.8.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6f4b34ebf61440a947a3bdfdc8bb5b6a
diff --git a/metadata/md5-cache/dev-libs/igraph-0.9.2 b/metadata/md5-cache/dev-libs/igraph-0.9.2
index c5af4374cccc..edeff8d7cacc 100644
--- a/metadata/md5-cache/dev-libs/igraph-0.9.2
+++ b/metadata/md5-cache/dev-libs/igraph-0.9.2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-ma
 DESCRIPTION=Creating and manipulating undirected and directed graphs
 EAPI=7
 HOMEPAGE=http://www.igraph.org/
+INHERIT=cmake
 IUSE=debug test threads
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-m
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/igraph/igraph/releases/download/0.9.2/igraph-0.9.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f6f47d8d1b044a0035f92ffebd282879
diff --git a/metadata/md5-cache/dev-libs/igraph-0.9.4 b/metadata/md5-cache/dev-libs/igraph-0.9.4
index 22323f55d747..3e584a14124f 100644
--- a/metadata/md5-cache/dev-libs/igraph-0.9.4
+++ b/metadata/md5-cache/dev-libs/igraph-0.9.4
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-ma
 DESCRIPTION=Creating and manipulating undirected and directed graphs
 EAPI=7
 HOMEPAGE=http://www.igraph.org/
+INHERIT=cmake
 IUSE=debug test threads
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-m
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/igraph/igraph/releases/download/0.9.4/igraph-0.9.4.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f6f47d8d1b044a0035f92ffebd282879
diff --git a/metadata/md5-cache/dev-libs/iksemel-1.4-r1 b/metadata/md5-cache/dev-libs/iksemel-1.4-r1
index 9549800c1991..6dd178a85e8b 100644
--- a/metadata/md5-cache/dev-libs/iksemel-1.4-r1
+++ b/metadata/md5-cache/dev-libs/iksemel-1.4-r1
@@ -3,11 +3,12 @@ DEPEND=ssl? ( net-libs/gnutls:= ) ssl? ( virtual/pkgconfig ) sys-devel/gnuconfig
 DESCRIPTION=eXtensible Markup Language parser library designed for Jabber applications
 EAPI=6
 HOMEPAGE=https://github.com/meduketto/iksemel
+INHERIT=autotools
 IUSE=ssl static-libs
 KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( net-libs/gnutls:= )
 SLOT=0
 SRC_URI=https://iksemel.googlecode.com/files/iksemel-1.4.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=06269e826cbaa9b075103779af77653b
diff --git a/metadata/md5-cache/dev-libs/imath-3.1.4-r3 b/metadata/md5-cache/dev-libs/imath-3.1.4-r3
index ce9425f7fddf..70921c179d81 100644
--- a/metadata/md5-cache/dev-libs/imath-3.1.4-r3
+++ b/metadata/md5-cache/dev-libs/imath-3.1.4-r3
@@ -4,6 +4,7 @@ DEPEND=!dev-libs/imath:0 !media-libs/ilmbase sys-libs/zlib python? ( !dev-python
 DESCRIPTION=Imath basic math package
 EAPI=8
 HOMEPAGE=https://imath.readthedocs.io
+INHERIT=cmake python-single-r1
 IUSE=doc large-stack python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=3/29
 SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.4.tar.gz -> imath-3.1.4.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7aa252f8d4eb28ebca5a93a034e35d91
diff --git a/metadata/md5-cache/dev-libs/imath-3.1.4-r4 b/metadata/md5-cache/dev-libs/imath-3.1.4-r4
index cd579e82831d..733f478d21c5 100644
--- a/metadata/md5-cache/dev-libs/imath-3.1.4-r4
+++ b/metadata/md5-cache/dev-libs/imath-3.1.4-r4
@@ -4,6 +4,7 @@ DEPEND=!dev-libs/imath:0 !media-libs/ilmbase sys-libs/zlib python? ( !dev-python
 DESCRIPTION=Imath basic math package
 EAPI=8
 HOMEPAGE=https://imath.readthedocs.io
+INHERIT=cmake python-single-r1
 IUSE=doc large-stack python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=3/29
 SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.4.tar.gz -> imath-3.1.4.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=38aeddf8f2e2f241ba492c4927fd36d5
diff --git a/metadata/md5-cache/dev-libs/imath-3.1.5 b/metadata/md5-cache/dev-libs/imath-3.1.5
index 6af680e0664f..21ab989dcf66 100644
--- a/metadata/md5-cache/dev-libs/imath-3.1.5
+++ b/metadata/md5-cache/dev-libs/imath-3.1.5
@@ -4,13 +4,14 @@ DEPEND=!dev-libs/imath:0 !media-libs/ilmbase sys-libs/zlib python? ( !dev-python
 DESCRIPTION=Imath basic math package
 EAPI=8
 HOMEPAGE=https://imath.readthedocs.io
+INHERIT=cmake python-single-r1
 IUSE=doc large-stack python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!dev-libs/imath:0 !media-libs/ilmbase sys-libs/zlib python? ( !dev-python/pyilmbase python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=3/29
 SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.5.tar.gz -> imath-3.1.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=93f2538c82d0eb8ce5eeeedb16b83765
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=324f4739108857448b1736ea114f0253
diff --git a/metadata/md5-cache/dev-libs/inih-53 b/metadata/md5-cache/dev-libs/inih-53
index fa4c267567d3..62f8d90c4068 100644
--- a/metadata/md5-cache/dev-libs/inih-53
+++ b/metadata/md5-cache/dev-libs/inih-53
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=inih (INI not invented here) simple .INI file parser
 EAPI=7
 HOMEPAGE=https://github.com/benhoyt/inih
+INHERIT=meson-multilib
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/benhoyt/inih/archive/r53.tar.gz -> inih-53.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=94dae09f09170737af619df72a21dc33
diff --git a/metadata/md5-cache/dev-libs/inih-55 b/metadata/md5-cache/dev-libs/inih-55
index 6fbbd4ad5a70..0b7146f19605 100644
--- a/metadata/md5-cache/dev-libs/inih-55
+++ b/metadata/md5-cache/dev-libs/inih-55
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=inih (INI not invented here) simple .INI file parser
 EAPI=7
 HOMEPAGE=https://github.com/benhoyt/inih
+INHERIT=meson-multilib
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/benhoyt/inih/archive/r55.tar.gz -> inih-55.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8961f677e539150a0e29002253fa1d2c
diff --git a/metadata/md5-cache/dev-libs/iniparser-3.1-r2 b/metadata/md5-cache/dev-libs/iniparser-3.1-r2
index d2239b4a9c26..ec617a496196 100644
--- a/metadata/md5-cache/dev-libs/iniparser-3.1-r2
+++ b/metadata/md5-cache/dev-libs/iniparser-3.1-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ndevilla.free.fr/iniparser/iniparser-3.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=749e930c9cf86be936bdee3bc594f347
diff --git a/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916 b/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
index 6fe145dd783c..7f2990a2e8b1 100644
--- a/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
+++ b/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile x11-libs/libxklavier virtual/libintl eekboard? ( dev-libs/eekboard ) introspection? ( dev-libs/gobject-introspection ) xtest? ( x11-libs/libXtst )
 SLOT=0
 SRC_URI=https://github.com/fujiwarat/input-pad/releases/download/1.0.99.20140916/input-pad-1.0.99.20140916.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=58b9417ecd55c15e226a4d7ea4f532b4
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-21.46.21636-r1 b/metadata/md5-cache/dev-libs/intel-compute-runtime-21.46.21636-r1
deleted file mode 100644
index 55c016e3d322..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-21.46.21636-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8744 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1:= >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.6.2 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
-DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
-EAPI=8
-HOMEPAGE=https://github.com/intel/compute-runtime
-IUSE=+l0 +vaapi
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8744 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1:= >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.6.2 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/21.46.21636.tar.gz -> intel-compute-runtime-21.46.21636.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e067f9eecd9897408510a6eb84fcfc70
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.12.22749 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.12.22749
deleted file mode 100644
index d58a871e6605..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.12.22749
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/intel-metrics-library dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.10713 >=dev-util/intel-graphics-system-controller-0.2.4 media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
-EAPI=8
-HOMEPAGE=https://github.com/intel/compute-runtime
-IUSE=+l0 +vaapi
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.0.2:=
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.12.22749.tar.gz -> intel-compute-runtime-22.12.22749.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=11d15a4ce10d6236c6c32e76d3a1aac7
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.13.22789 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.13.22789-r2
index adc29ffcc13b..01b8d0920acf 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.13.22789
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.13.22789-r2
@@ -1,14 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/intel-metrics-library dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.10713 >=dev-util/intel-graphics-system-controller-0.2.4 media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+DEPEND=dev-libs/intel-metrics-library dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.10713 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
 DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
 EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
+INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.0.2:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/22.13.22789.tar.gz -> intel-compute-runtime-22.13.22789.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9f53793767f481ba13bce4f19beeb753
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f7fd625dae186d23aed2682276343123
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.15.22905 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.15.22905
deleted file mode 100644
index b5aba6d160fb..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.15.22905
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/intel-metrics-library dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.10713 >=dev-util/intel-graphics-system-controller-0.2.4 media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
-EAPI=8
-HOMEPAGE=https://github.com/intel/compute-runtime
-IUSE=+l0 +vaapi
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.0.2:=
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.15.22905.tar.gz -> intel-compute-runtime-22.15.22905.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9f53793767f481ba13bce4f19beeb753
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.14.22890 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.16.22992-r2
index 59ddae2e65a2..4f7cb94ebd52 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.14.22890
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.16.22992-r2
@@ -1,14 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/intel-metrics-library dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.10713 >=dev-util/intel-graphics-system-controller-0.2.4 media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+DEPEND=dev-libs/intel-metrics-library dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.10713 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
 DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
 EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
+INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.0.2:=
 SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.14.22890.tar.gz -> intel-compute-runtime-22.14.22890.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9f53793767f481ba13bce4f19beeb753
+SRC_URI=https://github.com/intel/compute-runtime/archive/22.16.22992.tar.gz -> intel-compute-runtime-22.16.22992.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=740e575e7ea83c2e85b27d8205380d1f
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.17.23034 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.17.23034
new file mode 100644
index 000000000000..d657f6679641
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.17.23034
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/intel-metrics-library dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11061-r1 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=8
+HOMEPAGE=https://github.com/intel/compute-runtime
+INHERIT=cmake flag-o-matic
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=media-libs/gmmlib-22.0.2:=
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/22.17.23034.tar.gz -> intel-compute-runtime-22.17.23034.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5499fd24b3707799505b83d1f8f373cc
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.18.23063 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.18.23063
new file mode 100644
index 000000000000..fb7cf4e0e548
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.18.23063
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/intel-metrics-library dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11061-r1 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=8
+HOMEPAGE=https://github.com/intel/compute-runtime
+INHERIT=cmake flag-o-matic
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=media-libs/gmmlib-22.0.2:=
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/22.18.23063.tar.gz -> intel-compute-runtime-22.18.23063.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9eae9712485843e07a20c528e251cfaa
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20211123-r1 b/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20211123-r1
index 4d8d932d57c5..10a82f03bd65 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20211123-r1
+++ b/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20211123-r1
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libdrm
 DESCRIPTION=A user mode driver helper library that provides access to GPU performance counters
 EAPI=8
 HOMEPAGE=https://github.com/intel/metrics-library
-KEYWORDS=~amd64
+INHERIT=cmake
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0
 SRC_URI=https://github.com/intel/metrics-library/archive/3fd6eb0544fadcec2ac762aedee7c2d5d6479feb.tar.gz -> intel-metrics-library-0_pre20211123.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9b45cd2bbe549f2e19240c4b87319e19
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3780eb7cb6b11ff2d8f7052598f1e45c
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.1.0 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.1.0
index 04a6ac0e9a5c..c24199f459ac 100644
--- a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.1.0
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.1.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libxml2:2= sys-devel/llvm:13 sys-libs/zlib !!sys-devel/llvm:0
 DESCRIPTION=A set of new intrinsics on top of core LLVM IR instructions
 EAPI=8
 HOMEPAGE=https://github.com/intel/vc-intrinsics
+INHERIT=cmake llvm python-any-r1
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:13 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.1.0.tar.gz -> intel-vc-intrinsics-0.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d13a004165902eefbc45491f49887052
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.2.0 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.2.0
new file mode 100644
index 000000000000..9b254291afb8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.2.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libxml2:2= sys-devel/llvm:13 sys-libs/zlib !!sys-devel/llvm:0
+DESCRIPTION=A set of new intrinsics on top of core LLVM IR instructions
+EAPI=8
+HOMEPAGE=https://github.com/intel/vc-intrinsics
+INHERIT=cmake llvm python-any-r1
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:13 sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.2.0.tar.gz -> intel-vc-intrinsics-0.2.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d13a004165902eefbc45491f49887052
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.3.0 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.3.0
new file mode 100644
index 000000000000..d1e74b7359d4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.3.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libxml2:2= sys-devel/llvm:13 sys-libs/zlib !!sys-devel/llvm:0
+DESCRIPTION=A set of new intrinsics on top of core LLVM IR instructions
+EAPI=8
+HOMEPAGE=https://github.com/intel/vc-intrinsics
+INHERIT=cmake llvm python-any-r1
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:13 sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.3.0.tar.gz -> intel-vc-intrinsics-0.3.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d13a004165902eefbc45491f49887052
diff --git a/metadata/md5-cache/dev-libs/isa-l-2.30.0-r1 b/metadata/md5-cache/dev-libs/isa-l-2.30.0-r1
index 26246b681747..3807011bfc6b 100644
--- a/metadata/md5-cache/dev-libs/isa-l-2.30.0-r1
+++ b/metadata/md5-cache/dev-libs/isa-l-2.30.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~riscv
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/intel/isa-l/archive/refs/tags/v2.30.0.tar.gz -> isa-l-2.30.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9b4cd03b588c8944887688af80c53d93
diff --git a/metadata/md5-cache/dev-libs/isl-0.24 b/metadata/md5-cache/dev-libs/isl-0.24
deleted file mode 100644
index d14692c37eb0..000000000000
--- a/metadata/md5-cache/dev-libs/isl-0.24
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst test
-DEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=A library for manipulating integer points bounded by linear constraints
-EAPI=7
-HOMEPAGE=http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/23
-SRC_URI=http://isl.gforge.inria.fr/isl-0.24.tar.xz https://libisl.sourceforge.io/isl-0.24.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6793aad74572c703248fbbfd9262c388
diff --git a/metadata/md5-cache/dev-libs/isl-0.24-r2 b/metadata/md5-cache/dev-libs/isl-0.24-r2
index bb95badfe7de..68b1f53f815d 100644
--- a/metadata/md5-cache/dev-libs/isl-0.24-r2
+++ b/metadata/md5-cache/dev-libs/isl-0.24-r2
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=A library for manipulating integer points bounded by linear constraints
 EAPI=7
 HOMEPAGE=http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/
+INHERIT=autotools multilib multilib-minimal preserve-libs toolchain-funcs
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/23
 SRC_URI=http://isl.gforge.inria.fr/isl-0.24.tar.xz https://libisl.sourceforge.io/isl-0.24.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8ea923622472cd2a6d17c3016359fd82
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=cf7f8aba6bfffbffa77a891fe3f3c955
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.4 b/metadata/md5-cache/dev-libs/ivykis-0.42.4
index cc50e8d7134f..61e9f554f1ad 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.4
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.4
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x8
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.4.tar.gz -> ivykis-0.42.4.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a90a3f6ecee5436c7d53f1f77d090a8f
diff --git a/metadata/md5-cache/dev-libs/jansson-2.14 b/metadata/md5-cache/dev-libs/jansson-2.14
index 59e96e91cc8a..6ac19cd618fd 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.14
+++ b/metadata/md5-cache/dev-libs/jansson-2.14
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=8
 HOMEPAGE=https://www.digip.org/jansson/
+INHERIT=multilib-minimal toolchain-funcs
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0/4
 SRC_URI=https://github.com/akheron/jansson/releases/download/v2.14/jansson-2.14.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8d6889c1d8ae073999388525b19847af
+_md5_=6f15e423931b0285a23c31a7c1e4d88d
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1 b/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
index 82e8661cfa38..4345067b92c9 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 x86 ~amd
 LICENSE=BSD
 SLOT=0/2
 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7b56060aa070491d1d123a1053639774
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.3.0_pre20220405 b/metadata/md5-cache/dev-libs/jemalloc-5.3.0_pre20220405
new file mode 100644
index 000000000000..8552146f5357
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.3.0_pre20220405
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
+EAPI=8
+HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
+INHERIT=autotools multilib-minimal
+IUSE=debug lazy-lock prof stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~loong
+LICENSE=BSD
+SLOT=0/2
+SRC_URI=https://dev.gentoo.org/~xen0n/distfiles/jemalloc-5.3.0_pre20220405.tar.xz
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=c4847d337e786e5787e868d1cd31bc02
diff --git a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2 b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
index 7f7cb82f8234..17439e46a7b5 100644
--- a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
+++ b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gf-complete
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/jerasure-2.0.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1b182b1122554e9089acc2370e6d0b4d
diff --git a/metadata/md5-cache/dev-libs/json-c-0.15 b/metadata/md5-cache/dev-libs/json-c-0.15
index 366d18b52b9b..c196d8984de3 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.15
+++ b/metadata/md5-cache/dev-libs/json-c-0.15
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A JSON implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/json-c/json-c/wiki
+INHERIT=cmake-multilib
 IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0/5
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0cc0f733e2f82842a04dc36a22e2f45f
diff --git a/metadata/md5-cache/dev-libs/json-c-0.16-r1 b/metadata/md5-cache/dev-libs/json-c-0.16-r1
new file mode 100644
index 000000000000..8a392aedde7f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/json-c-0.16-r1
@@ -0,0 +1,13 @@
+BDEPEND=doc? ( >=app-doc/doxygen-1.8.13 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A JSON implementation in C
+EAPI=8
+HOMEPAGE=https://github.com/json-c/json-c/wiki
+INHERIT=cmake-multilib
+IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+SLOT=0/5
+SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e4e727e44744793584e3698d9a9a1ba4
diff --git a/metadata/md5-cache/dev-libs/json-c-9999 b/metadata/md5-cache/dev-libs/json-c-9999
index 6b0d558e6583..5085621b19c4 100644
--- a/metadata/md5-cache/dev-libs/json-c-9999
+++ b/metadata/md5-cache/dev-libs/json-c-9999
@@ -1,11 +1,12 @@
 BDEPEND=doc? ( >=app-doc/doxygen-1.8.13 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A JSON implementation in C
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/json-c/json-c/wiki
+INHERIT=cmake-multilib git-r3
 IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/5
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f1dbb1f855f8ef5f9cc18975c639cdef
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6e2b2865a9ecb63445cd648d21de814e
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.6.6-r1 b/metadata/md5-cache/dev-libs/json-glib-1.6.6-r1
index 8ee82bce823b..23bed451625b 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.6.6-r1
+++ b/metadata/md5-cache/dev-libs/json-glib-1.6.6-r1
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=Library providing GLib serialization and deserialization for the JSON format
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
+INHERIT=gnome.org meson-multilib xdg-utils
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.6/json-glib-1.6.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=75b9be52a8b6513d6a452ddefcd8edac
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.5 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
index 62cd11c1506d..d1b05dfa17df 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=C++ JSON reader and writer
 EAPI=8
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
+INHERIT=meson python-any-r1
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz -> jsoncpp-1.9.5.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=62b54f6d76305037c1dad610a2d188af
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=4695b4f3e9acde6cae78eeb2e2ca0f1e
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.40.0 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.40.0
index f9b69204e293..1228cad3deff 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.40.0
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.40.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib[introspection?] introspection? ( dev-l
 DESCRIPTION=JSON-RPC library for GLib
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/jsonrpc-glib
+INHERIT=gnome.org meson xdg vala
 IUSE=gtk-doc +introspection test vala
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.40/jsonrpc-glib-3.40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3f898716559b8598041211e41699efad
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
index 142b1a927e46..3a3995ff077d 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib[introspection?] introspection? ( dev-l
 DESCRIPTION=JSON-RPC library for GLib
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/jsonrpc-glib
+INHERIT=gnome.org meson vala
 IUSE=gtk-doc +introspection test vala
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.42/jsonrpc-glib-3.42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8
 _md5_=9abb50bfe5c94bcab39015a8ccd1a581
diff --git a/metadata/md5-cache/dev-libs/jthread-1.3.3 b/metadata/md5-cache/dev-libs/jthread-1.3.3
index 10cbd1eedf26..ca04075f3165 100644
--- a/metadata/md5-cache/dev-libs/jthread-1.3.3
+++ b/metadata/md5-cache/dev-libs/jthread-1.3.3
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JThread provides some classes to make use of threads easy on different platforms
 EAPI=7
 HOMEPAGE=https://research.edm.uhasselt.be/jori/page/CS/Jthread.html
+INHERIT=cmake-multilib
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0/1.3.3
 SRC_URI=https://research.edm.uhasselt.be/jori/jthread/jthread-1.3.3.tar.bz2
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1a051bed2f5e42bf2bf9de272c45b93d
diff --git a/metadata/md5-cache/dev-libs/judy-1.0.5-r2 b/metadata/md5-cache/dev-libs/judy-1.0.5-r2
index d02803c15085..d88f6279170d 100644
--- a/metadata/md5-cache/dev-libs/judy-1.0.5-r2
+++ b/metadata/md5-cache/dev-libs/judy-1.0.5-r2
@@ -3,10 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=A C library that implements a dynamic array
 EAPI=6
 HOMEPAGE=http://judy.sourceforge.net/
+INHERIT=autotools multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/judy/Judy-1.0.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c1d9ae20b589da13b50aae526c7537b1
diff --git a/metadata/md5-cache/dev-libs/judy-1.0.5-r3 b/metadata/md5-cache/dev-libs/judy-1.0.5-r3
index b5f1e9a35f5f..70d47027022e 100644
--- a/metadata/md5-cache/dev-libs/judy-1.0.5-r3
+++ b/metadata/md5-cache/dev-libs/judy-1.0.5-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/judy/Judy-1.0.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f04f14251929d5a4b1613c4a13caf41f
diff --git a/metadata/md5-cache/dev-libs/kasync-0.3.0 b/metadata/md5-cache/dev-libs/kasync-0.3.0
index f53c9d20b2de..acd370f795f3 100644
--- a/metadata/md5-cache/dev-libs/kasync-0.3.0
+++ b/metadata/md5-cache/dev-libs/kasync-0.3.0
@@ -4,6 +4,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qtte
 DESCRIPTION=C++ library for controlling asynchronous tasks
 EAPI=7
 HOMEPAGE=https://api.kde.org/kasync/html/index.html
+INHERIT=ecm kde.org
 IUSE=debug test
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
@@ -11,5 +12,5 @@ RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/unstable/kasync/0.3.0/src/kasync-0.3.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5db5e229536b044435b6e32fc7c2f465
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.8.0 b/metadata/md5-cache/dev-libs/kdiagram-2.8.0
index 95e154181e55..e25e9f2be1c0 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.8.0
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.8.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsvg-5
 DESCRIPTION=Powerful libraries (KChart, KGantt) for creating business diagrams
 EAPI=7
 HOMEPAGE=https://api.kde.org/kdiagram/index.html https://www.kdab.com/development-resources/qt-tools/kd-chart/
+INHERIT=ecm kde.org
 IUSE=test debug examples doc test
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=test? ( examples )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.8.0/kdiagram-2.8.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=720f167e69309675553df15e9df52077
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.2 b/metadata/md5-cache/dev-libs/keystone-0.9.2
deleted file mode 100644
index d6ae4c6a8a7b..000000000000
--- a/metadata/md5-cache/dev-libs/keystone-0.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=<sys-devel/llvm-13:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) !!sys-devel/llvm:0
-DESCRIPTION=assembly/assembler framework + bindings
-EAPI=7
-HOMEPAGE=https://www.keystone-engine.org/
-IUSE=python llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=<sys-devel/llvm-13:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.2.tar.gz -> keystone-0.9.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=216a7566e166b28c292c27c7b04817f6
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.2-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
index 37b48d0f2f2f..a9ffa87a3108 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
@@ -4,6 +4,7 @@ DEPEND=<sys-devel/llvm-15:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets
 DESCRIPTION=assembly/assembler framework + bindings
 EAPI=8
 HOMEPAGE=https://www.keystone-engine.org/
+INHERIT=cmake distutils-r1 llvm
 IUSE=python llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=<sys-devel/llvm-15:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_target
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.2.tar.gz -> keystone-0.9.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	distutils-r1	779bc733c68a72273cfce64602bada1d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d642c45a1572c9c12e30438a6cabe153
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index 1a4d12e4aa7b..f2c6f6f5a906 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -4,11 +4,12 @@ DEPEND=<sys-devel/llvm-15:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets
 DESCRIPTION=assembly/assembler framework + bindings
 EAPI=8
 HOMEPAGE=https://www.keystone-engine.org/
+INHERIT=cmake distutils-r1 llvm git-r3
 IUSE=python llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=<sys-devel/llvm-15:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	distutils-r1	779bc733c68a72273cfce64602bada1d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d642c45a1572c9c12e30438a6cabe153
diff --git a/metadata/md5-cache/dev-libs/kopeninghours-21.12.3 b/metadata/md5-cache/dev-libs/kopeninghours-21.12.3
index 5b4f46b17ee1..8e1390c2e838 100644
--- a/metadata/md5-cache/dev-libs/kopeninghours-21.12.3
+++ b/metadata/md5-cache/dev-libs/kopeninghours-21.12.3
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/kpublictransport-21.12.3:5 >=dev-qt/qtdeclarative-5.15.2:5 >=k
 DESCRIPTION=Library for parsing and evaluating OSM opening hours expressions
 EAPI=8
 HOMEPAGE=https://api.kde.org/kopeninghours/html/index.html https://invent.kde.org/libraries/kopeninghours
+INHERIT=ecm kde.org python-single-r1
 IUSE=python debug doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.12.3/src/kopeninghours-21.12.3.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1b12d6d3e9ff79131293e9bb9c95718c
diff --git a/metadata/md5-cache/dev-libs/kopeninghours-21.08.3 b/metadata/md5-cache/dev-libs/kopeninghours-22.04.0
index c3a5a0b4409b..08bf70d2bab8 100644
--- a/metadata/md5-cache/dev-libs/kopeninghours-21.08.3
+++ b/metadata/md5-cache/dev-libs/kopeninghours-22.04.0
@@ -1,16 +1,17 @@
-BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.84.0:5
+BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.92.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/kpublictransport-21.08.3:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kholidays-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_10(-)] ) ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/kpublictransport-22.04.0:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kholidays-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_10(-)] ) ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Library for parsing and evaluating OSM opening hours expressions
 EAPI=8
 HOMEPAGE=https://api.kde.org/kopeninghours/html/index.html https://invent.kde.org/libraries/kopeninghours
-IUSE=python debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=ecm kde.org python-single-r1
+IUSE=python debug doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/kpublictransport-21.08.3:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kholidays-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-libs/kpublictransport-22.04.0:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kholidays-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.08.3/src/kopeninghours-21.08.3.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=555ab5358a9f53dc0bacc054b1d231c2
+SRC_URI=mirror://kde/stable/release-service/22.04.0/src/kopeninghours-22.04.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5f99cb087abc67dd22b26ba4ea68b927
diff --git a/metadata/md5-cache/dev-libs/kosmindoormap-21.12.3 b/metadata/md5-cache/dev-libs/kosmindoormap-21.12.3
index 1accf5b87ed6..9269c327e915 100644
--- a/metadata/md5-cache/dev-libs/kosmindoormap-21.12.3
+++ b/metadata/md5-cache/dev-libs/kosmindoormap-21.12.3
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/kpublictransport-21.12.3:5 dev-libs/protobuf:= >=dev-qt/qtdecl
 DESCRIPTION=Data Model and Extraction System for Travel Reservation information
 EAPI=8
 HOMEPAGE=https://invent.kde.org/libraries/kosmindoormap
+INHERIT=ecm kde.org
 IUSE=+openinghours debug test
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/kpublictransport-21.12.3:5 dev-libs/protobuf:= >=dev-qt/qtdec
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.12.3/src/kosmindoormap-21.12.3.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5e628c2acfda6079983d21a889cc43e9
diff --git a/metadata/md5-cache/dev-libs/kosmindoormap-21.08.3 b/metadata/md5-cache/dev-libs/kosmindoormap-22.04.0
index 227723008086..959fdf86b3c7 100644
--- a/metadata/md5-cache/dev-libs/kosmindoormap-21.08.3
+++ b/metadata/md5-cache/dev-libs/kosmindoormap-22.04.0
@@ -1,15 +1,16 @@
-BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.84.0:5
+BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.92.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/kpublictransport-21.08.3:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.84.0:5 sys-libs/zlib openinghours? ( >=dev-libs/kopeninghours-21.08.3:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/kpublictransport-22.04.0:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.92.0:5 sys-libs/zlib openinghours? ( >=dev-libs/kopeninghours-22.04.0:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Data Model and Extraction System for Travel Reservation information
 EAPI=8
 HOMEPAGE=https://invent.kde.org/libraries/kosmindoormap
+INHERIT=ecm kde.org
 IUSE=+openinghours debug test
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/kpublictransport-21.08.3:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.84.0:5 sys-libs/zlib openinghours? ( >=dev-libs/kopeninghours-21.08.3:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-libs/kpublictransport-22.04.0:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.92.0:5 sys-libs/zlib openinghours? ( >=dev-libs/kopeninghours-22.04.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.08.3/src/kosmindoormap-21.08.3.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2eb072fb86ab0e680fc427995a26bebf
+SRC_URI=mirror://kde/stable/release-service/22.04.0/src/kosmindoormap-22.04.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=42df9131c326ca313b9f2d31001f05b9
diff --git a/metadata/md5-cache/dev-libs/kpeoplevcard-0.1-r1 b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1-r1
index 7fb484970151..f8c7d14a3d47 100644
--- a/metadata/md5-cache/dev-libs/kpeoplevcard-0.1-r1
+++ b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1-r1
@@ -4,11 +4,12 @@ DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcon
 DESCRIPTION=Library to expose vcards to KPeople
 EAPI=8
 HOMEPAGE=https://invent.kde.org/pim/kpeoplevcard
+INHERIT=ecm kde.org
 IUSE=debug
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcontacts-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kpeoplevcard/0.1/kpeoplevcard-0.1.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cee198d7cf108c691bdb57983995e97d
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.2.0 b/metadata/md5-cache/dev-libs/kproperty-3.2.0
index 3ab2e399f7d6..be5bd9bc9d27 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.2.0
+++ b/metadata/md5-cache/dev-libs/kproperty-3.2.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcon
 DESCRIPTION=Property editing framework with editor widget similar to Qt Designer
 EAPI=7
 HOMEPAGE=https://community.kde.org/KProperty
+INHERIT=ecm kde.org
 IUSE=debug doc test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test ) test
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.2.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d6da7e25bbdc38d95a9bfb5efebdb3f4
diff --git a/metadata/md5-cache/dev-libs/kpublictransport-21.12.3 b/metadata/md5-cache/dev-libs/kpublictransport-21.12.3
index ae802da22d82..244207e958b2 100644
--- a/metadata/md5-cache/dev-libs/kpublictransport-21.12.3
+++ b/metadata/md5-cache/dev-libs/kpublictransport-21.12.3
@@ -4,6 +4,7 @@ DEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2
 DESCRIPTION=Library for accessing public transport timetables and other information
 EAPI=8
 HOMEPAGE=https://invent.kde.org/libraries/kpublictransport https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html
+INHERIT=ecm kde.org
 IUSE=debug doc test
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.12.3/src/kpublictransport-21.12.3.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=84ab8579313cfa269c831271fb7828bf
diff --git a/metadata/md5-cache/dev-libs/kpublictransport-21.08.3-r1 b/metadata/md5-cache/dev-libs/kpublictransport-22.04.0
index 8fd00cd265b0..0e5bae16a102 100644
--- a/metadata/md5-cache/dev-libs/kpublictransport-21.08.3-r1
+++ b/metadata/md5-cache/dev-libs/kpublictransport-22.04.0
@@ -1,15 +1,16 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.84.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.92.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] sys-libs/zlib test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] sys-libs/zlib test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Library for accessing public transport timetables and other information
 EAPI=8
 HOMEPAGE=https://invent.kde.org/libraries/kpublictransport https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html
-IUSE=debug test
+INHERIT=ecm kde.org
+IUSE=debug doc test
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
-RDEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.08.3/src/kpublictransport-21.08.3.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=038359d16440204b54e053e7d6f3b45c
+SRC_URI=mirror://kde/stable/release-service/22.04.0/src/kpublictransport-22.04.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3390092b5009c04f8aacf600d727ab57
diff --git a/metadata/md5-cache/dev-libs/kqoauth-0.98-r3 b/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
index 54a2776d81d6..87a202141dc3 100644
--- a/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
+++ b/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5
 DESCRIPTION=Library for Qt that implements the OAuth 1.0 authentication specification
 EAPI=7
 HOMEPAGE=https://github.com/kypeli/kQOAuth
+INHERIT=qmake-utils
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/kypeli/kQOAuth/archive/0.98.tar.gz -> kqoauth-0.98.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5fa26ccb739e0d3c9820b6675ea685db
diff --git a/metadata/md5-cache/dev-libs/kreport-3.2.0-r2 b/metadata/md5-cache/dev-libs/kreport-3.2.0-r2
index 8efcc9a15d6a..b6342d04ba02 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.2.0-r2
+++ b/metadata/md5-cache/dev-libs/kreport-3.2.0-r2
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/kproperty-3.2.0:5= >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsup
 DESCRIPTION=Framework for creation and generation of reports in multiple formats
 EAPI=7
 HOMEPAGE=https://community.kde.org/KReport
+INHERIT=ecm kde.org python-any-r1
 IUSE=marble +scripting test debug doc test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/kproperty-3.2.0:5= >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsu
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.2.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ee52062ad0a4808217899247bb203723
diff --git a/metadata/md5-cache/dev-libs/kuserfeedback-1.2.0 b/metadata/md5-cache/dev-libs/kuserfeedback-1.2.0
index d5e02c623e30..3eb4eaedb1a3 100644
--- a/metadata/md5-cache/dev-libs/kuserfeedback-1.2.0
+++ b/metadata/md5-cache/dev-libs/kuserfeedback-1.2.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-qt/qtcharts-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui
 DESCRIPTION=Framework to collect user feedback for applications via telemetry and surveys
 EAPI=8
 HOMEPAGE=https://kde.org/
+INHERIT=ecm kde.org
 IUSE=doc test debug test
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=>=dev-qt/qtcharts-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgu
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kuserfeedback/kuserfeedback-1.2.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1c485b402930b4cdb5c2e66e915fe0cc
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.6-r1 b/metadata/md5-cache/dev-libs/leatherman-1.12.6-r1
index ef936f9f50e2..0e3b2427b5aa 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.6-r1
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.6-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl
 DESCRIPTION=A C++ toolkit
 EAPI=7
 HOMEPAGE=https://github.com/puppetlabs/leatherman
+INHERIT=cmake
 IUSE=debug static-libs test
 KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl
 RESTRICT=test
 SLOT=0/1.12.6
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.6.tar.gz -> leatherman-1.12.6.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=58b6b6d853318c97c153d372de141474
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.6-r2 b/metadata/md5-cache/dev-libs/leatherman-1.12.6-r2
index 3f02416f5510..5d77908ca660 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.6-r2
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.6-r2
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl
 DESCRIPTION=A C++ toolkit
 EAPI=7
 HOMEPAGE=https://github.com/puppetlabs/leatherman
+INHERIT=cmake
 IUSE=debug static-libs test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl
 RESTRICT=test
 SLOT=0/1.12.6
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.6.tar.gz -> leatherman-1.12.6.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=764901c17a1c842322b049c50146e65a
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.7 b/metadata/md5-cache/dev-libs/leatherman-1.12.7
index 4275946cc562..eaa264e56eaa 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.7
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.7
@@ -4,12 +4,13 @@ DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl
 DESCRIPTION=A C++ toolkit
 EAPI=7
 HOMEPAGE=https://github.com/puppetlabs/leatherman
+INHERIT=cmake
 IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl
 RESTRICT=test
 SLOT=0/1.12.7
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.7.tar.gz -> leatherman-1.12.7.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fbf4a1b87b52dcce5b9ca3057f918be8
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5dee1b765bcea5ca87546c9d7a8f47ab
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.7.15 b/metadata/md5-cache/dev-libs/level-zero-1.7.15
index e8e9fd02ca0e..b800893d5995 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.7.15
+++ b/metadata/md5-cache/dev-libs/level-zero-1.7.15
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
 EAPI=8
 HOMEPAGE=https://github.com/oneapi-src/level-zero
+INHERIT=cmake
 KEYWORDS=amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.7.15.tar.gz -> level-zero-1.7.15.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4cc08bb748d81b4bb7bf9eab224897dc
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.23-r3 b/metadata/md5-cache/dev-libs/leveldb-1.23-r3
index f8b74e1abe6c..82de024acc05 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.23-r3
+++ b/metadata/md5-cache/dev-libs/leveldb-1.23-r3
@@ -4,6 +4,7 @@ DEPEND=dev-libs/crc32c snappy? ( app-arch/snappy:= ) tcmalloc? ( dev-util/google
 DESCRIPTION=A fast key-value storage library written at Google
 EAPI=7
 HOMEPAGE=https://github.com/google/leveldb
+INHERIT=cmake
 IUSE=+snappy +tcmalloc test
 KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/crc32c snappy? ( app-arch/snappy:= ) tcmalloc? ( dev-util/googl
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/leveldb/archive/refs/tags/1.23.tar.gz -> leveldb-1.23.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=169d6b7e27540d0ea97deb127c77642e
diff --git a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2 b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
index c5dfa1614207..f8304cbe7123 100644
--- a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
+++ b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=CORBA tree builder
 EAPI=6
 HOMEPAGE=https://www.gnome.org/
+INHERIT=gnome2 multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5c69d90828839fe04b5917170f327f4f
diff --git a/metadata/md5-cache/dev-libs/libaio-0.3.113 b/metadata/md5-cache/dev-libs/libaio-0.3.113
new file mode 100644
index 000000000000..80e3d5cbf306
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libaio-0.3.113
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Asynchronous input/output library that uses the kernels native interface
+EAPI=7
+HOMEPAGE=https://pagure.io/libaio
+INHERIT=multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
+IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~loong
+LICENSE=LGPL-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://releases.pagure.org/libaio/libaio-0.3.113.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=d88f0667fc5c177d7b53ac804ee274da
diff --git a/metadata/md5-cache/dev-libs/libaio-9999 b/metadata/md5-cache/dev-libs/libaio-9999
index d6497533b89b..8d4d7b03f856 100644
--- a/metadata/md5-cache/dev-libs/libaio-9999
+++ b/metadata/md5-cache/dev-libs/libaio-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8850a92961ea5c079c5519e5f515e47e
+_md5_=bcd492906f35a71adc78bfb59498ae88
diff --git a/metadata/md5-cache/dev-libs/libansilove-1.2.9 b/metadata/md5-cache/dev-libs/libansilove-1.2.9
index eacb83ae80e2..be126d009d4c 100644
--- a/metadata/md5-cache/dev-libs/libansilove-1.2.9
+++ b/metadata/md5-cache/dev-libs/libansilove-1.2.9
@@ -4,10 +4,11 @@ DEPEND=media-libs/gd:2=[png]
 DESCRIPTION=library to convert ANSi and artscene related file formats into PNG images
 EAPI=8
 HOMEPAGE=https://github.com/ansilove/libansilove
+INHERIT=cmake
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=media-libs/gd:2=[png]
 SLOT=0
 SRC_URI=https://github.com/ansilove/libansilove/archive/refs/tags/1.2.9.tar.gz -> libansilove-1.2.9.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=43c3c5abb9cc53043b5837f7181474fc
diff --git a/metadata/md5-cache/dev-libs/libansilove-1.3.0 b/metadata/md5-cache/dev-libs/libansilove-1.3.0
new file mode 100644
index 000000000000..fc0aba14ef6c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libansilove-1.3.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/gd:2=[png]
+DESCRIPTION=library to convert ANSi and artscene related file formats into PNG images
+EAPI=8
+HOMEPAGE=https://github.com/ansilove/libansilove
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD-2
+RDEPEND=media-libs/gd:2=[png]
+SLOT=0
+SRC_URI=https://github.com/ansilove/libansilove/archive/refs/tags/1.3.0.tar.gz -> libansilove-1.3.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7e298865ae473383fb06cd2e1edf0e0f
diff --git a/metadata/md5-cache/dev-libs/libansilove-1.2.8 b/metadata/md5-cache/dev-libs/libansilove-1.3.1
index 3022414d081e..1649f8bc343a 100644
--- a/metadata/md5-cache/dev-libs/libansilove-1.2.8
+++ b/metadata/md5-cache/dev-libs/libansilove-1.3.1
@@ -4,10 +4,11 @@ DEPEND=media-libs/gd:2=[png]
 DESCRIPTION=library to convert ANSi and artscene related file formats into PNG images
 EAPI=8
 HOMEPAGE=https://github.com/ansilove/libansilove
+INHERIT=cmake
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=media-libs/gd:2=[png]
 SLOT=0
-SRC_URI=https://github.com/ansilove/libansilove/archive/refs/tags/1.2.8.tar.gz -> libansilove-1.2.8.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+SRC_URI=https://github.com/ansilove/libansilove/archive/refs/tags/1.3.1.tar.gz -> libansilove-1.3.1.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=43c3c5abb9cc53043b5837f7181474fc
diff --git a/metadata/md5-cache/dev-libs/libansilove-9999 b/metadata/md5-cache/dev-libs/libansilove-9999
index d3c807dacc06..932e1644d018 100644
--- a/metadata/md5-cache/dev-libs/libansilove-9999
+++ b/metadata/md5-cache/dev-libs/libansilove-9999
@@ -4,9 +4,10 @@ DEPEND=media-libs/gd:2=[png]
 DESCRIPTION=library to convert ANSi and artscene related file formats into PNG images
 EAPI=8
 HOMEPAGE=https://github.com/ansilove/libansilove
+INHERIT=cmake git-r3
 LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=media-libs/gd:2=[png]
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=43c3c5abb9cc53043b5837f7181474fc
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
index 8b6e4c620e44..d91a6955f0da 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=A library to allow applications to export a menu into the Unity Menu bar
 EAPI=6
 HOMEPAGE=https://launchpad.net/libappindicator
+INHERIT=autotools multilib-minimal vala xdg-utils
 IUSE=+introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk3,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libindicator-12.10.0:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=3
 SRC_URI=https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f9870438ef4f907352b0a3769c4f5505
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.1_p20200706 b/metadata/md5-cache/dev-libs/libappindicator-12.10.1_p20200706
index fe27af7e72e1..266649a8c4b0 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.1_p20200706
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.1_p20200706
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://ubuntu/pool/main/liba/libappindicator/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5b2144c94843fdf576387a69d00d1893
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.12.1 b/metadata/md5-cache/dev-libs/libarcus-4.12.1
deleted file mode 100644
index 9eb8543c3320..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-4.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] python? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=8
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples +python static-libs python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] python? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.12.1.tar.gz -> libarcus-4.12.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0bfa1269a3c46c18ab9dff6ac1f40de3
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.13.0 b/metadata/md5-cache/dev-libs/libarcus-4.13.0
deleted file mode 100644
index 0576e15e9b17..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-4.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] python? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=8
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples +python static-libs python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] python? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.13.0.tar.gz -> libarcus-4.13.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e189d3f57d94a6f8ce70aa2951828578
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.13.1 b/metadata/md5-cache/dev-libs/libarcus-4.13.1
index a448ef3110a7..52365f7afa5b 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.13.1
+++ b/metadata/md5-cache/dev-libs/libarcus-4.13.1
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=8
 HOMEPAGE=https://github.com/Ultimaker/libArcus
+INHERIT=cmake python-single-r1
 IUSE=examples +python static-libs python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=LGPL-3
@@ -11,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.13.1.tar.gz -> libarcus-4.13.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0bfa1269a3c46c18ab9dff6ac1f40de3
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.9.1 b/metadata/md5-cache/dev-libs/libarcus-4.9.1
deleted file mode 100644
index 1ad6513baea7..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-4.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] python? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples +python static-libs python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] python? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.9.1.tar.gz -> libarcus-4.9.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8c3c4cde38e44c63fb2a7b31208f6191
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.5 b/metadata/md5-cache/dev-libs/libassuan-2.5.5
index d1cced773cab..ea0387c3742c 100644
--- a/metadata/md5-cache/dev-libs/libassuan-2.5.5
+++ b/metadata/md5-cache/dev-libs/libassuan-2.5.5
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libgpg-error-1.17
 DESCRIPTION=IPC library used by GnuPG and GPGME
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/related_software/libassuan/index.en.html
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libgpg-error-1.17
 SLOT=0
 SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.5.tar.bz2
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=09466fc86157c14b0e9c985fc6513296
+_md5_=281ff6fe67c06c4cbbbbfa061e1aa886
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.12 b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.12
index 1b878ff4668b..5873c37f094b 100644
--- a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.12
+++ b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.12
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=Implementation for atomic memory update operations
 EAPI=7
 HOMEPAGE=https://github.com/ivmai/libatomic_ops/
+INHERIT=multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT boehm-gc GPL-2+
 SLOT=0
 SRC_URI=https://github.com/ivmai/libatomic_ops/releases/download/v7.6.12/libatomic_ops-7.6.12.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3755181c1b68bda6492ccaa988bee36d
+_md5_=60c7c8659bebcd8370788c1a41d5af3d
diff --git a/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1 b/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1
index 21482f2178d4..ba761c2a0fe4 100644
--- a/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1
@@ -11,5 +11,5 @@ RDEPEND=tools? ( dev-libs/libgcrypt )
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/luke-jr/libbase58/archive/v0.1.4.tar.gz -> libbase58-0.1.4.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f2615cc7623401d9732639586bad0e3f
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.7.0 b/metadata/md5-cache/dev-libs/libbpf-0.7.0
index a38f7742dc8b..4ea9f48bcef0 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.7.0
+++ b/metadata/md5-cache/dev-libs/libbpf-0.7.0
@@ -3,11 +3,12 @@ DEPEND=sys-kernel/linux-headers virtual/libelf
 DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
 EAPI=8
 HOMEPAGE=https://github.com/libbpf/libbpf
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=sys-kernel/linux-headers virtual/libelf
 SLOT=0/0.7
 SRC_URI=https://github.com/libbpf/libbpf/archive/v0.7.0.tar.gz -> libbpf-0.7.0.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=17a17648cc086527e703cff4d2d10e15
+_md5_=dc450e13ec13bf27b54db18104328209
diff --git a/metadata/md5-cache/dev-libs/libbpf-9999 b/metadata/md5-cache/dev-libs/libbpf-9999
index 63ec67a92f07..b76a0cbc7f0a 100644
--- a/metadata/md5-cache/dev-libs/libbpf-9999
+++ b/metadata/md5-cache/dev-libs/libbpf-9999
@@ -4,10 +4,11 @@ DEPEND=sys-kernel/linux-headers virtual/libelf
 DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
 EAPI=8
 HOMEPAGE=https://github.com/libbpf/libbpf
+INHERIT=flag-o-matic toolchain-funcs git-r3
 IUSE=static-libs
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 PROPERTIES=live
 RDEPEND=sys-kernel/linux-headers virtual/libelf
 SLOT=0/9999
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8a6dbf325207b9a62efdc3e6240de5d9
+_md5_=191983582d0d77ad9b6fc6be92de1fbb
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.11.6 b/metadata/md5-cache/dev-libs/libbsd-0.11.6
index 02c34c053a9c..2f224d82c14e 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.11.6
+++ b/metadata/md5-cache/dev-libs/libbsd-0.11.6
@@ -4,11 +4,12 @@ DEPEND=app-crypt/libmd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 DESCRIPTION=Library to provide useful functions commonly found on BSD systems
 EAPI=8
 HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
+INHERIT=multilib-minimal verify-sig
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 BSD-4 ISC
 RDEPEND=app-crypt/libmd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.11.6.tar.xz verify-sig? ( https://libbsd.freedesktop.org/releases/libbsd-0.11.6.tar.xz.asc )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=fc36f25a15e0ffbcf6d5dcfaace4f5fb
+_md5_=94e5ce82774251f8ff6b8a04c171163f
diff --git a/metadata/md5-cache/dev-libs/libbson-1.18.0 b/metadata/md5-cache/dev-libs/libbson-1.18.0
index f771754407ec..afd3221df66b 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.18.0
+++ b/metadata/md5-cache/dev-libs/libbson-1.18.0
@@ -4,10 +4,11 @@ DEPEND=dev-python/sphinx
 DESCRIPTION=Library routines related to building,parsing and iterating BSON documents
 EAPI=7
 HOMEPAGE=https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson
+INHERIT=cmake
 IUSE=examples static-libs
 KEYWORDS=amd64 ~hppa ~ppc ~riscv ~sparc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.18.0/mongo-c-driver-1.18.0.tar.gz -> libbson-1.18.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=02a6b38023e66486d603ac72e96e6211
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.5 b/metadata/md5-cache/dev-libs/libbytesize-2.5
index 4a1c3c4a52e7..98357ed5d028 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-2.5
+++ b/metadata/md5-cache/dev-libs/libbytesize-2.5
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_target
 DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libbytesize
+INHERIT=autotools python-r1
 IUSE=doc python test tools python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2+
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.5/libbytesize-2.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=734a7d7ebf6c8b1b5739f095c11ad108
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.6 b/metadata/md5-cache/dev-libs/libbytesize-2.6
index c1c3e09986cd..184b4f0c1c69 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-2.6
+++ b/metadata/md5-cache/dev-libs/libbytesize-2.6
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_target
 DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libbytesize
+INHERIT=autotools python-r1
 IUSE=doc python test tools python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.6/libbytesize-2.6.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=51c172016261993d53ac020ac06bf323
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.8.0 b/metadata/md5-cache/dev-libs/libcbor-0.8.0
index d20bc0602760..c53e8f8f15a5 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.8.0
+++ b/metadata/md5-cache/dev-libs/libcbor-0.8.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CBOR protocol implementation for C and others
 EAPI=7
 HOMEPAGE=https://github.com/pjk/libcbor
+INHERIT=python-any-r1 cmake
 IUSE=+custom-alloc doc test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.8.0.tar.gz -> libcbor-0.8.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c622f871e37a1bc134387f94de91824b
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.9.0 b/metadata/md5-cache/dev-libs/libcbor-0.9.0
index 038bd7ec7d96..8ddf77d9b8b5 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.9.0
+++ b/metadata/md5-cache/dev-libs/libcbor-0.9.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CBOR protocol implementation for C and others
 EAPI=7
 HOMEPAGE=https://github.com/pjk/libcbor
+INHERIT=python-any-r1 cmake
 IUSE=+custom-alloc doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.9.0.tar.gz -> libcbor-0.9.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=609f0b35b5ea511271ccc5c302e3cb9d
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=31a1ea9f8c987c5261830017539c602f
diff --git a/metadata/md5-cache/dev-libs/libcdada-0.3.4-r2 b/metadata/md5-cache/dev-libs/libcdada-0.3.4-r2
index 4df6c992aa8f..44e03a57d1fe 100644
--- a/metadata/md5-cache/dev-libs/libcdada-0.3.4-r2
+++ b/metadata/md5-cache/dev-libs/libcdada-0.3.4-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=configure install prepare setup
 DESCRIPTION=Basic data structures in C
 EAPI=7
 HOMEPAGE=https://github.com/msune/libcdada
+INHERIT=autotools python-any-r1
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/msune/libcdada/archive/refs/tags/v0.3.4.tar.gz -> libcdada-0.3.4.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9652898ba574e7f30190e52294d48a23
diff --git a/metadata/md5-cache/dev-libs/libcdada-0.3.5 b/metadata/md5-cache/dev-libs/libcdada-0.3.5
index ce435bf2ebba..bfc9fe538b78 100644
--- a/metadata/md5-cache/dev-libs/libcdada-0.3.5
+++ b/metadata/md5-cache/dev-libs/libcdada-0.3.5
@@ -3,11 +3,12 @@ DEFINED_PHASES=configure install prepare setup
 DESCRIPTION=Basic data structures in C
 EAPI=8
 HOMEPAGE=https://github.com/msune/libcdada
+INHERIT=autotools python-any-r1
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/msune/libcdada/archive/refs/tags/v0.3.5.tar.gz -> libcdada-0.3.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=15c5fbe01a9050343f399d5d940c2a62
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1 b/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
index 34aebc083159..15ebd419f860 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
@@ -3,6 +3,7 @@ DEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3
 DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
+INHERIT=autotools libtool multilib-minimal toolchain-funcs
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -10,5 +11,5 @@ RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.
 RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=mirror://gnu/libcdio/libcdio-2.0.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9ab446926b5259fee1c3db836648131c
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1 b/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
index e41795c8acb9..a1f4fbd0095e 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=mirror://gnu/libcdio/libcdio-2.1.0.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9c68e62b0cede1b82bfbd39fafe8dd26
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
index ee5f5e7bec27..a876339f3b0d 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ef47924e38e96797caae8a2941000436
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1 b/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
deleted file mode 100644
index dfffa7654129..000000000000
--- a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) python? ( dev-lang/swig ) virtual/pkgconfig
-DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
-EAPI=7
-HOMEPAGE=http://libcec.pulse-eight.com
-IUSE=cubox exynos python raspberry-pi +xrandr +python_single_target_python3_8
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.4.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb4a35f96f43904272a615b6aef38959
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.7 b/metadata/md5-cache/dev-libs/libcec-4.0.7
deleted file mode 100644
index aa6bd9e83c4d..000000000000
--- a/metadata/md5-cache/dev-libs/libcec-4.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=udev? ( virtual/udev ) >=dev-libs/libplatform-2.0.0 tools? ( sys-libs/ncurses:= ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) python? ( dev-lang/swig )
-DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
-EAPI=7
-HOMEPAGE=http://libcec.pulse-eight.com
-IUSE=cubox exynos python raspberry-pi kernel-cec tools +xrandr udev +python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=udev? ( virtual/udev ) >=dev-libs/libplatform-2.0.0 tools? ( sys-libs/ncurses:= ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.7.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=320f2ba079717bbe889aef580b10917d
diff --git a/metadata/md5-cache/dev-libs/libcec-6.0.2 b/metadata/md5-cache/dev-libs/libcec-6.0.2
index 6053448a1b58..f51620ea216a 100644
--- a/metadata/md5-cache/dev-libs/libcec-6.0.2
+++ b/metadata/md5-cache/dev-libs/libcec-6.0.2
@@ -1,9 +1,10 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
 DEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) tools? ( sys-libs/ncurses:= ) udev? ( virtual/udev ) xrandr? ( x11-libs/libXrandr ) python? ( dev-lang/swig )
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=7
 HOMEPAGE=http://libcec.pulse-eight.com
+INHERIT=cmake linux-info python-single-r1 toolchain-funcs udev
 IUSE=cubox exynos python raspberry-pi kernel-cec tools +xrandr udev python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_8? (
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-6.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=054a1f756cbe7ded37a3d2a96b78344a
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1a81dc7f68b983fa97280d753b73ffce
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
index 906e3d197235..b87f6dcb76ab 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=daemon? ( tools )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d73e63893d56f116ae04f9ea66ff8d86
diff --git a/metadata/md5-cache/dev-libs/libcgroup-2.0 b/metadata/md5-cache/dev-libs/libcgroup-2.0
index 1fd8c41d2c82..c411dbebfd77 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-2.0
+++ b/metadata/md5-cache/dev-libs/libcgroup-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=daemon? ( tools )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libcgroup/libcgroup/releases/download/v2.0/libcgroup-2.0.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=eabbc0a2a17888f52de701289dedba4a
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.12.1 b/metadata/md5-cache/dev-libs/libcharon-4.12.1
deleted file mode 100644
index 3be4e87caf77..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-4.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=8
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+client +dbus test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dbus? ( acct-group/ultimaker acct-user/ultimaker sys-apps/dbus )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.12.1.tar.gz -> libcharon-4.12.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba2807edf67d1f98dd0f76592306bcec
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.13.0 b/metadata/md5-cache/dev-libs/libcharon-4.13.0
index 8bf07a01c97f..6fbe0c1e208d 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.13.0
+++ b/metadata/md5-cache/dev-libs/libcharon-4.13.0
@@ -4,13 +4,14 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=8
 HOMEPAGE=https://github.com/Ultimaker/libCharon
+INHERIT=cmake python-single-r1
 IUSE=+client +dbus test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dbus? ( acct-group/ultimaker acct-user/ultimaker sys-apps/dbus )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.13.0.tar.gz -> libcharon-4.13.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=613277824669261fbf2b6cf66c870d26
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ba2807edf67d1f98dd0f76592306bcec
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1 b/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
deleted file mode 100644
index 645f0f095228..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+client +dbus test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dbus? ( acct-group/ultimaker acct-user/ultimaker sys-apps/dbus )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.9.1.tar.gz -> libcharon-4.9.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f589bf3bacbf517c22d7f37519505d88
diff --git a/metadata/md5-cache/dev-libs/libchdr-0_p20211127 b/metadata/md5-cache/dev-libs/libchdr-0_p20211127
index 1ce9812f0aa7..5cc80c891924 100644
--- a/metadata/md5-cache/dev-libs/libchdr-0_p20211127
+++ b/metadata/md5-cache/dev-libs/libchdr-0_p20211127
@@ -4,10 +4,11 @@ DEPEND=sys-libs/zlib:=
 DESCRIPTION=Standalone library for reading MAME's CHDv1-v5 formats
 EAPI=8
 HOMEPAGE=https://github.com/rtissera/libchdr/
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/rtissera/libchdr/archive/929a8d6523a7d21ea9e035f43211cd759e072053.tar.gz -> libchdr-0_p20211127.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=af039e5fb15d3cb3633e113eae13d251
diff --git a/metadata/md5-cache/dev-libs/libclc-13.0.0 b/metadata/md5-cache/dev-libs/libclc-13.0.0
deleted file mode 100644
index 100e91be67f5..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-13.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=7
-HOMEPAGE=https://libclc.llvm.org/
-IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	9fa116398a05a78f92d201417923c8dc	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5454bcb0ad2d1c206e9b126fe9aca732
diff --git a/metadata/md5-cache/dev-libs/libclc-13.0.1 b/metadata/md5-cache/dev-libs/libclc-13.0.1
index 560c5738255a..396b8674c9a7 100644
--- a/metadata/md5-cache/dev-libs/libclc-13.0.1
+++ b/metadata/md5-cache/dev-libs/libclc-13.0.1
@@ -4,11 +4,12 @@ DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
 EAPI=7
 HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
 IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	9fa116398a05a78f92d201417923c8dc	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98ac0e052e897fc0d6f980d88bceaa68
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=843db6c01dec460f8d001fffed2f6aa2
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.0 b/metadata/md5-cache/dev-libs/libclc-14.0.0
deleted file mode 100644
index f23853cdf049..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-14.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( sys-devel/clang:14 sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=7
-HOMEPAGE=https://libclc.llvm.org/
-IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	9fa116398a05a78f92d201417923c8dc	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1f60ef9b4a89f0e258554c8888e3e67e
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.1 b/metadata/md5-cache/dev-libs/libclc-14.0.1
index 6ea6b739c4e2..f66a317ceec9 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.1
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.1
@@ -4,11 +4,12 @@ DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
 EAPI=8
 HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
 IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	9fa116398a05a78f92d201417923c8dc	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b5a9c71b5cf61fc9697d6c2c1d51751e
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.3 b/metadata/md5-cache/dev-libs/libclc-14.0.3
new file mode 100644
index 000000000000..37e2bbae37ae
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.3
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( sys-devel/clang:14 sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!!sys-devel/llvm:0
+DESCRIPTION=OpenCL C library
+EAPI=8
+HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
+REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.3.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3d0d9669ff1ac2ee9699d7e441b97db2
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-15.0.0.9999
index e9146b397a10..6e10df39f960 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.0.9999
@@ -1,13 +1,14 @@
-BDEPEND=|| ( sys-devel/clang:15 sys-devel/clang:14 sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( sys-devel/clang:15 sys-devel/clang:14 sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
 IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	9fa116398a05a78f92d201417923c8dc	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3ca25e443db7b285c11d4fe76f220363
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6616a807d965be2df520886010952156
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.7.2 b/metadata/md5-cache/dev-libs/libconfig-1.7.2
deleted file mode 100644
index 272de6b4d639..000000000000
--- a/metadata/md5-cache/dev-libs/libconfig-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/texinfo sys-devel/bison sys-devel/libtool
-DESCRIPTION=Libconfig is a simple library for manipulating structured configuration files
-EAPI=7
-HOMEPAGE=http://www.hyperrealm.com/libconfig/libconfig.html https://github.com/hyperrealm/libconfig
-IUSE=+cxx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0/11
-SRC_URI=https://github.com/hyperrealm/libconfig/archive/v1.7.2.tar.gz -> libconfig-1.7.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ff5c1ea41ef13e5db35f5d3279dc8a71
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.7.3 b/metadata/md5-cache/dev-libs/libconfig-1.7.3
index 62d7c24b82c5..620e552f4434 100644
--- a/metadata/md5-cache/dev-libs/libconfig-1.7.3
+++ b/metadata/md5-cache/dev-libs/libconfig-1.7.3
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~
 LICENSE=LGPL-2.1
 SLOT=0/11
 SRC_URI=https://github.com/hyperrealm/libconfig/archive/v1.7.3.tar.gz -> libconfig-1.7.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=db8cd20d2fbe71b2f2077f8740550481
diff --git a/metadata/md5-cache/dev-libs/libdaemon-0.14-r3 b/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
index e81141b5e0a3..596c7c594022 100644
--- a/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
+++ b/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x8
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cb9926170819c815bbbecdfd9ea0b1ed
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.42.0 b/metadata/md5-cache/dev-libs/libdazzle-3.42.0
index 06ecec653abb..5ab309fc117f 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.42.0
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.42.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introsp
 DESCRIPTION=Experimental new features for GTK+ and GLib
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
+INHERIT=gnome.org meson xdg vala virtualx
 IUSE=gtk-doc +introspection test +vala test
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.42/libdazzle-3.42.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1515554facc7130567a5f61165f13bb4
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.44.0 b/metadata/md5-cache/dev-libs/libdazzle-3.44.0
index 48eaea9f5a8d..c9c6991e754b 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.44.0
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.44.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introsp
 DESCRIPTION=Experimental new features for GTK+ and GLib
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
+INHERIT=gnome.org meson vala virtualx
 IUSE=gtk-doc +introspection test +vala test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3+
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.44/libdazzle-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=fe348eba9b75979577f5dfa872206c71
diff --git a/metadata/md5-cache/dev-libs/libdbh-5.0.22 b/metadata/md5-cache/dev-libs/libdbh-5.0.22
index b8ec7965163a..160000dae142 100644
--- a/metadata/md5-cache/dev-libs/libdbh-5.0.22
+++ b/metadata/md5-cache/dev-libs/libdbh-5.0.22
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=mirror://sourceforge/dbh/dbh/5.0.22/libdbh2-5.0.22.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e9d950f36f81acbc18d95e8402a072ea
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1 b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1
index fa21ef3a1ae8..e9505310d03f 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=Library to pass menu structure across DBus
 EAPI=6
 HOMEPAGE=https://launchpad.net/libdbusmenu
+INHERIT=autotools flag-o-matic multilib-minimal vala virtualx xdg-utils
 IUSE=debug gtk gtk3 +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1 LGPL-3
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/dbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5f91fbe15cb7ea4bb87baf1b856c1a0f
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
index 3c0c19e71fbb..6a74259e5130 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 DESCRIPTION=Library providing Qt implementation of DBusMenu specification
 EAPI=7
 HOMEPAGE=https://launchpad.net/libdbusmenu-qt/
+INHERIT=cmake
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1df8845d0416ea29007ac291c30d3b14
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1 b/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
index 34ab5dae047e..20ae6ee171f6 100644
--- a/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
@@ -4,10 +4,11 @@ DEPEND=!gnustep-base/libobjc2
 DESCRIPTION=A library for concurrent code execution on multicore hardware
 EAPI=7
 HOMEPAGE=https://github.com/apple/swift-corelibs-libdispatch
+INHERIT=flag-o-matic cmake toolchain-funcs
 KEYWORDS=amd64 ~arm64 ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=!gnustep-base/libobjc2
 SLOT=0
 SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3.3-RELEASE.tar.gz -> libdispatch-5.3.3.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4fabf47abebbf1920ffee9deb5199b4f
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.5 b/metadata/md5-cache/dev-libs/libdispatch-5.5
index 37033d7169c9..8243ad83f782 100644
--- a/metadata/md5-cache/dev-libs/libdispatch-5.5
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.5
@@ -4,10 +4,11 @@ DEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 DESCRIPTION=A library for concurrent code execution on multicore hardware
 EAPI=8
 HOMEPAGE=https://github.com/apple/swift-corelibs-libdispatch
+INHERIT=flag-o-matic cmake toolchain-funcs
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 SLOT=0
 SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.5-RELEASE.tar.gz -> libdispatch-5.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bb5558ede7fac470b4892209e2e47cb2
diff --git a/metadata/md5-cache/dev-libs/libdivecomputer-9999 b/metadata/md5-cache/dev-libs/libdivecomputer-9999
index b99b5a1c5a87..02d1973bac87 100644
--- a/metadata/md5-cache/dev-libs/libdivecomputer-9999
+++ b/metadata/md5-cache/dev-libs/libdivecomputer-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 bluetooth? ( net-wireless/bluez )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1bc116481333e5f7c2d4391810e5a162
diff --git a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1 b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
index 0a1a48089c98..af1337185440 100644
--- a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare pretend setup test
 DESCRIPTION=Suffix-sorting library (for BWT)
 EAPI=7
 HOMEPAGE=https://github.com/y-256/libdivsufsort
+INHERIT=cmake toolchain-funcs
 IUSE=openmp
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/y-256/libdivsufsort/archive/2.0.1.tar.gz -> libdivsufsort-2.0.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9a24fe8aae92fa91ece5c4b619668550
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r2 b/metadata/md5-cache/dev-libs/libdnet-1.14-r2
index aea5ce67a0aa..1ecd6166f5c3 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r2
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14-r2
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=simplified, portable interface to several low-level networking routines
 EAPI=7
 HOMEPAGE=https://github.com/ofalk/libdnet
+INHERIT=autotools distutils-r1
 IUSE=python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3cf7717987ce06a528e5ef4f71ec07de
diff --git a/metadata/md5-cache/dev-libs/libdnsres-0.1a-r3 b/metadata/md5-cache/dev-libs/libdnsres-0.1a-r3
index 1b88095e0389..c4e624ea65a8 100644
--- a/metadata/md5-cache/dev-libs/libdnsres-0.1a-r3
+++ b/metadata/md5-cache/dev-libs/libdnsres-0.1a-r3
@@ -10,5 +10,5 @@ LICENSE=BSD-4
 RDEPEND=dev-libs/libevent
 SLOT=0
 SRC_URI=https://www.monkey.org/~provos/libdnsres-0.1a.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=32697be0ce243d50f4b34357b5457782
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1 b/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
index 322a5aa5eeaf..62fe94d1f6c3 100644
--- a/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
+++ b/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/c-blosc:0= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-li
 DESCRIPTION=C++ dynamic multi-dimensionnal array library with Python exposure
 EAPI=7
 HOMEPAGE=http://libdynd.org
+INHERIT=cmake cuda
 IUSE=cuda doc fftw test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/c-blosc:0= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-l
 RESTRICT=!test? ( test )
 SLOT=0/0.7.2
 SRC_URI=https://github.com/libdynd/libdynd/archive/v0.7.2.tar.gz -> libdynd-0.7.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b350142359c0e8dfb39dccb3903c88dc
diff --git a/metadata/md5-cache/dev-libs/libebml-1.4.2 b/metadata/md5-cache/dev-libs/libebml-1.4.2
index ff8f12bb894a..b6ce1b16934a 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.4.2
+++ b/metadata/md5-cache/dev-libs/libebml-1.4.2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extensible binary format library (kinda like XML)
 EAPI=7
 HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libebml/
+INHERIT=cmake
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.4.2.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fdc75cf6cfb2f1c9eb4623b444038efe
diff --git a/metadata/md5-cache/dev-libs/libedit-20210419.3.1 b/metadata/md5-cache/dev-libs/libedit-20210419.3.1
index 4338ed514967..f8c1d1fb7336 100644
--- a/metadata/md5-cache/dev-libs/libedit-20210419.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20210419.3.1
@@ -3,11 +3,12 @@ DEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=BSD replacement for libreadline
 EAPI=7
 HOMEPAGE=https://thrysoee.dk/editline/
+INHERIT=multilib-minimal usr-ldscript
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://thrysoee.dk/editline/libedit-20210419-3.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=097dda2ec33ec673ac636d09f941ade7
+_md5_=61a84c5b202d9fae59e3a01f9473cd7a
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
index e0710c27402d..e054dedfc92b 100644
--- a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
@@ -3,11 +3,12 @@ DEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-
 DESCRIPTION=A ELF object file access library
 EAPI=6
 HOMEPAGE=http://www.mr511.de/software/
+INHERIT=autotools multilib-minimal
 IUSE=debug nls 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 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=!dev-libs/elfutils
 SLOT=0
 SRC_URI=http://www.mr511.de/software/libelf-0.8.13.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=800d674bc07ae5469dca545808b9d19e
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r3 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r3
new file mode 100644
index 000000000000..78bd514782c2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r3
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/elfutils
+DESCRIPTION=A ELF object file access library
+EAPI=8
+HOMEPAGE=http://www.mr511.de/software/
+IUSE=debug nls 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2
+RDEPEND=!dev-libs/elfutils
+SLOT=0
+SRC_URI=http://www.mr511.de/software/libelf-0.8.13.tar.gz
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=3ebbb068072feb628e72e930945be637
diff --git a/metadata/md5-cache/dev-libs/liberasurecode-1.6.2 b/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
index 872cce5923fd..71e9b7e41b3d 100644
--- a/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
+++ b/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
@@ -3,10 +3,11 @@ DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20
 DESCRIPTION=Erasure Code API library written in C with pluggable Erasure Code backends
 EAPI=6
 HOMEPAGE=https://bitbucket.org/tsg-/liberasurecode/overview
+INHERIT=autotools
 IUSE=doc static-libs
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/openstack/liberasurecode/archive/1.6.2.tar.gz -> liberasurecode-1.6.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c6c88199c35a542631bb25ba77366c94
diff --git a/metadata/md5-cache/dev-libs/liberasurecode-1.6.3 b/metadata/md5-cache/dev-libs/liberasurecode-1.6.3
index e362ea7ccffb..89fad88d14b6 100644
--- a/metadata/md5-cache/dev-libs/liberasurecode-1.6.3
+++ b/metadata/md5-cache/dev-libs/liberasurecode-1.6.3
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/openstack/liberasurecode/archive/1.6.3.tar.gz -> liberasurecode-1.6.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a3497d1ffc47c6ef54408f39f2895c10
diff --git a/metadata/md5-cache/dev-libs/libestr-0.1.11 b/metadata/md5-cache/dev-libs/libestr-0.1.11
index 539e949bf154..c222635fa844 100644
--- a/metadata/md5-cache/dev-libs/libestr-0.1.11
+++ b/metadata/md5-cache/dev-libs/libestr-0.1.11
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libestr.adiscon.com/files/download/libestr-0.1.11.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=207c02ae1f89bcf2136f680cdf89dce0
diff --git a/metadata/md5-cache/dev-libs/libev-4.33 b/metadata/md5-cache/dev-libs/libev-4.33
index cf250f9673f7..8c8be4a71bdb 100644
--- a/metadata/md5-cache/dev-libs/libev-4.33
+++ b/metadata/md5-cache/dev-libs/libev-4.33
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=7
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
+INHERIT=autotools multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( BSD GPL-2 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.33.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=78f9eb2ecf4ca4ca0976168147a7a216
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=cb31ebf91244f5d42a5ef323eb302c6b
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.12.0 b/metadata/md5-cache/dev-libs/libevdev-1.12.0
index 678e05c4d01f..1c24b7c917d0 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.12.0
+++ b/metadata/md5-cache/dev-libs/libevdev-1.12.0
@@ -4,11 +4,12 @@ DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 DESCRIPTION=Handler library for evdev events
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
+INHERIT=meson-multilib python-any-r1
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.12.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=55b0bb4128728b76fc505a95f41906a6
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.12.1 b/metadata/md5-cache/dev-libs/libevdev-1.12.1
index 5ad5f715b6ef..91c26278bf5b 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.12.1
+++ b/metadata/md5-cache/dev-libs/libevdev-1.12.1
@@ -4,11 +4,12 @@ DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 DESCRIPTION=Handler library for evdev events
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
+INHERIT=meson-multilib python-any-r1
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.12.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=83ddf2471bac5e5e4917a5b6187b9c3d
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=df032e1d4135bc8e1b20760522baf02d
diff --git a/metadata/md5-cache/dev-libs/libevdev-9999 b/metadata/md5-cache/dev-libs/libevdev-9999
index 0bee0b0a02bb..dd0ac6ba6608 100644
--- a/metadata/md5-cache/dev-libs/libevdev-9999
+++ b/metadata/md5-cache/dev-libs/libevdev-9999
@@ -4,10 +4,11 @@ DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 DESCRIPTION=Handler library for evdev events
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
+INHERIT=meson-multilib python-any-r1 git-r3
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ff97f092c664c1b8586694e6b5cdbf07
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.12 b/metadata/md5-cache/dev-libs/libevent-2.1.12
index 105cb8a3c743..42b98a2dd0c0 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.12
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.12
@@ -4,12 +4,13 @@ DEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=Library to execute a function when a specific event occurs on a file descriptor
 EAPI=7
 HOMEPAGE=https://libevent.org/ https://github.com/libevent/libevent/
+INHERIT=libtool multilib-minimal
 IUSE=+clock-gettime debug malloc-replacement +ssl static-libs test +threads verbose-debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=dev-libs/9libs-1.0
 RESTRICT=!test? ( test )
 SLOT=0/2.1-7
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz -> libevent-2.1.12.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b0080191e45e568e94f416166d7705ee
+_md5_=0f5c662310864e2f54e603391004a0fe
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.9999 b/metadata/md5-cache/dev-libs/libevent-2.1.9999
index 64126fc6247a..d92abf5dbd1e 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.9999
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=dev-libs/9libs-1.0
 RESTRICT=test
 SLOT=0/2.1-7
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=dfe2458a0b8fa17924bea4f58c95c785
diff --git a/metadata/md5-cache/dev-libs/libevent-9999 b/metadata/md5-cache/dev-libs/libevent-9999
index 21d8f914673a..9ee28aa05295 100644
--- a/metadata/md5-cache/dev-libs/libevent-9999
+++ b/metadata/md5-cache/dev-libs/libevent-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=mbedtls? ( net-libs/mbedtls ) ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=dev-libs/9libs-1.0
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e37aed441457167175aac24c45a37e4c
diff --git a/metadata/md5-cache/dev-libs/libezV24-0.1.1-r2 b/metadata/md5-cache/dev-libs/libezV24-0.1.1-r2
new file mode 100644
index 000000000000..8aed9464dda4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libezV24-0.1.1-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=library that provides an easy API to Linux serial ports
+EAPI=8
+HOMEPAGE=http://ezv24.sourceforge.net
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/ezv24/libezV24-0.1.1.tar.gz
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=21a9d7f2ba6a42a89b62ca1fb79ad440
diff --git a/metadata/md5-cache/dev-libs/libfastjson-0.99.8 b/metadata/md5-cache/dev-libs/libfastjson-0.99.8
index 994c6d20b2a9..2d88d8f77bf1 100644
--- a/metadata/md5-cache/dev-libs/libfastjson-0.99.8
+++ b/metadata/md5-cache/dev-libs/libfastjson-0.99.8
@@ -3,10 +3,11 @@ DEPEND=>=sys-devel/autoconf-archive-2015.02.04 sys-devel/gnuconfig >=app-portage
 DESCRIPTION=Fork of the json-c library, which is optimized for liblognorm processing
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/tag/libfastjson/
+INHERIT=autotools
 IUSE=static-libs
 KEYWORDS=amd64 arm arm64 ~hppa sparc x86
 LICENSE=MIT
 SLOT=0/4.2.0
 SRC_URI=http://download.rsyslog.com/libfastjson/libfastjson-0.99.8.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=02bd3ede9674c1c7b63746fcf3e54358
diff --git a/metadata/md5-cache/dev-libs/libfastjson-0.99.9 b/metadata/md5-cache/dev-libs/libfastjson-0.99.9
index 420f266b1fa9..2230e95becb4 100644
--- a/metadata/md5-cache/dev-libs/libfastjson-0.99.9
+++ b/metadata/md5-cache/dev-libs/libfastjson-0.99.9
@@ -3,10 +3,11 @@ DEPEND=>=sys-devel/autoconf-archive-2015.02.04 sys-devel/gnuconfig >=app-portage
 DESCRIPTION=Fork of the json-c library, which is optimized for liblognorm processing
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/tag/libfastjson/
+INHERIT=autotools
 IUSE=static-libs
 KEYWORDS=amd64 arm arm64 ~hppa sparc x86
 LICENSE=MIT
 SLOT=0/4.3.0
 SRC_URI=http://download.rsyslog.com/libfastjson/libfastjson-0.99.9.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6556a16cc515e1f7781ce310e980f593
diff --git a/metadata/md5-cache/dev-libs/libffi-3.4.2-r1 b/metadata/md5-cache/dev-libs/libffi-3.4.2-r1
index aaba6f4df13d..0b7c661b8067 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.4.2-r1
+++ b/metadata/md5-cache/dev-libs/libffi-3.4.2-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test
 DESCRIPTION=a portable, high level programming interface to various calling conventions
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
-IUSE=debug exec-static-trampoline pax-kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+IUSE=debug exec-static-trampoline experimental-loong pax-kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/8
-SRC_URI=https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz
+SRC_URI=https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/libffi-3.4.2-loongarch64-20220428.patch.xz )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=712dbe584197b9865eb11a186d4eba0d
+_md5_=17e673288933123934c556f2008d1fa4
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.10.0 b/metadata/md5-cache/dev-libs/libfido2-1.10.0
index e25eda0ebf4a..7edb8ccc3a14 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.10.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.10.0
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libcbor:= dev-libs/openssl:= sys-libs/zlib:= virtual/libudev:=
 DESCRIPTION=Provides library functionality for FIDO 2.0
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/libfido2
+INHERIT=cmake udev linux-info
 IUSE=nfc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= dev-libs/openssl:= sys-libs/zlib:= virtual/libudev:= acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.10.0.tar.gz -> libfido2-1.10.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9bb685f818c86b5813254f98815de2d3
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c92c8cfa5ef1588f0d9852a96578a582
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.8.0 b/metadata/md5-cache/dev-libs/libfido2-1.8.0
index 7af8083d8814..25208969e6ae 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.8.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.8.0
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:=
 DESCRIPTION=Provides library functionality for FIDO 2.0
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/libfido2
+INHERIT=cmake udev linux-info
 IUSE=nfc static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:= acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.8.0.tar.gz -> libfido2-1.8.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=85f6ad9ab182e1c6d70fd854c0283b0a
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.9.0 b/metadata/md5-cache/dev-libs/libfido2-1.9.0
index 0c4be14ecef8..27ed61b55ec4 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.9.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.9.0
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:=
 DESCRIPTION=Provides library functionality for FIDO 2.0
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/libfido2
+INHERIT=cmake udev linux-info
 IUSE=nfc static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:= acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.9.0.tar.gz -> libfido2-1.9.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b4a0214ab37486851b11dbc8c7ce2043
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.27.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.27.1
deleted file mode 100644
index 7a26a55c5049..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
-RESTRICT=!test? ( test )
-SLOT=0/12
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.27.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=324502d8ecc9ac97148cee5a0465ddeb
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.28.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.28.0
deleted file mode 100644
index 1096293350b3..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.28.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
-RESTRICT=!test? ( test )
-SLOT=0/13
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.28.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6d0fd64716c770eee4f1d252065159e6
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.30.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.30.0
deleted file mode 100644
index f9a16fdad23d..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.30.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
-RESTRICT=!test? ( test )
-SLOT=0/15
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.30.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4d2979cf5b6a56456882a63bb80ac03f
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.31.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.31.1
deleted file mode 100644
index f35d71c68a9c..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.31.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.31.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9e4e07b482878baf233a073601a0ee9b
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.34.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.34.0
deleted file mode 100644
index 78a1f25565a3..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.34.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:=
-RESTRICT=!test? ( test )
-SLOT=0/21
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.34.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8c1edc0f0f654eda1c2f0fcff441d173
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.34.2 b/metadata/md5-cache/dev-libs/libfilezilla-0.34.2
deleted file mode 100644
index 69e1764e0ccc..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.34.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install pretend
-DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:= test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:=
-RESTRICT=!test? ( test )
-SLOT=0/22
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.34.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6ac7c929efbcd437ae12fed5fb8bf5e0
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.36.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.36.0
index 66a6700faf94..9493d4ab3f28 100644
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.36.0
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.36.0
@@ -4,11 +4,11 @@ DESCRIPTION=C++ library offering some basic functionality for platform-independe
 EAPI=8
 HOMEPAGE=https://lib.filezilla-project.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:=
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.36.0.tar.bz2
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a3e18f81ecad5b186b429ea4a7804565
+_md5_=011beb356053fb7fe3993ad4909bc882
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.37.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.37.1-r1
index ff6b2615e3ce..9895f5439261 100644
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.37.1
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.37.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ library offering some basic functionality for platform-independe
 EAPI=8
 HOMEPAGE=https://lib.filezilla-project.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:=
 RESTRICT=!test? ( test )
-SLOT=0/24
+SLOT=0/25
 SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.37.1.tar.bz2
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a3e18f81ecad5b186b429ea4a7804565
+_md5_=b56fc478f74a08d0b388d1064122d2d2
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.35.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.37.2
index b50d8f1af4d2..03fdebbf59cb 100644
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.35.0
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.37.2
@@ -3,12 +3,13 @@ DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:= test? ( d
 DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
 EAPI=8
 HOMEPAGE=https://lib.filezilla-project.org/
+INHERIT=flag-o-matic
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:=
 RESTRICT=!test? ( test )
-SLOT=0/23
-SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.35.0.tar.bz2
+SLOT=0/25
+SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.37.2.tar.bz2
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=63a9c8477e59ebc5e7e05af602615db6
+_md5_=b56fc478f74a08d0b388d1064122d2d2
diff --git a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009 b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
index 875ca36450f6..e46d606c0f69 100644
--- a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
+++ b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
@@ -4,11 +4,12 @@ DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit )
 DESCRIPTION=Struct of arrays library with object oriented interface for C++
 EAPI=7
 HOMEPAGE=http://www.libgeodecomp.org/libflatarray.html https://github.com/STEllAR-GROUP/libflatarray
+INHERIT=cmake cuda
 IUSE=cuda examples test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/libflatarray/archive/c8df37f6ac73250998b90c397458469902d6d9b9.tar.gz -> libflatarray-0.4.0_pre20201009.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=53e4733346863f16ccb5eed2e5677080
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.1.2 b/metadata/md5-cache/dev-libs/libfmt-7.1.2
index 3604c33983f8..90a4ed8d47db 100644
--- a/metadata/md5-cache/dev-libs/libfmt-7.1.2
+++ b/metadata/md5-cache/dev-libs/libfmt-7.1.2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/fmtlib/fmt/archive/7.1.2.tar.gz -> libfmt-7.1.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3e71a6228c18dc01b777e48837990eee
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.1.3 b/metadata/md5-cache/dev-libs/libfmt-7.1.3
index 0493fc5ebce8..cf9f2a7ce148 100644
--- a/metadata/md5-cache/dev-libs/libfmt-7.1.3
+++ b/metadata/md5-cache/dev-libs/libfmt-7.1.3
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz -> libfmt-7.1.3.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3e71a6228c18dc01b777e48837990eee
diff --git a/metadata/md5-cache/dev-libs/libfmt-8.0.0-r1 b/metadata/md5-cache/dev-libs/libfmt-8.0.0-r1
index 46c5394f3bda..b372afb44bd1 100644
--- a/metadata/md5-cache/dev-libs/libfmt-8.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libfmt-8.0.0-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/fmtlib/fmt/archive/8.0.0.tar.gz -> libfmt-8.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f24d925e10c3b979a3a30cc34fc0ea7e
diff --git a/metadata/md5-cache/dev-libs/libfmt-8.0.1-r1 b/metadata/md5-cache/dev-libs/libfmt-8.0.1-r1
index 7f4882d0debf..2be95daaa70f 100644
--- a/metadata/md5-cache/dev-libs/libfmt-8.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libfmt-8.0.1-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/8.0.1
 SRC_URI=https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz -> libfmt-8.0.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=15ede8ec85e393c1f9d87baac720724b
diff --git a/metadata/md5-cache/dev-libs/libfmt-8.1.1 b/metadata/md5-cache/dev-libs/libfmt-8.1.1
index 801b81ebebaf..42df0be3e8d0 100644
--- a/metadata/md5-cache/dev-libs/libfmt-8.1.1
+++ b/metadata/md5-cache/dev-libs/libfmt-8.1.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/8.1.1
 SRC_URI=https://github.com/fmtlib/fmt/archive/8.1.1.tar.gz -> libfmt-8.1.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=baccc7180ec94d6543e1af6b80e6be91
diff --git a/metadata/md5-cache/dev-libs/libfmt-8.1.1-r1 b/metadata/md5-cache/dev-libs/libfmt-8.1.1-r1
index bac69e80c987..d13136f67a77 100644
--- a/metadata/md5-cache/dev-libs/libfmt-8.1.1-r1
+++ b/metadata/md5-cache/dev-libs/libfmt-8.1.1-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/8.1.1
 SRC_URI=https://github.com/fmtlib/fmt/archive/8.1.1.tar.gz -> libfmt-8.1.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8d0f3a26a3267812d329f65a80769439
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=52aef8e1aeb8a2e43a7e357a7f0105bf
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
index a66c489fe6db..f9bcf76812b2 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9999
+++ b/metadata/md5-cache/dev-libs/libfmt-9999
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
+INHERIT=cmake-multilib git-r3
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=baccc7180ec94d6543e1af6b80e6be91
diff --git a/metadata/md5-cache/dev-libs/libfstrcmp-0.7 b/metadata/md5-cache/dev-libs/libfstrcmp-0.7
index f17e2652b4a4..d3bed388e01b 100644
--- a/metadata/md5-cache/dev-libs/libfstrcmp-0.7
+++ b/metadata/md5-cache/dev-libs/libfstrcmp-0.7
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> libfstrcmp-0.7.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=231fb413085bb325f1ca3884c6a13400
diff --git a/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1 b/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
index 9468074a4d93..2308544afb98 100644
--- a/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
+++ b/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> libfstrcmp-0.7.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5bf69657b17a076fb3d60167bfdb8293
diff --git a/metadata/md5-cache/dev-libs/libg15-9999 b/metadata/md5-cache/dev-libs/libg15-9999
index b7f6c7f090a4..22094fa8562d 100644
--- a/metadata/md5-cache/dev-libs/libg15-9999
+++ b/metadata/md5-cache/dev-libs/libg15-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:0
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9a1ef09fc0454d59ac09e978b429c469
diff --git a/metadata/md5-cache/dev-libs/libg15render-1.2-r2 b/metadata/md5-cache/dev-libs/libg15render-1.2-r2
index 9c6dfe81d596..034546e55218 100644
--- a/metadata/md5-cache/dev-libs/libg15render-1.2-r2
+++ b/metadata/md5-cache/dev-libs/libg15render-1.2-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libg15 truetype? ( media-libs/freetype )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15tools/libg15render-1.2.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d30131e924969d3461fbef5c828dc88a
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
index c3fbcb90217b..8232271ee26b 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
@@ -3,6 +3,7 @@ DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 sys-devel/gnuconfig >=app-portage
 DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=6
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
+INHERIT=autotools epatch gnome.org multilib-minimal
 IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
@@ -10,5 +11,5 @@ RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=24bf9aaf515d0ec5b76167f85e3381a0
diff --git a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1 b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
index fb2ec412f9f1..a35138a1f564 100644
--- a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
+++ b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
@@ -4,11 +4,12 @@ DEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/ca
 DESCRIPTION=Provides functionality for gaming input devices
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/libgaminggear/
+INHERIT=cmake xdg
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/cairo x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/libgaminggear/libgaminggear-0.15.1.tar.bz2
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=964033e2a1813d100a1305d104c5960b
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1 b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1
index cbdae7b4f7ff..96bee0ad4a09 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1
@@ -4,12 +4,13 @@ DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/
-IUSE=+asm custom-cflags cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
+IUSE=+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 ) cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a3e86be10940517da31821d58f6ee813
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f3e5f6a70812062341a5924db5ff5d17
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.8 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.8
index 473e7ce3beba..ddc0f06d7d3c 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.8
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.8
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/
-IUSE=doc o-flag-munging static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
+IUSE=+asm doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.8.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5e82269317538e022315b459b5a6aea8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ea4b6817a63955648c42abbcab3a69c4
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.9 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.9
index d09e7ff3295e..c67511e65a57 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.9
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.9
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/
-IUSE=doc o-flag-munging static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
+IUSE=+asm doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.9.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.8.9.tar.bz2.sig )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ba83365d55462e8145068381c6acb294
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=1c7ad2d15775fe7e3ff0388c78753e43
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r1
index df1ad860c891..e8ed9b79a148 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r1
@@ -4,12 +4,13 @@ DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/
-IUSE=+asm custom-cflags cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
+IUSE=+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 ) cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6fb535fadf324735f57d8917582afdc4
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=e55c01adcd686550ad2130c0dbfe32d1
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6 b/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
index 3a5864f9ca9d..eab40b545f67 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
+++ b/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libgcrypt:0/11 !dev-libs/libgcrypt:11/11
 SLOT=11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.6.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2407a0041665ec9de836c5402e45deb0
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.18.1 b/metadata/md5-cache/dev-libs/libgdata-0.18.1
index 59920a27e72f..48d0ad47e599 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.18.1
+++ b/metadata/md5-cache/dev-libs/libgdata-0.18.1
@@ -1,9 +1,10 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5.0 >=x11-libs/gdk-pixbuf-2.14:2 ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5.0 >=x11-libs/gdk-pixbuf-2.14:2 ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
+INHERIT=gnome.org gnome2-utils meson vala xdg
 IUSE=+crypt gnome-online-accounts gtk-doc +introspection test vala
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.18/libgdata-0.18.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=109f4c7f4d99f418999232b21992943d
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c1e80ced43d887587de301259ce6fd82
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.3.0 b/metadata/md5-cache/dev-libs/libgit2-1.3.0
index 62c61188ba12..a8bfafce0694 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.3.0
+++ b/metadata/md5-cache/dev-libs/libgit2-1.3.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:
 DESCRIPTION=A linkable library for Git
 EAPI=8
 HOMEPAGE=https://libgit2.org
+INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.3.0.tar.gz -> libgit2-1.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9e4d1fd36c898cd6dbcb4218f79f8b3f
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.3.1 b/metadata/md5-cache/dev-libs/libgit2-1.3.1
index 9e74068ce44b..dee84b5d55ff 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.3.1
+++ b/metadata/md5-cache/dev-libs/libgit2-1.3.1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:
 DESCRIPTION=A linkable library for Git
 EAPI=8
 HOMEPAGE=https://libgit2.org/
+INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.3.1.tar.gz -> libgit2-1.3.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9303046d29cdb488368222cef321b854
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.4.2 b/metadata/md5-cache/dev-libs/libgit2-1.4.2
index cc53968f8db2..ad78401f597e 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.4.2
+++ b/metadata/md5-cache/dev-libs/libgit2-1.4.2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:
 DESCRIPTION=A linkable library for Git
 EAPI=8
 HOMEPAGE=https://libgit2.org
+INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl
 RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.4.2.tar.gz -> libgit2-1.4.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=11d3ac380002b57d43a2608dcb4a441d
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.4.2-r1 b/metadata/md5-cache/dev-libs/libgit2-1.4.2-r1
index 60a94bb9e7e7..081ad2a0abd7 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.4.2-r1
+++ b/metadata/md5-cache/dev-libs/libgit2-1.4.2-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl
 DESCRIPTION=A linkable library for Git
 EAPI=8
 HOMEPAGE=https://libgit2.org
+INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openss
 RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.4.2.tar.gz -> libgit2-1.4.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c2207392f56ef26c9b0dbb67d99a7f8d
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.4.3 b/metadata/md5-cache/dev-libs/libgit2-1.4.3
index 9d2ae21b51b1..1aec84255779 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.4.3
+++ b/metadata/md5-cache/dev-libs/libgit2-1.4.3
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl
 DESCRIPTION=A linkable library for Git
 EAPI=8
 HOMEPAGE=https://libgit2.org/
+INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openss
 RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.4.3.tar.gz -> libgit2-1.4.3.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=87041986027ad6688c2a1bb6212a0b71
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-1.0.0.1 b/metadata/md5-cache/dev-libs/libgit2-glib-1.0.0.1
index df60ae73fbde..b02ba669cd7e 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-1.0.0.1
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-1.0.0.1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/gobject-introspection-1.54:= >=dev-libs/glib-2.44.0:2 >=dev-li
 DESCRIPTION=Git library for GLib
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
+INHERIT=gnome.org meson python-r1 vala xdg
 IUSE=gtk-doc python +ssh +vala python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/gobject-introspection-1.54:= >=dev-libs/glib-2.44.0:2 >=dev-l
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/1.0/libgit2-glib-1.0.0.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0b28796edbad095ba6577466d78a747d
diff --git a/metadata/md5-cache/dev-libs/libgnome-games-support-1.8.2 b/metadata/md5-cache/dev-libs/libgnome-games-support-1.8.2
index e9361fe659c4..e2fd48be6138 100644
--- a/metadata/md5-cache/dev-libs/libgnome-games-support-1.8.2
+++ b/metadata/md5-cache/dev-libs/libgnome-games-support-1.8.2
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.19
 DESCRIPTION=Library for code common to GNOME games
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libgnome-games-support
+INHERIT=gnome.org meson vala xdg
 KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.19.2:3
 SLOT=1/3
 SRC_URI=mirror://gnome/sources/libgnome-games-support/1.8/libgnome-games-support-1.8.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d27fd5fb9ef8b5941a1869e779740f64
diff --git a/metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0 b/metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0
index 9a0f8a86658a..e0de10d9dbe5 100644
--- a/metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0
+++ b/metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.2:4
 DESCRIPTION=Library for code common to GNOME games
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libgnome-games-support
+INHERIT=gnome.org meson vala xdg
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.2:4
 SLOT=2/4
 SRC_URI=mirror://gnome/sources/libgnome-games-support/2.0/libgnome-games-support-2.0.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f65b9f4c31ba850fb5d729ce45ea34b5
diff --git a/metadata/md5-cache/dev-libs/libgnt-2.14.2 b/metadata/md5-cache/dev-libs/libgnt-2.14.2
index 4ffa4e95d847..7a6b4f71b61f 100644
--- a/metadata/md5-cache/dev-libs/libgnt-2.14.2
+++ b/metadata/md5-cache/dev-libs/libgnt-2.14.2
@@ -4,11 +4,12 @@ DEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:
 DESCRIPTION=Pidgin's GLib Ncurses Toolkit
 EAPI=7
 HOMEPAGE=https://keep.imfreedom.org/libgnt/libgnt
+INHERIT=meson
 IUSE=doc
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/libgnt-2.14.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=72b3f108e12d26ac62e69c244863d4d8
diff --git a/metadata/md5-cache/dev-libs/libgnt-2.14.3 b/metadata/md5-cache/dev-libs/libgnt-2.14.3
index fac57e4ac4d1..6d01ee9dd1c2 100644
--- a/metadata/md5-cache/dev-libs/libgnt-2.14.3
+++ b/metadata/md5-cache/dev-libs/libgnt-2.14.3
@@ -4,11 +4,12 @@ DEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:
 DESCRIPTION=Pidgin's GLib Ncurses Toolkit
 EAPI=8
 HOMEPAGE=https://keep.imfreedom.org/libgnt/libgnt
+INHERIT=meson
 IUSE=doc
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/libgnt-2.14.3.tar.xz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=094c57dbf8073edae7e7270989147980
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.42 b/metadata/md5-cache/dev-libs/libgpg-error-1.42
index 247df5b9662c..815e58eca789 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.42
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.42
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.42.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1a5ddba1d62b91bb75c1a933c2507e5c
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.44 b/metadata/md5-cache/dev-libs/libgpg-error-1.44
index d14e98f2355a..6fb51bf1a38e 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.44
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.44
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.44.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=62a3ce110a5a26b23c2bbb30654fdf7a
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.45 b/metadata/md5-cache/dev-libs/libgpg-error-1.45
index 9fa088a6c5c7..006d50b25c0d 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.45
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.45
@@ -5,10 +5,10 @@ DESCRIPTION=Contains error handling functions used by GnuPG software
 EAPI=8
 HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error
 IUSE=common-lisp nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.45.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=62a3ce110a5a26b23c2bbb30654fdf7a
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=20c1fd7b0ccc6a969a4939f89a179d71
diff --git a/metadata/md5-cache/dev-libs/libgudev-236 b/metadata/md5-cache/dev-libs/libgudev-236
index fceb519ba4d9..bd2629c4d07b 100644
--- a/metadata/md5-cache/dev-libs/libgudev-236
+++ b/metadata/md5-cache/dev-libs/libgudev-236
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=GObject bindings for libudev
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
+INHERIT=meson-multilib
 IUSE=introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 SLOT=0/0
 SRC_URI=https://download.gnome.org/sources/libgudev/236/libgudev-236.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=52c4526f9e00eaeaec63501a461ff549
diff --git a/metadata/md5-cache/dev-libs/libgudev-237-r1 b/metadata/md5-cache/dev-libs/libgudev-237-r1
index d856af8d9ecc..cda06c233fa6 100644
--- a/metadata/md5-cache/dev-libs/libgudev-237-r1
+++ b/metadata/md5-cache/dev-libs/libgudev-237-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=GObject bindings for libudev
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
+INHERIT=meson-multilib
 IUSE=introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://download.gnome.org/sources/libgudev/237/libgudev-237.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=18f48acc152bc2108d547f9de0eb0973
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.10 b/metadata/md5-cache/dev-libs/libgusb-0.3.10
index ea43ddb40a53..af345bb51fef 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.10
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.10
@@ -4,13 +4,14 @@ DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=GObject wrapper for libusb
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libgusb
+INHERIT=meson-multilib python-any-r1 vala
 IUSE=gtk-doc +introspection static-libs test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cc0e5a7c8a1d19c6db975aa54e0b5ac9
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=6f390d39685f6e227cec2bd4e7122486
diff --git a/metadata/md5-cache/dev-libs/libgweather-4.0.0 b/metadata/md5-cache/dev-libs/libgweather-4.0.0
index b22d3fdb2572..57c7d73e2de4 100644
--- a/metadata/md5-cache/dev-libs/libgweather-4.0.0
+++ b/metadata/md5-cache/dev-libs/libgweather-4.0.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.68.0:2 >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2
 DESCRIPTION=Location and timezone database and weather-lookup library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=gtk-doc +introspection test +vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=4/4-0
 SRC_URI=mirror://gnome/sources/libgweather/4.0/libgweather-4.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5e42afded88c737ca7a4034833ebf090
diff --git a/metadata/md5-cache/dev-libs/libgweather-40.0 b/metadata/md5-cache/dev-libs/libgweather-40.0
index f3f6029a49d5..8707e29dcf61 100644
--- a/metadata/md5-cache/dev-libs/libgweather-40.0
+++ b/metadata/md5-cache/dev-libs/libgweather-40.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-l
 DESCRIPTION=Location and timezone database and weather-lookup library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=glade gtk-doc +introspection +vala
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-16-2
 SRC_URI=mirror://gnome/sources/libgweather/40/libgweather-40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2c3b6c15bca4f489e0733e3847ef6189
diff --git a/metadata/md5-cache/dev-libs/libhid-0.2.17-r1 b/metadata/md5-cache/dev-libs/libhid-0.2.17-r1
index 9cf1a4e0fc49..79c5c34a0d30 100644
--- a/metadata/md5-cache/dev-libs/libhid-0.2.17-r1
+++ b/metadata/md5-cache/dev-libs/libhid-0.2.17-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=virtual/libusb:0=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~conikost/files/libhid-0.2.17.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0618020d5c951ceaf992d28635351616
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.12 b/metadata/md5-cache/dev-libs/libical-3.0.12
index df57a7e1a83e..baa01629a4d5 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.12
+++ b/metadata/md5-cache/dev-libs/libical-3.0.12
@@ -4,6 +4,7 @@ DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 ) glib?
 DESCRIPTION=Implementation of basic iCAL protocols
 EAPI=7
 HOMEPAGE=https://github.com/libical/libical
+INHERIT=cmake python-any-r1 vala
 IUSE=berkdb doc examples +glib +introspection static-libs test vala
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
@@ -12,5 +13,5 @@ REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.12/libical-3.0.12.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5b2328817c14ec7d3d7d8a93234883f8
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.14 b/metadata/md5-cache/dev-libs/libical-3.0.14
index fed1d5208dad..b335beffc052 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.14
+++ b/metadata/md5-cache/dev-libs/libical-3.0.14
@@ -4,6 +4,7 @@ DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 ) glib?
 DESCRIPTION=Implementation of basic iCAL protocols
 EAPI=7
 HOMEPAGE=https://github.com/libical/libical
+INHERIT=cmake python-any-r1 vala
 IUSE=berkdb doc examples +glib +introspection static-libs test vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
@@ -12,5 +13,5 @@ REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.14/libical-3.0.14.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4f19c8d5265d37625b1a9ee5e4f3c6fc
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.14-r1 b/metadata/md5-cache/dev-libs/libical-3.0.14-r1
new file mode 100644
index 000000000000..1522b31265d1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libical-3.0.14-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen[dot] glib? ( dev-util/gtk-doc ) ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) glib? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/icu:= glib? ( dev-libs/glib:2 ) glib? ( dev-libs/libxml2:2 )
+DESCRIPTION=Implementation of basic iCAL protocols
+EAPI=8
+HOMEPAGE=https://github.com/libical/libical
+INHERIT=cmake python-any-r1 vala
+IUSE=doc examples +glib +introspection static-libs test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=|| ( MPL-2.0 LGPL-2.1 )
+RDEPEND=dev-libs/icu:= glib? ( dev-libs/glib:2 ) sys-libs/timezone-data
+REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://github.com/libical/libical/releases/download/v3.0.14/libical-3.0.14.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3dafca973eb85be918daab0432578805
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3 b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
index 4ff63d788ff5..5d9add3f3129 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
@@ -3,6 +3,7 @@ DEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libdbusmenu[introspection?] d
 DESCRIPTION=Library to raise flags on DBus for other components of the desktop
 EAPI=6
 HOMEPAGE=https://launchpad.net/libindicate
+INHERIT=autotools flag-o-matic vala xdg-utils
 IUSE=gtk +introspection
 KEYWORDS=~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1 LGPL-3
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libdbusmenu[introspection?]
 RESTRICT=test
 SLOT=3
 SRC_URI=https://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e14799d039c13c396bbd1d8266ca5ca7
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
index 4882ec98ef75..64ff374535e1 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c39c1a7b357f576912474893b82e4731
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index 33d37d072531..2841c844f34c 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=34aca8e8e762eddc4a0f7af7dcd0f44a
diff --git a/metadata/md5-cache/dev-libs/libinput-1.19.3 b/metadata/md5-cache/dev-libs/libinput-1.19.3
index 006231421527..7ecf22c054ba 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.19.3
+++ b/metadata/md5-cache/dev-libs/libinput-1.19.3
@@ -4,6 +4,7 @@ DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) >=dev-libs/libevdev-1.9
 DESCRIPTION=Library to handle input devices in Wayland
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
+INHERIT=meson python-any-r1 udev
 IUSE=doc input_devices_wacom test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) >=dev-libs/libevdev-1.
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.19.3.tar.xz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=8f6df219e51ee3b89bc1975d4f258cdb
diff --git a/metadata/md5-cache/dev-libs/libinput-1.20.0 b/metadata/md5-cache/dev-libs/libinput-1.20.0
index 4eb60e9e16bf..df0c2edc6cb8 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.20.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.20.0
@@ -4,6 +4,7 @@ DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) >=dev-libs/libevdev-1.9
 DESCRIPTION=Library to handle input devices in Wayland
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
+INHERIT=meson python-any-r1 udev
 IUSE=doc input_devices_wacom test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) >=dev-libs/libevdev-1.
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.20.0/libinput-1.20.0.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=cfcdcf2fde5f59fe8474bae2007011ed
diff --git a/metadata/md5-cache/dev-libs/libinput-1.20.1 b/metadata/md5-cache/dev-libs/libinput-1.20.1
new file mode 100644
index 000000000000..cde7fbd6fea5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.20.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/commonmark[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/commonmark[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/commonmark[python_targets_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_8(-)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) >=dev-libs/libevdev-1.9.902 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
+INHERIT=meson python-any-r1 udev
+IUSE=doc input_devices_wacom test
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) >=dev-libs/libevdev-1.9.902 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.20.1/libinput-1.20.1.tar.gz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=5a5a9c736ee3ae37d99ba60b18c9ecf2
diff --git a/metadata/md5-cache/dev-libs/libixion-0.16.1 b/metadata/md5-cache/dev-libs/libixion-0.16.1
index db0f5d52ee84..9024efc34a9a 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.16.1
+++ b/metadata/md5-cache/dev-libs/libixion-0.16.1
@@ -3,6 +3,7 @@ DEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( python_single_target_pytho
 DESCRIPTION=General purpose formula parser & interpreter
 EAPI=7
 HOMEPAGE=https://gitlab.com/ixion/ixion
+INHERIT=python-single-r1
 IUSE=debug python +threads python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( python_single_target_pyth
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0/0.16
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.16.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cc3187cc378f33a0eda8e8ae0ac3ce11
diff --git a/metadata/md5-cache/dev-libs/libixion-0.17.0 b/metadata/md5-cache/dev-libs/libixion-0.17.0
index 061f6b6048da..0855bead6f8a 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.17.0
+++ b/metadata/md5-cache/dev-libs/libixion-0.17.0
@@ -3,6 +3,7 @@ DEPEND=dev-libs/boost:= dev-util/mdds:1/2.0 python? ( python_single_target_pytho
 DESCRIPTION=General purpose formula parser & interpreter
 EAPI=8
 HOMEPAGE=https://gitlab.com/ixion/ixion
+INHERIT=python-single-r1
 IUSE=debug python +threads python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-util/mdds:1/2.0 python? ( python_single_target_pyth
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0/0.17
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.17.0.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ad365bb865965b695acb7f79e96362b4
diff --git a/metadata/md5-cache/dev-libs/libixion-9999 b/metadata/md5-cache/dev-libs/libixion-9999
index 76f29881bba2..502cd6c82d89 100644
--- a/metadata/md5-cache/dev-libs/libixion-9999
+++ b/metadata/md5-cache/dev-libs/libixion-9999
@@ -4,11 +4,12 @@ DEPEND=dev-libs/boost:= dev-util/mdds:1/9999 python? ( python_single_target_pyth
 DESCRIPTION=General purpose formula parser & interpreter
 EAPI=8
 HOMEPAGE=https://gitlab.com/ixion/ixion
+INHERIT=python-single-r1 git-r3 autotools
 IUSE=debug python +threads python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-util/mdds:1/9999 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0/0.18
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9ca6188b577a5e23425a82756666a0b0
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.10 b/metadata/md5-cache/dev-libs/libjcat-0.1.10
index 926681cd124c..788ab28522b7 100644
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.10
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.10
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme:= dev-libs/li
 DESCRIPTION=Library and tool for reading and writing Jcat files
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libjcat
+INHERIT=meson python-any-r1 vala xdg-utils
 IUSE=+gpg gtk-doc +introspection +man +pkcs7 test vala
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme:= dev-libs/l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.10.tar.gz -> libjcat-0.1.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cd8a3233fe86926c815d0847dc7c4988
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2a7abc534d050948eaa69f787ace67d2
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.11 b/metadata/md5-cache/dev-libs/libjcat-0.1.11
index 3b08cd477419..8bfb1acc242a 100644
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.11
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.11
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme:= dev-libs/li
 DESCRIPTION=Library and tool for reading and writing Jcat files
 EAPI=8
 HOMEPAGE=https://github.com/hughsie/libjcat
+INHERIT=meson python-any-r1 vala xdg-utils
 IUSE=+gpg gtk-doc +introspection +man +pkcs7 test vala
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme:= dev-libs/l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.11.tar.gz -> libjcat-0.1.11.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d4b59ae07fbbfe31647f8546bfa23843
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=843067cece5ec9b31bcaa303e1224f80
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.9-r1 b/metadata/md5-cache/dev-libs/libjcat-0.1.9-r1
index 9d44f6aa079f..cf1dbc0d7ffc 100644
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.9-r1
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.9-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme:= dev-libs/li
 DESCRIPTION=Library and tool for reading and writing Jcat files
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libjcat
+INHERIT=meson python-any-r1 vala xdg-utils
 IUSE=+gpg gtk-doc +introspection +man +pkcs7 test vala
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme:= dev-libs/l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.9.tar.gz -> libjcat-0.1.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cd8a3233fe86926c815d0847dc7c4988
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2a7abc534d050948eaa69f787ace67d2
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.0 b/metadata/md5-cache/dev-libs/libksba-1.6.0
index 0b1dbfb62d38..37f3fd304d36 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.6.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.6.0
@@ -5,9 +5,9 @@ DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/libksba
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.6.0.tar.bz2
-_md5_=8b926e7b68162d18c218974f0c289830
+_md5_=6b7e4dc1de05eeb570f2d6bdbdbf0eb6
diff --git a/metadata/md5-cache/dev-libs/liblogging-1.0.6 b/metadata/md5-cache/dev-libs/liblogging-1.0.6
index d1627477d359..e9f21254949e 100644
--- a/metadata/md5-cache/dev-libs/liblogging-1.0.6
+++ b/metadata/md5-cache/dev-libs/liblogging-1.0.6
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=systemd? ( sys-apps/systemd )
 SLOT=0/0
 SRC_URI=http://download.rsyslog.com/liblogging/liblogging-1.0.6.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4a249388180a75c60512e297efeaa4ea
diff --git a/metadata/md5-cache/dev-libs/liblogging-1.0.6-r1 b/metadata/md5-cache/dev-libs/liblogging-1.0.6-r1
index ec0773150356..0a0275a5d4d8 100644
--- a/metadata/md5-cache/dev-libs/liblogging-1.0.6-r1
+++ b/metadata/md5-cache/dev-libs/liblogging-1.0.6-r1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=systemd? ( sys-apps/systemd )
 SLOT=0/0
 SRC_URI=http://download.rsyslog.com/liblogging/liblogging-1.0.6.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ee05c186d989484f0686ef64df182f3a
diff --git a/metadata/md5-cache/dev-libs/liblognorm-2.0.6 b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
index d8f97a553e96..fb349b4a388f 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-2.0.6
+++ b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libfastjson-0.99.2:= >=sys-devel/auto
 DESCRIPTION=Fast samples-based log normalization library
 EAPI=6
 HOMEPAGE=https://www.liblognorm.com
+INHERIT=autotools
 IUSE=debug doc static-libs test
 KEYWORDS=amd64 arm arm64 ~hppa x86 ~amd64-linux
 LICENSE=LGPL-2.1 Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libfastjson-0.99.2:=
 RESTRICT=!test? ( test )
 SLOT=0/5.1.0
 SRC_URI=https://www.liblognorm.com/files/download/liblognorm-2.0.6.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=8f7ed648423a05c49476c96f94af6f3c
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.13.0 b/metadata/md5-cache/dev-libs/liblouis-3.13.0
index 67b4e9b64b40..4746c68a4428 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.13.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.13.0
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=An open-source braille translator and back-translator
 EAPI=7
 HOMEPAGE=https://github.com/liblouis/liblouis
+INHERIT=distutils-r1
 IUSE=python test python_targets_python3_8
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.13.0/liblouis-3.13.0.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=12e0060b2008125d9adb2a7553f5b243
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.17.0 b/metadata/md5-cache/dev-libs/liblouis-3.17.0
index fba83aa178e1..eecd43118392 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.17.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.17.0
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=An open-source braille translator and back-translator
 EAPI=7
 HOMEPAGE=https://github.com/liblouis/liblouis
+INHERIT=distutils-r1
 IUSE=python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.17.0/liblouis-3.17.0.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9b6ee770d60f6c5883abf5e94f27ec46
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.20.0 b/metadata/md5-cache/dev-libs/liblouis-3.20.0
index b84350573b97..5dfc8a75608f 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.20.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.20.0
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=An open-source braille translator and back-translator
 EAPI=7
 HOMEPAGE=https://github.com/liblouis/liblouis
+INHERIT=distutils-r1
 IUSE=python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.20.0/liblouis-3.20.0.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=aa290436a323aeab3aa81b878a89203c
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.7 b/metadata/md5-cache/dev-libs/libltdl-2.4.7
index 22d40ba62449..f1bd26422229 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.7
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.7
@@ -4,9 +4,9 @@ DESCRIPTION=A shared library tool for developers
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.7.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=50c2b47707c2ea9068e9a401cbb4f8a6
+_md5_=7d31eadd5b51b70a4bbc89585a80aec4
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.6 b/metadata/md5-cache/dev-libs/libmanette-0.2.6
index ef8ca813abd4..200bcf92c2e0 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.6
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.6
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-li
 DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
+INHERIT=gnome.org gnome2-utils meson vala xdg
 IUSE=gtk-doc +introspection +udev +vala test
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e38616242411c355b02807a042b88a38
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.24.1 b/metadata/md5-cache/dev-libs/libmateweather-1.24.1
index 923a44a9ff0c..d759d2bd0289 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.24.1
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.24.1
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2
 DESCRIPTION=MATE library to access weather information from online services
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
+INHERIT=mate
 IUSE=debug
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmateweather-1.24.1.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a78c4770598bdbdb869ea264883e2615
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.26.0 b/metadata/md5-cache/dev-libs/libmateweather-1.26.0
index 70b2da6101a6..faa77bb24b25 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.26.0
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.26.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.26/libmateweather-1.26.0.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7f4802f33706e685b926124f8c7c0d50
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-9999 b/metadata/md5-cache/dev-libs/libmaxminddb-9999
index 4357fe2bea57..5b9583637286 100644
--- a/metadata/md5-cache/dev-libs/libmaxminddb-9999
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/0.0.7
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=670850c3a1540fb8e5113c65482ff1a7
diff --git a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4 b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
index 180abcc76d54..cb8ab99d1539 100644
--- a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4b778d718a088752647673db6f5f79af
diff --git a/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1 b/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
index 72a719e62816..eae0fd7d5dcb 100644
--- a/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
+++ b/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=libmelf is a library interface for manipulating ELF object files
 EAPI=6
 HOMEPAGE=http://www.hick.org/code/skape/libmelf/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://www.hick.org/code/skape/libmelf/libmelf-0.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=63572dcf417e73db4a555e8fba95602b
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4
index 9c1a87b11fb3..732409e5c283 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4
@@ -11,5 +11,5 @@ RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/li
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=55c28c481faa4d0184baa7bb2109b2d5
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.6 b/metadata/md5-cache/dev-libs/libmirage-3.2.6
index 801d43696a05..101a5cba056a 100644
--- a/metadata/md5-cache/dev-libs/libmirage-3.2.6
+++ b/metadata/md5-cache/dev-libs/libmirage-3.2.6
@@ -4,11 +4,12 @@ DEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=med
 DESCRIPTION=CD and DVD image access library
 EAPI=7
 HOMEPAGE=https://cdemu.sourceforge.io
+INHERIT=cmake xdg-utils
 IUSE=doc +introspection
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=0/11
 SRC_URI=https://download.sourceforge.net/cdemu/libmirage/libmirage-3.2.6.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=98eb7a17653bce05aae5382b35ac74f1
diff --git a/metadata/md5-cache/dev-libs/libmix-2.05-r7 b/metadata/md5-cache/dev-libs/libmix-2.05-r7
index 1331d09a34e3..6d48ba16e794 100644
--- a/metadata/md5-cache/dev-libs/libmix-2.05-r7
+++ b/metadata/md5-cache/dev-libs/libmix-2.05-r7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://mixter.void.ru/libmix-205.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ae96e76b0f656ac6680c23207848d47f
diff --git a/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r3 b/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r3
index 7a5dd667fe6e..095a4f6721d3 100644
--- a/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r3
+++ b/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r3
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=2
 SRC_URI=https://github.com/atheme/libmowgli-2/archive/v2.1.3.tar.gz -> libmowgli-2.1.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b786d081ad8fd8a3848965679f77620f
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
index f9fc079b4f65..6c149275a3cd 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
+++ b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
+INHERIT=autotools multilib-minimal
 IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=31e9bd36a77112f5e17194fe05beaee9
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=db19bfbf6dfced9c4419fe116e17a8a2
diff --git a/metadata/md5-cache/dev-libs/libmspack-9999 b/metadata/md5-cache/dev-libs/libmspack-9999
index 0b0b72b4dc66..c642c6e02f46 100644
--- a/metadata/md5-cache/dev-libs/libmspack-9999
+++ b/metadata/md5-cache/dev-libs/libmspack-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
+INHERIT=autotools multilib-minimal git-r3
 IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e63a76e97f7e234e698e90a1a7e3e2de
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=f2a701f244093ddb5507817fac242323
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.3.0 b/metadata/md5-cache/dev-libs/libnatspec-0.3.0
index b63f12adf229..1480ad471958 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.3.0
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.3.0
@@ -4,11 +4,12 @@ DEPEND=dev-libs/popt
 DESCRIPTION=library to smooth charset/localization issues
 EAPI=7
 HOMEPAGE=http://natspec.sourceforge.net/
+INHERIT=autotools
 IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.3.0.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=92cb0aadf48d8c8ee3d82ae24e5fcb12
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=6c9ccb33b80d129144ec839403e8e661
diff --git a/metadata/md5-cache/dev-libs/libnest2d-0.4-r2 b/metadata/md5-cache/dev-libs/libnest2d-0.4-r2
index f98d980ad9b0..dcdccc2234bb 100644
--- a/metadata/md5-cache/dev-libs/libnest2d-0.4-r2
+++ b/metadata/md5-cache/dev-libs/libnest2d-0.4-r2
@@ -4,6 +4,7 @@ DEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/clipper sci-libs/nlopt test? ( >=
 DESCRIPTION=Library and framework for the 2D bin packaging problem
 EAPI=7
 HOMEPAGE=https://github.com/tamasmeszaros/libnest2d
+INHERIT=cmake
 IUSE=examples static-libs test
 KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=LGPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/clipper sci-libs/nlopt
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/tamasmeszaros/libnest2d/archive/0.4.tar.gz -> libnest2d-0.4.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a8a20d30a601add3540c544da178d01c
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
index 3f6fe3f4130b..675a42608770 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.5.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
 HOMEPAGE=https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
+INHERIT=distutils-r1 libtool multilib-minimal
 IUSE=+debug python test utils python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=81a24e1620ddd8d3c3d1870a680212d1
diff --git a/metadata/md5-cache/dev-libs/libnl-3.6.0 b/metadata/md5-cache/dev-libs/libnl-3.6.0-r1
index 74526d0710cb..7e387e2bc6a4 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.6.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.6.0-r1
@@ -4,12 +4,14 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=8
 HOMEPAGE=https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
+INHERIT=autotools distutils-r1 multilib-minimal
 IUSE=+debug python test utils python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
 RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_6_0/libnl-3.6.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7b8c3df653f1aad7c636960f71944b31
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=647ec8045d40a74920da96062b9b181d
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index 486dc4141457..4e33b7e76298 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
 HOMEPAGE=https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
+INHERIT=autotools distutils-r1 git-r3 multilib-minimal
 IUSE=+debug python test utils python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=3
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=76d90f0c3ea0dfa290777b35dbd8b235
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=ad9e03f3e77dbe1f8c8f1ca29726a250
diff --git a/metadata/md5-cache/dev-libs/libofx-0.10.1-r1 b/metadata/md5-cache/dev-libs/libofx-0.10.1-r1
deleted file mode 100644
index c63a2c04628e..000000000000
--- a/metadata/md5-cache/dev-libs/libofx-0.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-crypt/gnupg ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
-DESCRIPTION=Library to support the Open Financial eXchange XML format
-EAPI=7
-HOMEPAGE=https://github.com/libofx/libofx
-IUSE=doc test
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://github.com/libofx/libofx/archive/0.10.1.tar.gz -> libofx-0.10.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=53d8d4354e9fb0649089bc7e208e2fe9
diff --git a/metadata/md5-cache/dev-libs/libofx-0.10.2 b/metadata/md5-cache/dev-libs/libofx-0.10.2
deleted file mode 100644
index f1ff332ea7f7..000000000000
--- a/metadata/md5-cache/dev-libs/libofx-0.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-crypt/gnupg ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
-DESCRIPTION=Library to support the Open Financial eXchange XML format
-EAPI=7
-HOMEPAGE=https://github.com/libofx/libofx
-IUSE=doc test
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://github.com/libofx/libofx/archive/0.10.2.tar.gz -> libofx-0.10.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4dd432c09670b21a6f4f3d4f774f5ac0
diff --git a/metadata/md5-cache/dev-libs/libofx-0.10.3 b/metadata/md5-cache/dev-libs/libofx-0.10.3
index 533c51d52ba8..312cad8882c8 100644
--- a/metadata/md5-cache/dev-libs/libofx-0.10.3
+++ b/metadata/md5-cache/dev-libs/libofx-0.10.3
@@ -11,5 +11,5 @@ RDEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=n
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/libofx/libofx/archive/0.10.3.tar.gz -> libofx-0.10.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4de19321a6409ffc8338ddf256a6b33f
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.16.1 b/metadata/md5-cache/dev-libs/liborcus-0.16.1
index 01ca31a88a45..c8c650bf2616 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.16.1
+++ b/metadata/md5-cache/dev-libs/liborcus-0.16.1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_py
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=7
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
+INHERIT=autotools python-single-r1
 IUSE=python +spreadsheet-model test tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/0.16
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.16.1.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a13b6f445c3eb16e829ae325208ad1f3
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.17.2 b/metadata/md5-cache/dev-libs/liborcus-0.17.2
index 27e5db033eb3..07e7e9114eb3 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.17.2
+++ b/metadata/md5-cache/dev-libs/liborcus-0.17.2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_py
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=8
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
+INHERIT=autotools python-single-r1
 IUSE=python +spreadsheet-model test tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/0.17
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.17.2.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=53b205cc6422a3de986cb94eaa59e1cf
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index 1e772b49be81..c22625f30f48 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_py
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=8
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
+INHERIT=autotools python-single-r1 git-r3
 IUSE=python +spreadsheet-model test tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=MIT
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_p
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0/0.17
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fda0b59e64f342913442361bab8d080a
diff --git a/metadata/md5-cache/dev-libs/libotf-0.9.16 b/metadata/md5-cache/dev-libs/libotf-0.9.16
index d89a07e496a2..76881b8ef0c5 100644
--- a/metadata/md5-cache/dev-libs/libotf-0.9.16
+++ b/metadata/md5-cache/dev-libs/libotf-0.9.16
@@ -3,11 +3,12 @@ DEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs
 DESCRIPTION=Library for handling OpenType fonts (OTF)
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/m17n/
+INHERIT=autotools
 IUSE=static-libs X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/libotf-0.9.16.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6f903ec0c74be71ce5c33cf4b0b176a7
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.45-r1 b/metadata/md5-cache/dev-libs/libpcre-8.45-r1
index 1484371187ea..2625f84b5c8c 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.45-r1
+++ b/metadata/md5-cache/dev-libs/libpcre-8.45-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=7
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.45.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.45.tar.bz2
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=2a34ac2dcc36abf26ca381da25da3e77
+_md5_=f8cee8c058fd94496753271b79f9a47f
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.40 b/metadata/md5-cache/dev-libs/libpcre2-10.40
index fc5e27be34a9..4101eca62a0b 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.40
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.40
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=7
 HOMEPAGE=https://www.pcre.org/
 IUSE=bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0/3
 SRC_URI=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.40.tar.bz2 verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2.sig ) https://dev.gentoo.org/~whissi/dist/libpcre2/libpcre2-10.36-patchset-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/libpcre2-10.36-patchset-01.tar.xz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=2eadb0a195aec78fc1bd95875545d4aa
+_md5_=5283c5f0d4c79d62912ddf444fdf49be
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.30.0 b/metadata/md5-cache/dev-libs/libpeas-1.30.0
index a755797d1e68..1cd63562cf1b 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.30.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.30.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x
 DESCRIPTION=A GObject plugins library
 EAPI=7
 HOMEPAGE=https://developer.gnome.org/libpeas/stable/
+INHERIT=gnome.org lua-single meson python-single-r1 vala virtualx xdg
 IUSE=glade +gtk gtk-doc lua +python vala lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.30/libpeas-1.30.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1a09c54e2c1bd47867bf88032274719a
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.32.0 b/metadata/md5-cache/dev-libs/libpeas-1.32.0
index c28a6db0e65d..fba85c69fe6f 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.32.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.32.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x
 DESCRIPTION=A GObject plugins library
 EAPI=8
 HOMEPAGE=https://developer.gnome.org/libpeas/stable/
+INHERIT=gnome.org lua-single meson python-single-r1 vala virtualx xdg
 IUSE=glade +gtk gtk-doc lua +python vala lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
@@ -12,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.32/libpeas-1.32.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1c51de282783096bfbedc81d3263b696
diff --git a/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1 b/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
deleted file mode 100644
index ad2bb8b6c96e..000000000000
--- a/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Hardware-based performance monitoring interface for Linux
-EAPI=7
-HOMEPAGE=http://perfmon2.sourceforge.net
-IUSE=static-libs
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=GPL-2 MIT
-SLOT=0/4
-SRC_URI=mirror://sourceforge/perfmon2/libpfm4/libpfm-4.10.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0da492713839b91d9e95ec69b9b5d5ff
diff --git a/metadata/md5-cache/dev-libs/libphonenumber-8.12.39 b/metadata/md5-cache/dev-libs/libphonenumber-8.12.39
index 0db314e45108..4a87b1b9a5c3 100644
--- a/metadata/md5-cache/dev-libs/libphonenumber-8.12.39
+++ b/metadata/md5-cache/dev-libs/libphonenumber-8.12.39
@@ -4,6 +4,7 @@ DEPEND=dev-libs/icu:= dev-libs/protobuf:= dev-libs/boost:=
 DESCRIPTION=Library for parsing, formatting, and validating international phone numbers
 EAPI=8
 HOMEPAGE=https://github.com/google/libphonenumber
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/icu:= dev-libs/protobuf:= dev-libs/boost:=
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/libphonenumber/archive/v8.12.39.tar.gz -> libphonenumber-8.12.39.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c107f7d446b3898e82d86a16338edb18
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.4 b/metadata/md5-cache/dev-libs/libpipeline-1.5.4
deleted file mode 100644
index 628f1ec26e88..000000000000
--- a/metadata/md5-cache/dev-libs/libpipeline-1.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=test? ( dev-libs/check )
-DESCRIPTION=A pipeline manipulation library
-EAPI=7
-HOMEPAGE=https://libpipeline.nongnu.org/
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.4.tar.gz
-_md5_=a69fee9c2fd68b3ace89d6a706a622c8
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.6 b/metadata/md5-cache/dev-libs/libpipeline-1.5.6
new file mode 100644
index 000000000000..6fc8e0be60db
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.5.6
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=test? ( dev-libs/check )
+DESCRIPTION=A pipeline manipulation library
+EAPI=7
+HOMEPAGE=https://libpipeline.nongnu.org/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.6.tar.gz
+_md5_=0192a5eae26499f0480ff0a9dd15303a
diff --git a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2 b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2
index 19845918c46c..be35bccd7961 100644
--- a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2
+++ b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Platform support library used by libCEC and binary add-ons for Kodi
 EAPI=8
 HOMEPAGE=https://github.com/Pulse-Eight/platform
+INHERIT=cmake
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/platform/archive/p8-platform-2.1.0.1.tar.gz -> libplatform-2.1.0.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3d92a71504e351257e78719950b9c2d0
diff --git a/metadata/md5-cache/dev-libs/libplatform-9999 b/metadata/md5-cache/dev-libs/libplatform-9999
index c5048a436190..82fb1bcf3d9f 100644
--- a/metadata/md5-cache/dev-libs/libplatform-9999
+++ b/metadata/md5-cache/dev-libs/libplatform-9999
@@ -3,8 +3,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Platform support library used by libCEC and binary add-ons for Kodi
 EAPI=8
 HOMEPAGE=https://github.com/Pulse-Eight/platform
+INHERIT=cmake git-r3
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5bbae936cd785eb8c979fdd3857cc062
diff --git a/metadata/md5-cache/dev-libs/libportal-0.6 b/metadata/md5-cache/dev-libs/libportal-0.6
index 21d2cc421af9..c9a0a5e75274 100644
--- a/metadata/md5-cache/dev-libs/libportal-0.6
+++ b/metadata/md5-cache/dev-libs/libportal-0.6
@@ -4,13 +4,14 @@ DEPEND=>=dev-libs/glib-2.58:2 introspection? ( dev-libs/gobject-introspection:=
 DESCRIPTION=Flatpak portal library
 EAPI=8
 HOMEPAGE=https://github.com/flatpak/libportal
+INHERIT=meson vala virtualx
 IUSE=gtk gtk-doc +introspection qt5 test +vala test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.58:2 introspection? ( dev-libs/gobject-introspection:= ) gtk? ( x11-libs/gtk+:3 gui-libs/gtk:4 ) qt5? ( dev-qt/qtcore:= dev-qt/qtgui:= dev-qt/qtx11extras:= dev-qt/qtwidgets:= )
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/1-1-1-1
 SRC_URI=https://github.com/flatpak/libportal/releases/download/0.6/libportal-0.6.tar.xz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=3d1ddea6dd905533b6c8faf11add1340
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=460b5b875c56a80da70871959964ba2c
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.1.2 b/metadata/md5-cache/dev-libs/libpqxx-7.1.2
index 46a55f99d9ae..6cba6cbaaf69 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.1.2
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.1.2
@@ -3,11 +3,12 @@ DEPEND=dev-db/postgresql:= || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python
 DESCRIPTION=Standard front-end for writing C++ programs that use PostgreSQL
 EAPI=7
 HOMEPAGE=http://pqxx.org/development/libpqxx/
+INHERIT=python-any-r1
 IUSE=doc static-libs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.1.2.tar.gz -> libpqxx-7.1.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=128ee3e642ae2ab04fad4e6244606af9
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.2.1 b/metadata/md5-cache/dev-libs/libpqxx-7.2.1
index c775db007ade..9326ee700c39 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.2.1
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.2.1
@@ -3,11 +3,12 @@ DEPEND=dev-db/postgresql:= || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python
 DESCRIPTION=Standard front-end for writing C++ programs that use PostgreSQL
 EAPI=7
 HOMEPAGE=http://pqxx.org/development/libpqxx/
+INHERIT=python-any-r1
 IUSE=doc static-libs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.2.1.tar.gz -> libpqxx-7.2.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f9c2035a28701c8ba46b0b383ab0b530
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.3.0 b/metadata/md5-cache/dev-libs/libpqxx-7.3.0
index 5dec2a3af5ce..2b3d6afa77ee 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.3.0
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.3.0
@@ -3,11 +3,12 @@ DEPEND=dev-db/postgresql:= || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python
 DESCRIPTION=Standard front-end for writing C++ programs that use PostgreSQL
 EAPI=7
 HOMEPAGE=http://pqxx.org/development/libpqxx/
+INHERIT=python-any-r1
 IUSE=doc static-libs
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.3.0.tar.gz -> libpqxx-7.3.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=638182d9feca9198740f247f922002b3
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.4.1 b/metadata/md5-cache/dev-libs/libpqxx-7.4.1
index b8ad12f83413..522871208bd1 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.4.1
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.4.1
@@ -3,11 +3,12 @@ DEPEND=dev-db/postgresql:= || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python
 DESCRIPTION=Standard front-end for writing C++ programs that use PostgreSQL
 EAPI=7
 HOMEPAGE=http://pqxx.org/development/libpqxx/
+INHERIT=python-any-r1
 IUSE=doc static-libs
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.4.1.tar.gz -> libpqxx-7.4.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5a26c90c36da495f85168dd20617bef5
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10 b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
index 0c2ec9c60824..085dabe735a6 100644
--- a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
+++ b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
@@ -4,6 +4,7 @@ DEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) l
 DESCRIPTION=Prelude-SIEM Framework Library
 EAPI=7
 HOMEPAGE=https://www.prelude-siem.org
+INHERIT=autotools distutils-r1 lua-single ruby-single
 IUSE=lua perl python ruby python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 lua_single_target_lua5-1 lua_single_target_lua5-3
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libprelude-5.2.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=19bef3f89c5255e2e1e5d83f3d2dc2d1
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
index e6bf9bf18673..d12cca5e60d0 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysq
 DESCRIPTION=Framework to easy access to the Prelude database
 EAPI=7
 HOMEPAGE=https://www.prelude-siem.org
+INHERIT=autotools distutils-r1
 IUSE=mysql postgres python sqlite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mys
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libpreludedb-5.2.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b03e91216a0f53136c7b12565569224f
diff --git a/metadata/md5-cache/dev-libs/libptytty-2.0 b/metadata/md5-cache/dev-libs/libptytty-2.0
index 2d0fd168bb42..6d5d74b26622 100644
--- a/metadata/md5-cache/dev-libs/libptytty-2.0
+++ b/metadata/md5-cache/dev-libs/libptytty-2.0
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A library for mostly OS-independent handling of pty/tty/utmp/wtmp/lastlog
 EAPI=8
 HOMEPAGE=http://software.schmorp.de/pkg/libptytty.html
+INHERIT=cmake
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libptytty/libptytty-2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=382a587e734242f423604d7acafb2b3e
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
index df7953509ae7..7bcef6cd7bda 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
@@ -1,15 +1,16 @@
 BDEPEND=>=sys-devel/gettext-0.18.2 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) )
+DEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 DESCRIPTION=Library for password quality checking and generating random passwords
 EAPI=7
 HOMEPAGE=https://github.com/libpwquality/libpwquality
-IUSE=pam python static-libs python_targets_python3_8 python_targets_python3_9 split-usr
+INHERIT=pam python-r1 usr-ldscript
+IUSE=pam python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=df43d7b7f3cded94936d5185c9a3ee9f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=e85bb8cc821bf9f2dce59a2f042b05b8
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
new file mode 100644
index 000000000000..4c527ae53caf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/gettext-0.18.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+DESCRIPTION=Library for password quality checking and generating random passwords
+EAPI=8
+HOMEPAGE=https://github.com/libpwquality/libpwquality
+INHERIT=pam python-r1 usr-ldscript
+IUSE=pam python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 split-usr
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+SLOT=0
+SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=b981f584961c03bae8e4b75ecc434f6f
diff --git a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1 b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
index 3b68e54f0c7a..3e82da1dd4b3 100644
--- a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utilities for writing C++ extension modules
 EAPI=7
 HOMEPAGE=https://quantopian.github.io/libpy/ https://github.com/quantopian/libpy
+INHERIT=flag-o-matic distutils-r1
 IUSE=sparsehash test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ REQUIRED_USE=test? ( sparsehash ) || ( python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quantopian/libpy/archive/0.2.5.tar.gz -> libpy-0.2.5.tar.gz test? ( https://github.com/google/googletest/archive/23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz -> gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz )
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=b08ecdbef550172f2b441c3129b7b338
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.7.1 b/metadata/md5-cache/dev-libs/libqtxdg-3.7.1
index 13ab65430a2d..b02aac21298e 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.7.1
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.7.1
@@ -4,6 +4,7 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtw
 DESCRIPTION=Qt Implementation of XDG Standards
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
+INHERIT=cmake optfeature virtualx
 IUSE=test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
@@ -11,5 +12,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.7.1/libqtxdg-3.7.1.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=15bdbf40411b4fc363060c476a029905
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.8.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.8.0
index 3e9b07ccf8f6..9ba9647e5718 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.8.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.8.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5= >=de
 DESCRIPTION=Qt Implementation of XDG Standards
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
+INHERIT=cmake optfeature virtualx
 IUSE=test test
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
@@ -11,5 +12,5 @@ RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5= >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.8.0/libqtxdg-3.8.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2ad87b6a2c2fc4a382b155850ebeab2a
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.15 b/metadata/md5-cache/dev-libs/libratbag-0.15
index 342742967359..1b06b6f2d050 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.15
+++ b/metadata/md5-cache/dev-libs/libratbag-0.15
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Library to configure gaming mice
 EAPI=8
 HOMEPAGE=https://github.com/libratbag/libratbag
+INHERIT=meson python-single-r1 systemd udev
 IUSE=doc elogind systemd test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.15.tar.gz -> libratbag-0.15.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=9fe6fb14698bfea9d1761bd8fe985f95
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.16 b/metadata/md5-cache/dev-libs/libratbag-0.16
index f3500ecbe1d3..200c8e900415 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.16
+++ b/metadata/md5-cache/dev-libs/libratbag-0.16
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Library to configure gaming mice
 EAPI=8
 HOMEPAGE=https://github.com/libratbag/libratbag
+INHERIT=meson python-single-r1 systemd udev
 IUSE=doc elogind systemd test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.16.tar.gz -> libratbag-0.16.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=9fe6fb14698bfea9d1761bd8fe985f95
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.5.0 b/metadata/md5-cache/dev-libs/librdkafka-1.5.0
index b8562f7d6fc5..f5f62632155b 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.5.0
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.5.0
@@ -4,11 +4,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
 DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=lz4 sasl ssl static-libs zstd
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.5.0.tar.gz -> librdkafka-1.5.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=05de04517f0bcc90c55c8019397bb319
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.5.2 b/metadata/md5-cache/dev-libs/librdkafka-1.5.2
index 0effeac1808b..5a072b594113 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.5.2
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.5.2
@@ -4,11 +4,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
 DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=lz4 sasl ssl static-libs zstd
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.5.2.tar.gz -> librdkafka-1.5.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=05de04517f0bcc90c55c8019397bb319
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.5.3 b/metadata/md5-cache/dev-libs/librdkafka-1.5.3
index 9f11536d8ea2..6b4429958429 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.5.3
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.5.3
@@ -4,11 +4,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
 DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=lz4 sasl ssl static-libs zstd
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.5.3.tar.gz -> librdkafka-1.5.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=05de04517f0bcc90c55c8019397bb319
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.6.0 b/metadata/md5-cache/dev-libs/librdkafka-1.6.0
index 8505e8e18c85..eaf67208a60c 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.6.0
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.6.0
@@ -4,11 +4,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
 DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=lz4 sasl ssl static-libs zstd
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.6.0.tar.gz -> librdkafka-1.6.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=73c3dc4f412d66fd0fbe00a224d9ffad
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.6.1 b/metadata/md5-cache/dev-libs/librdkafka-1.6.1
index 82b8cd38dff8..e7b7130db5be 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.6.1
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.6.1
@@ -4,11 +4,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
 DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=lz4 sasl ssl static-libs zstd
 KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.6.1.tar.gz -> librdkafka-1.6.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1d357cc043cde8b38b02a8cb0d6d9c87
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.7.0 b/metadata/md5-cache/dev-libs/librdkafka-1.7.0
index 6e5accf59a12..85758cb4a781 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.7.0
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.7.0
@@ -4,11 +4,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
 DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=lz4 sasl ssl static-libs zstd
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.7.0.tar.gz -> librdkafka-1.7.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0e7bff9486100df94ba80d5096a71e5b
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.8.0 b/metadata/md5-cache/dev-libs/librdkafka-1.8.0
index 46875f740815..2adf74afec60 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.8.0
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.8.0
@@ -4,11 +4,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
 DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=lz4 sasl ssl static-libs zstd
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.8.0.tar.gz -> librdkafka-1.8.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0e7bff9486100df94ba80d5096a71e5b
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.8.2 b/metadata/md5-cache/dev-libs/librdkafka-1.8.2
index b364e03950a6..bc5ca09186d8 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.8.2
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.8.2
@@ -4,11 +4,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
 DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=8
 HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=lz4 sasl ssl static-libs zstd
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.8.2.tar.gz -> librdkafka-1.8.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=288104ee38c2cf9f96815aac4cbbefa0
diff --git a/metadata/md5-cache/dev-libs/librelp-1.10.0 b/metadata/md5-cache/dev-libs/librelp-1.10.0
index d9d275f8edc0..7c32b02d8d50 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.10.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.10.0
@@ -4,6 +4,7 @@ DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( dev-libs/open
 DESCRIPTION=An easy to use library for the RELP protocol
 EAPI=7
 HOMEPAGE=https://www.rsyslog.com/librelp/
+INHERIT=autotools python-any-r1
 IUSE=debug doc +ssl +gnutls openssl static-libs test
 KEYWORDS=amd64 arm arm64 ~hppa sparc x86
 LICENSE=GPL-3+ doc? ( FDL-1.3 )
@@ -12,5 +13,5 @@ REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=https://download.rsyslog.com/librelp/librelp-1.10.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e05363084eeb0e585a0bf67280441fef
diff --git a/metadata/md5-cache/dev-libs/librep-0.92.7-r1 b/metadata/md5-cache/dev-libs/librep-0.92.7-r1
index 2825f90709b5..8f9ffa118053 100644
--- a/metadata/md5-cache/dev-libs/librep-0.92.7-r1
+++ b/metadata/md5-cache/dev-libs/librep-0.92.7-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/gdbm-1.8.0:= virtual/libcrypt:= emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/librep/librep_0.92.7.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e9a7ab503f24cd4826cfd3ea5d5d1f85
diff --git a/metadata/md5-cache/dev-libs/libreport-2.16.0 b/metadata/md5-cache/dev-libs/libreport-2.16.0
index 53843844ed55..12fc99c71c14 100644
--- a/metadata/md5-cache/dev-libs/libreport-2.16.0
+++ b/metadata/md5-cache/dev-libs/libreport-2.16.0
@@ -4,6 +4,7 @@ DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_t
 DESCRIPTION=Generic library for reporting software bugs
 EAPI=8
 HOMEPAGE=https://github.com/abrt/libreport
+INHERIT=autotools python-r1
 IUSE=gtk +python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/abrt/libreport/archive/2.16.0.tar.gz -> libreport-2.16.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e432f844bc6abf828e0b08cdeb7bab02
diff --git a/metadata/md5-cache/dev-libs/libreport-2.17.1 b/metadata/md5-cache/dev-libs/libreport-2.17.1
index 5645016e98df..f8f6a553d4af 100644
--- a/metadata/md5-cache/dev-libs/libreport-2.17.1
+++ b/metadata/md5-cache/dev-libs/libreport-2.17.1
@@ -4,6 +4,7 @@ DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_t
 DESCRIPTION=Generic library for reporting software bugs
 EAPI=8
 HOMEPAGE=https://github.com/abrt/libreport
+INHERIT=autotools python-r1
 IUSE=gtk +python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/abrt/libreport/archive/2.17.1.tar.gz -> libreport-2.17.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e432f844bc6abf828e0b08cdeb7bab02
diff --git a/metadata/md5-cache/dev-libs/libretls-3.5.0 b/metadata/md5-cache/dev-libs/libretls-3.5.0
deleted file mode 100644
index 84baf072c68a..000000000000
--- a/metadata/md5-cache/dev-libs/libretls-3.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/openssl:=
-DESCRIPTION=Port of libtls from LibreSSL to OpenSSL
-EAPI=8
-HOMEPAGE=https://git.causal.agency/libretls/about/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=ISC
-RDEPEND=dev-libs/openssl:=
-SLOT=0/22
-SRC_URI=https://causal.agency/libretls/libretls-3.5.0.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1297623717c00e948d900356b6cac683
diff --git a/metadata/md5-cache/dev-libs/libretls-3.5.1 b/metadata/md5-cache/dev-libs/libretls-3.5.1
index df16dadcd477..5ccf9aefcf08 100644
--- a/metadata/md5-cache/dev-libs/libretls-3.5.1
+++ b/metadata/md5-cache/dev-libs/libretls-3.5.1
@@ -5,10 +5,10 @@ DESCRIPTION=Port of libtls from LibreSSL to OpenSSL
 EAPI=8
 HOMEPAGE=https://git.causal.agency/libretls/about/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=ISC
 RDEPEND=dev-libs/openssl:=
 SLOT=0/22
 SRC_URI=https://causal.agency/libretls/libretls-3.5.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4fa81538721178730e5346ef7a94fdd3
+_md5_=1297623717c00e948d900356b6cac683
diff --git a/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1 b/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
index cd57c25bffdb..e37a431c03f4 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
@@ -3,6 +3,7 @@ DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(
 DESCRIPTION=A helper library for REVerse ENGineered formats filters
 EAPI=6
 HOMEPAGE=https://sf.net/p/libwpd/librevenge
+INHERIT=flag-o-matic multilib-minimal
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
@@ -10,5 +11,5 @@ RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f62d64f8a5252fa551f6af33edc802e1
diff --git a/metadata/md5-cache/dev-libs/librevenge-9999 b/metadata/md5-cache/dev-libs/librevenge-9999
index f87cc426ef38..ae285b74f4e4 100644
--- a/metadata/md5-cache/dev-libs/librevenge-9999
+++ b/metadata/md5-cache/dev-libs/librevenge-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3d9953904154093f6028251265d4718b
diff --git a/metadata/md5-cache/dev-libs/libsass-3.6.5 b/metadata/md5-cache/dev-libs/libsass-3.6.5
index 826abd3090cb..74309a967594 100644
--- a/metadata/md5-cache/dev-libs/libsass-3.6.5
+++ b/metadata/md5-cache/dev-libs/libsass-3.6.5
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=https://github.com/sass/libsass/archive/3.6.5.tar.gz -> libsass-3.6.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1b7af987c7327a3500624573d3951a51
diff --git a/metadata/md5-cache/dev-libs/libsass-9999 b/metadata/md5-cache/dev-libs/libsass-9999
index 269f95c01e67..9967865215d9 100644
--- a/metadata/md5-cache/dev-libs/libsass-9999
+++ b/metadata/md5-cache/dev-libs/libsass-9999
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/1
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4bce03d5a9a75a80002262572f42249b
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.12.1 b/metadata/md5-cache/dev-libs/libsavitar-4.12.1
deleted file mode 100644
index a4a0faf8eac8..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-4.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] ) test? ( dev-cpp/gtest dev-cpp/tbb )
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=8
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.12.1.tar.gz -> libsavitar-4.12.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d688ad4d2c55340c83d2cfd9a1c8bd3
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.13.0 b/metadata/md5-cache/dev-libs/libsavitar-4.13.0
index a8cfa5a1151f..fe8c1e27b6ef 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.13.0
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.13.0
@@ -4,13 +4,14 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
 EAPI=8
 HOMEPAGE=https://github.com/Ultimaker/libSavitar
+INHERIT=cmake python-single-r1
 IUSE=+python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.13.0.tar.gz -> libsavitar-4.13.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=272aca9d8a45594cead71a8928b4b416
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3d688ad4d2c55340c83d2cfd9a1c8bd3
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.9.1 b/metadata/md5-cache/dev-libs/libsavitar-4.9.1
deleted file mode 100644
index 0cebe8fc79b8..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-4.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] ) test? ( dev-cpp/gtest dev-cpp/tbb )
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.9.1.tar.gz -> libsavitar-4.9.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2ae52cd5faecef35ee0cb0c166ec9160
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401 b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
index ace81a0b72cf..aee3baa1b957 100644
--- a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
@@ -12,5 +12,5 @@ REQUIRED_USE=asm? ( || ( amd64 arm ) arm? ( experimental ) ) ecdh? ( experimenta
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin-core/secp256k1/archive/b19c000063be11018b4d1a6b0a85871ab9d0bdcf.tar.gz -> libsecp256k1-v0.1_pre20190401.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4d2fddd6ed97d47498f064301a1a7bc7
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028 b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028
index cebfa5107564..36595fc77dc3 100644
--- a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028
@@ -12,5 +12,5 @@ REQUIRED_USE=asm? ( || ( amd64 arm ) arm? ( experimental ) ) extrakeys? ( experi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin-core/secp256k1/archive/3967d96bf184519eb98b766af665b4d4b072563e.tar.gz -> libsecp256k1-v0.1_pre20201028.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3a28656bf430107777cede6b6a0892ff
diff --git a/metadata/md5-cache/dev-libs/libserialport-0.1.1-r1 b/metadata/md5-cache/dev-libs/libserialport-0.1.1-r1
index c5baccb9f30c..3b54d66f2c48 100644
--- a/metadata/md5-cache/dev-libs/libserialport-0.1.1-r1
+++ b/metadata/md5-cache/dev-libs/libserialport-0.1.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=https://sigrok.org/download/source/libserialport/libserialport-0.1.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4578cd04642d99a70a4002304009a5f9
diff --git a/metadata/md5-cache/dev-libs/libserialport-9999 b/metadata/md5-cache/dev-libs/libserialport-9999
index c6e79144f9e2..75f49bd90469 100644
--- a/metadata/md5-cache/dev-libs/libserialport-9999
+++ b/metadata/md5-cache/dev-libs/libserialport-9999
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=LGPL-3
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6ab9ca5b5aabf78dd85a614dbc069b9c
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.7 b/metadata/md5-cache/dev-libs/libsigc++-2.10.7
index 0170c590e2ec..294d947671a8 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.7
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.7
@@ -4,11 +4,12 @@ DEPEND=test? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 DESCRIPTION=Typesafe callback system for standard C++
 EAPI=7
 HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
+INHERIT=flag-o-matic gnome.org meson-multilib
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.7.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2c6d249392d0783a8a56ee104f631b4b
diff --git a/metadata/md5-cache/dev-libs/libsigc++-3.2.0 b/metadata/md5-cache/dev-libs/libsigc++-3.2.0
index 78e8ef9ebb86..77df52fd3ba8 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-3.2.0
+++ b/metadata/md5-cache/dev-libs/libsigc++-3.2.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Typesafe callback system for standard C++
 EAPI=7
 HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
+INHERIT=gnome.org flag-o-matic meson-multilib
 IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libsigc++/3.2/libsigc++-3.2.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3d6afe04dc0990c9a8c9bdf0e785c825
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=69349a3f08624874a414a0ba8d510181
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1 b/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
index ffc3bd5f2f16..f7d3ff08a8bd 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
@@ -3,9 +3,10 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Library for handling page faults in user mode
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libsigsegv/
+INHERIT=autotools
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.12.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cb422d81cd99f9428026a2231377c80e
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.13 b/metadata/md5-cache/dev-libs/libsigsegv-2.13
index 0f39adcf7cc5..1de670ca83e5 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.13
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.13
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~a
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.13.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=452fd87e42c75b3843f2613fef87237f
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.14 b/metadata/md5-cache/dev-libs/libsigsegv-2.14
index 2d235c5f9e14..49c258d33f51 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.14
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.14
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Library for handling page faults in user mode
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libsigsegv/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+INHERIT=autotools
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.14.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4763148bfda365675450b01fade0a47a
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=269356284bb318370beb058bd8a7353e
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18 b/metadata/md5-cache/dev-libs/libsodium-1.0.18
index 993cb60abb37..65726497fe98 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.18
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd
 LICENSE=ISC
 SLOT=0/23
 SRC_URI=https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz verify-sig? ( https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz.sig )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=5c3e9abbc835dce4e65c6d8c008b5754
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617 b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617
index 128c2b5fe98b..d3ad3216eed6 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
 EAPI=7
 HOMEPAGE=https://libsodium.org
+INHERIT=autotools multilib-minimal
 IUSE=+asm minimal static-libs +urandom cpu_flags_x86_aes cpu_flags_x86_sse4_1 verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=ISC
 SLOT=0/23
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210617.tar.gz -> libsodium-1.0.18_p20210617.tar.gz verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210617.tar.gz.minisig -> libsodium-1.0.18_p20210617.tar.gz.minisig )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5bdf41f78f13ea5c7bf965705a50261f
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=c43b9a04a1b5104cb5f72d5d65819c34
diff --git a/metadata/md5-cache/dev-libs/libspt-1.1-r4 b/metadata/md5-cache/dev-libs/libspt-1.1-r4
index a40bc7b16068..cecab69cf4c9 100644
--- a/metadata/md5-cache/dev-libs/libspt-1.1-r4
+++ b/metadata/md5-cache/dev-libs/libspt-1.1-r4
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libtirpc
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.j10n.org/libspt/libspt-1.1.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0b68cfabf8b082e2e4ad032efc4bc74a
diff --git a/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1 b/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
index a712ae45bcc2..5bc7e23d9fab 100644
--- a/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
+++ b/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.etla.net/libstroke/libstroke-0.5.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a7edd414468beffa1c152d60a59948b5
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.10.0 b/metadata/md5-cache/dev-libs/libstrophe-0.10.0
index 839906bc9368..da1d735676fa 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.10.0
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.10.0
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install test
-DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0= doc? ( app-doc/doxygen )
+DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0=
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
 HOMEPAGE=http://strophe.im/libstrophe/
@@ -9,4 +10,4 @@ LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.10.0/libstrophe-0.10.0.tar.xz
-_md5_=2f4d2f1ec33b3d496c785178632d861a
+_md5_=3a7b4c1c7eeec96fbe99223af7af4ab5
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.10.1 b/metadata/md5-cache/dev-libs/libstrophe-0.10.1
deleted file mode 100644
index 167d902d5342..000000000000
--- a/metadata/md5-cache/dev-libs/libstrophe-0.10.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0= doc? ( app-doc/doxygen )
-DESCRIPTION=A simple, lightweight C library for writing XMPP clients
-EAPI=7
-HOMEPAGE=http://strophe.im/libstrophe/
-IUSE=doc expat
-KEYWORDS=~amd64
-LICENSE=|| ( MIT GPL-3 )
-RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.10.1/libstrophe-0.10.1.tar.xz
-_md5_=4797d36cfb54e4eef106f0a8b670156e
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.11.0 b/metadata/md5-cache/dev-libs/libstrophe-0.11.0
index d553f1b865f5..e5c3c22f3d86 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.11.0
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.11.0
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install test
-DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) dev-libs/openssl:0= doc? ( app-doc/doxygen )
+DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) dev-libs/openssl:0=
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
 HOMEPAGE=http://strophe.im/libstrophe/
@@ -9,4 +10,4 @@ LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.11.0/libstrophe-0.11.0.tar.xz
-_md5_=7c324c947657e4296d1e870e9ea211f0
+_md5_=c15353694151ad63339d1b459fde1976
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.9.2 b/metadata/md5-cache/dev-libs/libstrophe-0.9.2
deleted file mode 100644
index 96bee1e554d0..000000000000
--- a/metadata/md5-cache/dev-libs/libstrophe-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0= doc? ( app-doc/doxygen )
-DESCRIPTION=A simple, lightweight C library for writing XMPP clients
-EAPI=7
-HOMEPAGE=http://strophe.im/libstrophe/
-IUSE=doc expat
-KEYWORDS=~amd64
-LICENSE=|| ( MIT GPL-3 )
-RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.9.2/libstrophe-0.9.2.tar.xz
-_md5_=4797d36cfb54e4eef106f0a8b670156e
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.9.3 b/metadata/md5-cache/dev-libs/libstrophe-0.9.3
deleted file mode 100644
index 87926826b3f7..000000000000
--- a/metadata/md5-cache/dev-libs/libstrophe-0.9.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0= doc? ( app-doc/doxygen )
-DESCRIPTION=A simple, lightweight C library for writing XMPP clients
-EAPI=7
-HOMEPAGE=http://strophe.im/libstrophe/
-IUSE=doc expat
-KEYWORDS=~amd64
-LICENSE=|| ( MIT GPL-3 )
-RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.9.3/libstrophe-0.9.3.tar.xz
-_md5_=4797d36cfb54e4eef106f0a8b670156e
diff --git a/metadata/md5-cache/dev-libs/libtar-1.2.20-r4 b/metadata/md5-cache/dev-libs/libtar-1.2.20-r4
index b94560bd8942..6c440f8c5675 100644
--- a/metadata/md5-cache/dev-libs/libtar-1.2.20-r4
+++ b/metadata/md5-cache/dev-libs/libtar-1.2.20-r4
@@ -3,6 +3,7 @@ DEPEND=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip ) sys-devel/gnuconfig >=
 DESCRIPTION=C library for manipulating tar archives
 EAPI=6
 HOMEPAGE=https://repo.or.cz/w/libtar.git/
+INHERIT=autotools
 IUSE=static-libs zlib
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/libtar-1.2.20.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=47a55775fa34fbd1bde55978ad2f6076
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.18.0 b/metadata/md5-cache/dev-libs/libtasn1-4.18.0
index 590d49299231..2ee67d4b73ec 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.18.0
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=static-libs test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.18.0.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6efa93f2249776efc4e9b91a25692979
+_md5_=e4de43f60855482bc00ab27f3295c45f
diff --git a/metadata/md5-cache/dev-libs/libtecla-1.6.3 b/metadata/md5-cache/dev-libs/libtecla-1.6.3
index dc5c971b3c65..dec3571ad3dd 100644
--- a/metadata/md5-cache/dev-libs/libtecla-1.6.3
+++ b/metadata/md5-cache/dev-libs/libtecla-1.6.3
@@ -3,11 +3,12 @@ DEPEND=sys-libs/ncurses:= sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DESCRIPTION=Tecla command-line editing library
 EAPI=6
 HOMEPAGE=https://www.astro.caltech.edu/~mcs/tecla/
+INHERIT=autotools flag-o-matic
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=icu
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1a857d752bf84d6caa1f3ae4473315e1
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ba9ebf4c64caf576c17398fcb019072e
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.20 b/metadata/md5-cache/dev-libs/libtermkey-0.20
index bb63ae6fdb3f..47b71afe9f5e 100644
--- a/metadata/md5-cache/dev-libs/libtermkey-0.20
+++ b/metadata/md5-cache/dev-libs/libtermkey-0.20
@@ -3,11 +3,12 @@ DEPEND=dev-libs/unibilium:= sys-devel/libtool virtual/pkgconfig demos? ( dev-lib
 DESCRIPTION=Library for easy processing of keyboard entry from terminal-based programs
 EAPI=6
 HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/
+INHERIT=flag-o-matic
 IUSE=demos static-libs
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/unibilium:=
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6506f04e47631b255d1a5c33b2b3ee4d
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.22 b/metadata/md5-cache/dev-libs/libtermkey-0.22
index 78014f7217cf..ba5fd90c39ca 100644
--- a/metadata/md5-cache/dev-libs/libtermkey-0.22
+++ b/metadata/md5-cache/dev-libs/libtermkey-0.22
@@ -3,11 +3,12 @@ DEPEND=dev-libs/unibilium:= sys-devel/libtool virtual/pkgconfig demos? ( dev-lib
 DESCRIPTION=Library for easy processing of keyboard entry from terminal-based programs
 EAPI=6
 HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/
+INHERIT=flag-o-matic
 IUSE=demos static-libs
 KEYWORDS=amd64 arm ~arm64 ~riscv x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/unibilium:=
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=54171f714b6dcb95abc962ef93fc2129
diff --git a/metadata/md5-cache/dev-libs/libthreadar-1.4.0 b/metadata/md5-cache/dev-libs/libthreadar-1.4.0
index dea6e6f78c7c..fa3e8f3279d9 100644
--- a/metadata/md5-cache/dev-libs/libthreadar-1.4.0
+++ b/metadata/md5-cache/dev-libs/libthreadar-1.4.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Threading library used by dar archiver
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/libthreadar/
-KEYWORDS=~amd64 ppc sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/libthreadar/libthreadar-1.4.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=45660e9c7abe35b20b86ed07a6c6a23e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=42094ef5aa89d01c70115245a331ea0d
diff --git a/metadata/md5-cache/dev-libs/libtimezonemap-0.4.6-r1 b/metadata/md5-cache/dev-libs/libtimezonemap-0.4.6-r1
index 2ca951e93425..0de2a9c8ae1a 100644
--- a/metadata/md5-cache/dev-libs/libtimezonemap-0.4.6-r1
+++ b/metadata/md5-cache/dev-libs/libtimezonemap-0.4.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:0= dev-libs/json-glib net-libs/libsoup:2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libt/libtimezonemap/libtimezonemap_0.4.6.orig.tar.gz -> libtimezonemap_0.4.6.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bb9c050e65a89af573ae9aa5016ac29c
diff --git a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4 b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4
new file mode 100644
index 000000000000..6427657ef04c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/libtool virtual/pkgconfig
+DEFINED_PHASES=compile install test
+DEPEND=gmp? ( dev-libs/gmp:= ) libtommath? ( dev-libs/libtommath:= ) tomsfastmath? ( dev-libs/tomsfastmath:= )
+DESCRIPTION=LibTomCrypt is a comprehensive, modular and portable cryptographic toolkit
+EAPI=7
+HOMEPAGE=https://www.libtom.net/LibTomCrypt/ https://github.com/libtom/libtomcrypt
+INHERIT=toolchain-funcs
+IUSE=+gmp +libtommath tomsfastmath
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( WTFPL-2 public-domain )
+RDEPEND=gmp? ( dev-libs/gmp:= ) libtommath? ( dev-libs/libtommath:= ) tomsfastmath? ( dev-libs/tomsfastmath:= )
+REQUIRED_USE=|| ( gmp libtommath tomsfastmath )
+SLOT=0/1
+SRC_URI=https://github.com/libtom/libtomcrypt/releases/download/v1.18.2/crypt-1.18.2.tar.xz -> libtomcrypt-1.18.2.tar.xz
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=46479e01ebfdaa6d83b521e82892ce47
diff --git a/metadata/md5-cache/dev-libs/libtommath-1.2.0-r2 b/metadata/md5-cache/dev-libs/libtommath-1.2.0-r2
index b1225ceef937..4f1a75ad701b 100644
--- a/metadata/md5-cache/dev-libs/libtommath-1.2.0-r2
+++ b/metadata/md5-cache/dev-libs/libtommath-1.2.0-r2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=https://github.com/libtom/libtommath/releases/download/v1.2.0/ltm-1.2.0.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6acb6445ab4feeb4c9c4ee4522fc6715
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.9.3 b/metadata/md5-cache/dev-libs/libtpms-0.9.4
index daee7188c78a..3d47e8bd0107 100644
--- a/metadata/md5-cache/dev-libs/libtpms-0.9.3
+++ b/metadata/md5-cache/dev-libs/libtpms-0.9.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:=
 SLOT=0
-SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.9.3.tar.gz -> libtpms-0.9.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.9.4.tar.gz -> libtpms-0.9.4.tar.gz
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=66cb68ef224c33991dbb56e5b46c3868
diff --git a/metadata/md5-cache/dev-libs/libtsm-4.0.1 b/metadata/md5-cache/dev-libs/libtsm-4.0.1
index 187c875c162c..f2c06bd85686 100644
--- a/metadata/md5-cache/dev-libs/libtsm-4.0.1
+++ b/metadata/md5-cache/dev-libs/libtsm-4.0.1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Terminal Emulator State Machine
 EAPI=7
 HOMEPAGE=https://github.com/Aetf/libtsm
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 MIT
 SLOT=0/4
 SRC_URI=https://github.com/Aetf/libtsm/archive/v4.0.1.tar.gz -> libtsm-4.0.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=40c41bd6e88d16b72338e5177fe14ff9
diff --git a/metadata/md5-cache/dev-libs/libtsm-4.0.2 b/metadata/md5-cache/dev-libs/libtsm-4.0.2
index 05bdeb68785b..77dc52c6af58 100644
--- a/metadata/md5-cache/dev-libs/libtsm-4.0.2
+++ b/metadata/md5-cache/dev-libs/libtsm-4.0.2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Terminal Emulator State Machine
 EAPI=7
 HOMEPAGE=https://github.com/Aetf/libtsm
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 MIT
 SLOT=0/4
 SRC_URI=https://github.com/Aetf/libtsm/archive/v4.0.2.tar.gz -> libtsm-4.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=40c41bd6e88d16b72338e5177fe14ff9
diff --git a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100 b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
index e2d6ee8eb37b..61eff4f87121 100644
--- a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
+++ b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/libucl/archive/0.8.1.tar.gz -> libucl-0.8.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c3fcc9dc8d1ccded2ccd07862a9b8ef0
diff --git a/metadata/md5-cache/dev-libs/libucl-9999 b/metadata/md5-cache/dev-libs/libucl-9999
index ed707adbe077..da09fe08a518 100644
--- a/metadata/md5-cache/dev-libs/libucl-9999
+++ b/metadata/md5-cache/dev-libs/libucl-9999
@@ -11,5 +11,5 @@ RDEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c3fcc9dc8d1ccded2ccd07862a9b8ef0
diff --git a/metadata/md5-cache/dev-libs/libudfread-1.1.0 b/metadata/md5-cache/dev-libs/libudfread-1.1.0
index 0bff1cdbd972..c4d17a719959 100644
--- a/metadata/md5-cache/dev-libs/libudfread-1.1.0
+++ b/metadata/md5-cache/dev-libs/libudfread-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libudfread/-/archive/1.1.0/libudfread-1.1.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=97b3a98289c952805f0a025834484900
diff --git a/metadata/md5-cache/dev-libs/libudfread-1.1.1 b/metadata/md5-cache/dev-libs/libudfread-1.1.1
index 7c9d61b2ebf3..415fbe1a2d2e 100644
--- a/metadata/md5-cache/dev-libs/libudfread-1.1.1
+++ b/metadata/md5-cache/dev-libs/libudfread-1.1.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libudfread/-/archive/1.1.1/libudfread-1.1.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=17b33f4ea8d7db76c1286bb79c2d4716
diff --git a/metadata/md5-cache/dev-libs/libudfread-1.1.2 b/metadata/md5-cache/dev-libs/libudfread-1.1.2
index 4687449406c8..7b06ed932362 100644
--- a/metadata/md5-cache/dev-libs/libudfread-1.1.2
+++ b/metadata/md5-cache/dev-libs/libudfread-1.1.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libudfread/-/archive/1.1.2/libudfread-1.1.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c8581966513ef22db929394750d3a0e4
diff --git a/metadata/md5-cache/dev-libs/libudfread-9999 b/metadata/md5-cache/dev-libs/libudfread-9999
index cee2674971cb..8d141d799f47 100644
--- a/metadata/md5-cache/dev-libs/libudfread-9999
+++ b/metadata/md5-cache/dev-libs/libudfread-9999
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=97b3a98289c952805f0a025834484900
diff --git a/metadata/md5-cache/dev-libs/libuev-2.3.2-r1 b/metadata/md5-cache/dev-libs/libuev-2.3.2-r1
index 5ad506a7ed71..7c6ca573bb1c 100644
--- a/metadata/md5-cache/dev-libs/libuev-2.3.2-r1
+++ b/metadata/md5-cache/dev-libs/libuev-2.3.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.3.2/libuev-2.3.2.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d4a65df70512ce61f425fb8790ef455f
diff --git a/metadata/md5-cache/dev-libs/libunique-1.1.6-r2 b/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
index 32227d4fa69a..2d5c2ac71397 100644
--- a/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
+++ b/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.12:2 >=x11-libs/gtk+-2.11:2[introspection?] x11-libs/li
 DESCRIPTION=A library for writing single instance application
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Attic/LibUnique
+INHERIT=gnome2 virtualx
 IUSE=debug dbus +introspection test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.12:2 >=x11-libs/gtk+-2.11:2[introspection?] x11-libs/l
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libunique/1.1/libunique-1.1.6.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b870bf3d637c1285ea9afcca2a9fbe7
diff --git a/metadata/md5-cache/dev-libs/libunique-3.0.2-r1 b/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
index 9d78c9bcd9eb..f3fd8444b797 100644
--- a/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
+++ b/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.25.7:2 sys-apps/dbus[X] >=x11-libs/gtk+-2.90.0:3[intros
 DESCRIPTION=A library for writing single instance application
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Attic/LibUnique
+INHERIT=gnome2 virtualx
 IUSE=debug +introspection test
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.25.7:2 sys-apps/dbus[X] >=x11-libs/gtk+-2.90.0:3[intro
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libunique/3.0/libunique-3.0.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=498353312f9970a5c15ba2917efa2488
diff --git a/metadata/md5-cache/dev-libs/libunistring-1.0 b/metadata/md5-cache/dev-libs/libunistring-1.0
index 752187d0c79b..68d5ffe0d8bd 100644
--- a/metadata/md5-cache/dev-libs/libunistring-1.0
+++ b/metadata/md5-cache/dev-libs/libunistring-1.0
@@ -4,9 +4,9 @@ DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libunistring/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )
 SLOT=0/2
 SRC_URI=mirror://gnu/libunistring/libunistring-1.0.tar.xz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=062bf3540f616c24461642b73c714e2d
+_md5_=aa91e7fa61ad5d4eb28518511f544783
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.26 b/metadata/md5-cache/dev-libs/libusb-1.0.26
index 301c7175d34e..d84ae78aa3df 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.26
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.26
@@ -4,8 +4,9 @@ DEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 DESCRIPTION=Userspace access to USB devices
 EAPI=7
 HOMEPAGE=https://libusb.info/ https://github.com/libusb/libusb
+INHERIT=multilib-minimal usr-ldscript
 IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=static-libs? ( !udev )
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=3a1cbbf71c32da26d30d3f93ab474532
+_md5_=487f482d1defff720a06d1f309c15e19
diff --git a/metadata/md5-cache/dev-libs/libuv-1.43.0 b/metadata/md5-cache/dev-libs/libuv-1.43.0
index 8406c6b9a3d8..e524946024af 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.43.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.43.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x8
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.43.0.tar.gz -> libuv-1.43.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=01954cb8ef6e7de70fcced9865182b82
diff --git a/metadata/md5-cache/dev-libs/libuv-1.44.1 b/metadata/md5-cache/dev-libs/libuv-1.44.1
index 817d0318382c..37df398ec62f 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.44.1
+++ b/metadata/md5-cache/dev-libs/libuv-1.44.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform asychronous I/O
 EAPI=8
 HOMEPAGE=https://github.com/libuv/libuv
+INHERIT=autotools multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.44.1.tar.gz -> libuv-1.44.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=64b0940da998620d120addffa7326117
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=7c8e28e680475fd0ad12cdff5da218fe
diff --git a/metadata/md5-cache/dev-libs/libuv-9999 b/metadata/md5-cache/dev-libs/libuv-9999
index 8551b2d88b38..5e8aa27add3d 100644
--- a/metadata/md5-cache/dev-libs/libuv-9999
+++ b/metadata/md5-cache/dev-libs/libuv-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
 HOMEPAGE=https://github.com/libuv/libuv
+INHERIT=autotools multilib-minimal git-r3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD BSD-2 ISC MIT
 PROPERTIES=live
 SLOT=0/1
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ccb98f50dc38ba13cef6472ea20fd0dd
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0e3ec362aa42c8165571b1b6d9d318d0
diff --git a/metadata/md5-cache/dev-libs/libvarlink-22 b/metadata/md5-cache/dev-libs/libvarlink-22
index 253ab91720fd..3c512d15a385 100644
--- a/metadata/md5-cache/dev-libs/libvarlink-22
+++ b/metadata/md5-cache/dev-libs/libvarlink-22
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=C implementation of the Varlink protocol and command line tool
 EAPI=7
 HOMEPAGE=https://github.com/varlink/libvarlink
+INHERIT=meson
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/varlink/libvarlink/archive/22.tar.gz -> libvarlink-22.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ddd767de897ef43963828904ab31e023
diff --git a/metadata/md5-cache/dev-libs/libvarlink-23 b/metadata/md5-cache/dev-libs/libvarlink-23
index 981471c49e6d..6ee20c3efccf 100644
--- a/metadata/md5-cache/dev-libs/libvarlink-23
+++ b/metadata/md5-cache/dev-libs/libvarlink-23
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=C implementation of the Varlink protocol and command line tool
 EAPI=7
 HOMEPAGE=https://github.com/varlink/libvarlink
-KEYWORDS=~amd64 ~x86
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/varlink/libvarlink/archive/23.tar.gz -> libvarlink-23.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ddd767de897ef43963828904ab31e023
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=1090970ca2d6fbe847ca9e48c29ec1f1
diff --git a/metadata/md5-cache/dev-libs/libverto-0.3.1-r1 b/metadata/md5-cache/dev-libs/libverto-0.3.1-r1
index 85c1f0027d68..7fa71f17e047 100644
--- a/metadata/md5-cache/dev-libs/libverto-0.3.1-r1
+++ b/metadata/md5-cache/dev-libs/libverto-0.3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 REQUIRED_USE=|| ( glib libev libevent tevent )
 SLOT=0
 SRC_URI=https://github.com/latchset/libverto/releases/download/0.3.1/libverto-0.3.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=814e206a8580f1d10c515e34337eb238
diff --git a/metadata/md5-cache/dev-libs/libverto-0.3.2 b/metadata/md5-cache/dev-libs/libverto-0.3.2
index be898a2d6981..a9e7f1d5845f 100644
--- a/metadata/md5-cache/dev-libs/libverto-0.3.2
+++ b/metadata/md5-cache/dev-libs/libverto-0.3.2
@@ -4,12 +4,13 @@ DEPEND=glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 DESCRIPTION=Main event loop abstraction library
 EAPI=7
 HOMEPAGE=https://github.com/latchset/libverto/
+INHERIT=autotools multilib-minimal
 IUSE=glib +libev libevent +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libev? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libevent? ( >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( glib libev libevent )
 SLOT=0
 SRC_URI=https://github.com/latchset/libverto/releases/download/0.3.2/libverto-0.3.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=df346c875b53b1775abca303bd96e890
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=f88ddd79c73759fe2732fbc59c6e1abd
diff --git a/metadata/md5-cache/dev-libs/libvformat-1.13-r2 b/metadata/md5-cache/dev-libs/libvformat-1.13-r2
index a65343645465..5b785c701ad5 100644
--- a/metadata/md5-cache/dev-libs/libvformat-1.13-r2
+++ b/metadata/md5-cache/dev-libs/libvformat-1.13-r2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libv/libvformat/libvformat_1.13.orig.tar.gz mirror://debian/pool/main/libv/libvformat/libvformat_1.13-10.debian.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2a094b0c33cb0560be98690e86991d80
diff --git a/metadata/md5-cache/dev-libs/libvoikko-4.3.1 b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
index 97ef720ff489..1418f33be933 100644
--- a/metadata/md5-cache/dev-libs/libvoikko-4.3.1
+++ b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
@@ -4,6 +4,7 @@ DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_t
 DESCRIPTION=Spell checking, hyphenation and morphological analysis tool for Finnish language
 EAPI=7
 HOMEPAGE=https://voikko.puimula.org/
+INHERIT=python-r1 verify-sig
 IUSE=+expvfst +hfst verify-sig python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
 KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2+
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=7d394c7f94d2677be47b2730a37601d8
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.11 b/metadata/md5-cache/dev-libs/libwacom-1.11
index eddb7214c10a..ad4eadbaaf2b 100644
--- a/metadata/md5-cache/dev-libs/libwacom-1.11
+++ b/metadata/md5-cache/dev-libs/libwacom-1.11
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
 EAPI=8
 HOMEPAGE=https://github.com/linuxwacom/libwacom
+INHERIT=meson python-any-r1 toolchain-funcs udev
 IUSE=doc test
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.11/libwacom-1.11.tar.bz2
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=a27f44780a14fa029547e55c8a52a9cc
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.12 b/metadata/md5-cache/dev-libs/libwacom-1.12
index bd4c15a5bff1..f87e0de0c2d4 100644
--- a/metadata/md5-cache/dev-libs/libwacom-1.12
+++ b/metadata/md5-cache/dev-libs/libwacom-1.12
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
 EAPI=8
 HOMEPAGE=https://github.com/linuxwacom/libwacom
+INHERIT=meson python-any-r1 toolchain-funcs udev
 IUSE=doc test
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.12/libwacom-1.12.tar.bz2
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=a27f44780a14fa029547e55c8a52a9cc
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.7 b/metadata/md5-cache/dev-libs/libwbxml-0.11.7
index 519468a6bbfe..5c1b937be5d7 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.7
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.7
@@ -4,6 +4,7 @@ DEPEND=dev-libs/expat virtual/libiconv test? ( dev-libs/check )
 DESCRIPTION=Library and tools to parse, encode and handle WBXML documents
 EAPI=7
 HOMEPAGE=https://github.com/libwbxml/libwbxml
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/expat virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libwbxml/libwbxml/archive/libwbxml-0.11.7.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2d8673c6ab6c167be7b9340f5715eccd
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.7-r1 b/metadata/md5-cache/dev-libs/libwbxml-0.11.7-r1
index 4ef83ef151f0..5be72ca1a555 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.7-r1
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.7-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/expat virtual/libiconv test? ( dev-libs/check )
 DESCRIPTION=Library and tools to parse, encode and handle WBXML documents
 EAPI=7
 HOMEPAGE=https://github.com/libwbxml/libwbxml
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/expat virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libwbxml/libwbxml/archive/libwbxml-0.11.7.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b2818593b0528e0e9655d30e5f2ab7d7
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.8 b/metadata/md5-cache/dev-libs/libwbxml-0.11.8
index 19837e10e462..69df9de8665f 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.8
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.8
@@ -4,6 +4,7 @@ DEPEND=dev-libs/expat virtual/libiconv test? ( dev-libs/check )
 DESCRIPTION=Library and tools to parse, encode and handle WBXML documents
 EAPI=8
 HOMEPAGE=https://github.com/libwbxml/libwbxml
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/expat virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libwbxml/libwbxml/archive/libwbxml-0.11.8.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6b6054a806c3d8e86a18e7481a848e38
diff --git a/metadata/md5-cache/dev-libs/libx86-1.1-r4 b/metadata/md5-cache/dev-libs/libx86-1.1-r4
index 86ea524caf4d..cc8c6c2116f4 100644
--- a/metadata/md5-cache/dev-libs/libx86-1.1-r4
+++ b/metadata/md5-cache/dev-libs/libx86-1.1-r4
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=A hardware-independent library for executing real-mode x86 code
 EAPI=6
 HOMEPAGE=https://www.codon.org.uk/~mjg59/libx86/
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=static-libs
 KEYWORDS=amd64 ~arm -ppc -riscv -sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3d1538bfacbec4286c7169c14fbfcbd9
diff --git a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1 b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
index c0c18d25b4da..3b7b4a06f812 100644
--- a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solari
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-1.2.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=192799c4f58b3f8fa6125c5870ea40af
diff --git a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.3 b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.3
index 6cb20a4b8ed9..07fc0e9222da 100644
--- a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.3
+++ b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-1.2.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=809f0fd1b8d596f5d6244f2c300a2257
diff --git a/metadata/md5-cache/dev-libs/libxdiff-0.23-r2 b/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
index 1ed6e3459f9a..5e9e60cbc398 100644
--- a/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
+++ b/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
@@ -3,9 +3,10 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Library for creating diff files
 EAPI=6
 HOMEPAGE=http://www.xmailserver.org/xdiff-lib.html
+INHERIT=autotools
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.xmailserver.org/libxdiff-0.23.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7f559089fdcebe785917762b266d45ee
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.13-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.13-r1
index 62ea3e14cd28..a69d88b5e06b 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.13-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.13-r1
@@ -4,13 +4,14 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
+INHERIT=autotools flag-o-matic prefix python-r1 multilib-minimal gnome.org
 IUSE=debug examples icu lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libxml2/2.9/libxml2-2.9.13.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r5-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=49f1dfa63b4c5bca79a5dae2635b0fe9
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3376e60b9906c3f78aa99c5c5ea167fa
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5 b/metadata/md5-cache/dev-libs/libxml2-2.9.14-r1
index 740ed0d2c887..166d944e8881 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.14-r1
@@ -1,16 +1,17 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-danielveillard ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) ) readline? ( sys-libs/readline:= )
 DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-IUSE=debug examples icu lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-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
+INHERIT=autotools flag-o-matic python-r1 multilib-minimal gnome.org libtool
+IUSE=debug examples icu lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=2
-SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r5-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d8f314e93101115669da264146f1107d
+SRC_URI=mirror://gnome/sources/libxml2/2.9/libxml2-2.9.14.tar.xz https://dev.gentoo.org/~soap/distfiles/libxml2-2.9.14-patches-r0.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a60dc9f4f5bede5cec6fa519734e9d77
diff --git a/metadata/md5-cache/dev-libs/libxml2-9999 b/metadata/md5-cache/dev-libs/libxml2-9999
index 0746d533a013..11f29c50b3fd 100644
--- a/metadata/md5-cache/dev-libs/libxml2-9999
+++ b/metadata/md5-cache/dev-libs/libxml2-9999
@@ -1,9 +1,10 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig dev-util/gtk-doc-am sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) ) readline? ( sys-libs/readline:= )
 DESCRIPTION=XML C parser and toolkit
 EAPI=8
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
+INHERIT=flag-o-matic python-r1 multilib-minimal autotools git-r3
 IUSE=debug examples icu lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
@@ -12,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c78887825d95c600762e9154a06b4cb5
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=012dae678731a0b0c56adc5a6a3da89f
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.15-r1 b/metadata/md5-cache/dev-libs/libxmlb-0.1.15-r1
index a2e4f44efd03..72c6c7872e9f 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.15-r1
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.15-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer:
 DESCRIPTION=Library to help create and query binary XML blobs
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libxmlb
+INHERIT=meson python-any-r1
 IUSE=doc introspection stemmer test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.15.tar.gz -> libxmlb-0.1.15.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9abae5269aa3f5fb9a634f8f86584a97
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.3.7 b/metadata/md5-cache/dev-libs/libxmlb-0.3.7
index 9eebe94516bb..a5b76e222090 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.3.7
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.3.7
@@ -4,6 +4,7 @@ DEPEND=app-arch/xz-utils dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs
 DESCRIPTION=Library to help create and query binary XML blobs
 EAPI=8
 HOMEPAGE=https://github.com/hughsie/libxmlb
+INHERIT=meson python-any-r1
 IUSE=doc introspection stemmer test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=app-arch/xz-utils dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-lib
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.3.7.tar.gz -> libxmlb-0.3.7.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c89e78769396d3e5acfa1bd6f4d4b1b3
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.3.8 b/metadata/md5-cache/dev-libs/libxmlb-0.3.8
index ffd8b9a75c89..5fda2272cc14 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.3.8
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.3.8
@@ -4,6 +4,7 @@ DEPEND=app-arch/xz-utils dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs
 DESCRIPTION=Library to help create and query binary XML blobs
 EAPI=8
 HOMEPAGE=https://github.com/hughsie/libxmlb
+INHERIT=meson python-any-r1
 IUSE=doc introspection stemmer test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=app-arch/xz-utils dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-lib
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.3.8.tar.gz -> libxmlb-0.3.8.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c89e78769396d3e5acfa1bd6f4d4b1b3
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r2 b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r2
deleted file mode 100644
index 3eacd25916c3..000000000000
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/pkgconfig-1 verify-sig? ( sec-keys/openpgp-keys-danielveillard ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=XSLT libraries and tools
-EAPI=7
-HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt
-IUSE=crypt debug examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz verify-sig? ( ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz.asc )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=4710fcfb416e1c2d2baf18be2f88b5cb
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.35 b/metadata/md5-cache/dev-libs/libxslt-1.1.35
index d1aae379cbe9..e30bfdabcc53 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.35
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.35
@@ -5,10 +5,10 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libxslt
 IUSE=crypt debug examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libxslt/1.1/libxslt-1.1.35.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=58abc933d23f18b6f85b11a7f78bd592
+_md5_=4750687ee950baa4715417351f097ffe
diff --git a/metadata/md5-cache/dev-libs/libxslt-9999 b/metadata/md5-cache/dev-libs/libxslt-9999
index 652e7acfa2b6..226ab909dc71 100644
--- a/metadata/md5-cache/dev-libs/libxslt-9999
+++ b/metadata/md5-cache/dev-libs/libxslt-9999
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=XSLT libraries and tools
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libxslt
+INHERIT=libtool python-r1 multilib-minimal autotools git-r3
 IUSE=crypt debug examples python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3c3d484c480c85c8bd6d53336815c2e3
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.2 b/metadata/md5-cache/dev-libs/libyaml-0.2.2
index c3fbe53e03d6..a98dd8b9e87f 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.2
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/libyaml/archive/0.2.2.tar.gz -> libyaml-0.2.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8583e735da06e702b580a3afd7805f5d
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.5 b/metadata/md5-cache/dev-libs/libyaml-0.2.5
index 1bab379494f9..e23d4b715531 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.5
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.5
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=YAML 1.1 parser and emitter written in C
 EAPI=7
 HOMEPAGE=https://github.com/yaml/libyaml
+INHERIT=autotools libtool
 IUSE=doc static-libs test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/libyaml/archive/0.2.5.tar.gz -> libyaml-0.2.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8583e735da06e702b580a3afd7805f5d
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=d853a63df434a2acbba4c8a39f9ba319
diff --git a/metadata/md5-cache/dev-libs/libzia-4.30 b/metadata/md5-cache/dev-libs/libzia-4.30
deleted file mode 100644
index 3e128d4edf76..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.30
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
-DESCRIPTION=Platform abstraction code for tucnak package
-EAPI=7
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.30.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5327aeab6d6afc7e7a0159c7d673e2f9
diff --git a/metadata/md5-cache/dev-libs/libzia-4.34 b/metadata/md5-cache/dev-libs/libzia-4.34
index 72810af82cbd..2ddd8ad47dbc 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.34
+++ b/metadata/md5-cache/dev-libs/libzia-4.34
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.34.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1b858146dbd0ba215d850de3a3fbebbd
diff --git a/metadata/md5-cache/dev-libs/libzia-4.32 b/metadata/md5-cache/dev-libs/libzia-4.36
index 8132776ee873..f169a23b0c79 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.32
+++ b/metadata/md5-cache/dev-libs/libzia-4.36
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftd
 DESCRIPTION=Platform abstraction code for tucnak package
 EAPI=8
 HOMEPAGE=http://tucnak.nagano.cz
+INHERIT=autotools
 IUSE=ftdi
-KEYWORDS=amd64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
 SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.32.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=dde5d194e1570e3615253f7a73c4429b
+SRC_URI=http://tucnak.nagano.cz/libzia-4.36.tar.gz
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=b975b9861fe7f7c840d44993b1bf2914
diff --git a/metadata/md5-cache/dev-libs/libzip-1.8.0-r1 b/metadata/md5-cache/dev-libs/libzip-1.8.0-r1
index c441815d4b76..8add662faf97 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.8.0-r1
+++ b/metadata/md5-cache/dev-libs/libzip-1.8.0-r1
@@ -4,6 +4,7 @@ DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl
 DESCRIPTION=Library for manipulating zip archives
 EAPI=7
 HOMEPAGE=https://nih.at/libzip/
+INHERIT=cmake multibuild flag-o-matic
 IUSE=bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
@@ -12,5 +13,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.8.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ac2c9ea1fea39548a0579e4ee73b88bf
diff --git a/metadata/md5-cache/dev-libs/light-1.2.2-r2 b/metadata/md5-cache/dev-libs/light-1.2.2-r2
index 274be72eb912..5257d9f34fc2 100644
--- a/metadata/md5-cache/dev-libs/light-1.2.2-r2
+++ b/metadata/md5-cache/dev-libs/light-1.2.2-r2
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure postinst prepare
-DEPEND=udev? ( virtual/libudev:= ) acct-group/video !sys-power/acpilight
+DEPEND=acct-group/video !sys-power/acpilight udev? ( virtual/libudev:= )
 DESCRIPTION=A program to control backlights (and other hardware lights)
 EAPI=8
 HOMEPAGE=https://github.com/haikarainen/light
 IUSE=udev
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=acct-group/video !sys-power/acpilight
+RDEPEND=acct-group/video !sys-power/acpilight udev? ( virtual/libudev:= )
 SLOT=0
 SRC_URI=https://github.com/haikarainen/light/archive/v1.2.2.tar.gz -> light-1.2.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=74741d661a66e369b1e8cb32d46fc9b8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=e09d3e5f13c012556a003acba11c2f3e
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.10.2 b/metadata/md5-cache/dev-libs/link-grammar-5.10.2
deleted file mode 100644
index 7cb49e19dbaf..000000000000
--- a/metadata/md5-cache/dev-libs/link-grammar-5.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/swig:0 sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) !sci-mathematics/minisat
-DESCRIPTION=A Syntactic English parser
-EAPI=8
-HOMEPAGE=https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/
-IUSE=aspell +hunspell python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) !sci-mathematics/minisat
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0/5
-SRC_URI=https://www.abisource.com/downloads/link-grammar/5.10.2/link-grammar-5.10.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=438d756426aa305dc61a992a6cb8f8bb
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.10.4 b/metadata/md5-cache/dev-libs/link-grammar-5.10.4
index 7976afcf0a93..8843f878a317 100644
--- a/metadata/md5-cache/dev-libs/link-grammar-5.10.4
+++ b/metadata/md5-cache/dev-libs/link-grammar-5.10.4
@@ -4,6 +4,7 @@ DEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell
 DESCRIPTION=A Syntactic English parser
 EAPI=8
 HOMEPAGE=https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/
+INHERIT=autotools python-r1 out-of-source
 IUSE=aspell +hunspell python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspel
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0/5
 SRC_URI=https://www.abisource.com/downloads/link-grammar/5.10.4/link-grammar-5.10.4.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=153e0abc27691c55057a115b0039792a
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r4 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r4
index 8cac85485d05..9fe500bf101f 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r4
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r4
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install preinst prepare setup test
 DESCRIPTION=Library for locking devices
 EAPI=8
 HOMEPAGE=http://packages.debian.org/source/sid/lockdev
+INHERIT=perl-module autotools multilib-minimal
 IUSE=perl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0b61114a399c228e7a1aba047c08118f
diff --git a/metadata/md5-cache/dev-libs/log4cplus-2.0.6 b/metadata/md5-cache/dev-libs/log4cplus-2.0.6
deleted file mode 100644
index 97961496af4e..000000000000
--- a/metadata/md5-cache/dev-libs/log4cplus-2.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
-DESCRIPTION=C++ port of the Log for Java (log4j) logging library
-EAPI=7
-HOMEPAGE=https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus
-IUSE=explicit-initialization iconv qt5 server test threads
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( Apache-2.0 BSD-2 )
-RDEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/2.0.6/log4cplus-2.0.6.tar.bz2
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c3980b1ddc5aa52214998ee06be98e97
diff --git a/metadata/md5-cache/dev-libs/log4cplus-2.0.7 b/metadata/md5-cache/dev-libs/log4cplus-2.0.7
index d7741f5ee285..392f7728467e 100644
--- a/metadata/md5-cache/dev-libs/log4cplus-2.0.7
+++ b/metadata/md5-cache/dev-libs/log4cplus-2.0.7
@@ -4,6 +4,7 @@ DEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
 DESCRIPTION=C++ port of the Log for Java (log4j) logging library
 EAPI=7
 HOMEPAGE=https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus
+INHERIT=cmake
 IUSE=explicit-initialization iconv qt5 server test threads
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=|| ( Apache-2.0 BSD-2 )
@@ -11,5 +12,5 @@ RDEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/2.0.7/log4cplus-2.0.7.tar.bz2
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=406e51b4a5b5af4c8bb8bfa324c15e53
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1.3 b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
index b0736a67c6f7..2be85e34e5e0 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1.3
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
@@ -3,11 +3,12 @@ DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20
 DESCRIPTION=C++ classes for flexible logging to files, syslog and other destinations
 EAPI=6
 HOMEPAGE=http://log4cpp.sourceforge.net/
+INHERIT=autotools multilib-minimal
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ppc ~s390 x86
+KEYWORDS=amd64 ~arm ppc ~riscv ~s390 x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8cbcf1b2afb8c99344ce1441b49ff84f
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=7ea5958ddca3287712dc70e457242599
diff --git a/metadata/md5-cache/dev-libs/log4cxx-0.11.0 b/metadata/md5-cache/dev-libs/log4cxx-0.11.0
index 56ba8c42df13..a32ad15d9c23 100644
--- a/metadata/md5-cache/dev-libs/log4cxx-0.11.0
+++ b/metadata/md5-cache/dev-libs/log4cxx-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=iodbc? ( !odbc )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d1120973c81c923f8893d8dae32bc6fd
diff --git a/metadata/md5-cache/dev-libs/lzo-2.10 b/metadata/md5-cache/dev-libs/lzo-2.10
index 46248b6b68f1..28ad7e92f9e1 100644
--- a/metadata/md5-cache/dev-libs/lzo-2.10
+++ b/metadata/md5-cache/dev-libs/lzo-2.10
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=An extremely fast compression and decompression library
 EAPI=7
 HOMEPAGE=https://www.oberhumer.com/opensource/lzo/
+INHERIT=multilib-minimal usr-ldscript
 IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=2
 SRC_URI=https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=70857e091e9db6e3fcb02e62c78749bc
+_md5_=1e6f904395c4fe0a6996cbd8558fe158
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.8.0 b/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
index d29733e12bdf..2df4b720147a 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.8.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-db/m17n-db-1.8.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/m17n-lib-1.8.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4bae855339c17fb319872bce85a357a3
diff --git a/metadata/md5-cache/dev-libs/maloc-1.5-r1 b/metadata/md5-cache/dev-libs/maloc-1.5-r1
index b7141208d690..36bdf887bc0b 100644
--- a/metadata/md5-cache/dev-libs/maloc-1.5-r1
+++ b/metadata/md5-cache/dev-libs/maloc-1.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/maloc-1.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=82d228ad26492722ecfc89fef04455ed
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.5 b/metadata/md5-cache/dev-libs/marisa-0.2.5
index 28c3268e0123..6ecea4357059 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.5
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.5
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
 EAPI=7
 HOMEPAGE=https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/
+INHERIT=autotools distutils-r1
 IUSE=python static-libs python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm64 ppc ppc64 sparc x86
 LICENSE=|| ( BSD-2 LGPL-2.1+ )
@@ -11,5 +12,5 @@ RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.5.tar.gz -> marisa-0.2.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b6354e76ae9fd5b7dba8ae27be44f09a
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.6 b/metadata/md5-cache/dev-libs/marisa-0.2.6
index 68a9a8b2eb85..e21dbe27043f 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.6
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.6
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
 EAPI=8
 HOMEPAGE=https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/
+INHERIT=autotools distutils-r1 toolchain-funcs
 IUSE=python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( BSD-2 LGPL-2.1+ )
@@ -11,5 +12,5 @@ RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.6.tar.gz -> marisa-0.2.6.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0e9968ded311e256ed1d5f1ee086bef5
diff --git a/metadata/md5-cache/dev-libs/marisa-9999 b/metadata/md5-cache/dev-libs/marisa-9999
index b40cc5feaee1..bab1b845384f 100644
--- a/metadata/md5-cache/dev-libs/marisa-9999
+++ b/metadata/md5-cache/dev-libs/marisa-9999
@@ -4,11 +4,12 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
 EAPI=8
 HOMEPAGE=https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/
+INHERIT=autotools distutils-r1 toolchain-funcs git-r3
 IUSE=python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=|| ( BSD-2 LGPL-2.1+ )
 PROPERTIES=live
 RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a06846fbc789056510e32b3b3943beaf
diff --git a/metadata/md5-cache/dev-libs/metee-3.1.2 b/metadata/md5-cache/dev-libs/metee-3.1.2
index 90a5ae7e2567..f9655af09b05 100644
--- a/metadata/md5-cache/dev-libs/metee-3.1.2
+++ b/metadata/md5-cache/dev-libs/metee-3.1.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform access library for Intel CSME HECI interface
 EAPI=8
 HOMEPAGE=https://github.com/intel/metee
+INHERIT=cmake
 IUSE=doc
 KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/intel/metee/archive/refs/tags/3.1.2.tar.gz -> metee-3.1.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f0687a917d4074d032a2ddff52b55b29
diff --git a/metadata/md5-cache/dev-libs/metee-3.1.3 b/metadata/md5-cache/dev-libs/metee-3.1.3
new file mode 100644
index 000000000000..9d6a745fdf42
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/metee-3.1.3
@@ -0,0 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cross-platform access library for Intel CSME HECI interface
+EAPI=8
+HOMEPAGE=https://github.com/intel/metee
+INHERIT=cmake
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0/3.1.3
+SRC_URI=https://github.com/intel/metee/archive/refs/tags/3.1.3.tar.gz -> metee-3.1.3.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3646fff753d7a427297cd2911694fffa
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r1 b/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r1
deleted file mode 100644
index e856612b2924..000000000000
--- a/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A compact general purpose allocator with excellent performance
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/mimalloc
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz -> mimalloc-2.0.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b17bdd610a9905f40de6e51cf33aa7eb
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2 b/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2
index a569106371aa..f29483083483 100644
--- a/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2
+++ b/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A compact general purpose allocator with excellent performance
 EAPI=8
 HOMEPAGE=https://github.com/microsoft/mimalloc
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz -> mimalloc-2.0.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2442b3f6ea90c2606ae1ca28723aed56
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.0.6 b/metadata/md5-cache/dev-libs/mimalloc-2.0.6
index 81ade02ed3ea..0f110e12bf7a 100644
--- a/metadata/md5-cache/dev-libs/mimalloc-2.0.6
+++ b/metadata/md5-cache/dev-libs/mimalloc-2.0.6
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A compact general purpose allocator with excellent performance
 EAPI=8
 HOMEPAGE=https://github.com/microsoft/mimalloc
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.6.tar.gz -> mimalloc-2.0.6.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a49c2a2753a302e924b04abee18dad75
diff --git a/metadata/md5-cache/dev-libs/mimetic-0.9.8 b/metadata/md5-cache/dev-libs/mimetic-0.9.8
index ecfad5392e8f..8ecd7792e0f5 100644
--- a/metadata/md5-cache/dev-libs/mimetic-0.9.8
+++ b/metadata/md5-cache/dev-libs/mimetic-0.9.8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.codesink.org/download/mimetic-0.9.8.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cc4f4cda8fc4d7ffcc313eddb5472c2c
diff --git a/metadata/md5-cache/dev-libs/miniz-2.1.0-r3 b/metadata/md5-cache/dev-libs/miniz-2.1.0-r3
index 20ea8768357b..1a15c4ba835b 100644
--- a/metadata/md5-cache/dev-libs/miniz-2.1.0-r3
+++ b/metadata/md5-cache/dev-libs/miniz-2.1.0-r3
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A lossless, high performance data compression library
 EAPI=7
 HOMEPAGE=https://github.com/richgel999/miniz
+INHERIT=cmake
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
 SLOT=0/2.1.0
 SRC_URI=https://github.com/richgel999/miniz/archive/2.1.0.tar.gz -> miniz-2.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=855fee5410c214087ea02bd1fe319d18
diff --git a/metadata/md5-cache/dev-libs/miniz-2.2.0 b/metadata/md5-cache/dev-libs/miniz-2.2.0
index 131858680232..cab54f4aeef6 100644
--- a/metadata/md5-cache/dev-libs/miniz-2.2.0
+++ b/metadata/md5-cache/dev-libs/miniz-2.2.0
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A lossless, high performance data compression library
 EAPI=8
 HOMEPAGE=https://github.com/richgel999/miniz
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0/2.2.0
 SRC_URI=https://github.com/richgel999/miniz/archive/2.2.0.tar.gz -> miniz-2.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f34f1755d136baf5bd5e9031b737c43b
diff --git a/metadata/md5-cache/dev-libs/miniz-9999 b/metadata/md5-cache/dev-libs/miniz-9999
index d53e08342525..139be308c7e4 100644
--- a/metadata/md5-cache/dev-libs/miniz-9999
+++ b/metadata/md5-cache/dev-libs/miniz-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A lossless, high performance data compression library
 EAPI=7
 HOMEPAGE=https://github.com/richgel999/miniz
+INHERIT=cmake git-r3
 IUSE=examples static-libs
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=51df71e46b9f5f7b5f4507c4192fa2cc
diff --git a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1 b/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1
index 7c2c095abbf9..a949a64b1ff1 100644
--- a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1
+++ b/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/msgpack
 DESCRIPTION=The pure C++ implementation of the MMTF API, decoder and encoder
 EAPI=8
 HOMEPAGE=https://github.com/rcsb/mmtf-cpp
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/msgpack
 SLOT=0
 SRC_URI=https://github.com/rcsb/mmtf-cpp/archive/v1.0.0.tar.gz -> mmtf-cpp-1.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fd19388229b99fe598d545f115cd75a5
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0
index 01ec3899a3e5..e82ed9ece241 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0
@@ -4,13 +4,14 @@ DEPEND=app-arch/snappy:= app-arch/zstd:= >=dev-libs/libbson-1.18.0[static-libs?]
 DESCRIPTION=Client library written in C for MongoDB
 EAPI=7
 HOMEPAGE=https://github.com/mongodb/mongo-c-driver
+INHERIT=cmake
 IUSE=debug examples icu sasl ssl static-libs test
-KEYWORDS=amd64 ~hppa ~riscv ~s390 x86
+KEYWORDS=amd64 ~hppa ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/snappy:= app-arch/zstd:= >=dev-libs/libbson-1.18.0[static-libs?] dev-python/sphinx sys-libs/zlib:= icu? ( dev-libs/icu:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=test? ( static-libs )
 RESTRICT=x86? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.18.0/mongo-c-driver-1.18.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d9de31fbef6dbdab674301ab61063891
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a97f12212e4135aed00cb02fd0931b65
diff --git a/metadata/md5-cache/dev-libs/mpc-1.2.1 b/metadata/md5-cache/dev-libs/mpc-1.2.1
index 4b092819e543..23ebd3a77d00 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.2.1
+++ b/metadata/md5-cache/dev-libs/mpc-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=7
 HOMEPAGE=https://www.multiprecision.org/mpc/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-4.1.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/3
 SRC_URI=mirror://gnu/mpc/mpc-1.2.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3763f60e520ade353ccd6c24f139c27b
+_md5_=4f07acbc14d4bb9f89cf4747bf2c7b29
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.1.0_p13-r1 b/metadata/md5-cache/dev-libs/mpfr-4.1.0_p13-r1
index 0c5ff30ab4d2..98f8f84c1487 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.1.0_p13-r1
+++ b/metadata/md5-cache/dev-libs/mpfr-4.1.0_p13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for multiple-precision floating-point computations with exac
 EAPI=7
 HOMEPAGE=https://www.mpfr.org/ https://gitlab.inria.fr/mpfr
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/6
 SRC_URI=https://www.mpfr.org/mpfr-4.1.0/mpfr-4.1.0.tar.xz https://www.mpfr.org/mpfr-4.1.0/patch01 -> mpfr-4.1.0-patch01.patch https://www.mpfr.org/mpfr-4.1.0/patch02 -> mpfr-4.1.0-patch02.patch https://www.mpfr.org/mpfr-4.1.0/patch03 -> mpfr-4.1.0-patch03.patch https://www.mpfr.org/mpfr-4.1.0/patch04 -> mpfr-4.1.0-patch04.patch https://www.mpfr.org/mpfr-4.1.0/patch05 -> mpfr-4.1.0-patch05.patch https://www.mpfr.org/mpfr-4.1.0/patch06 -> mpfr-4.1.0-patch06.patch https://www.mpfr.org/mpfr-4.1.0/patch07 -> mpfr-4.1.0-patch07.patch https://www.mpfr.org/mpfr-4.1.0/patch08 -> mpfr-4.1.0-patch08.patch https://www.mpfr.org/mpfr-4.1.0/patch09 -> mpfr-4.1.0-patch09.patch https://www.mpfr.org/mpfr-4.1.0/patch10 -> mpfr-4.1.0-patch10.patch https://www.mpfr.org/mpfr-4.1.0/patch11 -> mpfr-4.1.0-patch11.patch https://www.mpfr.org/mpfr-4.1.0/patch12 -> mpfr-4.1.0-patch12.patch https://www.mpfr.org/mpfr-4.1.0/patch13 -> mpfr-4.1.0-patch13.patch
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bc2c394af0778b2061c61bdd08b76ab6
+_md5_=65fc333cd80433ee92d0cfa8e6b24689
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.3.0 b/metadata/md5-cache/dev-libs/msgpack-3.3.0
index ddd34318ee80..594bb63b266d 100644
--- a/metadata/md5-cache/dev-libs/msgpack-3.3.0
+++ b/metadata/md5-cache/dev-libs/msgpack-3.3.0
@@ -4,6 +4,7 @@ DEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 DESCRIPTION=MessagePack is a binary-based efficient data interchange format
 EAPI=7
 HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
+INHERIT=cmake-multilib
 IUSE=boost +cxx doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Boost-1.0
@@ -11,5 +12,5 @@ RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=73a5c33436f466b2a971391fc922a3cf
diff --git a/metadata/md5-cache/dev-libs/mxml-3.3 b/metadata/md5-cache/dev-libs/mxml-3.3
index 64ca51df0aa7..98eb58acef63 100644
--- a/metadata/md5-cache/dev-libs/mxml-3.3
+++ b/metadata/md5-cache/dev-libs/mxml-3.3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Mini-XML
 SLOT=0
 SRC_URI=https://github.com/michaelrsweet/mxml/archive/v3.3.tar.gz -> mxml-3.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=72cfa5ebb93fdd1c2d2e07d5c9ee2462
diff --git a/metadata/md5-cache/dev-libs/nanomsg-1.1.5 b/metadata/md5-cache/dev-libs/nanomsg-1.1.5
index cbee274445d8..9485b8d93c12 100644
--- a/metadata/md5-cache/dev-libs/nanomsg-1.1.5
+++ b/metadata/md5-cache/dev-libs/nanomsg-1.1.5
@@ -4,10 +4,11 @@ DEPEND=doc? ( dev-ruby/asciidoctor )
 DESCRIPTION=High-performance messaging interface for distributed applications
 EAPI=7
 HOMEPAGE=https://nanomsg.org/
+INHERIT=cmake-multilib
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~riscv x86
 LICENSE=MIT
 SLOT=0/5.0.0
 SRC_URI=https://github.com/nanomsg/nanomsg/archive/1.1.5.tar.gz -> nanomsg-1.1.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b9c9f84b0d8fbc535e9982b6b542d2cc
diff --git a/metadata/md5-cache/dev-libs/ncnn-20210525 b/metadata/md5-cache/dev-libs/ncnn-20210525-r1
index 4ccc58621fc2..717fd8d7b785 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20210525
+++ b/metadata/md5-cache/dev-libs/ncnn-20210525-r1
@@ -4,12 +4,13 @@ DEPEND=dev-util/glslang tools? ( dev-libs/protobuf:= ) vulkan? ( media-libs/vulk
 DESCRIPTION=High-performance neural network inference framework
 EAPI=7
 HOMEPAGE=https://github.com/Tencent/ncnn
+INHERIT=cmake
 IUSE=tools +vulkan
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD ZLIB
 RDEPEND=dev-util/glslang tools? ( dev-libs/protobuf:= ) vulkan? ( media-libs/vulkan-loader )
 RESTRICT=test
-SLOT=0
+SLOT=0/20210525
 SRC_URI=https://github.com/Tencent/ncnn/archive/20210525.tar.gz -> ncnn-20210525.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bd598a2cbd491a95f867c1c8e8f46ce6
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=eade8275952a549c2e1a84d9c8b2e76b
diff --git a/metadata/md5-cache/dev-libs/ncnn-20220420 b/metadata/md5-cache/dev-libs/ncnn-20220420
new file mode 100644
index 000000000000..c9273347bab3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ncnn-20220420
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/glslang tools? ( dev-libs/protobuf:= ) vulkan? ( media-libs/vulkan-loader ) vulkan? ( dev-util/vulkan-headers )
+DESCRIPTION=High-performance neural network inference framework
+EAPI=8
+HOMEPAGE=https://github.com/Tencent/ncnn/
+INHERIT=cmake
+IUSE=tools +vulkan
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD ZLIB
+RDEPEND=dev-util/glslang tools? ( dev-libs/protobuf:= ) vulkan? ( media-libs/vulkan-loader )
+RESTRICT=test
+SLOT=0/20220420
+SRC_URI=https://github.com/Tencent/ncnn/archive/20220420.tar.gz -> ncnn-20220420.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=70b40fd379a6362700143e5d4cbdb0a4
diff --git a/metadata/md5-cache/dev-libs/nettle-3.7.3 b/metadata/md5-cache/dev-libs/nettle-3.7.3
index 9acedea30a15..b3a02d0cf48f 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.7.3
+++ b/metadata/md5-cache/dev-libs/nettle-3.7.3
@@ -5,11 +5,11 @@ DESCRIPTION=Low-level cryptographic library
 EAPI=7
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 IUSE=+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/8-6
 SRC_URI=mirror://gnu/nettle/nettle-3.7.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=05ecad08767b2a3996c977b7ea40624b
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0e1d1dde53c936eb015e6b389cff3e17
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.21-r1 b/metadata/md5-cache/dev-libs/newt-0.52.21-r1
index ff5475476767..a162e60b8510 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.21-r1
+++ b/metadata/md5-cache/dev-libs/newt-0.52.21-r1
@@ -4,6 +4,7 @@ DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_t
 DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=7
 HOMEPAGE=https://pagure.io/newt
+INHERIT=autotools python-r1 toolchain-funcs
 IUSE=gpm nls tcl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.pagure.org/newt/newt-0.52.21.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9e39174142637a46b937bb8fbcc71c76
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816 b/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
index cb3830ef6621..30b44351c407 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
+++ b/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
@@ -1,9 +1,10 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/popt-1.6 =sys-libs/slang-2* gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=7
 HOMEPAGE=https://pagure.io/newt
+INHERIT=autotools python-r1 toolchain-funcs
 IUSE=gpm nls tcl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mlichvar/newt/archive/a7533580cd092e6a71c4ed722e830da4eb884d06.tar.gz -> newt-0.52.21_p20210816.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=06c4a3da57e969954520aa7f94b1a861
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0e15284018cdb27c2956837f00eb8d64
diff --git a/metadata/md5-cache/dev-libs/npth-1.6-r1 b/metadata/md5-cache/dev-libs/npth-1.6-r1
index 050e2677bf9e..9014c0dfde81 100644
--- a/metadata/md5-cache/dev-libs/npth-1.6-r1
+++ b/metadata/md5-cache/dev-libs/npth-1.6-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=New GNU Portable Threads Library
 EAPI=7
 HOMEPAGE=https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.6.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2318ec7dc94fc410bfcf3b3924ef711b
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=bcd35d3dd09dcbfe45d0802cc026079d
diff --git a/metadata/md5-cache/dev-libs/nspr-4.33 b/metadata/md5-cache/dev-libs/nspr-4.33
index 15ab17ad6af9..dce32dcc395e 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.33
+++ b/metadata/md5-cache/dev-libs/nspr-4.33
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.33/src/nspr-4.33.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=77510260174be2d4ae7c53fde2f4bea2
diff --git a/metadata/md5-cache/dev-libs/nss-3.76.1 b/metadata/md5-cache/dev-libs/nss-3.78
index 175d89a9ee5b..4f240688614f 100644
--- a/metadata/md5-cache/dev-libs/nss-3.76.1
+++ b/metadata/md5-cache/dev-libs/nss-3.78
@@ -10,6 +10,6 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 RESTRICT=test
 SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_76_1_RTM/src/nss-3.76.1.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_78_RTM/src/nss-3.78.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6e51effc10753867772c08e74cfd446b
+_md5_=80cb8deb6239bd06043607c8bb5873b3
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.8 b/metadata/md5-cache/dev-libs/nss-pem-1.0.8
index 7070b8573d77..b5a3ae7a56b0 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.8
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.8
@@ -4,11 +4,12 @@ DEPEND=!<=dev-libs/nss-3.50 >=dev-libs/nss-3.50-r1
 DESCRIPTION=PEM file reader for Network Security Services (NSS)
 EAPI=7
 HOMEPAGE=https://github.com/kdudka/nss-pem
+INHERIT=cmake-multilib
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris
 LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.8/nss-pem-1.0.8.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3532f6ab3a9f07efda6894601723c409
diff --git a/metadata/md5-cache/dev-libs/nsync-1.20.1 b/metadata/md5-cache/dev-libs/nsync-1.20.1
index fc834c78d87a..5396830bbcce 100644
--- a/metadata/md5-cache/dev-libs/nsync-1.20.1
+++ b/metadata/md5-cache/dev-libs/nsync-1.20.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C library that exports various synchronization primitives, such as mutexes
 EAPI=7
 HOMEPAGE=https://github.com/google/nsync
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/nsync/archive/1.20.1.tar.gz -> nsync-1.20.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3d0d8c692b2cbb5f499c6782d9c3af0f
diff --git a/metadata/md5-cache/dev-libs/nsync-1.24.0 b/metadata/md5-cache/dev-libs/nsync-1.24.0
index 70f57e93d110..7b41f7f22249 100644
--- a/metadata/md5-cache/dev-libs/nsync-1.24.0
+++ b/metadata/md5-cache/dev-libs/nsync-1.24.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C library that exports various synchronization primitives, such as mutexes
 EAPI=7
 HOMEPAGE=https://github.com/google/nsync
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/nsync/archive/1.24.0.tar.gz -> nsync-1.24.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3d0d8c692b2cbb5f499c6782d9c3af0f
diff --git a/metadata/md5-cache/dev-libs/ntl-11.4.4 b/metadata/md5-cache/dev-libs/ntl-11.4.4
deleted file mode 100644
index 5474ccecabff..000000000000
--- a/metadata/md5-cache/dev-libs/ntl-11.4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/gmp:0= dev-libs/gf2x threads? ( >=dev-libs/gf2x-1.2 )
-DESCRIPTION=High-performance and portable C++ number theory library
-EAPI=7
-HOMEPAGE=https://www.shoup.net/ntl/ https://github.com/libntl/ntl
-IUSE=bindist doc static-libs threads cpu_flags_x86_avx2
-KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gmp:0= dev-libs/gf2x threads? ( >=dev-libs/gf2x-1.2 )
-REQUIRED_USE=bindist? ( !cpu_flags_x86_avx2 )
-SLOT=0/43
-SRC_URI=https://www.shoup.net/ntl/ntl-11.4.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b4d6ac85a9574306eae40bc36e0d3d37
diff --git a/metadata/md5-cache/dev-libs/ntl-11.5.1-r1 b/metadata/md5-cache/dev-libs/ntl-11.5.1-r1
index 34d06c50e1dc..ca8d82470c93 100644
--- a/metadata/md5-cache/dev-libs/ntl-11.5.1-r1
+++ b/metadata/md5-cache/dev-libs/ntl-11.5.1-r1
@@ -4,12 +4,13 @@ DEPEND=dev-libs/gmp:0= dev-libs/gf2x threads? ( >=dev-libs/gf2x-1.2 )
 DESCRIPTION=High-performance and portable C++ number theory library
 EAPI=8
 HOMEPAGE=https://www.shoup.net/ntl/ https://github.com/libntl/ntl
+INHERIT=toolchain-funcs gnuconfig
 IUSE=bindist doc static-libs threads cpu_flags_x86_avx2
-KEYWORDS=~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/gmp:0= dev-libs/gf2x threads? ( >=dev-libs/gf2x-1.2 )
 REQUIRED_USE=bindist? ( !cpu_flags_x86_avx2 )
 SLOT=0/44
 SRC_URI=https://www.shoup.net/ntl/ntl-11.5.1.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=267abed7a0eb3e3f49f2eaa6e5fb226e
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e1b725df8c92933eb2372930f103b759
diff --git a/metadata/md5-cache/dev-libs/nwjs-0.62.1 b/metadata/md5-cache/dev-libs/nwjs-0.63.1
index e9772aa7794e..28b45aabda9f 100644
--- a/metadata/md5-cache/dev-libs/nwjs-0.62.1
+++ b/metadata/md5-cache/dev-libs/nwjs-0.63.1
@@ -5,8 +5,8 @@ HOMEPAGE=https://nwjs.io
 IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_et +l10n_fa +l10n_fil +l10n_fi +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=MIT
-RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/libglvnd media-libs/vulkan-loader media-video/ffmpeg-chromium:96 net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango[X]
+RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/libglvnd media-libs/vulkan-loader media-video/ffmpeg-chromium:100 net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( https://dl.nwjs.io/v0.62.1/nwjs-v0.62.1-linux-x64.tar.gz )
+SRC_URI=amd64? ( https://dl.nwjs.io/v0.63.1/nwjs-v0.63.1-linux-x64.tar.gz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=60de8be12bf315f9ad2420789a9b916e
+_md5_=1570d458e9ead20afbcb9cb0b0343ac8
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.3.0 b/metadata/md5-cache/dev-libs/ocl-icd-2.3.0
index 7fe2ee571106..c27f3ffbdab2 100644
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.3.0
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.3.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-util/opencl-headers-2021.04.29 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
 SLOT=0
 SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.3.0.tar.gz -> ocl-icd-2.3.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=02acd0e23dee98f53954df464589638e
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.3.1 b/metadata/md5-cache/dev-libs/ocl-icd-2.3.1
index fd5df4b8285d..af45cefcce84 100644
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.3.1
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.3.1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-util/opencl-headers-2021.04.29 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
 SLOT=0
 SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.3.1.tar.gz -> ocl-icd-2.3.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=da5a22e243ca8323a8c776980f1b66fb
diff --git a/metadata/md5-cache/dev-libs/onigmo-6.1.3 b/metadata/md5-cache/dev-libs/onigmo-6.1.3
index be0e2787533d..18c674367e58 100644
--- a/metadata/md5-cache/dev-libs/onigmo-6.1.3
+++ b/metadata/md5-cache/dev-libs/onigmo-6.1.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD-2
 SLOT=0/6
 SRC_URI=https://github.com/k-takata/Onigmo/releases/download/Onigmo-6.1.3/onigmo-6.1.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ccd23e36fb12fedac3bb5a5328e5967f
diff --git a/metadata/md5-cache/dev-libs/onigmo-6.2.0 b/metadata/md5-cache/dev-libs/onigmo-6.2.0
index 10408f1fd7ed..853806524cbd 100644
--- a/metadata/md5-cache/dev-libs/onigmo-6.2.0
+++ b/metadata/md5-cache/dev-libs/onigmo-6.2.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD-2
 SLOT=0/6
 SRC_URI=https://github.com/k-takata/Onigmo/releases/download/Onigmo-6.2.0/onigmo-6.2.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8acc57d176314f3948c3fe3a433c02d3
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1 b/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
index 59428a2074eb..8f33d04e6ff8 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Regular expression library for different character encodings
 EAPI=7
 HOMEPAGE=https://github.com/kkos/oniguruma
+INHERIT=multilib-minimal
 IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.7.1/onig-6.9.7.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cb43356076db9b83148b681ce217eff2
+_md5_=2f8e79de7a902b1b7229bc78909c44c8
diff --git a/metadata/md5-cache/dev-libs/oniguruma-9999 b/metadata/md5-cache/dev-libs/oniguruma-9999
index 482e738d8a68..ce90df31fb7b 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-9999
+++ b/metadata/md5-cache/dev-libs/oniguruma-9999
@@ -7,5 +7,5 @@ IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_m
 LICENSE=BSD-2
 PROPERTIES=live
 SLOT=0/5
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d9690b41ea7b9af7ed7b34636ab3e4a1
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222 b/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222
deleted file mode 100644
index 3bf1820eff1f..000000000000
--- a/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/spirv-llvm-translator-11.0.0:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/clang-11.1.0:11=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=OpenCL-oriented thin wrapper library around clang
-EAPI=7
-HOMEPAGE=https://github.com/intel/opencl-clang
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-util/spirv-llvm-translator-11.0.0:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/clang-11.1.0:11=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=11
-SRC_URI=https://github.com/intel/opencl-clang/archive/c67648d41df00ea8ee9d701d17299b86f86f0321.tar.gz -> opencl-clang-11.1.0_pre20201222.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b2fba45ffb15100bd8e786ece843d893
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-12.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-12.0.0
index 2afa1787e877..6b2d452bed3b 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-12.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-12.0.0
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/spirv-llvm-translator-12.0.0:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-12.0.0:12=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
+DEPEND=dev-util/spirv-llvm-translator:12= sys-devel/clang:12=[static-analyzer] sys-devel/llvm:12= !!sys-devel/llvm:0
 DESCRIPTION=OpenCL-oriented thin wrapper library around clang
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/intel/opencl-clang
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+INHERIT=cmake llvm
 KEYWORDS=amd64
 LICENSE=UoI-NCSA
-RDEPEND=>=dev-util/spirv-llvm-translator-12.0.0:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-12.0.0:12=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=dev-util/spirv-llvm-translator:12= sys-devel/clang:12=[static-analyzer] sys-devel/llvm:12=
 SLOT=12
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v12.0.0.tar.gz -> opencl-clang-12.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a2417805fb87c03fedd9e82fbc13a38f
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7990eb11f40d5be9cb5d58d47a0e9f03
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-13.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-13.0.0
deleted file mode 100644
index 743a2d51e439..000000000000
--- a/metadata/md5-cache/dev-libs/opencl-clang-13.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/spirv-llvm-translator-13.0.0:13=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-13.0.0:13=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=OpenCL-oriented thin wrapper library around clang
-EAPI=7
-HOMEPAGE=https://github.com/intel/opencl-clang
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-util/spirv-llvm-translator-13.0.0:13=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-13.0.0:13=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=13
-SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v13.0.0.tar.gz -> opencl-clang-13.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=afa7580bc156e2f97a564a5cb1c0a51a
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-13.0.0-r1 b/metadata/md5-cache/dev-libs/opencl-clang-13.0.0-r1
new file mode 100644
index 000000000000..134f1b4d43b9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opencl-clang-13.0.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/spirv-llvm-translator:13= sys-devel/clang:13=[static-analyzer] sys-devel/llvm:13= !!sys-devel/llvm:0
+DESCRIPTION=OpenCL-oriented thin wrapper library around clang
+EAPI=8
+HOMEPAGE=https://github.com/intel/opencl-clang
+INHERIT=cmake llvm
+KEYWORDS=amd64
+LICENSE=UoI-NCSA
+RDEPEND=dev-util/spirv-llvm-translator:13= sys-devel/clang:13=[static-analyzer] sys-devel/llvm:13=
+SLOT=13
+SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v13.0.0.tar.gz -> opencl-clang-13.0.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=24e096e3fc9325ab9e189dfe2978f62e
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-14.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-14.0.0
new file mode 100644
index 000000000000..566b059ae335
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opencl-clang-14.0.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/spirv-llvm-translator:14= sys-devel/clang:14=[static-analyzer] sys-devel/llvm:14= !!sys-devel/llvm:0
+DESCRIPTION=OpenCL-oriented thin wrapper library around clang
+EAPI=8
+HOMEPAGE=https://github.com/intel/opencl-clang
+INHERIT=cmake llvm
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA
+RDEPEND=dev-util/spirv-llvm-translator:14= sys-devel/clang:14=[static-analyzer] sys-devel/llvm:14=
+SLOT=14
+SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v14.0.0.tar.gz -> opencl-clang-14.0.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2b248756788cbbd5dba2929aa9e5be77
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2021.06.30 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2021.06.30
index 079fb927d211..0745204c1a13 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2021.06.30
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2021.06.30
@@ -4,6 +4,7 @@ DEPEND=>=dev-util/opencl-headers-2021.06.30 !dev-libs/ocl-icd
 DESCRIPTION=Official Khronos OpenCL ICD Loader
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-ICD-Loader
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=>=dev-util/opencl-headers-2021.06.30 !dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2021.06.30.tar.gz -> opencl-icd-loader-2021.06.30.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8b12faaf037c6a3487b195a073dfa784
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2022.01.04 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2022.01.04
index 385ffd4a6796..b7002f4cb9a0 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2022.01.04
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2022.01.04
@@ -4,6 +4,7 @@ DEPEND=>=dev-util/opencl-headers-2022.01.04 !dev-libs/ocl-icd
 DESCRIPTION=Official Khronos OpenCL ICD Loader
 EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-ICD-Loader
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=>=dev-util/opencl-headers-2022.01.04 !dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2022.01.04.tar.gz -> opencl-icd-loader-2022.01.04.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6f39646803880f9ea48a030bbfed04f7
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1-r1 b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1-r1
index ab667486f55d..fea84cf69e74 100644
--- a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1-r1
+++ b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1-r1
@@ -11,5 +11,5 @@ RDEPEND=tpm? ( app-crypt/trousers ) >=dev-libs/openssl-1.1.0:0= acct-group/pkcs1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencryptoki/3.6.1/opencryptoki-3.6.1.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f86201e19a6a453437ab3fab70e79552
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r5 b/metadata/md5-cache/dev-libs/openct-0.6.20-r5
index dc8898c9a153..59bc34406252 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r5
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r5
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0= acct-group/openct acct-user/openctd
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=50817499eecaf3282c73465caf8e08d4
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.2-r3 b/metadata/md5-cache/dev-libs/openobex-1.7.2-r3
index ad2b5277317f..efabc3ff9656 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.2-r3
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.2-r3
@@ -4,11 +4,12 @@ DEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 DESCRIPTION=Implementation of the OBEX protocol used for transferring data to mobile devices
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/openobex/
+INHERIT=cmake udev
 IUSE=bluetooth doc irda usb
 KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.2/openobex-1.7.2-Source.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=97b66fbe7a7cb8b0b423f99857a8c46a
diff --git a/metadata/md5-cache/dev-libs/opensc-0.22.0 b/metadata/md5-cache/dev-libs/opensc-0.22.0
index fa63c26a1d1f..5382292e8bd1 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.22.0
+++ b/metadata/md5-cache/dev-libs/opensc-0.22.0
@@ -4,8 +4,9 @@ DEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( dev-lib
 DESCRIPTION=Libraries and applications to access smartcards
 EAPI=8
 HOMEPAGE=https://github.com/OpenSC/OpenSC/wiki
+INHERIT=bash-completion-r1 libtool
 IUSE=ctapi doc openct notify +pcsc-lite readline secure-messaging ssl test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2 )
 REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.22.0/opensc-0.22.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6082562f27fc5e34292686bb7d8ce512
+_md5_=f71cbb45efcf33c776d8fe4972d25056
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1k-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1k-r1
deleted file mode 100644
index fd5c18610c76..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1k-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1k.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=db32159233a61e498e5b08d0ae481599
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1l b/metadata/md5-cache/dev-libs/openssl-1.1.1l
deleted file mode 100644
index a0458af82d9a..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1l
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1l.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=db32159233a61e498e5b08d0ae481599
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1l-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1l-r1
deleted file mode 100644
index 477ead92187f..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1l-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1l.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2ba725a1c3d2258c40450a3676d426f3
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1n b/metadata/md5-cache/dev-libs/openssl-1.1.1n
index 9717cc9277dd..34d3cf9f999b 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1n
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1n
@@ -5,7 +5,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=7
 HOMEPAGE=https://www.openssl.org/
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1n.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1n.tar.gz.asc )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e6d5d6fbbb3d7eb2075d07c28b7229e2
+_md5_=19a4b0ce2d9e5558e160fdadb632126a
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1m b/metadata/md5-cache/dev-libs/openssl-1.1.1o
index 15af33b2cb2c..3ea0d8b56459 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1m
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1o
@@ -1,16 +1,17 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
 EAPI=7
 HOMEPAGE=https://www.openssl.org/
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+INHERIT=flag-o-matic toolchain-funcs multilib-minimal verify-sig
+IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
 RESTRICT=!test? ( test )
 SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1m.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1599d19e61cb59d5d0dd099728565b1c
+SRC_URI=mirror://openssl/source/openssl-1.1.1o.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1o.tar.gz.asc )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=011d1b725e117da707db16cd0e742662
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.1 b/metadata/md5-cache/dev-libs/openssl-3.0.1
deleted file mode 100644
index 77935989aa5f..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
-LICENSE=Apache-2.0
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.0.1.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.1.tar.gz.asc )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8181a55379d05eafafffd245e556c0a3
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.0 b/metadata/md5-cache/dev-libs/openssl-3.0.3
index caa0b6b2303a..ec097a056b7b 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.0
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.3
@@ -4,13 +4,14 @@ DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[st
 DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
 EAPI=7
 HOMEPAGE=https://www.openssl.org/
-IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
+IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
 LICENSE=Apache-2.0
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.0.0.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.0.tar.gz.asc )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=159aefafdf11a4ef4c0b8d3e281374da
+SRC_URI=mirror://openssl/source/openssl-3.0.3.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.3.tar.gz.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f11aa9e6fdbfcb29a6391fcb2e8fcc2a
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2 b/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2
index 2e5f8d15d476..8b0a1f9627d2 100644
--- a/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2
+++ b/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2
@@ -3,6 +3,7 @@ DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
 EAPI=6
 HOMEPAGE=https://www.openssl.org/
+INHERIT=flag-o-matic toolchain-funcs multilib-minimal
 IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test tls-compression 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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=openssl
@@ -10,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=!bindist? ( bindist ) test
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=32b770d6f595428e634e704de003456e
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
index 6f5036f5a5c8..310edab436c4 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
@@ -3,11 +3,12 @@ DEPEND=perl? ( dev-lang/perl:= )
 DESCRIPTION=An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID
 EAPI=6
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
+INHERIT=perl-module
 IUSE=+cxx perl static-libs
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=ISC
 RDEPEND=perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0
 _md5_=41cdfcfb75635665ebed4be9e37d69a9
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
index 3b5e64208206..8f8065568986 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
@@ -4,6 +4,7 @@ DEPEND=perl? ( dev-lang/perl test? ( virtual/perl-Test-Simple ) )
 DESCRIPTION=An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID
 EAPI=8
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
+INHERIT=perl-module
 IUSE=+cxx perl static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=ISC
@@ -11,5 +12,5 @@ RDEPEND=perl? ( dev-lang/perl:= )
 RESTRICT=perl? ( !test? ( test ) )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=6e1db3df9a741a0740ceedf436b7f58f
diff --git a/metadata/md5-cache/dev-libs/papi-6.0.0.1 b/metadata/md5-cache/dev-libs/papi-6.0.0.1
index e7511fc4d2ef..6359d809c37c 100644
--- a/metadata/md5-cache/dev-libs/papi-6.0.0.1
+++ b/metadata/md5-cache/dev-libs/papi-6.0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libpfm[static-libs] virtual/mpi virtual/fortran
 SLOT=0
 SRC_URI=http://icl.cs.utk.edu/projects/papi/downloads/papi-6.0.0.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=08b3f51cc2a5e9ef0e12be68ed20696d
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1 b/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
index 9b4954ca7575..88994bb24a53 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
+++ b/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
 EAPI=7
 HOMEPAGE=https://github.com/taocpp/PEGTL
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/2.8.3.tar.gz -> pegtl-2.8.3.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=386e8bf280a0ecf22c76b15ad9b141bc
diff --git a/metadata/md5-cache/dev-libs/pegtl-3.2.1 b/metadata/md5-cache/dev-libs/pegtl-3.2.1
index f5efb068e360..3952f875f956 100644
--- a/metadata/md5-cache/dev-libs/pegtl-3.2.1
+++ b/metadata/md5-cache/dev-libs/pegtl-3.2.1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
 EAPI=8
 HOMEPAGE=https://github.com/taocpp/PEGTL
+INHERIT=cmake
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.1.tar.gz -> pegtl-3.2.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ec13f6e7ea956c89f49396ca9e82af4f
diff --git a/metadata/md5-cache/dev-libs/pegtl-3.2.5 b/metadata/md5-cache/dev-libs/pegtl-3.2.5
index 92d4e015ec7a..13a8c91bd4da 100644
--- a/metadata/md5-cache/dev-libs/pegtl-3.2.5
+++ b/metadata/md5-cache/dev-libs/pegtl-3.2.5
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
 EAPI=8
 HOMEPAGE=https://github.com/taocpp/PEGTL
+INHERIT=cmake
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.5.tar.gz -> pegtl-3.2.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bcebcd4614f33f5bfd9d8298488154ca
diff --git a/metadata/md5-cache/dev-libs/pigpio-79 b/metadata/md5-cache/dev-libs/pigpio-79
index d6605bc04f7d..1732a65b450c 100644
--- a/metadata/md5-cache/dev-libs/pigpio-79
+++ b/metadata/md5-cache/dev-libs/pigpio-79
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
 EAPI=7
 HOMEPAGE=http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio
+INHERIT=distutils-r1 systemd toolchain-funcs
 IUSE=python python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~arm
 LICENSE=Unlicense
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/v79.tar.gz -> pigpio-79.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d5b5ef7879679890bfcdbc7e08f5fac1
diff --git a/metadata/md5-cache/dev-libs/pkcs11-helper-1.25.1-r1 b/metadata/md5-cache/dev-libs/pkcs11-helper-1.25.1-r1
deleted file mode 100644
index 74404e3e5797..000000000000
--- a/metadata/md5-cache/dev-libs/pkcs11-helper-1.25.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.4.7 )
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/openssl-0.9.7:0=[bindist(-)=] gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
-DESCRIPTION=PKCS#11 helper library
-EAPI=7
-HOMEPAGE=https://github.com/OpenSC/pkcs11-helper
-IUSE=bindist doc gnutls nss static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=dev-libs/openssl-0.9.7:0=[bindist(-)=] gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
-SLOT=0
-SRC_URI=https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.25.1/pkcs11-helper-1.25.1.tar.bz2
-_md5_=835b606c8f616ad436941171acd56989
diff --git a/metadata/md5-cache/dev-libs/pkcs11-helper-1.27.0 b/metadata/md5-cache/dev-libs/pkcs11-helper-1.27.0
deleted file mode 100644
index b76552107771..000000000000
--- a/metadata/md5-cache/dev-libs/pkcs11-helper-1.27.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.4.7 )
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/openssl-0.9.7:0=[bindist(-)=] gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
-DESCRIPTION=PKCS#11 helper library
-EAPI=7
-HOMEPAGE=https://github.com/OpenSC/pkcs11-helper
-IUSE=bindist doc gnutls nss static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=dev-libs/openssl-0.9.7:0=[bindist(-)=] gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
-SLOT=0
-SRC_URI=https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.27/pkcs11-helper-1.27.0.tar.bz2
-_md5_=7e4906937a048046743924e2544bd83a
diff --git a/metadata/md5-cache/dev-libs/pkcs11-helper-1.29.0 b/metadata/md5-cache/dev-libs/pkcs11-helper-1.29.0
new file mode 100644
index 000000000000..16da72506aec
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pkcs11-helper-1.29.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.4.7 )
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/openssl-0.9.7:= gnutls? ( >=net-libs/gnutls-1.4.4:= ) nss? ( dev-libs/nss )
+DESCRIPTION=PKCS#11 helper library
+EAPI=8
+HOMEPAGE=https://github.com/OpenSC/pkcs11-helper
+IUSE=doc gnutls nss
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=>=dev-libs/openssl-0.9.7:= gnutls? ( >=net-libs/gnutls-1.4.4:= ) nss? ( dev-libs/nss )
+SLOT=0
+SRC_URI=https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.29.0/pkcs11-helper-1.29.0.tar.bz2
+_md5_=8339fc04f7374519d0efaa18b82500db
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.6.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.6.0
index dd5fd54a2ed8..04332ad65c19 100644
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.6.0
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.6.0
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5
 DESCRIPTION=Plasma Specific Protocols for Wayland
 EAPI=8
 HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
+INHERIT=ecm kde.org
 IUSE=debug
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.6.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8931f9c48cf2b3f1579a5e815860d3d2
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.7.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.7.0
new file mode 100644
index 000000000000..87c524933638
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=Plasma Specific Protocols for Wayland
+EAPI=8
+HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1e49a5e7ef7fa87b410503c15d175c9a
diff --git a/metadata/md5-cache/dev-libs/pocl-1.7-r3 b/metadata/md5-cache/dev-libs/pocl-1.7-r3
deleted file mode 100644
index 2f9e473f2969..000000000000
--- a/metadata/md5-cache/dev-libs/pocl-1.7-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!cuda? ( <sys-devel/clang-13:= ) cuda? ( <sys-devel/clang-13:=[llvm_targets_NVPTX] ) virtual/pkgconfig doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 <dev-python/markupsafe-2.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 <dev-python/markupsafe-2.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 <dev-python/markupsafe-2.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 <dev-python/markupsafe-2.0[python_targets_pypy3(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libltdl <sys-devel/llvm-13:* virtual/opencl !cuda? ( <sys-devel/clang-13:= ) cuda? ( <sys-devel/clang-13:=[llvm_targets_NVPTX] ) debug? ( dev-util/lttng-ust:= ) hwloc? ( sys-apps/hwloc:=[cuda?] ) !!sys-devel/llvm:0
-DESCRIPTION=Portable Computing Language (an implementation of OpenCL)
-EAPI=7
-HOMEPAGE=http://portablecl.org https://github.com/pocl/pocl
-IUSE=accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager test doc
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/libltdl <sys-devel/llvm-13:* virtual/opencl !cuda? ( <sys-devel/clang-13:= ) cuda? ( <sys-devel/clang-13:=[llvm_targets_NVPTX] ) debug? ( dev-util/lttng-ust:= ) hwloc? ( sys-apps/hwloc:=[cuda?] )
-RESTRICT=!test? ( test ) mirror
-SLOT=0
-SRC_URI=https://github.com/pocl/pocl/archive/v1.7.tar.gz -> pocl-1.7.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=210fb5a8f469d0580039c10ff17dc0a2
diff --git a/metadata/md5-cache/dev-libs/pocl-1.8-r2 b/metadata/md5-cache/dev-libs/pocl-1.8-r2
index fe006d2bf083..fe4777981096 100644
--- a/metadata/md5-cache/dev-libs/pocl-1.8-r2
+++ b/metadata/md5-cache/dev-libs/pocl-1.8-r2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libltdl <sys-devel/llvm-14:* virtual/opencl !cuda? ( <sys-devel/
 DESCRIPTION=Portable Computing Language (an implementation of OpenCL)
 EAPI=7
 HOMEPAGE=http://portablecl.org https://github.com/pocl/pocl
+INHERIT=cmake llvm python-any-r1 docs
 IUSE=accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager test doc
 KEYWORDS=~amd64
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/libltdl <sys-devel/llvm-14:* virtual/opencl !cuda? ( <sys-devel
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/pocl/pocl/archive/v1.8.tar.gz -> pocl-1.8.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=37d62c530542ad89e53055a6b356bed4
diff --git a/metadata/md5-cache/dev-libs/poco-1.10.1 b/metadata/md5-cache/dev-libs/poco-1.10.1
index 2ce03a1be39d..b0b65fab8f23 100644
--- a/metadata/md5-cache/dev-libs/poco-1.10.1
+++ b/metadata/md5-cache/dev-libs/poco-1.10.1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libpcre-8.42 mysql? ( !mariadb? ( dev-db/mysql-connector-c:0=
 DESCRIPTION=C++ libraries for building network-based applications
 EAPI=7
 HOMEPAGE=https://pocoproject.org/
+INHERIT=cmake
 IUSE=7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip
 KEYWORDS=amd64 arm ~arm64 ~ppc64 x86
 LICENSE=Boost-1.0
@@ -12,5 +13,5 @@ REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mon
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.10.1-release.tar.gz -> poco-1.10.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=47c72f7b8a7be4c8233a38a217d69a3f
diff --git a/metadata/md5-cache/dev-libs/poco-1.11.2 b/metadata/md5-cache/dev-libs/poco-1.11.2
new file mode 100644
index 000000000000..ed5839852994
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/poco-1.11.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libpcre-8.42 activerecord? ( !app-arch/arc ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib )
+DESCRIPTION=C++ libraries for building network-based applications
+EAPI=8
+HOMEPAGE=https://pocoproject.org/
+INHERIT=cmake
+IUSE=7z activerecord cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Boost-1.0
+RDEPEND=>=dev-libs/libpcre-8.42 activerecord? ( !app-arch/arc ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib )
+REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) ssl? ( util ) test? ( data? ( sqlite ) json util xml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.11.2-release.tar.gz -> poco-1.11.2.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fb5c9083247f2cfef6eb67cf0dad4f30
diff --git a/metadata/md5-cache/dev-libs/poco-1.9.0-r2 b/metadata/md5-cache/dev-libs/poco-1.9.0-r2
deleted file mode 100644
index 717541ddd0c3..000000000000
--- a/metadata/md5-cache/dev-libs/poco-1.9.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libpcre-8.42 mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib )
-DESCRIPTION=C++ libraries for building network-based applications
-EAPI=7
-HOMEPAGE=https://pocoproject.org/
-IUSE=7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip
-KEYWORDS=amd64 arm x86
-LICENSE=Boost-1.0
-RDEPEND=>=dev-libs/libpcre-8.42 mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib )
-REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) ssl? ( util ) test? ( data? ( sqlite ) json util xml )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.9.0-release.tar.gz -> poco-1.9.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9136b3628cb487d78794cda6f19bc65b
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
index 6cecb23f5b94..e18bc1a0367f 100644
--- a/metadata/md5-cache/dev-libs/popt-1.18
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -5,10 +5,10 @@ DESCRIPTION=Parse Options - Command line parser
 EAPI=7
 HOMEPAGE=https://github.com/rpm-software-management/popt
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a3f38421b1574c1f4b0578b7716360e3
+_md5_=fe146e40da9fbcbb7486b779a6170777
diff --git a/metadata/md5-cache/dev-libs/ppl-1.2-r4 b/metadata/md5-cache/dev-libs/ppl-1.2-r4
index dca6bcdca0f9..fb5e938e6dfd 100644
--- a/metadata/md5-cache/dev-libs/ppl-1.2-r4
+++ b/metadata/md5-cache/dev-libs/ppl-1.2-r4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-6[cxx(+)] lpsol? ( sci-mathematics/glpk )
 RESTRICT=!test? ( test )
 SLOT=0/4.14
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/ppl-1.2-r3-disable-boeing-tests.patch
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f16fbf839d826716017e803b52809886
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.17.3 b/metadata/md5-cache/dev-libs/protobuf-3.17.3
index 8b7b18018f7a..3d858a0e99ca 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.17.3
+++ b/metadata/md5-cache/dev-libs/protobuf-3.17.3
@@ -11,5 +11,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7795acbf0ab715b0f1dfeb9c2571704e
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.19.1 b/metadata/md5-cache/dev-libs/protobuf-3.19.1
index 03a6902e5dc1..1bb1e3927901 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.19.1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.19.1
@@ -11,5 +11,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.1.tar.gz -> protobuf-3.19.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d6bf161a4f045e5eb6988d82ad519834
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.19.3 b/metadata/md5-cache/dev-libs/protobuf-3.19.3
index e7fe63872074..9ddbbff0b767 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.19.3
+++ b/metadata/md5-cache/dev-libs/protobuf-3.19.3
@@ -4,12 +4,13 @@ DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.3.tar.gz -> protobuf-3.19.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b19738ae9edee8e2c98f51194d4e71e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4370d1019a968bdb74c108c5fb3f11ff
diff --git a/metadata/md5-cache/dev-libs/protobuf-9999 b/metadata/md5-cache/dev-libs/protobuf-9999
index bd4e944731f0..97f6dfef4586 100644
--- a/metadata/md5-cache/dev-libs/protobuf-9999
+++ b/metadata/md5-cache/dev-libs/protobuf-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/30
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=492969c9a20990f14918c26c9276c40a
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.3-r1 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.3-r1
deleted file mode 100644
index e9fe3659489b..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/protobuf-3:0 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Protocol Buffers implementation in C
-EAPI=7
-HOMEPAGE=https://github.com/protobuf-c/protobuf-c
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0/1.0.0
-SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.3/protobuf-c-1.3.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ab74fbc6c4ab8ec772b517ae9629156c
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.4.0-r1 b/metadata/md5-cache/dev-libs/protobuf-c-1.4.0-r1
index d06c315a5338..c0e89cc4e027 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.4.0-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f9bc22b98e6af382de4a065f956aeaf4
diff --git a/metadata/md5-cache/dev-libs/psimd-2020.05.17 b/metadata/md5-cache/dev-libs/psimd-2020.05.17
new file mode 100644
index 000000000000..1315e0e26bb7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/psimd-2020.05.17
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=P(ortable) SIMD
+EAPI=8
+HOMEPAGE=https://github.com/Maratyszcza/psimd/
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a900.tar.gz -> psimd-2020.05.17.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=769482fbfb7911be717f381e84e9b5ae
diff --git a/metadata/md5-cache/dev-libs/pslib-0.4.5 b/metadata/md5-cache/dev-libs/pslib-0.4.5
index 2ce556df3540..b6d6e87d86f9 100644
--- a/metadata/md5-cache/dev-libs/pslib-0.4.5
+++ b/metadata/md5-cache/dev-libs/pslib-0.4.5
@@ -3,11 +3,12 @@ DEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs
 DESCRIPTION=pslib is a C-library to create PostScript files on the fly
 EAPI=6
 HOMEPAGE=http://pslib.sourceforge.net/
+INHERIT=autotools
 IUSE=debug jpeg png static-libs tiff
 KEYWORDS=amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/pslib/pslib-0.4.5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=826396099657e4ee285f360c6ddaaa26
diff --git a/metadata/md5-cache/dev-libs/pthreadpool-2022.05.09 b/metadata/md5-cache/dev-libs/pthreadpool-2022.05.09
new file mode 100644
index 000000000000..033dc19452f5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pthreadpool-2022.05.09
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/FXdiv
+DESCRIPTION=Portable and efficient thread pool implementation
+EAPI=8
+HOMEPAGE=https://github.com/Maratyszcza/pthreadpool
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-libs/FXdiv
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Maratyszcza/pthreadpool/archive/1787867.tar.gz -> pthreadpool-2022.05.09.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f5ce03f54e59fbeb07c2c00f6c5b81b9
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.11.4 b/metadata/md5-cache/dev-libs/pugixml-1.11.4
index 7a5a62862afa..d9e18c131686 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.11.4
+++ b/metadata/md5-cache/dev-libs/pugixml-1.11.4
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=7
 HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
+INHERIT=cmake
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.11.4/pugixml-1.11.4.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=08ec901620e71db3cad269f2faa4d50c
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.12 b/metadata/md5-cache/dev-libs/pugixml-1.12
index f7ef3c9bd8ef..67e33bd29e74 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.12
+++ b/metadata/md5-cache/dev-libs/pugixml-1.12
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=8
 HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml
+INHERIT=cmake
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.12/pugixml-1.12.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3adda8054e8c8fa3993f3dcba99f0ec4
diff --git a/metadata/md5-cache/dev-libs/pugixml-9999 b/metadata/md5-cache/dev-libs/pugixml-9999
index 69a699d87ebb..8a34888facb8 100644
--- a/metadata/md5-cache/dev-libs/pugixml-9999
+++ b/metadata/md5-cache/dev-libs/pugixml-9999
@@ -3,8 +3,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=8
 HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml
+INHERIT=cmake git-r3
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c9fa0e4e0e22df2ba43555699bc9f453
diff --git a/metadata/md5-cache/dev-libs/qcustomplot-2.0.1 b/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
index 08e33f30a897..0cc12b2069ec 100644
--- a/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
+++ b/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 DESCRIPTION=Qt C++ widget for plotting and data visualization
 EAPI=7
 HOMEPAGE=https://www.qcustomplot.com/
+INHERIT=qmake-utils
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://www.qcustomplot.com/release/2.0.1/QCustomPlot-sharedlib.tar.gz -> qcustomplot-sharedlib-2.0.1.tar.gz https://www.qcustomplot.com/release/2.0.1/QCustomPlot-source.tar.gz -> qcustomplot-source-2.0.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=59431df6141bcb625bd5321c8c650264
diff --git a/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3 b/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
index 22ba91905f11..a67a4dd81164 100644
--- a/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
+++ b/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
@@ -4,6 +4,7 @@ DEPEND=app-crypt/qca:2[debug?,qt5(+)] dev-qt/qtnetwork:5 test? ( dev-qt/qttest:5
 DESCRIPTION=Qt-based library for OAuth support
 EAPI=7
 HOMEPAGE=https://github.com/ayoy/qoauth/wiki
+INHERIT=qmake-utils
 IUSE=debug doc test
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=app-crypt/qca:2[debug?,qt5(+)] dev-qt/qtnetwork:5 app-crypt/qca:2[ssl] !
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/qoauth-2.0.1_pre20160315.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1257e20ff605a90b67ebc0901833b37e
diff --git a/metadata/md5-cache/dev-libs/qtcompress-0_p20180513 b/metadata/md5-cache/dev-libs/qtcompress-0_p20180513
index 91e5a7d57a18..3599c00d3460 100644
--- a/metadata/md5-cache/dev-libs/qtcompress-0_p20180513
+++ b/metadata/md5-cache/dev-libs/qtcompress-0_p20180513
@@ -4,6 +4,7 @@ DEPEND=dev-qt/qtcore:5 sys-libs/zlib test? ( dev-qt/qttest:5 )
 DESCRIPTION=A public API for QZip in an easy to use module
 EAPI=7
 HOMEPAGE=https://github.com/nezticle/qtcompress
+INHERIT=qmake-utils toolchain-funcs virtualx
 IUSE=test test
 KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=|| ( LGPL-2.1 GPL-3 ) FDL-1.3
@@ -11,5 +12,5 @@ RDEPEND=dev-qt/qtcore:5 sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0/5.11.0
 SRC_URI=https://github.com/nezticle/qtcompress/archive/23f8831826cd72aedf99fc3699148b6c994fd677.tar.gz -> qtcompress-0_p20180513.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=3fdfee0f1a108a86cab75faf8d1fc3ca
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.13.2 b/metadata/md5-cache/dev-libs/qtkeychain-0.13.2
index bbc3097bb13e..2aeadf66e9f1 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.13.2
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.13.2
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( app-crypt/libsecret dev-
 DESCRIPTION=Qt API for storing passwords securely
 EAPI=8
 HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
+INHERIT=cmake
 IUSE=gnome-keyring
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.13.2.tar.gz -> qtkeychain-0.13.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f7d9c1dd1655115550ec3be6576face9
diff --git a/metadata/md5-cache/dev-libs/quazip-1.2 b/metadata/md5-cache/dev-libs/quazip-1.2
index 2393408b61f6..7ad39decf843 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.2
+++ b/metadata/md5-cache/dev-libs/quazip-1.2
@@ -4,6 +4,7 @@ DEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] test? ( dev-qt/qtnetwork:5 dev-qt/
 DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 EAPI=8
 HOMEPAGE=https://stachenov.github.io/quazip/
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
@@ -11,5 +12,5 @@ RDEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] !=dev-libs/quazip-1.1-r0:1
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.2.tar.gz -> quazip-1.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bf3bfcb4a1634a063a4cb59050e9d864
diff --git a/metadata/md5-cache/dev-libs/quazip-1.3-r1 b/metadata/md5-cache/dev-libs/quazip-1.3-r1
new file mode 100644
index 000000000000..316df33a745b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/quazip-1.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 )
+DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
+EAPI=8
+HOMEPAGE=https://stachenov.github.io/quazip/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] !=dev-libs/quazip-1.1-r0:1
+RESTRICT=!test? ( test )
+SLOT=0/1.3
+SRC_URI=https://github.com/stachenov/quazip/archive/v1.3.tar.gz -> quazip-1.3.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=608b98ecac7e8c2818286837f58a1125
diff --git a/metadata/md5-cache/dev-libs/raft-0.11.3-r1 b/metadata/md5-cache/dev-libs/raft-0.11.3-r1
index ada41f276a7e..44097a29a6f2 100644
--- a/metadata/md5-cache/dev-libs/raft-0.11.3-r1
+++ b/metadata/md5-cache/dev-libs/raft-0.11.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libuv:= lz4? ( app-arch/lz4:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/canonical/raft/archive/v0.11.3.tar.gz -> raft-0.11.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2a4089d7ee52ccd4eaf0694bf0a9f795
diff --git a/metadata/md5-cache/dev-libs/raft-0.13.0 b/metadata/md5-cache/dev-libs/raft-0.13.0
index d555a12ab1c4..d94d05fd1aad 100644
--- a/metadata/md5-cache/dev-libs/raft-0.13.0
+++ b/metadata/md5-cache/dev-libs/raft-0.13.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libuv:= lz4? ( app-arch/lz4:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/canonical/raft/archive/v0.13.0.tar.gz -> raft-0.13.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b3f424b63d8bb4317317b246a01fd1b3
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
index 5da77363f62e..8e25555d1a09 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
@@ -4,11 +4,12 @@ DEPEND=doc? ( app-doc/doxygen ) test? ( dev-cpp/gtest dev-util/valgrind )
 DESCRIPTION=A fast JSON parser/generator for C++ with both SAX/DOM style API
 EAPI=7
 HOMEPAGE=https://rapidjson.org/
+INHERIT=cmake
 IUSE=doc examples test
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=72309a17f2dd97e50bbee08318abeb5d
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3
index d662678b8c32..c10328d2ae59 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3
@@ -4,11 +4,12 @@ DEPEND=doc? ( app-doc/doxygen ) test? ( dev-cpp/gtest )
 DESCRIPTION=A fast JSON parser/generator for C++ with both SAX/DOM style API
 EAPI=7
 HOMEPAGE=https://rapidjson.org/
+INHERIT=cmake
 IUSE=doc examples test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=63f7d14f3ec59f181a342fe7ea6e797e
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index 7ae8cbe8f7e1..8c0b342d38e1 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -4,10 +4,11 @@ DEPEND=doc? ( app-doc/doxygen ) test? ( dev-cpp/gtest )
 DESCRIPTION=A fast JSON parser/generator for C++ with both SAX/DOM style API
 EAPI=7
 HOMEPAGE=https://rapidjson.org/
+INHERIT=cmake git-r3
 IUSE=doc examples test
 LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=38a463af280b17895995ddfd797bc714
diff --git a/metadata/md5-cache/dev-libs/rccl-4.0.0-r2 b/metadata/md5-cache/dev-libs/rccl-4.0.0-r2
index bfd08cfa3b68..f30e7bed01aa 100644
--- a/metadata/md5-cache/dev-libs/rccl-4.0.0-r2
+++ b/metadata/md5-cache/dev-libs/rccl-4.0.0-r2
@@ -4,10 +4,11 @@ DEPEND==dev-util/hip-4.0* dev-util/rocm-cmake
 DESCRIPTION=ROCm Communication Collectives Library (RCCL)
 EAPI=7
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rccl
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND==dev-util/hip-4.0*
 SLOT=0
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-4.0.0.tar.gz -> rccl-4.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f17730cd34e1091bd9f40c9e4ed4c1c1
diff --git a/metadata/md5-cache/dev-libs/rccl-4.3.0 b/metadata/md5-cache/dev-libs/rccl-4.3.0-r1
index c0983f7437da..4a0f2731d703 100644
--- a/metadata/md5-cache/dev-libs/rccl-4.3.0
+++ b/metadata/md5-cache/dev-libs/rccl-4.3.0-r1
@@ -1,13 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/cmake-3.22 dev-util/rocm-cmake dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-util/hip-4.3* dev-util/rocm-cmake
+DEPEND==dev-util/hip-4.3*
 DESCRIPTION=ROCm Communication Collectives Library (RCCL)
 EAPI=7
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rccl
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND==dev-util/hip-4.3*
 SLOT=0
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-4.3.0.tar.gz -> rccl-4.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=542c87de2934aefa121256ed27b80f1a
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f06f232fb0944eda05e72bcbeb7315fb
diff --git a/metadata/md5-cache/dev-libs/rccl-5.0.2 b/metadata/md5-cache/dev-libs/rccl-5.0.2
new file mode 100644
index 000000000000..98faed08efd5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rccl-5.0.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.22 >=dev-util/rocm-cmake-5.0.2-r1 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip:0/5.0
+DESCRIPTION=ROCm Communication Collectives Library (RCCL)
+EAPI=7
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rccl
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-util/hip:0/5.0
+SLOT=0/5.0
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.0.2.tar.gz -> rccl-5.0.2.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b30b49fd04e7a6c7946bd70286508a46
diff --git a/metadata/md5-cache/dev-libs/redis-ipc-0.0.6 b/metadata/md5-cache/dev-libs/redis-ipc-0.0.6
index 49e5fe298030..5ef4b0ab6b87 100644
--- a/metadata/md5-cache/dev-libs/redis-ipc-0.0.6
+++ b/metadata/md5-cache/dev-libs/redis-ipc-0.0.6
@@ -4,6 +4,7 @@ DEPEND=dev-libs/hiredis:= dev-libs/json-c
 DESCRIPTION=A (redis) client library for using redis as system IPC msg/event bus
 EAPI=7
 HOMEPAGE=https://github.com/VCTLabs/redis-ipc
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/hiredis:= dev-libs/json-c dev-db/redis
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/VCTLabs/redis-ipc/archive/v0.0.6.tar.gz -> redis-ipc-0.0.6.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b46aa40b29b95e8bec5daafa048e6b2a
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
index 2e538c442fe0..1a54c9dd8ede 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/redland-1.0.14 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 DESCRIPTION=Language bindings for Redland
 EAPI=7
 HOMEPAGE=http://librdf.org/bindings/
+INHERIT=lua php-ext-source-r3 python-single-r1 autotools
 IUSE=lua perl python php ruby test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-linux
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
@@ -12,5 +13,5 @@ REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9795ee8d31f1123e4e85b32ccd813956
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.10.0 b/metadata/md5-cache/dev-libs/rinutils-0.10.0
index 71591bc15038..6648fce9c6f5 100644
--- a/metadata/md5-cache/dev-libs/rinutils-0.10.0
+++ b/metadata/md5-cache/dev-libs/rinutils-0.10.0
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Set of C headers containing macros and static functions
 EAPI=8
 HOMEPAGE=https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils
+INHERIT=cmake
 KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.10.0/rinutils-0.10.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=05e9554b1df3c0faee65304b9a475695
diff --git a/metadata/md5-cache/dev-libs/rlog-1.4 b/metadata/md5-cache/dev-libs/rlog-1.4
index 8c0d23cf178e..dc36381c4f83 100644
--- a/metadata/md5-cache/dev-libs/rlog-1.4
+++ b/metadata/md5-cache/dev-libs/rlog-1.4
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~ppc sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://rlog.googlecode.com/files/rlog-1.4.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=51e905a8c4f7f23daabfb79a82c86dad
diff --git a/metadata/md5-cache/dev-libs/rocclr-3.10.0 b/metadata/md5-cache/dev-libs/rocclr-3.10.0
index c95d179549c7..3579e0b01261 100644
--- a/metadata/md5-cache/dev-libs/rocclr-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocclr-3.10.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-comgr-3.10.0 >=dev-libs/rocr-runtime-3.10.0 >=dev-libs/ro
 DESCRIPTION=Radeon Open Compute Common Language Runtime
 EAPI=7
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-3.10.0 >=dev-libs/rocr-runtime-3.10.0
 SLOT=0/3.10
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.10.0.tar.gz -> rocclr-3.10.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.10.0.tar.gz -> rocm-opencl-runtime-3.10.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=42fbc29b244b38ebf46de85ff27a698d
diff --git a/metadata/md5-cache/dev-libs/rocclr-3.8.0 b/metadata/md5-cache/dev-libs/rocclr-3.8.0
index 0ae220bcbd68..f07301a8436e 100644
--- a/metadata/md5-cache/dev-libs/rocclr-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocclr-3.8.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocm
 DESCRIPTION=Radeon Open Compute Common Language Runtime
 EAPI=7
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocr-runtime-3.8.0
 SLOT=0/3.8
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.8.0.tar.gz -> rocclr-3.8.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.8.0.tar.gz -> rocm-opencl-runtime-3.8.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=42fbc29b244b38ebf46de85ff27a698d
diff --git a/metadata/md5-cache/dev-libs/rocclr-3.9.0 b/metadata/md5-cache/dev-libs/rocclr-3.9.0
index 3551c82bd3d4..884cc53be646 100644
--- a/metadata/md5-cache/dev-libs/rocclr-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocclr-3.9.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocm
 DESCRIPTION=Radeon Open Compute Common Language Runtime
 EAPI=7
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocr-runtime-3.9.0
 SLOT=0/3.9
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.9.0.tar.gz -> rocclr-3.9.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.9.0.tar.gz -> rocm-opencl-runtime-3.9.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=42fbc29b244b38ebf46de85ff27a698d
diff --git a/metadata/md5-cache/dev-libs/rocclr-4.0.0 b/metadata/md5-cache/dev-libs/rocclr-4.0.0
index 1a8a809093e5..ec363bfaa316 100644
--- a/metadata/md5-cache/dev-libs/rocclr-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocclr-4.0.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-comgr-4.0.0 >=dev-libs/rocr-runtime-4.0.0 >=dev-libs/rocm
 DESCRIPTION=Radeon Open Compute Common Language Runtime
 EAPI=7
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-4.0.0 >=dev-libs/rocr-runtime-4.0.0
 SLOT=0/4.0
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.0.0.tar.gz -> rocclr-4.0.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.0.0.tar.gz -> rocm-opencl-runtime-4.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7759fa1190858641100723e587dd30b4
diff --git a/metadata/md5-cache/dev-libs/rocclr-4.1.0 b/metadata/md5-cache/dev-libs/rocclr-4.1.0
index 90b65831a960..e6bba45f1ea0 100644
--- a/metadata/md5-cache/dev-libs/rocclr-4.1.0
+++ b/metadata/md5-cache/dev-libs/rocclr-4.1.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocm
 DESCRIPTION=Radeon Open Compute Common Language Runtime
 EAPI=7
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocr-runtime-4.1.0
 SLOT=0/4.1
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.1.0.tar.gz -> rocclr-4.1.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.1.0.tar.gz -> rocm-opencl-runtime-4.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7759fa1190858641100723e587dd30b4
diff --git a/metadata/md5-cache/dev-libs/rocclr-4.2.0 b/metadata/md5-cache/dev-libs/rocclr-4.2.0
index 66627e23116f..2440a872d2d5 100644
--- a/metadata/md5-cache/dev-libs/rocclr-4.2.0
+++ b/metadata/md5-cache/dev-libs/rocclr-4.2.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-comgr-4.2.0 >=dev-libs/rocr-runtime-4.2.0 >=dev-libs/rocm
 DESCRIPTION=Radeon Open Compute Common Language Runtime
 EAPI=7
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-4.2.0 >=dev-libs/rocr-runtime-4.2.0
 SLOT=0/4.2
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.2.0.tar.gz -> rocclr-4.2.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.2.0.tar.gz -> rocm-opencl-runtime-4.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7759fa1190858641100723e587dd30b4
diff --git a/metadata/md5-cache/dev-libs/rocclr-4.3.0 b/metadata/md5-cache/dev-libs/rocclr-4.3.0
index c2968040660b..3381f8945637 100644
--- a/metadata/md5-cache/dev-libs/rocclr-4.3.0
+++ b/metadata/md5-cache/dev-libs/rocclr-4.3.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/rocm-comgr:0/4.3 dev-libs/rocr-runtime:0/4.3 virtual/opengl dev-
 DESCRIPTION=Radeon Open Compute Common Language Runtime
 EAPI=7
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-libs/rocm-comgr:0/4.3 dev-libs/rocr-runtime:0/4.3
 SLOT=0/4.3
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.3.0.tar.gz -> rocclr-4.3.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.3.0.tar.gz -> rocm-opencl-runtime-4.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=efb34c41404e166b973f7387880a0ff0
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1 b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
index 0cd2563ec087..87630447fe8d 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
@@ -4,11 +4,12 @@ DEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags:= dev-py
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
 EAPI=7
 HOMEPAGE=http://rocksdb.org https://github.com/facebook/rocksdb/
+INHERIT=cmake
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs
 KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags:= dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.14.6.tar.gz -> rocksdb-6.14.6.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=524c8951c51a2c2a9071a0cdcc68f49b
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.15.5 b/metadata/md5-cache/dev-libs/rocksdb-6.15.5
index d7b69cda696c..763a238a77a4 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.15.5
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.15.5
@@ -4,11 +4,12 @@ DEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-pyth
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
 EAPI=7
 HOMEPAGE=http://rocksdb.org https://github.com/facebook/rocksdb/
+INHERIT=cmake
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.15.5.tar.gz -> rocksdb-6.15.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fa38de4333510636ab84efbb41497ef9
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.17.3 b/metadata/md5-cache/dev-libs/rocksdb-6.17.3
index f2cfab330ced..faa4d027b079 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.17.3
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.17.3
@@ -4,11 +4,12 @@ DEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-pyth
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
 EAPI=7
 HOMEPAGE=http://rocksdb.org https://github.com/facebook/rocksdb/
+INHERIT=cmake
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.17.3.tar.gz -> rocksdb-6.17.3.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=617cef9ea21769165274064e03661caf
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-3.10.0 b/metadata/md5-cache/dev-libs/rocm-comgr-3.10.0
index 467e383f48cb..0ab2104b670d 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-3.10.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-3.10.0 >=sys-devel/llvm-roc-3.10.0:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-3.10.0 >=sys-devel/llvm-roc-3.10.0:=
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.10.0.tar.gz -> rocm-comgr-3.10.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=240b3e4819452e393942c318099a9775
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0 b/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
index 60c6299c3d9c..e4f18abbaeb8 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-3.9.0 >=sys-devel/llvm-roc-3.9.0:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-3.9.0 >=sys-devel/llvm-roc-3.9.0:=
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.9.0.tar.gz -> rocm-comgr-3.9.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=240b3e4819452e393942c318099a9775
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-4.0.0 b/metadata/md5-cache/dev-libs/rocm-comgr-4.0.0
index 2ad829c01210..617833012123 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-4.0.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-4.0.0 >=sys-devel/llvm-roc-4.0.0:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-4.0.0 >=sys-devel/llvm-roc-4.0.0:=
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.0.0.tar.gz -> rocm-comgr-4.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=240b3e4819452e393942c318099a9775
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-4.1.0 b/metadata/md5-cache/dev-libs/rocm-comgr-4.1.0
index 702a113c6a64..cdfbc23a42bf 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-4.1.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-4.1.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-4.1.0 >=sys-devel/llvm-roc-4.1.0:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-4.1.0 >=sys-devel/llvm-roc-4.1.0:=
 SLOT=0/4.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.1.0.tar.gz -> rocm-comgr-4.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=839c5c83d9f1a63d994fdac115dd1a0c
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-4.2.0 b/metadata/md5-cache/dev-libs/rocm-comgr-4.2.0
index 2d83f81eca11..10f671367522 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-4.2.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-4.2.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-4.2.0 >=sys-devel/llvm-roc-4.2.0:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-4.2.0 >=sys-devel/llvm-roc-4.2.0:=
 SLOT=0/4.2
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.2.0.tar.gz -> rocm-comgr-4.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=839c5c83d9f1a63d994fdac115dd1a0c
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-4.3.0 b/metadata/md5-cache/dev-libs/rocm-comgr-4.3.0
index 6c768fd651ea..944274bd2921 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-4.3.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-4.3.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-4.3.0 >=sys-devel/llvm-roc-4.3.0:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-4.3.0 >=sys-devel/llvm-roc-4.3.0:=
 SLOT=0/4.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.3.0.tar.gz -> rocm-comgr-4.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=839c5c83d9f1a63d994fdac115dd1a0c
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-4.3.0-r1 b/metadata/md5-cache/dev-libs/rocm-comgr-4.3.0-r1
index 7734c4369429..231289ca44e9 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-4.3.0-r1
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-4.3.0-r1
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-4.3.0 >=sys-devel/llvm-roc-4.3.0:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-4.3.0 >=sys-devel/llvm-roc-4.3.0:=
 SLOT=0/4.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.3.0.tar.gz -> rocm-comgr-4.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bdfe8f97e913780f05db3f523be6ee65
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7a0ff95ffa114706259a469ae9fc42fd
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-4.5.2 b/metadata/md5-cache/dev-libs/rocm-comgr-4.5.2
index ef4dbe8ca244..a38a727ad9c0 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-4.5.2
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-4.5.2
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-4.5.2 >=sys-devel/llvm-roc-4.5.2:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-4.5.2 >=sys-devel/llvm-roc-4.5.2:=
 SLOT=0/4.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.5.2.tar.gz -> rocm-comgr-4.5.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5d83c066e8af849278af39613050734a
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-5.0.2 b/metadata/md5-cache/dev-libs/rocm-comgr-5.0.2
index 9e7709e9066b..7ade23695c5e 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-5.0.2
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-5.0.2
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocm-device-libs-5.0.2 >=sys-devel/llvm-roc-5.0.2:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake prefix
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-5.0.2 >=sys-devel/llvm-roc-5.0.2:=
 SLOT=0/5.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.0.2.tar.gz -> rocm-comgr-5.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=08b83485c29d41e0fc5c3924c4fa289c
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.10.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.10.0
index e73abd8e27d9..2b1be1ed607a 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.10.0
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-3.10.0:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.10.0:=
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.10.0.tar.gz -> rocm-device-libs-3.10.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5cbe443b21909418c0dca55037023a65
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
index b3cc9c998006..638a0badf36b 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-3.7.0:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.7.0:=
 SLOT=0/3.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.7.0.tar.gz -> rocm-device-libs-3.7.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=99f5867f03ec583d1ea39eb62b32a088
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
index d2e905b820eb..2074873409a6 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-3.8.0:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.8.0:=
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.8.0.tar.gz -> rocm-device-libs-3.8.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=99f5867f03ec583d1ea39eb62b32a088
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
index 9299b8c65f5a..02233bce469b 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-3.9.0:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.9.0:=
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.9.0.tar.gz -> rocm-device-libs-3.9.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5cbe443b21909418c0dca55037023a65
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-4.0.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-4.0.0
index de2ed4d6b36f..981276be24c8 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-4.0.0
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-4.0.0:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-4.0.0:=
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.0.0.tar.gz -> rocm-device-libs-4.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5cbe443b21909418c0dca55037023a65
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-4.1.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-4.1.0
index 463138f5d758..3d40eb1a13b9 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-4.1.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-4.1.0
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-4.1.0:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-4.1.0:=
 SLOT=0/4.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.1.0.tar.gz -> rocm-device-libs-4.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=70d3a3f649d4a4c04edb5bcdcbe2170b
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-4.2.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-4.2.0
index 65f99ec904fd..4459bdfa599d 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-4.2.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-4.2.0
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-4.2.0:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-4.2.0:=
 SLOT=0/4.2
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.2.0.tar.gz -> rocm-device-libs-4.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=70d3a3f649d4a4c04edb5bcdcbe2170b
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-4.3.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-4.3.0
index 0f8a651681c9..39d3b30ef50d 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-4.3.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-4.3.0
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-4.3.0:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-4.3.0:=
 SLOT=0/4.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.3.0.tar.gz -> rocm-device-libs-4.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=70d3a3f649d4a4c04edb5bcdcbe2170b
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-4.5.2 b/metadata/md5-cache/dev-libs/rocm-device-libs-4.5.2
index 549cef6ca424..f7d0cd04ba16 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-4.5.2
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-4.5.2
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-4.5.2:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-4.5.2:=
 SLOT=0/4.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.5.2.tar.gz -> rocm-device-libs-4.5.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=53921ef22810d4ea6c2b4e59a6016498
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.0.2 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.0.2
index 14d5aef8a574..e4ee85f42fa2 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.0.2
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.0.2
@@ -4,10 +4,11 @@ DEPEND=>=sys-devel/llvm-roc-5.0.2:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-5.0.2:=
 SLOT=0/5.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.0.2.tar.gz -> rocm-device-libs-5.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=52b6fe48d1c8c8edb4c11550b34de49c
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-9999 b/metadata/md5-cache/dev-libs/rocm-device-libs-9999
index 287b5fff5947..8f4e1bd5823f 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-9999
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-9999
@@ -4,9 +4,10 @@ DEPEND=dev-libs/rocr-runtime sys-devel/llvm-roc:=
 DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+INHERIT=cmake git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/rocr-runtime sys-devel/llvm-roc:=
 SLOT=0/9999
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a4c1e0e3c92a41ad9132b9c95edf47e8
diff --git a/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0 b/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
index 4cb399cca63d..511e299d876d 100644
--- a/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/rocr-runtime
 DESCRIPTION=Radeon Open Compute hostcall API
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-libs/rocr-runtime
 SLOT=0/2.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-2.7.0.tar.gz -> rocm-hostcall-2.7.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=731ea371f522d3707dc0844408393875
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
index 9d309640b19b..35cbad9762d0 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-3.10.0 >=dev-libs/rocclr-3.10.0 >=dev-libs/rocm-c
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-3.10.0 >=dev-libs/rocclr-3.10.0 >=dev-libs/rocm-comgr-3.10.0 >=dev-libs/rocm-device-libs-3.10.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.10.0.tar.gz -> rocm-opencl-runtime-3.10.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e350a5647c5b9e7e60351bdc3ee32a59
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
index f51bbe2c02ae..1f9b52fd8374 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocclr-3.8.0 >=dev-libs/rocm-com
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocclr-3.8.0 >=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocm-device-libs-3.8.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.8.0.tar.gz -> rocm-opencl-runtime-3.8.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=719ca1e3319e1a0e2876b6d5748f8bb7
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
index c70324d8f2b9..13b25a447802 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocclr-3.9.0 >=dev-libs/rocm-com
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocclr-3.9.0 >=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocm-device-libs-3.9.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.9.0.tar.gz -> rocm-opencl-runtime-3.9.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0724913ba317e75430dfaa19955a7bf1
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
index 97183b6656a4..1a816f6f8107 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-4.0.0 >=dev-libs/rocclr-4.0.0 >=dev-libs/rocm-com
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic prefix
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-4.0.0 >=dev-libs/rocclr-4.0.0 >=dev-libs/rocm-comgr-4.0.0 >=dev-libs/rocm-device-libs-4.0.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-4.0.0.tar.gz -> rocm-opencl-runtime-4.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=809715a501908b00184a8ce57ec3169b
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0
index d3fc0d115f94..c0a71265c98d 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocclr-4.1.0 >=dev-libs/rocm-com
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic prefix
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocclr-4.1.0 >=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocm-device-libs-4.1.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/4.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-4.1.0.tar.gz -> rocm-opencl-runtime-4.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=809715a501908b00184a8ce57ec3169b
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.2.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.2.0
index 7bfb51a3daa0..382c7a6313d1 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.2.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.2.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-4.2.0 >=dev-libs/rocclr-4.2.0 >=dev-libs/rocm-com
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic prefix
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-4.2.0 >=dev-libs/rocclr-4.2.0 >=dev-libs/rocm-comgr-4.2.0 >=dev-libs/rocm-device-libs-4.2.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/4.2
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-4.2.0.tar.gz -> rocm-opencl-runtime-4.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1597b5c26bfa830fe2c5c2b2b5381279
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.3.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.3.0
index a8fc98daf2d8..157cc0c37e05 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.3.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.3.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-4.3.0 >=dev-libs/rocclr-4.3.0 >=dev-libs/rocm-com
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic prefix
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-4.3.0 >=dev-libs/rocclr-4.3.0 >=dev-libs/rocm-comgr-4.3.0 >=dev-libs/rocm-device-libs-4.3.0 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/4.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-4.3.0.tar.gz -> rocm-opencl-runtime-4.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=45ee2b8e20012f31247cf19088deef7e
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.5.2 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.5.2
index 3e4e2b4071a9..c0409498640d 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.5.2
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.5.2
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-4.5.2 >=dev-libs/rocm-comgr-4.5.2 >=dev-libs/rocm
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic prefix
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-4.5.2 >=dev-libs/rocm-comgr-4.5.2 >=dev-libs/rocm-device-libs-4.5.2 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/4.5
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.5.2.tar.gz -> rocclr-4.5.2.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.5.2.tar.gz -> rocm-opencl-runtime-4.5.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=03620ac694cd669bd0de2c51e3cc6ef8
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.0.2 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.0.2
index 013b802eb610..1f74303e475e 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.0.2
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.0.2
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/rocr-runtime-5.0.2 >=dev-libs/rocm-comgr-5.0.2 >=dev-libs/rocm
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+INHERIT=cmake flag-o-matic prefix
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-5.0.2 >=dev-libs/rocm-comgr-5.0.2 >=dev-libs/rocm-device-libs-5.0.2 >=virtual/opencl-3 media-libs/mesa
 SLOT=0/5.0
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.0.2.tar.gz -> rocclr-5.0.2.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.0.2.tar.gz -> rocm-opencl-runtime-5.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=03620ac694cd669bd0de2c51e3cc6ef8
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.10.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.10.0
index f9d7f22dd996..04a00ddc8682 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.10.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.10.0 >=dev
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.10.0
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.10.0.tar.gz -> rocr-runtime-3.10.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=584663b0aaeda812ae922ecd6b56ae1a
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
index 26811c4a2753..de9074ae6618 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.8.0 >=dev-
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.8.0
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.8.0.tar.gz -> rocr-runtime-3.8.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a8f68614662470fd7df6278daae8ca13
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0
index da9a9a82d4cf..fb8638eccec4 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.9.0 >=dev-
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-3.9.0
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.9.0.tar.gz -> rocr-runtime-3.9.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=584663b0aaeda812ae922ecd6b56ae1a
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-4.0.0 b/metadata/md5-cache/dev-libs/rocr-runtime-4.0.0
index dc953f1b6b00..12bab902f360 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-4.0.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-4.0.0 >=dev-
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-4.0.0
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-4.0.0.tar.gz -> rocr-runtime-4.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8dd29465336a8fed47d46dc6af18f0a5
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-4.1.0 b/metadata/md5-cache/dev-libs/rocr-runtime-4.1.0
index 104d5b08eba0..f8cd7d9ace5d 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-4.1.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-4.1.0
@@ -4,11 +4,12 @@ DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-4.1.0 >=dev-
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-4.1.0
 SLOT=0/4.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-4.1.0.tar.gz -> rocr-runtime-4.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=64399f31b9f50bff73f418b9cfb641ff
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-4.2.0 b/metadata/md5-cache/dev-libs/rocr-runtime-4.2.0
index c5eb390fc857..a7da6ce3c163 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-4.2.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-4.2.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-4
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl dev-libs/elfutils:=
 SLOT=0/4.2
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-4.2.0.tar.gz -> rocr-runtime-4.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5cbf5bdb0a1d8136d2ca052254710337
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-4.3.0 b/metadata/md5-cache/dev-libs/rocr-runtime-4.3.0
index 3bea78240ddb..c7b413f7b1d4 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-4.3.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-4.3.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-4
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl dev-libs/elfutils:=
 SLOT=0/4.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-4.3.0.tar.gz -> rocr-runtime-4.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e7d656b19e1b2172df8c24d6085125b8
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-4.5.2 b/metadata/md5-cache/dev-libs/rocr-runtime-4.5.2
index b06057929f3b..f066843ef86e 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-4.5.2
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-4.5.2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-4.5.2 >=dev-libs/rocm-d
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-libs/elfutils
 SLOT=0/4.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-4.5.2.tar.gz -> rocr-runtime-4.5.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=677fab0fb30e93a3ca8c77b24eb2e719
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.0.2 b/metadata/md5-cache/dev-libs/rocr-runtime-5.0.2
index 262028a639cc..6cec05808f2a 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.0.2
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.0.2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.0.2 >=dev-libs/rocm-d
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-libs/elfutils
 SLOT=0/5.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.0.2.tar.gz -> rocr-runtime-5.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0274ed5edc158b7b5e472912041cb324
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-9999 b/metadata/md5-cache/dev-libs/rocr-runtime-9999
index 679d2d6c6d11..7e8d4f6b9157 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-9999
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-9999
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-9999 >=dev-l
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+INHERIT=cmake git-r3
 IUSE=debug
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-process/numactl dev-libs/elfutils:= >=sys-devel/llvm-roc-9999
 SLOT=0/9999
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=db36b0edcb1e4cf1e63ba5c9cb9e0b30
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
index eca7213b0063..8c5d5da57d87 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+INHERIT=cmake linux-info
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.0.0.tar.gz -> roct-thunk-interface-4.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0820c596b5b21ead35d3f465ab7a6b6e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
index b90fca343bee..ff77060543f2 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+INHERIT=cmake linux-info
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.1.0.tar.gz -> roct-thunk-interface-4.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=23a5754c6c89e3f511a2a72e38f6d62e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.2.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.2.0
index 03e3d04e4c7f..523f65634990 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.2.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.2.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+INHERIT=cmake linux-info
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.2
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.2.0.tar.gz -> roct-thunk-interface-4.2.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=23a5754c6c89e3f511a2a72e38f6d62e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.3.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.3.0
index d0d879d60194..235b70d6de9d 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.3.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.3.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+INHERIT=cmake linux-info
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.3.0.tar.gz -> roct-thunk-interface-4.3.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0820c596b5b21ead35d3f465ab7a6b6e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.5.2 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.5.2
index 6f15df529fcd..9cb1e565d6e0 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.5.2
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.5.2
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+INHERIT=cmake linux-info
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.5.2.tar.gz -> roct-thunk-interface-4.5.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e036cd4bf9eaf39e968c545efd1b1aae
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.0.2 b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.0.2
index fcc5d739a865..07d5418cde71 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.0.2
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.0.2
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+INHERIT=cmake linux-info
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/5.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.0.2.tar.gz -> roct-thunk-interface-5.0.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a4430921bceb8186e3f2bed893d3df24
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999 b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
index 2a49b43323fd..506c1fec2af5 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
@@ -4,9 +4,10 @@ DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+INHERIT=cmake linux-info git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-process/numactl
 SLOT=0/9999
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/s2n-0.10.21-r1 b/metadata/md5-cache/dev-libs/s2n-0.10.21-r1
index 0863be969755..0d1f9f88661b 100644
--- a/metadata/md5-cache/dev-libs/s2n-0.10.21-r1
+++ b/metadata/md5-cache/dev-libs/s2n-0.10.21-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/openssl:0=[static-libs=]
 DESCRIPTION=simple, small, fast and secure C99 implementation of the TLS/SSL protocols
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/s2n
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/openssl:0=[static-libs=]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/s2n/archive/v0.10.21.tar.gz -> s2n-0.10.21.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1f1444a032ba2aa58da1aa421d92fa07
diff --git a/metadata/md5-cache/dev-libs/s2n-1.0.0 b/metadata/md5-cache/dev-libs/s2n-1.0.0
index aaf8bf2fa503..9aecf852ea9f 100644
--- a/metadata/md5-cache/dev-libs/s2n-1.0.0
+++ b/metadata/md5-cache/dev-libs/s2n-1.0.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/openssl:0=[static-libs=]
 DESCRIPTION=Simple, small, fast and secure C99 implementation of the TLS/SSL protocols
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/s2n
+INHERIT=cmake
 IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/openssl:0=[static-libs=]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/s2n/archive/v1.0.0.tar.gz -> s2n-1.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=541a41244f365ed78b68d477d057eff8
diff --git a/metadata/md5-cache/dev-libs/satyr-0.38 b/metadata/md5-cache/dev-libs/satyr-0.38
index 19ed301bd394..7b28836d6c58 100644
--- a/metadata/md5-cache/dev-libs/satyr-0.38
+++ b/metadata/md5-cache/dev-libs/satyr-0.38
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=Satyr is a collection of low-level algorithms for program failure processing
 EAPI=8
 HOMEPAGE=https://github.com/abrt/satyr
+INHERIT=autotools multiprocessing python-r1
 IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0/4
 SRC_URI=https://github.com/abrt/satyr/archive/0.38/satyr-0.38.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8acd5df5feb82b0ceb4b4670ee795966
diff --git a/metadata/md5-cache/dev-libs/satyr-0.39 b/metadata/md5-cache/dev-libs/satyr-0.39
index 0c139562b72b..99b01c3c8bd3 100644
--- a/metadata/md5-cache/dev-libs/satyr-0.39
+++ b/metadata/md5-cache/dev-libs/satyr-0.39
@@ -4,6 +4,7 @@ DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 DESCRIPTION=Satyr is a collection of low-level algorithms for program failure processing
 EAPI=8
 HOMEPAGE=https://github.com/abrt/satyr
+INHERIT=autotools multiprocessing python-r1
 IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0/4
 SRC_URI=https://github.com/abrt/satyr/archive/0.39/satyr-0.39.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8acd5df5feb82b0ceb4b4670ee795966
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.7.0 b/metadata/md5-cache/dev-libs/sdformat-9.7.0
index e9050774e8fb..ad70af812334 100644
--- a/metadata/md5-cache/dev-libs/sdformat-9.7.0
+++ b/metadata/md5-cache/dev-libs/sdformat-9.7.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignitio
 DESCRIPTION=Simulation Description Format (SDF) parser
 EAPI=8
 HOMEPAGE=http://sdformat.org/
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
 SLOT=0/9
 SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.7.0.tar.bz2
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=282408ac6e0b9a4d6da3e8caef2273ea
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.10 b/metadata/md5-cache/dev-libs/serd-0.30.10
index 2a4737a3d984..dccb050c83a0 100644
--- a/metadata/md5-cache/dev-libs/serd-0.30.10
+++ b/metadata/md5-cache/dev-libs/serd-0.30.10
@@ -4,11 +4,12 @@ DEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.
 DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/serd/
+INHERIT=python-any-r1 waf-utils multilib-build multilib-minimal
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.30.10.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	waf-utils	b105702e851f214f466d51d24ad7efbd
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	waf-utils	b105702e851f214f466d51d24ad7efbd
 _md5_=18ee2d610a329e2cbef0bd0a0fa3442c
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.9.7 b/metadata/md5-cache/dev-libs/simdjson-0.9.7
index 53c06a532988..d0276e8e996b 100644
--- a/metadata/md5-cache/dev-libs/simdjson-0.9.7
+++ b/metadata/md5-cache/dev-libs/simdjson-0.9.7
@@ -4,6 +4,7 @@ DEPEND=tools? ( dev-libs/cxxopts:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
 EAPI=7
 HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
+INHERIT=cmake
 IUSE=test tools
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Boost-1.0 BSD MIT
@@ -11,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/simdjson/simdjson/archive/v0.9.7.tar.gz -> simdjson-0.9.7.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d1bb1345f2d7328d31e7a4e3f869dc47
diff --git a/metadata/md5-cache/dev-libs/simdjson-1.0.0-r1 b/metadata/md5-cache/dev-libs/simdjson-1.0.0-r1
index af52f58f30ae..b1710dc51213 100644
--- a/metadata/md5-cache/dev-libs/simdjson-1.0.0-r1
+++ b/metadata/md5-cache/dev-libs/simdjson-1.0.0-r1
@@ -4,6 +4,7 @@ DEPEND=tools? ( dev-libs/cxxopts:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
 EAPI=7
 HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
+INHERIT=toolchain-funcs cmake
 IUSE=test tools
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Boost-1.0 BSD MIT
@@ -11,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/simdjson/simdjson/archive/v1.0.0.tar.gz -> simdjson-1.0.0.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-1.0.0.tar.gz )
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=dced4bd6dbb207e8c5b23217cf31c07b
diff --git a/metadata/md5-cache/dev-libs/simdjson-1.0.2 b/metadata/md5-cache/dev-libs/simdjson-1.0.2
index 1cd00befe96a..ef74d925cccc 100644
--- a/metadata/md5-cache/dev-libs/simdjson-1.0.2
+++ b/metadata/md5-cache/dev-libs/simdjson-1.0.2
@@ -4,6 +4,7 @@ DEPEND=tools? ( dev-libs/cxxopts:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
 EAPI=7
 HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
+INHERIT=toolchain-funcs cmake
 IUSE=test tools
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Boost-1.0 BSD MIT
@@ -11,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/simdjson/simdjson/archive/v1.0.2.tar.gz -> simdjson-1.0.2.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-1.0.2.tar.gz )
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c58f94d5c52fcb60ff2bccc9b39fdd23
diff --git a/metadata/md5-cache/dev-libs/sink-0.8.0-r3 b/metadata/md5-cache/dev-libs/sink-0.8.0-r3
index 27a0946a0ba1..93a9c3f87045 100644
--- a/metadata/md5-cache/dev-libs/sink-0.8.0-r3
+++ b/metadata/md5-cache/dev-libs/sink-0.8.0-r3
@@ -4,11 +4,12 @@ DEPEND=dev-db/lmdb:= dev-libs/flatbuffers:= >=dev-libs/kasync-0.3:5 >=dev-libs/x
 DESCRIPTION=Data access layer handling synchronization, caching and indexing
 EAPI=7
 HOMEPAGE=https://kube-project.com
+INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
 RDEPEND=dev-db/lmdb:= dev-libs/flatbuffers:= >=dev-libs/kasync-0.3:5 >=dev-libs/xapian-1.4.4:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 kde-apps/kmime:5 kde-frameworks/kcalendarcore:5 kde-frameworks/kcontacts:5 kde-frameworks/kcoreaddons:5 >=net-libs/kdav2-0.3:5 >=net-libs/kimap2-0.3:5 net-misc/curl sys-libs/readline:0=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/sink/0.8.0/src/sink-0.8.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2b60d8de79a056a95f06fe72039fc34c
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.11.1.0 b/metadata/md5-cache/dev-libs/skalibs-2.11.1.0
index 8878a59953fa..1e6db4f1884a 100644
--- a/metadata/md5-cache/dev-libs/skalibs-2.11.1.0
+++ b/metadata/md5-cache/dev-libs/skalibs-2.11.1.0
@@ -3,9 +3,9 @@ DESCRIPTION=General-purpose libraries from skarnet.org
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/skalibs/
 IUSE=doc ipv6 static-libs
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=ISC
 SLOT=0/2.11
 SRC_URI=https://www.skarnet.org/software/skalibs/skalibs-2.11.1.0.tar.gz
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0d627e157c54ba1fe0bfcd4de1fa83e5
+_md5_=f10ad5796bc4b076ff2c7ff3bd08aedc
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.6.1-r1 b/metadata/md5-cache/dev-libs/softhsm-2.6.1-r1
deleted file mode 100644
index 95eea1cdd308..000000000000
--- a/metadata/md5-cache/dev-libs/softhsm-2.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gcc:=[cxx] virtual/pkgconfig test? ( dev-util/cppunit )
-DEFINED_PHASES=configure install
-DEPEND=migration-tool? ( dev-db/sqlite:3= ) dev-libs/openssl:0=[bindist(-)=] !~dev-libs/softhsm-2.0.0:0
-DESCRIPTION=A software PKCS#11 implementation
-EAPI=7
-HOMEPAGE=https://www.opendnssec.org/
-IUSE=bindist gost migration-tool test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=BSD
-RDEPEND=migration-tool? ( dev-db/sqlite:3= ) dev-libs/openssl:0=[bindist(-)=] !~dev-libs/softhsm-2.0.0:0
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.6.1.tar.gz
-_md5_=36fd43ee72ff55809b03b4adb80e6e5a
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.8-r1 b/metadata/md5-cache/dev-libs/sord-0.16.8-r1
index 2ba16d77ed73..b992fdf431b5 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.8-r1
+++ b/metadata/md5-cache/dev-libs/sord-0.16.8-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libpcre dev-libs/serd || ( >=dev-lang/python-3.10.0_p1-r1:3.10[t
 DESCRIPTION=Library for storing RDF data in memory
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/sord/
+INHERIT=python-any-r1 waf-utils multilib-build multilib-minimal
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.8.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	waf-utils	b105702e851f214f466d51d24ad7efbd
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	waf-utils	b105702e851f214f466d51d24ad7efbd
 _md5_=1eaea3ed182f9a86f1d4721dc039d4a5
diff --git a/metadata/md5-cache/dev-libs/sord-9999 b/metadata/md5-cache/dev-libs/sord-9999
index 8c01924ea8f1..5e2df0ea2167 100644
--- a/metadata/md5-cache/dev-libs/sord-9999
+++ b/metadata/md5-cache/dev-libs/sord-9999
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libpcre dev-libs/serd || ( >=dev-lang/python-3.10.0_p1-r1:3.10[t
 DESCRIPTION=Library for storing RDF data in memory
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/sord/
+INHERIT=python-any-r1 waf-utils multilib-build multilib-minimal git-r3
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=ISC
 PROPERTIES=live
 RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	waf-utils	b105702e851f214f466d51d24ad7efbd
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	waf-utils	b105702e851f214f466d51d24ad7efbd
 _md5_=c10dc4c4396b3d0273243ff41e8727fc
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.8.2 b/metadata/md5-cache/dev-libs/spdlog-1.8.2
index 770081fb4776..17b8a5c031a9 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.8.2
+++ b/metadata/md5-cache/dev-libs/spdlog-1.8.2
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libfmt-6.1.2:=
 DESCRIPTION=Very fast, header only, C++ logging library
 EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libfmt-6.1.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.8.2.tar.gz -> spdlog-1.8.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bb244f0a3b35acd27ca34cf9b21c4772
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.8.5 b/metadata/md5-cache/dev-libs/spdlog-1.8.5
index 5906b6a3893c..60619f48b608 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.8.5
+++ b/metadata/md5-cache/dev-libs/spdlog-1.8.5
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libfmt-6.1.2:=
 DESCRIPTION=Very fast, header only, C++ logging library
 EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libfmt-6.1.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.8.5.tar.gz -> spdlog-1.8.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6fb0b89b1b89435daa43afd889a6ab32
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.8.5-r1 b/metadata/md5-cache/dev-libs/spdlog-1.8.5-r1
index 0ef8dcbb2248..3d36b6428b66 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.8.5-r1
+++ b/metadata/md5-cache/dev-libs/spdlog-1.8.5-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libfmt-6.1.2:=
 DESCRIPTION=Very fast, header only, C++ logging library
 EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libfmt-6.1.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.8.5.tar.gz -> spdlog-1.8.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3e7f9a352de671c522e849542278268e
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.9.2 b/metadata/md5-cache/dev-libs/spdlog-1.9.2
index da8cb62c4b3d..966872e947be 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.9.2
+++ b/metadata/md5-cache/dev-libs/spdlog-1.9.2
@@ -4,12 +4,13 @@ DEPEND=>=dev-libs/libfmt-8.0.0:=
 DESCRIPTION=Very fast, header only, C++ logging library
 EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
+INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.9.2.tar.gz -> spdlog-1.9.2.tar.gz test? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/spdlog/spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 )
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fd94f9264ec5c60d2d93291e6735a605
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3e3faacdd58be3866141c054da4809ac
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.9.2-r1 b/metadata/md5-cache/dev-libs/spdlog-1.9.2-r1
index 52f503b2d6e2..a51b606fe600 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.9.2-r1
+++ b/metadata/md5-cache/dev-libs/spdlog-1.9.2-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libfmt-8.0.0:=
 DESCRIPTION=Very fast, header only, C++ logging library
 EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.9.2.tar.gz -> spdlog-1.9.2.tar.gz test? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/spdlog/spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 )
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5accffaf0d3bf6cebb49e1b42983e256
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e0bc5ec7becf90aff451538bde8cbfb8
diff --git a/metadata/md5-cache/dev-libs/spdlog-9999 b/metadata/md5-cache/dev-libs/spdlog-9999
index c75d5f785f0e..e95d42d9b96e 100644
--- a/metadata/md5-cache/dev-libs/spdlog-9999
+++ b/metadata/md5-cache/dev-libs/spdlog-9999
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/libfmt-8.0.0:=
 DESCRIPTION=Very fast, header only, C++ logging library
 EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
+INHERIT=cmake git-r3
 IUSE=test
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ff47c75548f5af72c92275d6bdedb43f
diff --git a/metadata/md5-cache/dev-libs/spsdeclib-5.1-r2 b/metadata/md5-cache/dev-libs/spsdeclib-5.1-r2
index 092fcf29f00c..6f66e6ac62b2 100644
--- a/metadata/md5-cache/dev-libs/spsdeclib-5.1-r2
+++ b/metadata/md5-cache/dev-libs/spsdeclib-5.1-r2
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Kryoflux SPS Decoder Library
 EAPI=8
 HOMEPAGE=https://www.kryoflux.com/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Kryoflux-MAME
 SLOT=0
 SRC_URI=https://www.kryoflux.com/download/spsdeclib_5.1_source.zip
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=21dfdf7369196eb678ec02ef7ba45d0c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e2777e41be954f6429d46e2a89ecd72a
diff --git a/metadata/md5-cache/dev-libs/squareball-9999 b/metadata/md5-cache/dev-libs/squareball-9999
index ba4f5037c883..1657d34e57d3 100644
--- a/metadata/md5-cache/dev-libs/squareball-9999
+++ b/metadata/md5-cache/dev-libs/squareball-9999
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0ce23fdc99f1102b65ca73f7dc1572b6
diff --git a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1 b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
index eb794ac13a93..e5dabece70ff 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
+++ b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
@@ -11,5 +11,5 @@ RDEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/37744/starpu-1.2.6.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f1ce660714b7343ce16e1e4b4c9b58bc
diff --git a/metadata/md5-cache/dev-libs/starpu-1.3.8 b/metadata/md5-cache/dev-libs/starpu-1.3.8
deleted file mode 100644
index 331cf8254b2b..000000000000
--- a/metadata/md5-cache/dev-libs/starpu-1.3.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
-DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
-EAPI=7
-HOMEPAGE=https://starpu.gitlabpages.inria.fr/
-IUSE=blas cuda doc examples fftw fortran hdf5 mpi opencl opengl openmp spinlock-check static-libs test valgrind
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
-RESTRICT=!test? ( test )
-SLOT=0/7
-SRC_URI=https://files.inria.fr/starpu/starpu-1.3.8/starpu-1.3.8.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=00a225b371ab64392b3b97ebe00b746f
diff --git a/metadata/md5-cache/dev-libs/starpu-1.3.9 b/metadata/md5-cache/dev-libs/starpu-1.3.9
index a1d8a81b406a..86ac1afb7dd1 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.3.9
+++ b/metadata/md5-cache/dev-libs/starpu-1.3.9
@@ -11,5 +11,5 @@ RDEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://files.inria.fr/starpu/starpu-1.3.9/starpu-1.3.9.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	cuda	15edbf8fd9df209322f42c06ecf59a96	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=872082a2d26ada46c530ed7c8de27d67
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24-r4 b/metadata/md5-cache/dev-libs/stfl-0.24-r4
index 383c97664e4b..262326897498 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24-r4
+++ b/metadata/md5-cache/dev-libs/stfl-0.24-r4
@@ -3,6 +3,7 @@ DEPEND=sys-libs/ncurses:=[unicode(+)] perl? ( dev-lang/perl:= ) ruby? ( dev-lang
 DESCRIPTION=A library which implements a curses-based widget set for text terminals
 EAPI=7
 HOMEPAGE=http://www.clifford.at/stfl/
+INHERIT=perl-module python-r1 toolchain-funcs
 IUSE=examples perl python ruby static-libs python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ppc ~ppc64 x86
 LICENSE=LGPL-3
@@ -11,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=658d95506efde1a4cf85425e838180a6
diff --git a/metadata/md5-cache/dev-libs/teakra-20220224 b/metadata/md5-cache/dev-libs/teakra-20220224
index 98e0c7d188e3..0cc01967cd77 100644
--- a/metadata/md5-cache/dev-libs/teakra-20220224
+++ b/metadata/md5-cache/dev-libs/teakra-20220224
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Emulator, assembler, etc for XpertTeak, the DSP used by DSi/3DS
 EAPI=8
 HOMEPAGE=https://github.com/wwylele/teakra/
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/wwylele/teakra/archive/01db7cdd00aabcce559a8dddce8798dabb71949b.tar.gz -> teakra-20220224.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9e30a8f6c044b9c976ab417ff2b0fff5
diff --git a/metadata/md5-cache/dev-libs/template-glib-3.34.0 b/metadata/md5-cache/dev-libs/template-glib-3.34.0
index 7046447eb681..44e094e72111 100644
--- a/metadata/md5-cache/dev-libs/template-glib-3.34.0
+++ b/metadata/md5-cache/dev-libs/template-glib-3.34.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:= dev-util/desktop-file-ut
 DESCRIPTION=Templating library for GLib
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/template-glib
+INHERIT=gnome.org meson xdg vala
 IUSE=gtk-doc +introspection vala
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/template-glib/3.34/template-glib-3.34.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=873adb6fae4333c5a44dba15dd8a785d
diff --git a/metadata/md5-cache/dev-libs/template-glib-3.34.1 b/metadata/md5-cache/dev-libs/template-glib-3.34.1
index 7f26c6371ac3..081ef19c5648 100644
--- a/metadata/md5-cache/dev-libs/template-glib-3.34.1
+++ b/metadata/md5-cache/dev-libs/template-glib-3.34.1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
 DESCRIPTION=Templating library for GLib
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/template-glib
+INHERIT=gnome.org meson vala
 IUSE=gtk-doc +introspection vala
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/template-glib/3.34/template-glib-3.34.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8
 _md5_=d9bd6eaec52a36a1a4237aa8885ff0c9
diff --git a/metadata/md5-cache/dev-libs/thrift-0.16.0-r1 b/metadata/md5-cache/dev-libs/thrift-0.16.0-r1
new file mode 100644
index 000000000000..d9bc2756cf1c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/thrift-0.16.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-libs/openssl:= libevent? ( dev-libs/libevent )
+DESCRIPTION=C++ bindings for Apache Thrift
+EAPI=8
+HOMEPAGE=https://thrift.apache.org/lib/cpp.html
+INHERIT=cmake
+IUSE=libevent lua +ssl test
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/boost:= dev-libs/openssl:= libevent? ( dev-libs/libevent )
+REQUIRED_USE=test? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/0
+SRC_URI=mirror://apache/thrift/0.16.0/thrift-0.16.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=02b8cfe38e2b28db52b82d1f6803b84f
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-7.1.0 b/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
deleted file mode 100644
index 72ce460fa82f..000000000000
--- a/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A simple, small, efficient, C++ XML parser
-EAPI=7
-HOMEPAGE=http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc64 sparc x86
-LICENSE=ZLIB
-RESTRICT=!test? ( test )
-SLOT=0/7
-SRC_URI=https://github.com/leethomason/tinyxml2/archive/7.1.0.tar.gz -> tinyxml2-7.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=134f3c70d1d973798d8c1df312d24686
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-8.0.0 b/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
deleted file mode 100644
index 3ccad1ea9e29..000000000000
--- a/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A simple, small, efficient, C++ XML parser
-EAPI=7
-HOMEPAGE=http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc64 sparc x86
-LICENSE=ZLIB
-RESTRICT=!test? ( test )
-SLOT=0/8
-SRC_URI=https://github.com/leethomason/tinyxml2/archive/8.0.0.tar.gz -> tinyxml2-8.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c036a57a81f84d85d1422213ed60672c
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-9.0.0 b/metadata/md5-cache/dev-libs/tinyxml2-9.0.0
index 499bbf183f0c..e5afeb930800 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-9.0.0
+++ b/metadata/md5-cache/dev-libs/tinyxml2-9.0.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A simple, small, efficient, C++ XML parser
 EAPI=7
 HOMEPAGE=http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/
+INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~hppa ~ppc64 ~riscv sparc x86
 LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/leethomason/tinyxml2/archive/9.0.0.tar.gz -> tinyxml2-9.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=036f0e5c7fe15d8e9242c72332522a2e
diff --git a/metadata/md5-cache/dev-libs/tllist-1.0.5 b/metadata/md5-cache/dev-libs/tllist-1.0.5
index ffb8d4564120..f5441dca9677 100644
--- a/metadata/md5-cache/dev-libs/tllist-1.0.5
+++ b/metadata/md5-cache/dev-libs/tllist-1.0.5
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=Header-only implementation of a typed linked list in C
 EAPI=8
 HOMEPAGE=https://codeberg.org/dnkl/tllist
+INHERIT=meson
 KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://codeberg.org/dnkl/tllist/archive/1.0.5.tar.gz -> tllist-1.0.5.tar.gz
-_eclasses_=meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6e5956aabd3d0921b7df2fab5f5c931f
diff --git a/metadata/md5-cache/dev-libs/tntnet-3.0 b/metadata/md5-cache/dev-libs/tntnet-3.0
index 3352ea30bcc7..8f1da912e639 100644
--- a/metadata/md5-cache/dev-libs/tntnet-3.0
+++ b/metadata/md5-cache/dev-libs/tntnet-3.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/cxxtools-3.0 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-3.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f3cc4df4333d6d0b78aaf50e1c7735bf
diff --git a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1 b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
index 1118989c3c8c..40dbd112a937 100644
--- a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
+++ b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=Fast public domain large integer arithmetic library
 EAPI=7
 HOMEPAGE=https://www.libtom.net/TomsFastMath/ https://github.com/libtom/tomsfastmath
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Unlicense
 SLOT=0/1
 SRC_URI=https://github.com/libtom/tomsfastmath/releases/download/v0.13.1/tfm-0.13.1.tar.xz
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6d76a010d9bd0645328cd5285c5359a3
+_md5_=2dea783d38720ec0fea2583a5d68a7dd
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6
index 684f78435d12..f634c56b9a1f 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.56:2 archive? ( >=app-arch/libarchive-3:0= ) dev-libs/l
 DESCRIPTION=Playlist parsing library
 EAPI=7
 HOMEPAGE=https://developer.gnome.org/totem-pl-parser/stable/
+INHERIT=gnome.org meson xdg
 IUSE=archive crypt gtk-doc +introspection test +uchardet
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.56:2 archive? ( >=app-arch/libarchive-3:0= ) dev-libs/
 RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=505dca4ab2e0b8c92e2e0bc24bd462a8
diff --git a/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321 b/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321
index fc3fcfe5954d..2d082f2ef663 100644
--- a/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321
+++ b/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321
@@ -4,12 +4,13 @@ DEPEND=agrep? ( !app-text/agrep !dev-ruby/amatch !app-misc/glimpse ) python? ( p
 DESCRIPTION=Lightweight, robust, and efficient POSIX compliant regexp matching library
 EAPI=8
 HOMEPAGE=https://laurikari.net/tre/ https://github.com/laurikari/tre
+INHERIT=autotools distutils-r1
 IUSE=+agrep +alloca +approx debug nls profile python python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=agrep? ( !app-text/agrep !dev-ruby/amatch !app-misc/glimpse ) python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=agrep? ( approx ) python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/laurikari/tre/archive/6092368aabdd0dbb0fbceb2766a37b98e0ff6911.tar.gz -> tre-0.8.0_p20210321.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	distutils-r1	779bc733c68a72273cfce64602bada1d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f25b64caff476f5ac2623658b6d10a59
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=53eec29f8eafa96bb85b5f5b3195f0d9
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.20.6 b/metadata/md5-cache/dev-libs/tree-sitter-0.20.6
index 79763ebac3b3..729313a0448d 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.20.6
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.20.6
@@ -2,9 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+INHERIT=optfeature toolchain-funcs
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.6.tar.gz -> tree-sitter-0.20.6.tar.gz
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8ec56fdb1a4684bd724365f2bc9fc3cf
+_md5_=b4969d0d53889c03796df9fecd62484d
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-9999 b/metadata/md5-cache/dev-libs/tree-sitter-9999
index 5e31f7bb7402..5b8f32dbf9db 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-9999
+++ b/metadata/md5-cache/dev-libs/tree-sitter-9999
@@ -3,8 +3,9 @@ DEFINED_PHASES=install postinst prepare unpack
 DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
+INHERIT=optfeature toolchain-funcs git-r3
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8ec56fdb1a4684bd724365f2bc9fc3cf
+_md5_=07cbd9a14ca3a13160592645a44b638e
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
index 72e1540d1f29..4a27ecb54465 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.19.0.tar.gz -> tree-sitter-bash-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=19f1b49c2adcf356611220d1cbf65a09
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.1
index 5cf06072d7e4..6cb1107d2258 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.1.tar.gz -> tree-sitter-c-0.20.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=91765889d4c1c28d6adfbcbf22b14031
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.19.1 b/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.19.1
index b4aedff74b8b..cbcf3a3a6d9a 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.19.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.19.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-c-sharp/archive/v0.19.1.tar.gz -> tree-sitter-c-sharp-0.19.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=17db7618b35eeddc8b6baff34a905aa2
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0
index 71dad088d822..f41d76df98a4 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-cpp/archive/v0.20.0.tar.gz -> tree-sitter-cpp-0.20.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=55ddbdb15dfc6936e48a9806552a55aa
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-css-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-css-0.19.0
index ef0a0745319d..315d22c7ea60 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-css-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-css-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-css/archive/v0.19.0.tar.gz -> tree-sitter-css-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=cff8fba25a235538f167cc21a603a4fa
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.19.0
index 917287c70bcb..daf64b0fca54 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-embedded-template/archive/v0.19.0.tar.gz -> tree-sitter-embedded-template-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=4e3b93c9b375d5f57f4245306352cfa9
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-go-0.19.1 b/metadata/md5-cache/dev-libs/tree-sitter-go-0.19.1
index 07cdf7b2b078..cf8f0790a476 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-go-0.19.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-go-0.19.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-go/archive/rust-0.19.1.tar.gz -> tree-sitter-go-0.19.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=23acbd29a27f3bf43befd4b49cc72f50
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-haskell-0.13.0_p20211114 b/metadata/md5-cache/dev-libs/tree-sitter-haskell-0.13.0_p20211114
index 8ffc1fabdb57..bf93af028d60 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-haskell-0.13.0_p20211114
+++ b/metadata/md5-cache/dev-libs/tree-sitter-haskell-0.13.0_p20211114
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-haskell/archive/d72f2e42c0d5ccf8e8b1c39e3642428317e8fe02.tar.gz -> tree-sitter-haskell-0.13.0_p20211114.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=3c210c5ee6b4fcbb1e9b4cb20a1b7296
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-html-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-html-0.19.0
index b3432244b2d9..48e0b80dd304 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-html-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-html-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-html/archive/v0.19.0.tar.gz -> tree-sitter-html-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=963675f7d47a8d3205825af45bbf510b
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-java-0.19.1 b/metadata/md5-cache/dev-libs/tree-sitter-java-0.19.1
index f75c7d3936df..6ed7604271cf 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-java-0.19.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-java-0.19.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-java/archive/v0.19.1.tar.gz -> tree-sitter-java-0.19.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=0d6302ae7fcb2ec8f431baa9c5a5e5dc
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.0
index ac56aed1d433..fd3dd268fdfd 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-javascript/archive/rust-0.20.0.tar.gz -> tree-sitter-javascript-0.20.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=0c3064630953cd34497dcda6dfc6a650
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-jsdoc-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-jsdoc-0.19.0
index eb2fc32424bc..67936fc88a7c 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-jsdoc-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-jsdoc-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-jsdoc/archive/v0.19.0.tar.gz -> tree-sitter-jsdoc-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=8c506ccf738b09a4461eba758aac292c
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-json-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-json-0.19.0
index f7d6e0a1052e..26a9c7d3cfb1 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-json-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-json-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-json/archive/v0.19.0.tar.gz -> tree-sitter-json-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=e35e5ffe02b5b9ef49e17d3e19e25bb0
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-julia-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-julia-0.19.0
index 98795d248ff9..887c20e89517 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-julia-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-julia-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-julia/archive/v0.19.0.tar.gz -> tree-sitter-julia-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=6ff02d88437f2e83cbf83c335dde2267
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.19.0
index 88e2393a4179..dd048880b7e8 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ocaml/archive/v0.19.0.tar.gz -> tree-sitter-ocaml-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=dff104e3037f5a91f8ffb133af5b4671
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-php-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-php-0.19.0
index 775780cba2a8..f0d6d26a4cfb 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-php-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-php-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-php/archive/v0.19.0.tar.gz -> tree-sitter-php-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=b965b5e3120f65200314c368964a9420
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-python-0.19.1_p20211112 b/metadata/md5-cache/dev-libs/tree-sitter-python-0.19.1_p20211112
index f8fed9abee1a..48a500808ae8 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-python-0.19.1_p20211112
+++ b/metadata/md5-cache/dev-libs/tree-sitter-python-0.19.1_p20211112
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-python/archive/24b530ca158d2782ea9046e756057a412e16b52f.tar.gz -> tree-sitter-python-0.19.1_p20211112.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=fb3ac12191efe4abd703775f8c1f0ac4
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ql-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-ql-0.19.0
index 14bec9842555..1e3f29c6a827 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ql-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ql-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ql/archive/v0.19.0.tar.gz -> tree-sitter-ql-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=1a5d5558aa9dc2eafb47463968a66156
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-regex-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-regex-0.19.0
index 32ae7fb31221..0380e1893576 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-regex-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-regex-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-regex/archive/v0.19.0.tar.gz -> tree-sitter-regex-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=8a29e39bc6f02bf7c1f9973fc8debf94
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.19.0
index ab47112f37dd..5a1613112f81 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ruby/archive/v0.19.0.tar.gz -> tree-sitter-ruby-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=b7cc1d79d8d724c03e151e4d960c9c6a
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.0
index 1cb8773822a7..f9545e4fa543 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-rust/archive/v0.20.0.tar.gz -> tree-sitter-rust-0.20.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=82d5fa6c84a7dda48945e002e62baff3
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.1
index bbe389d913c3..cb844d40fb67 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-rust/archive/v0.20.1.tar.gz -> tree-sitter-rust-0.20.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=0e30100cfcd35b83dc1783a8671a9a7b
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.0
index 2060ea717526..19f0ccda059f 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-scala/archive/v0.19.0.tar.gz -> tree-sitter-scala-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=b59c0a8a5773768787245f939afc7d77
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-tsq-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-tsq-0.19.0
index e7ccf1f3f1f4..3d37ad744f4d 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-tsq-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-tsq-0.19.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-tsq/archive/0.19.0.tar.gz -> tree-sitter-tsq-0.19.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=38f1d4aed3bd2379096e86d9e6beccef
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.0
index 021bed594d69..ac825e8823e5 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-typescript/archive/rust-0.20.0.tar.gz -> tree-sitter-typescript-0.20.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=3092ddc7cc0a81982e4c21a2256f5daf
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.1
index a2589a342eb9..be3c3ed1625e 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-typescript/archive/v0.20.1.tar.gz -> tree-sitter-typescript-0.20.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	ddb7304ac0e90c1cc08b32af0ca9682b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
 _md5_=1320bc9faed6e42f4951ace75abe2d26
diff --git a/metadata/md5-cache/dev-libs/ucl-1.03-r1 b/metadata/md5-cache/dev-libs/ucl-1.03-r1
index 35114e0849ef..0b24c3bcb738 100644
--- a/metadata/md5-cache/dev-libs/ucl-1.03-r1
+++ b/metadata/md5-cache/dev-libs/ucl-1.03-r1
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=827b1619b303836baf3239e951035553
diff --git a/metadata/md5-cache/dev-libs/ucommon-7.0.0 b/metadata/md5-cache/dev-libs/ucommon-7.0.0
index abf706be40db..ce69b484fbd3 100644
--- a/metadata/md5-cache/dev-libs/ucommon-7.0.0
+++ b/metadata/md5-cache/dev-libs/ucommon-7.0.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=ssl? ( net-libs/gnutls:= dev-libs/libgcrypt:= )
 SLOT=0/8
 SRC_URI=mirror://gnu/commoncpp/ucommon-7.0.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ff64621914f824336a76ffb802eef6d0
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7.2-r1 b/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
index eeaded49a515..0c8f9ce21a57 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
+++ b/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Disassembler library for the x86/-64 architecture sets
 EAPI=7
 HOMEPAGE=http://udis86.sourceforge.net/
+INHERIT=autotools multilib-minimal python-any-r1
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=39220ff374f5b9450e6a9d2bcde5baf0
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.0.0 b/metadata/md5-cache/dev-libs/unibilium-2.0.0
index 54bf3de2af74..46abf0b2670f 100644
--- a/metadata/md5-cache/dev-libs/unibilium-2.0.0
+++ b/metadata/md5-cache/dev-libs/unibilium-2.0.0
@@ -3,10 +3,11 @@ DEPEND=dev-lang/perl sys-devel/libtool
 DESCRIPTION=A very basic terminfo library
 EAPI=6
 HOMEPAGE=https://github.com/mauke/unibilium/
+INHERIT=flag-o-matic
 IUSE=static-libs
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=LGPL-3+ MIT
 SLOT=0/4
 SRC_URI=https://github.com/mauke/unibilium/archive/v2.0.0.tar.gz -> unibilium-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9553102d19cca4daccdf05936805423d
diff --git a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2 b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
index a6dc2b7514d6..13f2d498da44 100644
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
+++ b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A lightweight unit testing framework for C++
 EAPI=7
 HOMEPAGE=https://unittest-cpp.github.io/
+INHERIT=cmake
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v2.0.0.tar.gz -> unittest++-2.0.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=60e8504644e5cbc842c799f3a7821802
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=17b5c60421e9c5a2e069eeee8ab2addd
diff --git a/metadata/md5-cache/dev-libs/univalue-1.0.5 b/metadata/md5-cache/dev-libs/univalue-1.0.5
index 8a6796998701..e26161e7568d 100644
--- a/metadata/md5-cache/dev-libs/univalue-1.0.5
+++ b/metadata/md5-cache/dev-libs/univalue-1.0.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://codeload.github.com/jgarzik/univalue/tar.gz/v1.0.5 -> univalue-1.0.5.tgz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a62ef64a400ddbc55dec1648b44295a2
diff --git a/metadata/md5-cache/dev-libs/univalue-9999 b/metadata/md5-cache/dev-libs/univalue-9999
index d986b7595511..6afc1edc1e0d 100644
--- a/metadata/md5-cache/dev-libs/univalue-9999
+++ b/metadata/md5-cache/dev-libs/univalue-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jgarzik/univalue
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=39d69bbce39eae00244118c77ce41674
diff --git a/metadata/md5-cache/dev-libs/urdfdom-1.0.4-r1 b/metadata/md5-cache/dev-libs/urdfdom-1.0.4-r1
index 4b71430ed414..8ef6b394d969 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-1.0.4-r1
+++ b/metadata/md5-cache/dev-libs/urdfdom-1.0.4-r1
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs
 DESCRIPTION=URDF (U-Robot Description Format) library
 EAPI=7
 HOMEPAGE=http://ros.org/wiki/urdf
+INHERIT=cmake
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=[threads(+)]
 SLOT=0/1
 SRC_URI=https://github.com/ros/urdfdom/archive/1.0.4.tar.gz -> urdfdom-1.0.4.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=40bcd781942ff9d2bf5d07b627d50e45
diff --git a/metadata/md5-cache/dev-libs/urdfdom-3.0.1 b/metadata/md5-cache/dev-libs/urdfdom-3.0.1
index 0790316df5e0..88db078ac67a 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-3.0.1
+++ b/metadata/md5-cache/dev-libs/urdfdom-3.0.1
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs
 DESCRIPTION=URDF (U-Robot Description Format) library
 EAPI=7
 HOMEPAGE=http://ros.org/wiki/urdf
+INHERIT=cmake
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
 SLOT=0/3
 SRC_URI=https://github.com/ros/urdfdom/archive/3.0.1.tar.gz -> urdfdom-3.0.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=15bd0b0aec54812413794934a762e490
diff --git a/metadata/md5-cache/dev-libs/urdfdom-9999 b/metadata/md5-cache/dev-libs/urdfdom-9999
index 44431cbe51ad..63b2b526fb15 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom-9999
@@ -4,9 +4,10 @@ DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs
 DESCRIPTION=URDF (U-Robot Description Format) library
 EAPI=7
 HOMEPAGE=http://ros.org/wiki/urdf
+INHERIT=git-r3 cmake
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
 SLOT=0/3
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=af69cbc9f45210752e22bd2a942d3a44
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5 b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
index 721bcacb2d4d..db41998e7d50 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=URDF (U-Robot Description Format) headers
 EAPI=7
 HOMEPAGE=http://ros.org/wiki/urdf
+INHERIT=cmake
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/ros/urdfdom_headers/archive/1.0.5.tar.gz -> urdfdom_headers-1.0.5.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6e626cff919cd3e3db041542e3fd9a2d
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-9999 b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
index b9a882ad90ae..28f9aa899c4d 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
@@ -3,8 +3,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=URDF (U-Robot Description Format) headers
 EAPI=7
 HOMEPAGE=http://ros.org/wiki/urdf
+INHERIT=git-r3 cmake
 LICENSE=BSD
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6e626cff919cd3e3db041542e3fd9a2d
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.6 b/metadata/md5-cache/dev-libs/uriparser-0.9.6
index b6541b1ecc20..2b1efd38c07b 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.9.6
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.6
@@ -4,6 +4,7 @@ DEPEND=test? ( >=dev-cpp/gtest-1.8.1 )
 DESCRIPTION=Strictly RFC 3986 compliant URI parsing library in C
 EAPI=7
 HOMEPAGE=https://uriparser.github.io/
+INHERIT=cmake
 IUSE=+doc qt5 test unicode
 KEYWORDS=amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
@@ -11,5 +12,5 @@ REQUIRED_USE=qt5? ( doc ) test? ( unicode )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.6/uriparser-0.9.6.tar.bz2
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=52fbaff700fd9ff0aa16508e558bd3b1
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.13.0 b/metadata/md5-cache/dev-libs/userspace-rcu-0.13.0
index d4446bf8d949..743f0f57f1ae 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.13.0
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.13.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.13.0.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3867f09fdec3fd8c6f741e62e915fb4d
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.13.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.13.1
index 1f367af235fc..cecd8824cefe 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.13.1
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.13.1
@@ -4,10 +4,10 @@ DESCRIPTION=Userspace RCU (read-copy-update) library
 EAPI=7
 HOMEPAGE=https://liburcu.org/
 IUSE=static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8dd9b483675845acd69c5c117a762bc1
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=b5abc5f292e577d8017d269e54673ae6
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.1.2 b/metadata/md5-cache/dev-libs/utfcpp-3.1.2
index d710875ed19a..58c1547111e3 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-3.1.2
+++ b/metadata/md5-cache/dev-libs/utfcpp-3.1.2
@@ -4,11 +4,12 @@ DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=UTF-8 C++ library
 EAPI=7
 HOMEPAGE=https://github.com/nemtrif/utfcpp
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 sparc x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.1.2.tar.gz -> utfcpp-3.1.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=95463474af4cd1c9e06d6ef50c4f698d
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.2.1 b/metadata/md5-cache/dev-libs/utfcpp-3.2.1
index eceecf697a12..ed49f89dc1d2 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-3.2.1
+++ b/metadata/md5-cache/dev-libs/utfcpp-3.2.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=UTF-8 C++ library
 EAPI=8
 HOMEPAGE=https://github.com/nemtrif/utfcpp
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.2.1.tar.gz -> utfcpp-3.2.1.tar.gz test? ( https://github.com/nemtrif/ftest/archive/1e14b77c2ab8489386fc7046a8bced696c0fc4d6.tar.gz -> ftest-20211106174116.tar.gz )
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c2191ccdf8d90446f4f8ca5c89eda3c2
diff --git a/metadata/md5-cache/dev-libs/utfcpp-9999 b/metadata/md5-cache/dev-libs/utfcpp-9999
index 8cc397274e51..09f2f8525877 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-9999
+++ b/metadata/md5-cache/dev-libs/utfcpp-9999
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=UTF-8 C++ library
 EAPI=8
 HOMEPAGE=https://github.com/nemtrif/utfcpp
+INHERIT=cmake git-r3
 IUSE=test
 LICENSE=Boost-1.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=685bcc84d9c84bb20d516f5ee8c69f04
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.56.1 b/metadata/md5-cache/dev-libs/vala-common-0.56.1
new file mode 100644
index 000000000000..8cc6b7bc0d85
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.56.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+INHERIT=gnome.org
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.56/vala-0.56.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
+_md5_=357b8a61c9766b629b43c7ae9bc89d5e
diff --git a/metadata/md5-cache/dev-libs/vc-1.4.1-r1 b/metadata/md5-cache/dev-libs/vc-1.4.1-r1
index 94bd960cc5a6..b3bfaca1c7c3 100644
--- a/metadata/md5-cache/dev-libs/vc-1.4.1-r1
+++ b/metadata/md5-cache/dev-libs/vc-1.4.1-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SIMD Vector Class Library for C++
 EAPI=7
 HOMEPAGE=https://github.com/VcDevel/Vc
+INHERIT=cmake
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/VcDevel/Vc/archive/1.4.1.tar.gz -> vc-1.4.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3374fdd4c774e3195c2907f747c09760
diff --git a/metadata/md5-cache/dev-libs/vc-1.4.2 b/metadata/md5-cache/dev-libs/vc-1.4.2
index 7321ee128403..553bd168c06b 100644
--- a/metadata/md5-cache/dev-libs/vc-1.4.2
+++ b/metadata/md5-cache/dev-libs/vc-1.4.2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SIMD Vector Class Library for C++
 EAPI=7
 HOMEPAGE=https://github.com/VcDevel/Vc
+INHERIT=cmake
 KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/VcDevel/Vc/archive/1.4.2.tar.gz -> vc-1.4.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9df01fac3326c6421e0e9f586b2c4ec5
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.5 b/metadata/md5-cache/dev-libs/voikko-fi-2.5
index 4d80803880b4..e24b9f499b02 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.5
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.5
@@ -4,11 +4,12 @@ DEPEND=dev-libs/foma dev-libs/libvoikko
 DESCRIPTION=Finnish dictionary for libvoikko based spell checkers (vvfst format)
 EAPI=8
 HOMEPAGE=https://voikko.puimula.org/
+INHERIT=python-any-r1 verify-sig
 IUSE=verify-sig
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/foma dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.5.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.5.tar.gz.asc )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=2c5c0ac7304db7eea477854aa1869122
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.12-r4 b/metadata/md5-cache/dev-libs/volume_key-0.3.12-r4
index 77e1aaf5b58c..49714a215016 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.12-r4
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.12-r4
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Library for manipulating and storing storage volume encryption keys
 EAPI=7
 HOMEPAGE=https://pagure.io/volume_key
+INHERIT=autotools python-single-r1
 IUSE=test python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/volume_key/volume_key-0.3.12.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=de76c818ce5de421743da871616899cf
diff --git a/metadata/md5-cache/dev-libs/wayland-1.20.0 b/metadata/md5-cache/dev-libs/wayland-1.20.0
index e4b71c361c23..b6f793ae6c9b 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.20.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.20.0
@@ -4,12 +4,13 @@ DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=Wayland protocol libraries
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
+INHERIT=meson-multilib
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.20.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c18d5d3626cfd5b08b45835a5ba1784f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=7dead6b8bde3004a1eebfb198d857352
diff --git a/metadata/md5-cache/dev-libs/wayland-9999 b/metadata/md5-cache/dev-libs/wayland-9999
index 5ea9f052282d..a2fd84c90fff 100644
--- a/metadata/md5-cache/dev-libs/wayland-9999
+++ b/metadata/md5-cache/dev-libs/wayland-9999
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=Wayland protocol libraries
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
+INHERIT=git-r3 meson-multilib
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=49c1e393a534db457acb94ab88919e9e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=3861e545143e3ea9621e345b21c5556e
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.24 b/metadata/md5-cache/dev-libs/wayland-protocols-1.24
index f2d2819c1adf..f6d0b4ac533f 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.24
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.24
@@ -4,11 +4,12 @@ DEPEND=test? ( dev-libs/wayland )
 DESCRIPTION=Wayland protocol files
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/
+INHERIT=meson
 IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.24.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a13d4253eb9dcfbbf16cbd6a967dc099
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.25 b/metadata/md5-cache/dev-libs/wayland-protocols-1.25
index 3884d6d6cc78..75cc36662564 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.25
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.25
@@ -4,11 +4,12 @@ DEPEND=test? ( dev-libs/wayland )
 DESCRIPTION=Wayland protocol files
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/
+INHERIT=meson
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.25.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=68a03509491b732d61281daae87a7b66
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=8ffd5670c3cca0cb86457ca08a06d7ad
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-9999 b/metadata/md5-cache/dev-libs/wayland-protocols-9999
index 632f0df9c6dd..8b9bcbf29394 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-9999
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-9999
@@ -4,10 +4,11 @@ DEPEND=test? ( dev-libs/wayland )
 DESCRIPTION=Wayland protocol files
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/
+INHERIT=meson git-r3
 IUSE=test
 LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c9f273b1c1498628f4fc7c611d4fc135
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=bacf8e5e50f8625897acfe6b839f0ba5
diff --git a/metadata/md5-cache/dev-libs/weston-10.0.0 b/metadata/md5-cache/dev-libs/weston-10.0.0
index 07fea6f0365a..858b5031b5a4 100644
--- a/metadata/md5-cache/dev-libs/weston-10.0.0
+++ b/metadata/md5-cache/dev-libs/weston-10.0.0
@@ -4,13 +4,14 @@ DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-pr
 DESCRIPTION=Wayland reference compositor
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
+INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-10.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=667139ffa05195ef729b28119f2f0cc8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c9b71ce6cc15be495a8a3d777d2e9404
diff --git a/metadata/md5-cache/dev-libs/weston-9.0.0-r2 b/metadata/md5-cache/dev-libs/weston-9.0.0-r2
index 51664632c9c8..283a0c6048d4 100644
--- a/metadata/md5-cache/dev-libs/weston-9.0.0-r2
+++ b/metadata/md5-cache/dev-libs/weston-9.0.0-r2
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-pr
 DESCRIPTION=Wayland reference compositor
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
+INHERIT=meson readme.gentoo-r1 xdg-utils
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=MIT CC-BY-SA-3.0
@@ -12,5 +13,5 @@ REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm g
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-9.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=350b16bf778cc2aad85caf9ce117f886
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index 1126782d64bd..813349caf3fb 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-pr
 DESCRIPTION=Wayland reference compositor
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
+INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils git-r3
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
 LICENSE=MIT CC-BY-SA-3.0
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-p
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=24b61f6a218c14e5423460047748815e
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.25-r1 b/metadata/md5-cache/dev-libs/xapian-1.2.25-r1
index 2041dcf8486e..02a91e263f3b 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.25-r1
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.25-r1
@@ -3,11 +3,12 @@ DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=https://www.xapian.org/
+INHERIT=flag-o-matic multilib-minimal
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +brass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/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(-)?]
 SLOT=0/1.2.22
 SRC_URI=https://oligarchy.co.uk/xapian/1.2.25/xapian-core-1.2.25.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5592e6b2c6cfb57a99eaee5416bc6231
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
index 82a41cf3c16c..a7f71cf7cee7 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:= )
 DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=7
 HOMEPAGE=https://www.xapian.org/
+INHERIT=java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
 IUSE=java lua mono perl php python ruby tcl java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) ruby? ( || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-bindings-1.4.18.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3f99d728c0458f6758c2fb9f70444d83
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
index 086db18bbc56..4218cba9753f 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/xapian-1.4.19 lua? ( lua_targets_luajit? ( dev-lang/luajit:= )
 DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=7
 HOMEPAGE=https://www.xapian.org/
+INHERIT=java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
 IUSE=java lua mono perl php python ruby tcl java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/xapian-1.4.19 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.19/xapian-bindings-1.4.19.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d705df7deabf90f9ac174162d3d9861a
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.3-r2 b/metadata/md5-cache/dev-libs/xerces-c-3.2.3-r2
index 85094528fc0d..a0c1f59e32db 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.3-r2
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.3-r2
@@ -4,12 +4,13 @@ DEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 DESCRIPTION=A validating XML parser written in a portable subset of C++
 EAPI=7
 HOMEPAGE=https://xerces.apache.org/xerces-c/
+INHERIT=cmake prefix
 IUSE=cpu_flags_x86_sse2 curl doc examples iconv icu static-libs test threads
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.3.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c639df997711a3bf78ed04d34bd72b7c
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=16b91ab376671a683bdc81cf1b093984
diff --git a/metadata/md5-cache/dev-libs/xerces-c-9999 b/metadata/md5-cache/dev-libs/xerces-c-9999
index 626635dce8f0..dde3f623690d 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-9999
+++ b/metadata/md5-cache/dev-libs/xerces-c-9999
@@ -4,11 +4,12 @@ DEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 DESCRIPTION=A validating XML parser written in a portable subset of C++
 EAPI=7
 HOMEPAGE=https://xerces.apache.org/xerces-c/
+INHERIT=cmake prefix subversion
 IUSE=cpu_flags_x86_sse2 curl doc examples iconv icu static-libs test threads
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7c45f37eee2585df835116d2554465bf
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05
index a70869d88dfe..81c64471cae0 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05
@@ -4,7 +4,7 @@ DESCRIPTION=A lightweigt RPC library based on XML and HTTP
 EAPI=7
 HOMEPAGE=http://xmlrpc-c.sourceforge.net/
 IUSE=abyss +cgi +curl +cxx +libxml2 threads test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( abyss curl cxx )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.54
 SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.54.05.tgz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=537053690983168ab1928a5b513bb7fc
+_md5_=8c752aeb325785f101d7736ebf625d6f
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.32 b/metadata/md5-cache/dev-libs/xmlsec-1.2.32
deleted file mode 100644
index 225d9f1aa163..000000000000
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.32
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( nss? ( >=dev-libs/nss-3.9[utils] ) )
-DEFINED_PHASES=configure install test
-DEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting XML
-EAPI=7
-HOMEPAGE=https://www.aleksey.com/xmlsec
-IUSE=doc gcrypt gnutls nss +openssl static-libs test
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.32.tar.gz
-_md5_=e52d7eb8ef01ed828272837c57594fac
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.34 b/metadata/md5-cache/dev-libs/xmlsec-1.2.34
new file mode 100644
index 000000000000..013eeabd4647
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.34
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( nss? ( >=dev-libs/nss-3.9[utils] ) )
+DEFINED_PHASES=configure install test
+DEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= dev-libs/libltdl gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting XML
+EAPI=8
+HOMEPAGE=https://www.aleksey.com/xmlsec
+IUSE=doc gcrypt gnutls nss +openssl static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= dev-libs/libltdl gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.34.tar.gz
+_md5_=dac48ab13898372ba9498022afe4c614
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.8.1 b/metadata/md5-cache/dev-libs/xxhash-0.8.1
index 283c47b0ae28..09cdcc994fab 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.8.1
+++ b/metadata/md5-cache/dev-libs/xxhash-0.8.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=7
 HOMEPAGE=http://www.xxhash.net
+INHERIT=toolchain-funcs
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.8.1.tar.gz -> xxhash-0.8.1.tar.gz
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8da4982cccb10b13e6fc91fdbc04fe11
+_md5_=ca6952a8a415ace77d013808632bd488
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r3 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
index 526ff836d176..3e4d9765aa82 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small event-driven (SAX-style) JSON parser
 EAPI=7
 HOMEPAGE=https://lloyd.github.com/yajl/
+INHERIT=cmake-multilib
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
 SLOT=0/2
 SRC_URI=https://github.com/lloyd/yajl/tarball/2.1.0 -> yajl-2.1.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ecabd9ba5a4a5f5c5407d7bab0f91fd2
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=de5022e761fcbc3468ee62f72ff1c59f
diff --git a/metadata/md5-cache/dev-libs/yaz-3.0.53 b/metadata/md5-cache/dev-libs/yaz-3.0.53
index d58c199d9fa3..c5a7a8a41da7 100644
--- a/metadata/md5-cache/dev-libs/yaz-3.0.53
+++ b/metadata/md5-cache/dev-libs/yaz-3.0.53
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt sys-libs/readline:= sys-libs/ncurses:= virtual/libintl !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-3.0.53.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9a08a19da65845a538336b28a318198d
diff --git a/metadata/md5-cache/dev-libs/yaz-5.31.0 b/metadata/md5-cache/dev-libs/yaz-5.31.0
index 6db48f1687ac..983b736a6840 100644
--- a/metadata/md5-cache/dev-libs/yaz-5.31.0
+++ b/metadata/md5-cache/dev-libs/yaz-5.31.0
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt sys-libs/readline:= sys-libs/ncurses:= virtual/libintl !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0/5
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-5.31.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0ac4b3ab8894b874e1e023a2960ffbee
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.14-r1 b/metadata/md5-cache/dev-libs/zlog-1.2.14-r1
deleted file mode 100644
index 59ddefc239d4..000000000000
--- a/metadata/md5-cache/dev-libs/zlog-1.2.14-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DESCRIPTION=A reliable, thread safe, clear-model, pure C logging library
-EAPI=7
-HOMEPAGE=http://hardysimpson.github.io/zlog/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.14.tar.gz -> zlog-v1.2.14.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f10404e4ee4f2e0e7815d0411f395d53
diff --git a/metadata/md5-cache/dev-libs/zthread-2.3.2-r4 b/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
index a471ba7859ac..94bbe9149d25 100644
--- a/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
+++ b/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=510f1d5c9b6424b51fef1baa28007267
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.72 b/metadata/md5-cache/dev-libs/zziplib-0.13.72
index 78f2dc725890..41bdb631c5b8 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.72
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.72
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 DESCRIPTION=Lightweight library for extracting data from files archived in a single zip file
 EAPI=7
 HOMEPAGE=https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/
+INHERIT=cmake flag-o-matic python-any-r1
 IUSE=sdl static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0/13
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz -> zziplib-0.13.72.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=65d782c3a301dea8305d69117bb515df
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.72-r1 b/metadata/md5-cache/dev-libs/zziplib-0.13.72-r1
index 638e16a8540e..ae07eb881368 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.72-r1
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.72-r1
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 DESCRIPTION=Lightweight library for extracting data from files archived in a single zip file
 EAPI=8
 HOMEPAGE=https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/
+INHERIT=cmake flag-o-matic python-any-r1
 IUSE=sdl static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0/13
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz -> zziplib-0.13.72.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=164628c927e18a808560bf7501198d23
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /metadata/md5-cache/dev-libs
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)