gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/app-arch
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
131 files changed, 368 insertions, 298 deletions
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 90bab29d2a2e..43e1b91f18c3 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/advancecomp-2.2_pre20190301 b/metadata/md5-cache/app-arch/advancecomp-2.2_pre20190301
deleted file mode 100644
index 7e20796b461e..000000000000
--- a/metadata/md5-cache/app-arch/advancecomp-2.2_pre20190301
+++ /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=app-arch/bzip2:= sys-libs/zlib:=
-DESCRIPTION=Recompress ZIP, PNG and MNG, considerably improving compression
-EAPI=7
-HOMEPAGE=https://www.advancemame.it/comp-readme.html
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
-LICENSE=GPL-2+ Apache-2.0 LGPL-2.1+ MIT
-RDEPEND=app-arch/bzip2:= sys-libs/zlib:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/amadvance/advancecomp/archive/fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz -> advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=abe5c4916b55cc2af7fdcdf52dc93480
diff --git a/metadata/md5-cache/app-arch/advancecomp-2.3 b/metadata/md5-cache/app-arch/advancecomp-2.3
index 23c24edf1777..8216434dc943 100644
--- a/metadata/md5-cache/app-arch/advancecomp-2.3
+++ b/metadata/md5-cache/app-arch/advancecomp-2.3
@@ -3,10 +3,10 @@ DEPEND=app-arch/bzip2:= sys-libs/zlib:=
 DESCRIPTION=Recompress ZIP, PNG and MNG, considerably improving compression
 EAPI=8
 HOMEPAGE=https://www.advancemame.it/comp-readme.html https://github.com/amadvance/advancecomp/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ Apache-2.0 LGPL-2.1+ MIT
 RDEPEND=app-arch/bzip2:= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/amadvance/advancecomp/releases/download/v2.3/advancecomp-2.3.tar.gz
-_md5_=769acd2b5f73c8e8febddff1bb95d120
+_md5_=0347f074d67ab64755d54539bc3b0eb9
diff --git a/metadata/md5-cache/app-arch/afio-2.5.1-r2 b/metadata/md5-cache/app-arch/afio-2.5.1-r2
index bb72133759d5..930d4a85b283 100644
--- a/metadata/md5-cache/app-arch/afio-2.5.1-r2
+++ b/metadata/md5-cache/app-arch/afio-2.5.1-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Afio creates cpio-format archives
 EAPI=7
 HOMEPAGE=http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~hppa ppc sparc x86
 LICENSE=Artistic LGPL-2
 SLOT=0
 SRC_URI=http://members.chello.nl/k.holtman/afio-2.5.1.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ab2bdbf99426b4d5d0c27de79b4abd43
diff --git a/metadata/md5-cache/app-arch/arc-5.21p b/metadata/md5-cache/app-arch/arc-5.21p
index d14c69637e49..4d83b42c9494 100644
--- a/metadata/md5-cache/app-arch/arc-5.21p
+++ b/metadata/md5-cache/app-arch/arc-5.21p
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Create & extract files from DOS .ARC files
 EAPI=7
 HOMEPAGE=http://arc.sourceforge.net
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arc/arc-5.21p.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=97e570a44d3e47f8aa5cc2c6061fd357
diff --git a/metadata/md5-cache/app-arch/arj-3.10.22-r7 b/metadata/md5-cache/app-arch/arj-3.10.22-r7
deleted file mode 100644
index f5c6268df806..000000000000
--- a/metadata/md5-cache/app-arch/arj-3.10.22-r7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=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
-DESCRIPTION=Utility for opening arj archives
-EAPI=6
-HOMEPAGE=http://arj.sourceforge.net/
-INHERIT=autotools toolchain-funcs
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-15.debian.tar.xz
-_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_=f9e45909d1266035ada531c640fda173
diff --git a/metadata/md5-cache/app-arch/arj-3.10.22-r8 b/metadata/md5-cache/app-arch/arj-3.10.22-r8
new file mode 100644
index 000000000000..b40c760a0e32
--- /dev/null
+++ b/metadata/md5-cache/app-arch/arj-3.10.22-r8
@@ -0,0 +1,12 @@
+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 prepare
+DESCRIPTION=Utility for opening arj archives
+EAPI=8
+HOMEPAGE=http://arj.sourceforge.net/
+INHERIT=autotools toolchain-funcs
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-15.debian.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e127c2c97979059a4553acb766974ccc
diff --git a/metadata/md5-cache/app-arch/atool-0.39.0-r1 b/metadata/md5-cache/app-arch/atool-0.39.0-r1
index a9b36b7ceaf5..db662c8d1a7c 100644
--- a/metadata/md5-cache/app-arch/atool-0.39.0-r1
+++ b/metadata/md5-cache/app-arch/atool-0.39.0-r1
@@ -4,10 +4,11 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Script for managing file archives of various types
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/atool/
+INHERIT=autotools
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl !app-text/adiff
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f1b4865c2dbc2d4f8c7e58598fcce914
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.16.0 b/metadata/md5-cache/app-arch/bloscpack-0.16.0
index b896a232db08..bd9d0ecfe5e8 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.16.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.16.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c7bd5f9dc0797605f42aebddd50a61c5
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r3 b/metadata/md5-cache/app-arch/brotli-1.0.9-r3
index 451c06945488..e64d2d860916 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r3
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=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 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0d51b55681909af576f244d4a87c5c64
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r4 b/metadata/md5-cache/app-arch/brotli-1.0.9-r4
new file mode 100644
index 000000000000..99ffde6dc201
--- /dev/null
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r4
@@ -0,0 +1,17 @@
+BDEPEND=python? ( >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+DESCRIPTION=Generic-purpose lossless compression algorithm
+EAPI=8
+HOMEPAGE=https://github.com/google/brotli/
+INHERIT=cmake-multilib distutils-r1
+IUSE=python 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 python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=MIT python? ( Apache-2.0 )
+RDEPEND=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_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/brotli-1.0.9.testdata.tar.xz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=de13010aa36fe9c1b78012437880df65
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index b8b93263dc72..9994b056e470 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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 ) )
+DEPEND=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_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=8
-HOMEPAGE=https://github.com/google/brotli
+HOMEPAGE=https://github.com/google/brotli/
 INHERIT=cmake-multilib distutils-r1 git-r3
-IUSE=python 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 python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python 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 python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=MIT python? ( Apache-2.0 )
 PROPERTIES=live
-RDEPEND=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 ) )
-REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RDEPEND=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_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d8e990e7e8b7027838cff5d174f73e74
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=de13010aa36fe9c1b78012437880df65
diff --git a/metadata/md5-cache/app-arch/bsdsfv-1.18-r2 b/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
index 3e78adbf6d32..c1fc1b0546ba 100644
--- a/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
+++ b/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=all-in-one SFV checksum utility
 EAPI=6
 HOMEPAGE=http://bsdsfv.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm ~hppa ~m68k ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/bsdsfv/bsdsfv-1.18.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0ce7ea6e1ee063e2ddd60b27a2db8740
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.8-r1 b/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
index 7ef2c3241a41..0c6790b9e3a7 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
 EAPI=7
 HOMEPAGE=https://sourceware.org/bzip2/
+INHERIT=toolchain-funcs multilib-minimal usr-ldscript verify-sig
 IUSE=static 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 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BZIP2
 SLOT=0/1
 SRC_URI=https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz verify-sig? ( https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz.sig )
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=3e075d73b394927a793da8d8550d2627
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=96625089dbce437035aad9c064a1981a
diff --git a/metadata/md5-cache/app-arch/bzip2-9999 b/metadata/md5-cache/app-arch/bzip2-9999
index 7a2f7265e6ff..5ddedda398f0 100644
--- a/metadata/md5-cache/app-arch/bzip2-9999
+++ b/metadata/md5-cache/app-arch/bzip2-9999
@@ -8,5 +8,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=BZIP2
 PROPERTIES=live
 SLOT=0/1
-_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	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
 _md5_=3b2331370432c72bcd7fb6ada72792e9
diff --git a/metadata/md5-cache/app-arch/bzip3-1.1.2-r1 b/metadata/md5-cache/app-arch/bzip3-1.1.2-r1
new file mode 100644
index 000000000000..6222defc1747
--- /dev/null
+++ b/metadata/md5-cache/app-arch/bzip3-1.1.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A better and stronger spiritual successor to BZip2
+EAPI=8
+HOMEPAGE=https://github.com/kspalaiologos/bzip3
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+SLOT=0
+SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.2/bzip3-1.1.2.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b12809f65b8f6e3e30aea4e84a32cb9b
diff --git a/metadata/md5-cache/app-arch/bzip3-1.1.3-r1 b/metadata/md5-cache/app-arch/bzip3-1.1.3-r1
new file mode 100644
index 000000000000..ef8b46963f2b
--- /dev/null
+++ b/metadata/md5-cache/app-arch/bzip3-1.1.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A better and stronger spiritual successor to BZip2
+EAPI=8
+HOMEPAGE=https://github.com/kspalaiologos/bzip3
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm64 ~loong ~x86
+LICENSE=LGPL-3+
+SLOT=0
+SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.3/bzip3-1.1.3.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=49e77d16744f08d232de972e545a4559
diff --git a/metadata/md5-cache/app-arch/bzip3-1.1.4 b/metadata/md5-cache/app-arch/bzip3-1.1.4
new file mode 100644
index 000000000000..2949dd5fdbaa
--- /dev/null
+++ b/metadata/md5-cache/app-arch/bzip3-1.1.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A better and stronger spiritual successor to BZip2
+EAPI=8
+HOMEPAGE=https://github.com/kspalaiologos/bzip3
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm64 ~loong ~x86
+LICENSE=LGPL-3+
+SLOT=0
+SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.4/bzip3-1.1.4.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=49e77d16744f08d232de972e545a4559
diff --git a/metadata/md5-cache/app-arch/cabextract-1.8 b/metadata/md5-cache/app-arch/cabextract-1.8
index 337b9afce16b..37debcd548a6 100644
--- a/metadata/md5-cache/app-arch/cabextract-1.8
+++ b/metadata/md5-cache/app-arch/cabextract-1.8
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Extracts files from Microsoft cabinet archive files
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/
+INHERIT=toolchain-funcs
 IUSE=extras
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=extras? ( dev-lang/perl )
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/cabextract-1.8.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a86efb3d74e6b4049d38be2b16ad39ca
diff --git a/metadata/md5-cache/app-arch/cabextract-1.9-r2 b/metadata/md5-cache/app-arch/cabextract-1.9-r2
index 0a7ec8b018e0..bc611d7f238c 100644
--- a/metadata/md5-cache/app-arch/cabextract-1.9-r2
+++ b/metadata/md5-cache/app-arch/cabextract-1.9-r2
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/libmspack-0.8_alpha:= extras? ( dev-lang/perl )
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/cabextract-1.9.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3a59265f757243511c04af4c31cef2dd
diff --git a/metadata/md5-cache/app-arch/cabextract-1.9.1 b/metadata/md5-cache/app-arch/cabextract-1.9.1
index 25c3dcae9323..070b82708fff 100644
--- a/metadata/md5-cache/app-arch/cabextract-1.9.1
+++ b/metadata/md5-cache/app-arch/cabextract-1.9.1
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/libmspack-0.8_alpha:= virtual/pkgconfig
 DESCRIPTION=Extracts files from Microsoft cabinet archive files
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/
+INHERIT=autotools toolchain-funcs
 IUSE=extras
-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=GPL-3
 RDEPEND=>=dev-libs/libmspack-0.8_alpha:= extras? ( dev-lang/perl )
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/cabextract-1.9.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6943022665bc74b60811ba94b4bb5686
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f8c6386b77c328e72bd2b69bb12ffdd2
diff --git a/metadata/md5-cache/app-arch/cabextract-9999 b/metadata/md5-cache/app-arch/cabextract-9999
index 40c664b19adf..20d1f547c81a 100644
--- a/metadata/md5-cache/app-arch/cabextract-9999
+++ b/metadata/md5-cache/app-arch/cabextract-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=~dev-libs/libmspack-9999:= extras? ( dev-lang/perl )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=28a4dc57f678bcebe78cac30ae090332
diff --git a/metadata/md5-cache/app-arch/cksfv-1.3.15 b/metadata/md5-cache/app-arch/cksfv-1.3.15
index 457a6747a6e1..8c8172352d18 100644
--- a/metadata/md5-cache/app-arch/cksfv-1.3.15
+++ b/metadata/md5-cache/app-arch/cksfv-1.3.15
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
 DESCRIPTION=SFV checksum utility (simple file verification)
 EAPI=7
 HOMEPAGE=http://zakalwe.fi/~shd/foss/cksfv/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.15.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2793802384d2320ff3dc74cae9ed28e6
diff --git a/metadata/md5-cache/app-arch/clzip-1.13 b/metadata/md5-cache/app-arch/clzip-1.13
index d842fcbcca42..435df898ce99 100644
--- a/metadata/md5-cache/app-arch/clzip-1.13
+++ b/metadata/md5-cache/app-arch/clzip-1.13
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure unpack
 DESCRIPTION=C language version of lzip
 EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/clzip.html
+INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
 KEYWORDS=~amd64
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/clzip/clzip-1.13.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/clzip/clzip-1.13.tar.gz.sig )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=239ae955d558800e675c186dcf2d6b61
diff --git a/metadata/md5-cache/app-arch/createrepo_c-0.16.2 b/metadata/md5-cache/app-arch/createrepo_c-0.16.2
index a9e1d1d6b29a..475717fb0af2 100644
--- a/metadata/md5-cache/app-arch/createrepo_c-0.16.2
+++ b/metadata/md5-cache/app-arch/createrepo_c-0.16.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/bzip2:= app-arch/rpm dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:= net-misc/curl sys-apps/file sys-libs/zlib:=
 DESCRIPTION=C implementation of createrepo
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/rpm dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:= net-misc/curl sys-apps/file sys-libs/zlib:= app-arch/lzma
 SLOT=0
 SRC_URI=https://github.com/rpm-software-management/createrepo_c/archive/0.16.2.tar.gz -> createrepo_c-0.16.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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=444a210903b2a02882409465fe4994b4
diff --git a/metadata/md5-cache/app-arch/csnappy-0_pre20220804 b/metadata/md5-cache/app-arch/csnappy-0_pre20220804
new file mode 100644
index 000000000000..89fb63f20ebd
--- /dev/null
+++ b/metadata/md5-cache/app-arch/csnappy-0_pre20220804
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DESCRIPTION=Google's snappy compression library for the Linux Kernel
+EAPI=8
+HOMEPAGE=https://github.com/zeevt/csnappy
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+SLOT=0/0_pre20220804
+SRC_URI=https://github.com/zeevt/csnappy/archive/6c10c305e8dde193546e6b33cf8a785d5dc123e2.tar.gz -> csnappy-0_pre20220804.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6ecb81cc53c52a070e8417967a07deb7
diff --git a/metadata/md5-cache/app-arch/dpkg-1.20.9 b/metadata/md5-cache/app-arch/dpkg-1.20.9
index 9dfd09e14062..ad18906e065c 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.20.9
+++ b/metadata/md5-cache/app-arch/dpkg-1.20.9
@@ -4,6 +4,7 @@ DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/lib
 DESCRIPTION=Package maintenance system for Debian
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/dpkg
+INHERIT=autotools toolchain-funcs
 IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.20.9.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=819b2d45c8a89746953ad3799fca9819
diff --git a/metadata/md5-cache/app-arch/dpkg-1.21.1 b/metadata/md5-cache/app-arch/dpkg-1.21.1
index ed5a40355c9e..0c46c909512a 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.21.1
+++ b/metadata/md5-cache/app-arch/dpkg-1.21.1
@@ -4,6 +4,7 @@ DEPEND=>=app-arch/gzip-1.7 >=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) li
 DESCRIPTION=Package maintenance system for Debian
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/dpkg
+INHERIT=autotools toolchain-funcs
 IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=app-arch/gzip-1.7 >=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.21.1.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=88764edc11e163814408ba05cd123709
diff --git a/metadata/md5-cache/app-arch/engrampa-1.24.2 b/metadata/md5-cache/app-arch/engrampa-1.24.2
index b4da866e4ffc..35cf39d883f6 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.24.2
+++ b/metadata/md5-cache/app-arch/engrampa-1.24.2
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://mate-desktop.org
 INHERIT=mate optfeature readme.gentoo-r1
 IUSE=caja magic packagekit
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~riscv x86
 LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) virtual/libintl !!app-arch/mate-file-archiver
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/engrampa-1.24.2.tar.xz
-_eclasses_=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	optfeature	d524f291c80f9d21ad80fe978e3ca760	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8c88df8e5ac064cc47fc08ddf0ef04b1
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	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	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6df7b72162bec1794612da8ece5b5b8b
diff --git a/metadata/md5-cache/app-arch/file-roller-3.40.0 b/metadata/md5-cache/app-arch/file-roller-3.40.0
deleted file mode 100644
index f294205d6803..000000000000
--- a/metadata/md5-cache/app-arch/file-roller-3.40.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig 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 setup test
-DEPEND=>=app-arch/libarchive-3.2:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Archive manager for GNOME
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
-INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-IUSE=libnotify nautilus
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=app-arch/libarchive-3.2:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/file-roller/3.40/file-roller-3.40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	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	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=13cb5b2a5fb3afba6d97bd3144ed2351
diff --git a/metadata/md5-cache/app-arch/file-roller-3.42.0 b/metadata/md5-cache/app-arch/file-roller-3.42.0
index c31b28472bf7..1a808ef3dbb9 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.42.0
+++ b/metadata/md5-cache/app-arch/file-roller-3.42.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
 INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 IUSE=libnotify nautilus
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3.2:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 >=gui-libs/libhandy-1.5.0:1 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.42/file-roller-3.42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	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	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=379e4d313fcbdc49cc9d05b6bf585276
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1b336e3b080f55a0e0c331f3398d1d9a
diff --git a/metadata/md5-cache/app-arch/funzix-1.0 b/metadata/md5-cache/app-arch/funzix-1.0
index f5d29239f44b..c70ff8d40ef5 100644
--- a/metadata/md5-cache/app-arch/funzix-1.0
+++ b/metadata/md5-cache/app-arch/funzix-1.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=unpacker for the bogus ZIX format
 EAPI=6
 HOMEPAGE=http://funzix.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/funzix/funzix-1.0.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bd9fc3dcddce416fba01eb10ac689ebd
diff --git a/metadata/md5-cache/app-arch/gcab-1.4 b/metadata/md5-cache/app-arch/gcab-1.4
index b9af508a3d06..f0a511e16232 100644
--- a/metadata/md5-cache/app-arch/gcab-1.4
+++ b/metadata/md5-cache/app-arch/gcab-1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/1.4/gcab-1.4.tar.xz
-_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
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=525480e6018e96804f8091ed053e288a
diff --git a/metadata/md5-cache/app-arch/gnome-autoar-0.4.3 b/metadata/md5-cache/app-arch/gnome-autoar-0.4.3
index 2992ed34515e..e926dc553021 100644
--- a/metadata/md5-cache/app-arch/gnome-autoar-0.4.3
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=vala? ( introspection ) gtk-doc? ( gtk )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-autoar/0.4/gnome-autoar-0.4.3.tar.xz
-_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
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=61e338d667657917c708066a80de9941
diff --git a/metadata/md5-cache/app-arch/gzip-1.12 b/metadata/md5-cache/app-arch/gzip-1.12
index 7d4c87be24dd..5b28b21e0b2a 100644
--- a/metadata/md5-cache/app-arch/gzip-1.12
+++ b/metadata/md5-cache/app-arch/gzip-1.12
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install unpack
 DESCRIPTION=Standard GNU compressor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gzip/
+INHERIT=flag-o-matic verify-sig
 IUSE=pic static 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
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.12.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.12.tar.xz verify-sig? ( mirror://gnu/gzip/gzip-1.12.tar.xz.sig https://alpha.gnu.org/gnu/gzip/gzip-1.12.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4f3240eb28ea02cbc3e5f2d7f286b6ad
diff --git a/metadata/md5-cache/app-arch/hardlink-0.3.2 b/metadata/md5-cache/app-arch/hardlink-0.3.2
index f111c1ec8383..a7eb655e6319 100644
--- a/metadata/md5-cache/app-arch/hardlink-0.3.2
+++ b/metadata/md5-cache/app-arch/hardlink-0.3.2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libpcre !>=sys-apps/util-linux-2.34[hardlink]
 DESCRIPTION=A tool which replaces copies of a file with hardlinks
 EAPI=7
 HOMEPAGE=https://jak-linux.org/projects/hardlink/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/libpcre !>=sys-apps/util-linux-2.34[hardlink]
 SLOT=0
 SRC_URI=https://salsa.debian.org/jak/hardlink/-/archive/0.3.2/hardlink-0.3.2.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=73bd0186ec1e0ff10b0551b5adca0605
diff --git a/metadata/md5-cache/app-arch/innoextract-1.9 b/metadata/md5-cache/app-arch/innoextract-1.9
index 2a683e7fb564..3f0e86704f4e 100644
--- a/metadata/md5-cache/app-arch/innoextract-1.9
+++ b/metadata/md5-cache/app-arch/innoextract-1.9
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:=[bzip2,zlib] iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
 DESCRIPTION=A tool to unpack installers created by Inno Setup
@@ -11,5 +11,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/boost:=[bzip2,zlib] iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=https://constexpr.org/innoextract/files/innoextract-1.9.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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ec20cf38e7c693ca70405fd3e59daebb
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1 b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1
index a803e6b14df3..e46a65c6d076 100644
--- a/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1
+++ b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~whissi/dist/lbzip2/lbzip2-2.5_p20181227.tar.gz
-_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
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a5a103ea40e56aed84b1b87617fac986
diff --git a/metadata/md5-cache/app-arch/lcab-1.0_beta12 b/metadata/md5-cache/app-arch/lcab-1.0_beta12
index f654138b5e50..e43321e4c023 100644
--- a/metadata/md5-cache/app-arch/lcab-1.0_beta12
+++ b/metadata/md5-cache/app-arch/lcab-1.0_beta12
@@ -3,9 +3,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=CAB file creation tool
 EAPI=7
 HOMEPAGE=http://ohnopub.net/lcab/
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://mirror.ohnopub.net/mirror/lcab-1.0b12.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=caf0c9566706cb6771e8746ec7a45774
diff --git a/metadata/md5-cache/app-arch/lha-114i_p20201004 b/metadata/md5-cache/app-arch/lha-114i_p20201004
index 2ffbc10d2a1d..50f5fb429b11 100644
--- a/metadata/md5-cache/app-arch/lha-114i_p20201004
+++ b/metadata/md5-cache/app-arch/lha-114i_p20201004
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Utility for creating and opening lzh archives
 EAPI=7
 HOMEPAGE=https://github.com/jca02266/lha https://lha.osdn.jp
+INHERIT=autotools
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=lha
 SLOT=0
 SRC_URI=https://github.com/jca02266/lha/archive/7c3cd95fdf0d2f9198bb779561724cd314bc39a6.tar.gz -> lha-114i_p20201004.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f05dc44bbb97ab3026998db2e5f28abd
diff --git a/metadata/md5-cache/app-arch/libarchive-3.6.1 b/metadata/md5-cache/app-arch/libarchive-3.6.1
index 29d40ad11544..b0256275a39a 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.6.1
+++ b/metadata/md5-cache/app-arch/libarchive-3.6.1
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(
 DESCRIPTION=Multi-format archive and compression library
 EAPI=8
 HOMEPAGE=https://www.libarchive.org/
+INHERIT=multilib-minimal toolchain-funcs verify-sig
 IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 BSD-4 public-domain
 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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( 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(-)?] ) iconv? ( 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(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[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/openssl: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(-)?] lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.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(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle: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(-)?] ) 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(-)?] )
 SLOT=0/13
 SRC_URI=https://www.libarchive.de/downloads/libarchive-3.6.1.tar.gz verify-sig? ( https://www.libarchive.de/downloads/libarchive-3.6.1.tar.gz.asc )
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=36133eae7b7e6aefa800cf79e52ec113
diff --git a/metadata/md5-cache/app-arch/lrzip-0.651 b/metadata/md5-cache/app-arch/lrzip-0.651
index 0beea60c947e..a8c6738f08d4 100644
--- a/metadata/md5-cache/app-arch/lrzip-0.651
+++ b/metadata/md5-cache/app-arch/lrzip-0.651
@@ -4,11 +4,12 @@ DEPEND=app-arch/bzip2 app-arch/lz4 dev-libs/lzo sys-libs/zlib
 DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
 EAPI=8
 HOMEPAGE=https://github.com/ckolivas/lrzip
+INHERIT=autotools
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 app-arch/lz4 dev-libs/lzo sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/ckolivas/lrzip/archive/v0.651.tar.gz -> lrzip-0.651.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1f72c732b4105813328c501ff38bd8df
diff --git a/metadata/md5-cache/app-arch/lunzip-1.13 b/metadata/md5-cache/app-arch/lunzip-1.13
index fad937cc4c00..b63aa5f85c93 100644
--- a/metadata/md5-cache/app-arch/lunzip-1.13
+++ b/metadata/md5-cache/app-arch/lunzip-1.13
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure unpack
 DESCRIPTION=Decompressor for the lzip format, written in C
 EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/lunzip.html
+INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
 KEYWORDS=~amd64
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lunzip/lunzip-1.13.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lunzip/lunzip-1.13.tar.gz.sig )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=ecfb83306116ae3b8808de70e71be817
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.4.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.4.0
index c5ce9e473c99..187c4f40c0c1 100644
--- a/metadata/md5-cache/app-arch/lxqt-archiver-0.4.0
+++ b/metadata/md5-cache/app-arch/lxqt-archiver-0.4.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.9.0 dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.9.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/json-glib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-qt-0.17.0
 DESCRIPTION=Qt GUI File Archiver
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/json-glib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-qt-0.17.0
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.4.0/lxqt-archiver-0.4.0.tar.xz
-_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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b93c571d551c429f79893f93572576d4
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.5.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.5.0
index 54cb8cdc0ce7..a776d777310d 100644
--- a/metadata/md5-cache/app-arch/lxqt-archiver-0.5.0
+++ b/metadata/md5-cache/app-arch/lxqt-archiver-0.5.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/lxqt-build-tools-0.10.0 dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/lxqt-build-tools-0.10.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1:=
 DESCRIPTION=Qt GUI File Archiver
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.5.0/lxqt-archiver-0.5.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f45d1cbcbdbe4894d688b87381be1766
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.6.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.6.0
new file mode 100644
index 000000000000..2aa16999f6fc
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lxqt-archiver-0.6.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/lxqt-build-tools-0.11.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1.1:=
+DESCRIPTION=Qt GUI File Archiver
+EAPI=8
+HOMEPAGE=https://lxqt-project.org/
+INHERIT=cmake xdg-utils
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2 GPL-2+
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1.1:=
+SLOT=0
+SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.6.0/lxqt-archiver-0.6.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5d336c8d23577a50399e72030f7e1ea3
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.3-r1 b/metadata/md5-cache/app-arch/lz4-1.9.3-r1
index 742a5a9108a8..8cea26c1b234 100644
--- a/metadata/md5-cache/app-arch/lz4-1.9.3-r1
+++ b/metadata/md5-cache/app-arch/lz4-1.9.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=7
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=BSD-2 GPL-2
 SLOT=0/r132
 SRC_URI=https://github.com/lz4/lz4/archive/v1.9.3.tar.gz -> lz4-1.9.3.tar.gz
-_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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c33e3a5971bb09a73738835db3086ca1
diff --git a/metadata/md5-cache/app-arch/lz5-2.0 b/metadata/md5-cache/app-arch/lz5-2.0
index 140d7b70d6b6..e7a16ed89928 100644
--- a/metadata/md5-cache/app-arch/lz5-2.0
+++ b/metadata/md5-cache/app-arch/lz5-2.0
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=An efficient compressor with very fast decompression
 EAPI=6
 HOMEPAGE=https://github.com/inikep/lz5
+INHERIT=toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~amd64
 LICENSE=GPL-2 BSD-2
 SLOT=0/2
 SRC_URI=https://github.com/inikep/lz5/archive/v2.0.tar.gz -> lz5-2.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cad5f5d2c2d03f59cd866c60be571192
diff --git a/metadata/md5-cache/app-arch/lzip-1.23 b/metadata/md5-cache/app-arch/lzip-1.23
index 75401415d371..6d14d5661e7b 100644
--- a/metadata/md5-cache/app-arch/lzip-1.23
+++ b/metadata/md5-cache/app-arch/lzip-1.23
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure unpack
 DESCRIPTION=Lossless data compressor based on the LZMA algorithm
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/lzip/lzip.html
+INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k 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 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=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzip-1.23.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lzip-1.23.tar.gz.sig )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=514821c1f8a4b2babf78db451bae59ce
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=542950d5ec268e02bae17f38d4009fb5
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.23 b/metadata/md5-cache/app-arch/lziprecover-1.23
index 96974b823e84..d7c149dd92e3 100644
--- a/metadata/md5-cache/app-arch/lziprecover-1.23
+++ b/metadata/md5-cache/app-arch/lziprecover-1.23
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure unpack
 DESCRIPTION=Lziprecover is a data recovery tool and decompressor for lzip compressed files
 EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/lziprecover.html
+INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lziprecover/lziprecover-1.23.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lziprecover/lziprecover-1.23.tar.gz.sig )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=27f9ec51e6a6bdebe0d44e77c00f3325
diff --git a/metadata/md5-cache/app-arch/lzlib-1.13 b/metadata/md5-cache/app-arch/lzlib-1.13
index 25cbf4ffa04d..d044aea51d06 100644
--- a/metadata/md5-cache/app-arch/lzlib-1.13
+++ b/metadata/md5-cache/app-arch/lzlib-1.13
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/lzlib.html
 INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86
 LICENSE=libstdc++
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.13.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.13.tar.gz.sig )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=914d27b7dba5e87250b0cc8800b93f6b
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=fbaa3cb65bd6fd7f3f278f769d0d66bb
diff --git a/metadata/md5-cache/app-arch/lzma-19.00 b/metadata/md5-cache/app-arch/lzma-19.00
index bb9d6f3bd437..6836360b25ed 100644
--- a/metadata/md5-cache/app-arch/lzma-19.00
+++ b/metadata/md5-cache/app-arch/lzma-19.00
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=LZMA Stream Compressor from the SDK
 EAPI=7
 HOMEPAGE=https://www.7-zip.org/sdk.html
+INHERIT=toolchain-funcs
 IUSE=doc
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/sevenzip/lzma1900.7z -> lzma-19.00.7z
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3eb860b9fa5e5ade029ba3582c833082
diff --git a/metadata/md5-cache/app-arch/lzma-9.20-r1 b/metadata/md5-cache/app-arch/lzma-9.20-r1
index 361423a8502c..bd64c6adfa85 100644
--- a/metadata/md5-cache/app-arch/lzma-9.20-r1
+++ b/metadata/md5-cache/app-arch/lzma-9.20-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=LZMA Stream Compressor from the SDK
 EAPI=6
 HOMEPAGE=https://www.7-zip.org/sdk.html
+INHERIT=toolchain-funcs
 IUSE=doc
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/sevenzip/lzma920.tar.bz2 -> lzma-9.20.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f812a0611fb61c685cfe604aea534cbd
diff --git a/metadata/md5-cache/app-arch/mscompress-0.3-r1 b/metadata/md5-cache/app-arch/mscompress-0.3-r1
index 6578b37c7862..b1e0313fbfea 100644
--- a/metadata/md5-cache/app-arch/mscompress-0.3-r1
+++ b/metadata/md5-cache/app-arch/mscompress-0.3-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Microsoft compress.exe/expand.exe compatible (de)compressor
 EAPI=7
 HOMEPAGE=http://gnuwin32.sourceforge.net/packages/mscompress.htm
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.penguin.cz/pub/users/mhi/mscompress/mscompress-0.3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c281997593b69c5d033ff1bd0e3711ca
diff --git a/metadata/md5-cache/app-arch/mt-st-1.4 b/metadata/md5-cache/app-arch/mt-st-1.4
index a758e545c12f..5b54d1482497 100644
--- a/metadata/md5-cache/app-arch/mt-st-1.4
+++ b/metadata/md5-cache/app-arch/mt-st-1.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=control magnetic tape drive operation
 EAPI=7
 HOMEPAGE=https://github.com/iustin/mt-st
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/iustin/mt-st/releases/download/v1.4/mt-st-1.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=56f832bd00ad3cddb1906ff6d3d874c9
diff --git a/metadata/md5-cache/app-arch/mt-st-9999 b/metadata/md5-cache/app-arch/mt-st-9999
index 1965d1e1481b..9d3b0905d811 100644
--- a/metadata/md5-cache/app-arch/mt-st-9999
+++ b/metadata/md5-cache/app-arch/mt-st-9999
@@ -3,8 +3,9 @@ DEFINED_PHASES=configure install unpack
 DESCRIPTION=control magnetic tape drive operation
 EAPI=7
 HOMEPAGE=https://github.com/iustin/mt-st
+INHERIT=git-r3 toolchain-funcs
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=50d9d0cd32d5b0db09d7e707b068e967
diff --git a/metadata/md5-cache/app-arch/ncompress-5.0 b/metadata/md5-cache/app-arch/ncompress-5.0
index ea29af468f05..f11e18e419e3 100644
--- a/metadata/md5-cache/app-arch/ncompress-5.0
+++ b/metadata/md5-cache/app-arch/ncompress-5.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/vapier/ncompress/archive/v5.0.tar.gz -> ncompress-5.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1f8ff5bd5fa04b4984279f6c544ae3a4
diff --git a/metadata/md5-cache/app-arch/p7zip-16.02-r8 b/metadata/md5-cache/app-arch/p7zip-16.02-r8
index 56a74bff57d8..f8f2e1da1c3b 100644
--- a/metadata/md5-cache/app-arch/p7zip-16.02-r8
+++ b/metadata/md5-cache/app-arch/p7zip-16.02-r8
@@ -4,6 +4,7 @@ DEPEND=wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) dev-util/desktop-file-utils x11
 DESCRIPTION=Port of 7-Zip archiver for Unix
 EAPI=7
 HOMEPAGE=http://p7zip.sourceforge.net/
+INHERIT=multilib toolchain-funcs wrapper wxwidgets xdg
 IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=LGPL-2.1 rar? ( unRAR )
@@ -11,5 +12,5 @@ RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] )
 REQUIRED_USE=kde? ( wxwidgets )
 SLOT=0
 SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d8b279e8171b424c58ae66729c927b8d
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.8.0 b/metadata/md5-cache/app-arch/par2cmdline-0.8.0
index 0349b566542e..373906ed7bb5 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.8.0
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.8.0
@@ -2,10 +2,11 @@ DEFINED_PHASES=pretend setup test
 DESCRIPTION=A PAR-2.0 file verification and repair tool
 EAPI=6
 HOMEPAGE=https://github.com/Parchive/par2cmdline
+INHERIT=toolchain-funcs
 IUSE=openmp
 KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.8.0/par2cmdline-0.8.0.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d8a07c57f99641f6da64a4ea20cb5a6d
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.8.1 b/metadata/md5-cache/app-arch/par2cmdline-0.8.1
index 6bd77d0b4866..e625c5dac3eb 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.8.1
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.8.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=pretend setup test
 DESCRIPTION=A PAR-2.0 file verification and repair tool
 EAPI=7
 HOMEPAGE=https://github.com/Parchive/par2cmdline
+INHERIT=toolchain-funcs
 IUSE=openmp
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.8.1/par2cmdline-0.8.1.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a1a6812937459c2f4fc6d4f37ff4813c
diff --git a/metadata/md5-cache/app-arch/patool-1.12 b/metadata/md5-cache/app-arch/patool-1.12
index af85cc203799..c48a511d041f 100644
--- a/metadata/md5-cache/app-arch/patool-1.12
+++ b/metadata/md5-cache/app-arch/patool-1.12
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patool/patool-1.12.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=390a86ea0e0e699ada17c2afc418660e
diff --git a/metadata/md5-cache/app-arch/pax-20201030 b/metadata/md5-cache/app-arch/pax-20201030
index e57ef110a08e..c55ff6c7e52d 100644
--- a/metadata/md5-cache/app-arch/pax-20201030
+++ b/metadata/md5-cache/app-arch/pax-20201030
@@ -4,10 +4,11 @@ DEPEND=elibc_musl? ( sys-libs/fts-standalone )
 DESCRIPTION=pax (Portable Archive eXchange) is the POSIX standard archive tool
 EAPI=7
 HOMEPAGE=https://www.mirbsd.org/pax.htm
+INHERIT=unpacker toolchain-funcs flag-o-matic
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=elibc_musl? ( sys-libs/fts-standalone )
 SLOT=0
 SRC_URI=https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20201030.cpio.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c7a9a2904dd7a03e531fba8fbd458830
diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.13 b/metadata/md5-cache/app-arch/pbzip2-1.1.13
index d1da9dbd564b..5d00b3043e16 100644
--- a/metadata/md5-cache/app-arch/pbzip2-1.1.13
+++ b/metadata/md5-cache/app-arch/pbzip2-1.1.13
@@ -3,11 +3,12 @@ DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static
 DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
 EAPI=7
 HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=static symlink
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BZIP2
 RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
 SLOT=0
 SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=993f5896c3d1f8282fcd95823369edfe
diff --git a/metadata/md5-cache/app-arch/pdlzip-1.11 b/metadata/md5-cache/app-arch/pdlzip-1.11
index 3098242a7273..11586cae89f6 100644
--- a/metadata/md5-cache/app-arch/pdlzip-1.11
+++ b/metadata/md5-cache/app-arch/pdlzip-1.11
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
 DESCRIPTION=Public-domain version of lzip compressor
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/lzip/pdlzip.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~mips ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/pdlzip/pdlzip-1.11.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=45cc168e3e66bc56346291accee94ee0
diff --git a/metadata/md5-cache/app-arch/pdlzip-1.12 b/metadata/md5-cache/app-arch/pdlzip-1.12
index b4ba32df7dec..b1fb07a61f3e 100644
--- a/metadata/md5-cache/app-arch/pdlzip-1.12
+++ b/metadata/md5-cache/app-arch/pdlzip-1.12
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure unpack
 DESCRIPTION=Public-domain version of lzip compressor
 EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/pdlzip.html
+INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
 KEYWORDS=~amd64 ~mips ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/pdlzip/pdlzip-1.12.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/pdlzip/pdlzip-1.12.tar.gz.sig )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=03722b69852c26d26d3a8986ae3d7c37
diff --git a/metadata/md5-cache/app-arch/pdv-1.5.1-r3 b/metadata/md5-cache/app-arch/pdv-1.5.1-r3
index fba61fddec7e..0c040b85b07b 100644
--- a/metadata/md5-cache/app-arch/pdv-1.5.1-r3
+++ b/metadata/md5-cache/app-arch/pdv-1.5.1-r3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/motif-2.3:0 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXext-1.0.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdv/pdv-1.5.1.tar.gz
-_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
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9b143c032372f537d2f47a1d10b21752
diff --git a/metadata/md5-cache/app-arch/pigz-2.6 b/metadata/md5-cache/app-arch/pigz-2.6
index d37fd5e03b36..8d734546eed4 100644
--- a/metadata/md5-cache/app-arch/pigz-2.6
+++ b/metadata/md5-cache/app-arch/pigz-2.6
@@ -3,6 +3,7 @@ DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] ) test
 DESCRIPTION=A parallel implementation of gzip
 EAPI=7
 HOMEPAGE=https://www.zlib.net/pigz/
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=static symlink test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
 LICENSE=ZLIB
@@ -10,5 +11,5 @@ RDEPEND=!static? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.zlib.net/pigz/pigz-2.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d2ba46841d73813d4a009c8308ebb3be
diff --git a/metadata/md5-cache/app-arch/pigz-2.7 b/metadata/md5-cache/app-arch/pigz-2.7
index 3d035389e72c..ec4a1e44f7d7 100644
--- a/metadata/md5-cache/app-arch/pigz-2.7
+++ b/metadata/md5-cache/app-arch/pigz-2.7
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.zlib.net/pigz/
 INHERIT=toolchain-funcs flag-o-matic
 IUSE=static symlink test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
 LICENSE=ZLIB
 RDEPEND=!static? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.zlib.net/pigz/pigz-2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bd0ffb9f779d9b0ce769de6e7f2f62ee
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b784f970c88b967b12159fd7439d2aa9
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.7 b/metadata/md5-cache/app-arch/pixz-1.0.7
index a5ae9a3b66c3..ef437d8aee70 100644
--- a/metadata/md5-cache/app-arch/pixz-1.0.7
+++ b/metadata/md5-cache/app-arch/pixz-1.0.7
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
 SLOT=0
 SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2bda4a3168154a3dcc99fe90b1c260c8
diff --git a/metadata/md5-cache/app-arch/pixz-9999 b/metadata/md5-cache/app-arch/pixz-9999
index 611aac54db27..ec69533a92a9 100644
--- a/metadata/md5-cache/app-arch/pixz-9999
+++ b/metadata/md5-cache/app-arch/pixz-9999
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6ae381d120f7f3331c8da97bcfac6fc0
diff --git a/metadata/md5-cache/app-arch/plzip-1.10 b/metadata/md5-cache/app-arch/plzip-1.10
index e0d15671cae3..4394828e4ca3 100644
--- a/metadata/md5-cache/app-arch/plzip-1.10
+++ b/metadata/md5-cache/app-arch/plzip-1.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/plzip.html
 INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
-KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=app-arch/lzlib:0=
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.10.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.10.tar.gz.sig )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=f790244b9997831c18c95db2b2c7012e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=053cf2cccf8f61a9939b5952098867f0
diff --git a/metadata/md5-cache/app-arch/plzip-1.9 b/metadata/md5-cache/app-arch/plzip-1.9
index 75551494b8bf..8783ed325ade 100644
--- a/metadata/md5-cache/app-arch/plzip-1.9
+++ b/metadata/md5-cache/app-arch/plzip-1.9
@@ -3,10 +3,11 @@ DEPEND=app-arch/lzlib:0=
 DESCRIPTION=Parallel lzip compressor
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/lzip/plzip.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-arch/lzlib:0=
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e41dd7448ee47a1407467e9385b29a3b
diff --git a/metadata/md5-cache/app-arch/pure-sfv-0.3-r1 b/metadata/md5-cache/app-arch/pure-sfv-0.3-r1
index 7112b3264ea5..036d9a388910 100644
--- a/metadata/md5-cache/app-arch/pure-sfv-0.3-r1
+++ b/metadata/md5-cache/app-arch/pure-sfv-0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pure-sfv/pure-sfv_0.3_src.tar.gz
-_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
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0d9b2cbee8633b047f36dac501295558
diff --git a/metadata/md5-cache/app-arch/pxz-5.0_pre20151029 b/metadata/md5-cache/app-arch/pxz-5.0_pre20151029-r1
index d0a6a5b00d8f..2c42ad85f7a4 100644
--- a/metadata/md5-cache/app-arch/pxz-5.0_pre20151029
+++ b/metadata/md5-cache/app-arch/pxz-5.0_pre20151029-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
+DEFINED_PHASES=configure prepare pretend setup unpack
+DEPEND=app-arch/xz-utils
 DESCRIPTION=Parallel implementation of the XZ compression utility
-EAPI=6
+EAPI=8
 HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
+INHERIT=toolchain-funcs vcs-snapshot
 KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
+RDEPEND=app-arch/xz-utils
 SLOT=0
 SRC_URI=https://github.com/jnovy/pxz/archive/fcfea93957d96b7661d1439cf4b767ecfd341eed.tar.gz -> pxz-5.0_pre20151029.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476
-_md5_=e3f740b28d2f50909bb3da4a57adf14a
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-snapshot	19dc666868420457132a7514d4621476
+_md5_=5c8bfd78ea20ca1a8ab2669e83360365
diff --git a/metadata/md5-cache/app-arch/pxz-9999 b/metadata/md5-cache/app-arch/pxz-9999
index 962d30ce86b4..57d9ef03297b 100644
--- a/metadata/md5-cache/app-arch/pxz-9999
+++ b/metadata/md5-cache/app-arch/pxz-9999
@@ -1,12 +1,13 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure prepare pretend setup unpack
+DEPEND=app-arch/xz-utils
 DESCRIPTION=parallel LZMA compressor (no parallel decompression!)
-EAPI=6
+EAPI=8
 HOMEPAGE=https://jnovy.fedorapeople.org/pxz/
-INHERIT=toolchain-funcs flag-o-matic git-r3
+INHERIT=toolchain-funcs git-r3
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
+RDEPEND=app-arch/xz-utils
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f7182c8662d475caa101f158ae059062
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=065f91389e563dc230918eccd6879292
diff --git a/metadata/md5-cache/app-arch/qpress-1.1 b/metadata/md5-cache/app-arch/qpress-1.1
index 8edb4e8b7ca3..fe8e1dc375d2 100644
--- a/metadata/md5-cache/app-arch/qpress-1.1
+++ b/metadata/md5-cache/app-arch/qpress-1.1
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=A portable file archiver using QuickLZ algorithm
 EAPI=7
 HOMEPAGE=http://www.quicklz.com/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.quicklz.com/qpress-11-source.zip
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=88a838eb4f3d16bccf0b1ff0102f0f12
diff --git a/metadata/md5-cache/app-arch/rar-6.0.2_p20210611 b/metadata/md5-cache/app-arch/rar-6.0.2_p20210611
deleted file mode 100644
index 583d3d284bc2..000000000000
--- a/metadata/md5-cache/app-arch/rar-6.0.2_p20210611
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=all_sfx? ( app-arch/unrar )
-DESCRIPTION=RAR compressor/uncompressor
-EAPI=7
-HOMEPAGE=https://rarlab.com/
-IUSE=all_sfx
-KEYWORDS=-* amd64 x86
-LICENSE=RAR BSD BSD-2
-RDEPEND=sys-libs/glibc
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=x86? ( https://mirror.whissi.de/distfiles/rar/rarlinux-6.0.2_p20210611.tar.gz ) amd64? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x64-6.0.2_p20210611.tar.gz ) all_sfx? ( https://mirror.whissi.de/distfiles/rar/rarlinux-6.0.2_p20210611.tar.gz https://mirror.whissi.de/distfiles/rar/rarlinux-x64-6.0.2_p20210611.tar.gz https://mirror.whissi.de/distfiles/rar/winrar-x64-6.0.2_p20210611.exe )
-_md5_=f360cd993fc55b300997687839bf354e
diff --git a/metadata/md5-cache/app-arch/rar-6.10_p20220124 b/metadata/md5-cache/app-arch/rar-6.10_p20220124
deleted file mode 100644
index f76dede6bcc7..000000000000
--- a/metadata/md5-cache/app-arch/rar-6.10_p20220124
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=all_sfx? ( app-arch/unrar )
-DESCRIPTION=RAR compressor/uncompressor
-EAPI=7
-HOMEPAGE=https://rarlab.com/
-IUSE=all_sfx
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=RAR BSD BSD-2
-RDEPEND=sys-libs/glibc
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=x86? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x32-6.10_p20220124.tar.gz ) amd64? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x64-6.10_p20220124.tar.gz ) all_sfx? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x32-6.10_p20220124.tar.gz https://mirror.whissi.de/distfiles/rar/rarlinux-x64-6.10_p20220124.tar.gz https://mirror.whissi.de/distfiles/rar/winrar-x64-6.10_p20220124.exe )
-_md5_=18ee330a5cc50c729438dfb7ffc87e13
diff --git a/metadata/md5-cache/app-arch/rar-6.12 b/metadata/md5-cache/app-arch/rar-6.12
new file mode 100644
index 000000000000..76c3b6a3dc0e
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rar-6.12
@@ -0,0 +1,15 @@
+BDEPEND=all-sfx? ( app-arch/unrar )
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=RAR compressor/uncompressor
+EAPI=8
+HOMEPAGE=https://www.rarlab.com/
+INHERIT=unpacker
+IUSE=all-sfx
+KEYWORDS=-* amd64 x86
+LICENSE=BSD BSD-2 RAR
+RDEPEND=sys-libs/glibc
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=all-sfx? ( https://www.rarlab.com/rar/rarlinux-x64-612.tar.gz https://www.rarlab.com/rar/rarlinux-x32-612.tar.gz https://www.rarlab.com/rar/winrar-x64-611.exe ) amd64? ( https://www.rarlab.com/rar/rarlinux-x64-612.tar.gz ) x86? ( https://www.rarlab.com/rar/rarlinux-x32-612.tar.gz )
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285
+_md5_=3de8190e251bc33be0a486dfe1e72f0e
diff --git a/metadata/md5-cache/app-arch/rpm-4.17.0-r2 b/metadata/md5-cache/app-arch/rpm-4.17.0-r2
index 8f0c15fb3c62..860b92255b18 100644
--- a/metadata/md5-cache/app-arch/rpm-4.17.0-r2
+++ b/metadata/md5-cache/app-arch/rpm-4.17.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) python? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.osuosl.org/pub/rpm/releases/rpm-4.17.x/rpm-4.17.0.tar.bz2 http://ftp.rpm.org/releases/rpm-4.17.x/rpm-4.17.0.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b1a63217e7456d66c8765e84e800650f
diff --git a/metadata/md5-cache/app-arch/rpm2targz-2021.03.16 b/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
index 7f223f58c7e7..9c1c6678780b 100644
--- a/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
+++ b/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Convert a .rpm file to a .tar.gz archive
 EAPI=7
 HOMEPAGE=http://www.slackware.com/config/packages.php
-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=toolchain-funcs
+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-1
 RDEPEND=app-arch/cpio
 SLOT=0
 SRC_URI=mirror://gentoo/rpm2targz-2021.03.16.tar.xz https://dev.gentoo.org/~vapier/dist/rpm2targz-2021.03.16.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=993784ba703ef7c5f21c23fd79904e31
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6614fb63e0959ffb0613bd17eddeba2a
diff --git a/metadata/md5-cache/app-arch/rzip-2.1-r3 b/metadata/md5-cache/app-arch/rzip-2.1-r3
index e406cf9dddb2..930658f31221 100644
--- a/metadata/md5-cache/app-arch/rzip-2.1-r3
+++ b/metadata/md5-cache/app-arch/rzip-2.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:=
 SLOT=0
 SRC_URI=https://rzip.samba.org/ftp/rzip/rzip-2.1.tar.gz
-_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
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a0e77b664f8c34d3b0e327391f4e05b5
diff --git a/metadata/md5-cache/app-arch/sharutils-4.15.2-r2 b/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
index e6583032b45b..f2f04747b753 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
+++ b/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
@@ -3,10 +3,11 @@ DEPEND=app-arch/xz-utils sys-apps/texinfo nls? ( >=sys-devel/gettext-0.10.35 )
 DESCRIPTION=Tools to deal with shar archives
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/sharutils/
+INHERIT=flag-o-matic strip-linguas
 IUSE=nls
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=8a7b9d7b48492d4a3844ffb133bc18cc
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.8 b/metadata/md5-cache/app-arch/snappy-1.1.8
index c423ac6808cd..fa7946fa8f79 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.8
+++ b/metadata/md5-cache/app-arch/snappy-1.1.8
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=A high-speed compression/decompression library by Google
@@ -11,5 +11,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.8.tar.gz -> snappy-1.1.8.tar.gz
-_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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d5b950140c3664a7a68727e50a7173e3
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.9 b/metadata/md5-cache/app-arch/snappy-1.1.9
index 447e46a6f149..b9b0f8f08dce 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.9
+++ b/metadata/md5-cache/app-arch/snappy-1.1.9
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=A high-speed compression/decompression library by Google
@@ -11,5 +11,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.9.tar.gz -> snappy-1.1.9.tar.gz
-_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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c8c968bbe669273e63193b56e681237b
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.9-r1 b/metadata/md5-cache/app-arch/snappy-1.1.9-r1
index e1dcb428c055..7302b34032d9 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.9-r1
+++ b/metadata/md5-cache/app-arch/snappy-1.1.9-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=A high-speed compression/decompression library by Google
@@ -11,5 +11,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.9.tar.gz -> snappy-1.1.9.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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3488335a0e3b5423dafc9cfbc2de682b
diff --git a/metadata/md5-cache/app-arch/stenc-1.0.8 b/metadata/md5-cache/app-arch/stenc-1.0.8
index 6c910f154cd1..a6391e9a80c4 100644
--- a/metadata/md5-cache/app-arch/stenc-1.0.8
+++ b/metadata/md5-cache/app-arch/stenc-1.0.8
@@ -3,9 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=SCSI Tape Encryption Manager enables AES support for LTO drives
 EAPI=7
 HOMEPAGE=https://github.com/scsitape/stenc/
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/scsitape/stenc/archive/1.0.8.tar.gz -> stenc-1.0.8.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6d12ebe00e8a1dd561d2b25a9085d7ba
diff --git a/metadata/md5-cache/app-arch/stenc-1.1.0 b/metadata/md5-cache/app-arch/stenc-1.1.0
index bd76138bf067..4a2dd35faea8 100644
--- a/metadata/md5-cache/app-arch/stenc-1.1.0
+++ b/metadata/md5-cache/app-arch/stenc-1.1.0
@@ -3,9 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=SCSI Tape Encryption Manager enables AES support for LTO drives
 EAPI=8
 HOMEPAGE=https://github.com/scsitape/stenc/
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/scsitape/stenc/archive/1.1.0.tar.gz -> stenc-1.1.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4f337f004d80222e7960108875e45aaf
diff --git a/metadata/md5-cache/app-arch/stenc-1.1.1 b/metadata/md5-cache/app-arch/stenc-1.1.1
index bbf56e2eced9..04a7bf5d7fa5 100644
--- a/metadata/md5-cache/app-arch/stenc-1.1.1
+++ b/metadata/md5-cache/app-arch/stenc-1.1.1
@@ -3,9 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=SCSI Tape Encryption Manager enables AES support for LTO drives
 EAPI=8
 HOMEPAGE=https://github.com/scsitape/stenc/
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/scsitape/stenc/archive/1.1.1.tar.gz -> stenc-1.1.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4f337f004d80222e7960108875e45aaf
diff --git a/metadata/md5-cache/app-arch/stormlib-9.23-r1 b/metadata/md5-cache/app-arch/stormlib-9.23-r1
index 6020c55bdbc7..15ac56f21b5c 100644
--- a/metadata/md5-cache/app-arch/stormlib-9.23-r1
+++ b/metadata/md5-cache/app-arch/stormlib-9.23-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
 DESCRIPTION=Library to read and write MPQ archives (Diablo, StarCraft)
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/ladislav-zezula/StormLib/archive/v9.23.tar.gz -> StormLib-9.23.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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=272e8a5e83e32afc66e66c97adc39086
diff --git a/metadata/md5-cache/app-arch/tapeutils-0.4 b/metadata/md5-cache/app-arch/tapeutils-0.4
index 93f4f4f727e2..efda8b9b6e34 100644
--- a/metadata/md5-cache/app-arch/tapeutils-0.4
+++ b/metadata/md5-cache/app-arch/tapeutils-0.4
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Utilities for manipulation of tapes and tape image files
 EAPI=6
 HOMEPAGE=http://www.brouhaha.com/~eric/software/tapeutils/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!app-emulation/hercules
 SLOT=0
 SRC_URI=http://www.brouhaha.com/~eric/software/tapeutils/tapeutils-0.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=167d669f46e36cfa47b8184d1c79e5a9
diff --git a/metadata/md5-cache/app-arch/tardelta-1.0.1 b/metadata/md5-cache/app-arch/tardelta-1.0.1
index 5b5131f1c1d8..a29ec82a469e 100644
--- a/metadata/md5-cache/app-arch/tardelta-1.0.1
+++ b/metadata/md5-cache/app-arch/tardelta-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/tardelta/archive/1.0.1.tar.gz -> tardelta-1.0.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=619e80dc907ef97996c8a9a99d0df24b
diff --git a/metadata/md5-cache/app-arch/tarlz-0.21 b/metadata/md5-cache/app-arch/tarlz-0.21
deleted file mode 100644
index 50885c72673f..000000000000
--- a/metadata/md5-cache/app-arch/tarlz-0.21
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DEFINED_PHASES=configure unpack
-DEPEND=>=app-arch/lzlib-1.12:0=
-DESCRIPTION=A parallel archiver combining tar and lzip
-EAPI=7
-HOMEPAGE=https://www.nongnu.org/lzip/tarlz.html
-INHERIT=toolchain-funcs unpacker
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=>=app-arch/lzlib-1.12:0=
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-0.21.tar.lz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
-_md5_=987c87477ab2dded17ae5381aaf653f5
diff --git a/metadata/md5-cache/app-arch/tarlz-0.22 b/metadata/md5-cache/app-arch/tarlz-0.22
index ba542ea85e6b..133e7b8520e9 100644
--- a/metadata/md5-cache/app-arch/tarlz-0.22
+++ b/metadata/md5-cache/app-arch/tarlz-0.22
@@ -4,10 +4,11 @@ DEPEND=>=app-arch/lzlib-1.12
 DESCRIPTION=A parallel archiver combining tar and lzip
 EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/tarlz.html
-KEYWORDS=~amd64
+INHERIT=toolchain-funcs unpacker
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=>=app-arch/lzlib-1.12
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-0.22.tar.lz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
-_md5_=0e02be7c3538d51e1054e1f94be1fc91
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285
+_md5_=f89c5f41aa37c637b430f4d77ec72d58
diff --git a/metadata/md5-cache/app-arch/tarsync-0.2.1-r1 b/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
index 0de7c6a1248f..27e067641d3d 100644
--- a/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
+++ b/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
@@ -3,10 +3,11 @@ DEPEND=>=dev-util/diffball-0.7
 DESCRIPTION=Delta compression suite for using/generating binary patches
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-util/diffball-0.7
 SLOT=0
 SRC_URI=mirror://gentoo/tarsync-0.2.1.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9caf67455a8aa693a8d6ed4234209f7f
diff --git a/metadata/md5-cache/app-arch/tarsync-0.2.1-r2 b/metadata/md5-cache/app-arch/tarsync-0.2.1-r2
index 5ca6c2590ccf..2b22058f4135 100644
--- a/metadata/md5-cache/app-arch/tarsync-0.2.1-r2
+++ b/metadata/md5-cache/app-arch/tarsync-0.2.1-r2
@@ -3,10 +3,11 @@ DEPEND=>=dev-util/diffball-0.7
 DESCRIPTION=Delta compression suite for using/generating binary patches
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-util/diffball-0.7
 SLOT=0
 SRC_URI=mirror://gentoo/tarsync-0.2.1.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=acc9b2f47aef0fbaea4a9b991efd9404
diff --git a/metadata/md5-cache/app-arch/tarsync-0.2.2 b/metadata/md5-cache/app-arch/tarsync-0.2.2
index a9e7f09e5835..635091eb05f7 100644
--- a/metadata/md5-cache/app-arch/tarsync-0.2.2
+++ b/metadata/md5-cache/app-arch/tarsync-0.2.2
@@ -3,10 +3,11 @@ DEPEND=>=dev-util/diffball-0.7
 DESCRIPTION=Delta compression suite for using/generating binary patches
 EAPI=7
 HOMEPAGE=https://github.com/zmedico/tarsync
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-util/diffball-0.7
 SLOT=0
 SRC_URI=https://github.com/zmedico/tarsync/archive/refs/tags/v0.2.2.tar.gz -> tarsync-0.2.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d960c9f95fdfe3ac945adce85fa2989d
diff --git a/metadata/md5-cache/app-arch/tarsync-0.2.3 b/metadata/md5-cache/app-arch/tarsync-0.2.3
index 31b836ed29fb..0bd04e79ea29 100644
--- a/metadata/md5-cache/app-arch/tarsync-0.2.3
+++ b/metadata/md5-cache/app-arch/tarsync-0.2.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-util/diffball-0.7:=
 DESCRIPTION=Synchronize tarball content with file system content
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-util/diffball-0.7:=
 SLOT=0
 SRC_URI=https://github.com/zmedico/tarsync/archive/refs/tags/v0.2.3.tar.gz -> tarsync-0.2.3.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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=dd547136849b0998cd2759b77cf8b7ab
diff --git a/metadata/md5-cache/app-arch/torrentzip-0.9-r1 b/metadata/md5-cache/app-arch/torrentzip-0.9-r1
index aef453ad9ede..096205846f48 100644
--- a/metadata/md5-cache/app-arch/torrentzip-0.9-r1
+++ b/metadata/md5-cache/app-arch/torrentzip-0.9-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Create identical zip archives over multiple systems
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/trrntzip
+INHERIT=autotools
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/torrentzip-0.9.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7e60833362de09bd8a08942a9351918c
diff --git a/metadata/md5-cache/app-arch/unace-2.5-r5 b/metadata/md5-cache/app-arch/unace-2.5-r5
index f38cbf7d4f6d..c9f23c9273d0 100644
--- a/metadata/md5-cache/app-arch/unace-2.5-r5
+++ b/metadata/md5-cache/app-arch/unace-2.5-r5
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=ACE unarchiver
 EAPI=6
 HOMEPAGE=http://www.winace.com/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=freedist
 SLOT=1
 SRC_URI=mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5-9.debian.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6344c1ebea53b490a72542a581286c98
diff --git a/metadata/md5-cache/app-arch/unadf-0.7.12-r1 b/metadata/md5-cache/app-arch/unadf-0.7.12-r1
index efcb628437d4..4302fbb50f03 100644
--- a/metadata/md5-cache/app-arch/unadf-0.7.12-r1
+++ b/metadata/md5-cache/app-arch/unadf-0.7.12-r1
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://lclevy.free.fr/adflib/adflib-0.7.12.tar.bz2
-_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
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=21f6b67ace0e0bdac02a2dcec29ff3f3
diff --git a/metadata/md5-cache/app-arch/unar-1.10.7 b/metadata/md5-cache/app-arch/unar-1.10.7
index c07cf76bd2db..e181a27372a9 100644
--- a/metadata/md5-cache/app-arch/unar-1.10.7
+++ b/metadata/md5-cache/app-arch/unar-1.10.7
@@ -4,10 +4,11 @@ DEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base:= media-sound/w
 DESCRIPTION=Unpacker for various archiving formats, e.g. rar v3
 EAPI=7
 HOMEPAGE=https://unarchiver.c3.cx/
+INHERIT=bash-completion-r1 toolchain-funcs
 KEYWORDS=amd64
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base:= media-sound/wavpack sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/MacPaw/XADMaster/archive/v1.10.7/XADMaster-1.10.7.tar.gz https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=183ef53183ce8906921fcbc3e0cde8cf
diff --git a/metadata/md5-cache/app-arch/unp-2.0_pre9 b/metadata/md5-cache/app-arch/unp-2.0_pre9
index fb6b3a136a94..7295d30730da 100644
--- a/metadata/md5-cache/app-arch/unp-2.0_pre9
+++ b/metadata/md5-cache/app-arch/unp-2.0_pre9
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( sys-devel/gettext ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/u/unp/unp_2.0~pre9.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6959c2318170f391289911186957b825
diff --git a/metadata/md5-cache/app-arch/unrar-6.0.7 b/metadata/md5-cache/app-arch/unrar-6.0.7
deleted file mode 100644
index 62c52d1ebf28..000000000000
--- a/metadata/md5-cache/app-arch/unrar-6.0.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=7
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-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 ~x86-solaris
-LICENSE=unRAR
-SLOT=0/6
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.0.7.tar.gz -> unrar-6.0.7.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=86b072f36156698672ee95e2a35ebb3f
diff --git a/metadata/md5-cache/app-arch/unrar-6.1.2 b/metadata/md5-cache/app-arch/unrar-6.1.2
deleted file mode 100644
index 3efe487802d0..000000000000
--- a/metadata/md5-cache/app-arch/unrar-6.1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=7
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-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 ~x86-solaris
-LICENSE=unRAR
-SLOT=0/6
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.1.2.tar.gz -> unrar-6.1.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=20b81fac8f023fbd7dd07493695fcc67
diff --git a/metadata/md5-cache/app-arch/unrar-6.1.4 b/metadata/md5-cache/app-arch/unrar-6.1.4
deleted file mode 100644
index 1c23334c0977..000000000000
--- a/metadata/md5-cache/app-arch/unrar-6.1.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=7
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-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 ~x86-solaris
-LICENSE=unRAR
-SLOT=0/6
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.1.4.tar.gz -> unrar-6.1.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=73fd729cdeaf68dac3664c6a9ac1e674
diff --git a/metadata/md5-cache/app-arch/unrar-6.1.7 b/metadata/md5-cache/app-arch/unrar-6.1.7
new file mode 100644
index 000000000000..1a457eb70b90
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-6.1.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=7
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+INHERIT=multilib toolchain-funcs
+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 ~x86-solaris
+LICENSE=unRAR
+SLOT=0/6
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.1.7.tar.gz -> unrar-6.1.7.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f4f7acefe1a09bfdf3a80b82e684ea72
diff --git a/metadata/md5-cache/app-arch/unrpa-2.3.0 b/metadata/md5-cache/app-arch/unrpa-2.3.0
index 4484b9409303..0532d290bbf1 100644
--- a/metadata/md5-cache/app-arch/unrpa-2.3.0
+++ b/metadata/md5-cache/app-arch/unrpa-2.3.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Lattyware/unrpa/archive/2.3.0.tar.gz -> unrpa-2.3.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=42209a1f1ea6aa953d10fe9f089b59e2
diff --git a/metadata/md5-cache/app-arch/unshield-1.4.3 b/metadata/md5-cache/app-arch/unshield-1.4.3
index 31e193dfeb33..5a22067868d2 100644
--- a/metadata/md5-cache/app-arch/unshield-1.4.3
+++ b/metadata/md5-cache/app-arch/unshield-1.4.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/openssl:0= sys-libs/zlib
 DESCRIPTION=InstallShield CAB file extractor
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/twogood/unshield/archive/1.4.3.tar.gz -> unshield-1.4.3.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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=861a1b24efe1dc76b72e4b523646defa
diff --git a/metadata/md5-cache/app-arch/unzip-6.0_p26 b/metadata/md5-cache/app-arch/unzip-6.0_p26
index d2141ee80eb0..df9e0190c7d2 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0_p26
+++ b/metadata/md5-cache/app-arch/unzip-6.0_p26
@@ -3,11 +3,12 @@ DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 DESCRIPTION=unzipper for pkzip-compressed files
 EAPI=7
 HOMEPAGE=http://www.info-zip.org/
+INHERIT=flag-o-matic multilib toolchain-funcs
 IUSE=bzip2 natspec unicode
 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=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-26.debian.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5c1e240e9f44b1945ff55bdb84561396
diff --git a/metadata/md5-cache/app-arch/upx-3.96-r2 b/metadata/md5-cache/app-arch/upx-3.96-r2
index fdfe5a4e9ad5..4f292013f042 100644
--- a/metadata/md5-cache/app-arch/upx-3.96-r2
+++ b/metadata/md5-cache/app-arch/upx-3.96-r2
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/ucl-1.03 sys-libs/zlib
 DESCRIPTION=Ultimate Packer for eXecutables (free version using UCL compression and not NRV)
 EAPI=7
 HOMEPAGE=https://upx.github.io/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ UPX-exception
 RDEPEND=!app-arch/upx-bin
 SLOT=0
 SRC_URI=https://github.com/upx/upx/releases/download/v3.96/upx-3.96-src.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ed8c79217d0a194be6850a98491fd2fd
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index 74310265c87d..a6d2603d82a0 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bccf070b310ed7ea90cc518ac371d795
diff --git a/metadata/md5-cache/app-arch/vimball-9999 b/metadata/md5-cache/app-arch/vimball-9999
index 0cc895b0c020..671e0f6b55d6 100644
--- a/metadata/md5-cache/app-arch/vimball-9999
+++ b/metadata/md5-cache/app-arch/vimball-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1ef461f9bd0bf047346c932cde197c5e
diff --git a/metadata/md5-cache/app-arch/wimlib-1.13.4-r1 b/metadata/md5-cache/app-arch/wimlib-1.13.4-r1
index 19cc6bebd6d9..1475d053674e 100644
--- a/metadata/md5-cache/app-arch/wimlib-1.13.4-r1
+++ b/metadata/md5-cache/app-arch/wimlib-1.13.4-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=The open source Windows Imaging (WIM) library
 EAPI=7
 HOMEPAGE=https://wimlib.net
+INHERIT=autotools pax-utils
 IUSE=cpu_flags_x86_ssse3 fuse iso ntfs ssl test threads yasm
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-3+ LGPL-3+ ) CC0-1.0
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/libxml2:2 fuse? ( sys-fs/fuse:0 ) iso? ( app-arch/cabextract ap
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wimlib.net/downloads/wimlib-1.13.4.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9ae0133123f6f434fda4ccb3b0c7bb1f
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r2 b/metadata/md5-cache/app-arch/xar-1.8-r2
index 30e4540358a9..f3a03684682d 100644
--- a/metadata/md5-cache/app-arch/xar-1.8-r2
+++ b/metadata/md5-cache/app-arch/xar-1.8-r2
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) !kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/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(-)?]
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/xar/xar-400.tar.gz
-_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
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=75eaf1b14e629a7b73e5b40bfbd3aabf
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r4 b/metadata/md5-cache/app-arch/xar-1.8-r4
index c8288555d6d5..36a7d251b1f5 100644
--- a/metadata/md5-cache/app-arch/xar-1.8-r4
+++ b/metadata/md5-cache/app-arch/xar-1.8-r4
@@ -4,11 +4,12 @@ DEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) dev
 DESCRIPTION=An easily extensible archive format
 EAPI=7
 HOMEPAGE=https://opensource.apple.com/source/xar/
+INHERIT=flag-o-matic toolchain-funcs multilib-minimal 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
 LICENSE=BSD-2
 RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/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(-)?]
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/xar/xar-417.1.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
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2edea7b2d6703fd55421ec9ced0eca83
diff --git a/metadata/md5-cache/app-arch/xar-1.8.0.0.452 b/metadata/md5-cache/app-arch/xar-1.8.0.0.452
index 332b8b1bba03..8ddc634bbc0c 100644
--- a/metadata/md5-cache/app-arch/xar-1.8.0.0.452
+++ b/metadata/md5-cache/app-arch/xar-1.8.0.0.452
@@ -4,11 +4,12 @@ DEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) dev
 DESCRIPTION=An easily extensible archive format
 EAPI=7
 HOMEPAGE=https://opensource.apple.com/source/xar/
+INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal 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
 LICENSE=BSD-2
 RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/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(-)?]
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/xar/xar-452.tar.gz
-_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
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=89401cda263507128cf3e92f7997e4e7
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.18 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.18
new file mode 100644
index 000000000000..fcc01ce601e4
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.18
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt )
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
+DESCRIPTION=A GTK+ archive manager that can be used with Thunar
+EAPI=8
+HOMEPAGE=https://github.com/ib/xarchiver/
+INHERIT=xdg-utils
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
+SLOT=0
+SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.18.tar.gz -> xarchiver-0.5.4.18.tar.gz
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=95b94c538f89c0b2c2503bd54fc5b2b9
diff --git a/metadata/md5-cache/app-arch/xdms-1.3.2-r2 b/metadata/md5-cache/app-arch/xdms-1.3.2-r2
index 8ab570941605..729b9e636d23 100644
--- a/metadata/md5-cache/app-arch/xdms-1.3.2-r2
+++ b/metadata/md5-cache/app-arch/xdms-1.3.2-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=xDMS - Amiga DMS disk image decompressor
 EAPI=7
 HOMEPAGE=https://zakalwe.fi/~shd/foss/xdms
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://zakalwe.fi/~shd/foss/xdms/xdms-1.3.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5e82e878587c018097ad78d449f52c29
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.5-r2 b/metadata/md5-cache/app-arch/xz-utils-5.2.5-r2
index e2b4ded6efaa..c2cd8650aaeb 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.5-r2
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.5-r2
@@ -4,6 +4,7 @@ DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 DESCRIPTION=Utils for managing LZMA compressed files
 EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
+INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
 IUSE=+extra-filters 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 split-usr 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
 LICENSE=public-domain LGPL-2.1+ GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-5.2.5.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.5.tar.gz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=1e404b73652ba42597b504646d02957e
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 7463b774d13b..a87722d28432 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -4,11 +4,12 @@ DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 DESCRIPTION=Utils for managing LZMA compressed files
 EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
+INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript git-r3 autotools
 IUSE=+extra-filters 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 split-usr
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 PROPERTIES=live
 RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 RESTRICT=!extra-filters? ( test )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
 _md5_=6670179078b1db89063374851885b026
diff --git a/metadata/md5-cache/app-arch/zip-3.0-r4 b/metadata/md5-cache/app-arch/zip-3.0-r4
index df9f7692ee9f..609fe553c233 100644
--- a/metadata/md5-cache/app-arch/zip-3.0-r4
+++ b/metadata/md5-cache/app-arch/zip-3.0-r4
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Info ZIP (encryption support)
 EAPI=7
 HOMEPAGE=http://www.info-zip.org/
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=bzip2 crypt natspec unicode
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/zip30.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=59194e82eabd0e7551482c1140cb5bc0
diff --git a/metadata/md5-cache/app-arch/zoo-2.10-r5 b/metadata/md5-cache/app-arch/zoo-2.10-r5
index 9e3d3030e2f4..a8929728b457 100644
--- a/metadata/md5-cache/app-arch/zoo-2.10-r5
+++ b/metadata/md5-cache/app-arch/zoo-2.10-r5
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Manipulate archives of files in compressed form
 EAPI=7
 HOMEPAGE=https://packages.debian.org/sid/utils/zoo
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/z/zoo/zoo_2.10.orig.tar.gz http://http.debian.net/debian/pool/main/z/zoo/zoo_2.10-28.debian.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c8e0daa3fb0705b5de8f81705b7fc7c2
diff --git a/metadata/md5-cache/app-arch/zopfli-1.0.3 b/metadata/md5-cache/app-arch/zopfli-1.0.3
index 58ce88137348..485ca2d61649 100644
--- a/metadata/md5-cache/app-arch/zopfli-1.0.3
+++ b/metadata/md5-cache/app-arch/zopfli-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Very good, but slow, deflate or zlib compression
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x
 LICENSE=Apache-2.0
 SLOT=0/1
 SRC_URI=https://github.com/google/zopfli/archive/zopfli-1.0.3.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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=675ca6962e0483a88c2e6756f5fcd7ce
diff --git a/metadata/md5-cache/app-arch/zpaq-7.15 b/metadata/md5-cache/app-arch/zpaq-7.15
index c815384e4901..4150e578315d 100644
--- a/metadata/md5-cache/app-arch/zpaq-7.15
+++ b/metadata/md5-cache/app-arch/zpaq-7.15
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
 INHERIT=flag-o-matic pax-utils toolchain-funcs
 IUSE=debug +jit
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/zpaq715.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f16f69019a0c500a213d6ca36baa565c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4fc6ac2a45b5c344b488fad5876ad3c9
diff --git a/metadata/md5-cache/app-arch/zpaq-extras-3 b/metadata/md5-cache/app-arch/zpaq-extras-3
index 67ed0ebd1cef..ee83deab98c0 100644
--- a/metadata/md5-cache/app-arch/zpaq-extras-3
+++ b/metadata/md5-cache/app-arch/zpaq-extras-3
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install unpack
 DESCRIPTION=A set of additional compression profiles for app-arch/zpaq
 EAPI=7
 HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/zpaq-6.19
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/bwt_j3.zip http://mattmahoney.net/dc/bwt_slowmode1.zip http://mattmahoney.net/dc/exe_j1.zip http://mattmahoney.net/dc/jpg_test2.zip http://mattmahoney.net/dc/min.zip http://mattmahoney.net/dc/fast.cfg -> zpaq-fast.cfg http://mattmahoney.net/dc/mid.cfg -> zpaq-mid.cfg http://mattmahoney.net/dc/max.cfg -> zpaq-max.cfg http://mattmahoney.net/dc/bmp_j4c.zip http://mattmahoney.net/dc/lz1.zip http://mattmahoney.net/dc/lazy100.zip http://mattmahoney.net/dc/lazy210.zip
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=15877b2e21b1c6c504e7df7b3f1768a8
diff --git a/metadata/md5-cache/app-arch/zstd-1.4.9 b/metadata/md5-cache/app-arch/zstd-1.4.9
index 159695500075..98d08ecbc045 100644
--- a/metadata/md5-cache/app-arch/zstd-1.4.9
+++ b/metadata/md5-cache/app-arch/zstd-1.4.9
@@ -3,11 +3,12 @@ DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
+INHERIT=flag-o-matic multilib-minimal toolchain-funcs
 IUSE=lz4 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 ~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=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.4.9.tar.gz -> zstd-1.4.9.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
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=aff17808ee0b21d125de94cda26fed72
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.0 b/metadata/md5-cache/app-arch/zstd-1.5.0
deleted file mode 100644
index 120f6e71ec86..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-DESCRIPTION=zstd fast compression library
-EAPI=7
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=956438ebf28efac416db8c6de09d756e
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.1-r2 b/metadata/md5-cache/app-arch/zstd-1.5.1-r2
deleted file mode 100644
index 11635ed93d35..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.5.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-DESCRIPTION=zstd fast compression library
-EAPI=7
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.5.1.tar.gz -> zstd-1.5.1.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7a65c025dcb638f6559427fa182d1e6e
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.2 b/metadata/md5-cache/app-arch/zstd-1.5.2
index 9210138489e8..4da24ffba888 100644
--- a/metadata/md5-cache/app-arch/zstd-1.5.2
+++ b/metadata/md5-cache/app-arch/zstd-1.5.2
@@ -3,11 +3,12 @@ DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
+INHERIT=multilib-minimal toolchain-funcs
 IUSE=lz4 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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.5.2.tar.gz -> zstd-1.5.2.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3d93f20fcef80c65080eb673ea7c9ead
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.2-r1 b/metadata/md5-cache/app-arch/zstd-1.5.2-r1
new file mode 100644
index 000000000000..e317566a0db4
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zstd-1.5.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+DESCRIPTION=zstd fast compression library
+EAPI=8
+HOMEPAGE=https://facebook.github.io/zstd/
+INHERIT=multilib-minimal toolchain-funcs usr-ldscript
+IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 GPL-2 )
+RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+SLOT=0/1
+SRC_URI=https://github.com/facebook/zstd/archive/v1.5.2.tar.gz -> zstd-1.5.2.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=13fcd046e325ba0a5a2b53acadb80fee
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/app-arch
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)