gentoo auto-resync : 28:07:2022 - 03:03:20

275 files changed, 2999 insertions, 1636 deletions

diff --git a/Manifest b/Manifest
index 49f0cefb50fd..de80096164f8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29623 BLAKE2B 5d9ae738615343ac095b1ed891ebb2f0a839f4e01b142b7cde1a82bc237216a0f29f8c02293d64430e1d89653ebac966538a52e7f7bd17d8acb06c3571227193 SHA512 f4425d73fb29ab57f4956a79d311295f2a0674b67a232bf0c48926a005dae2ff305727e65f2a3c5594ca7998dc8a9eaa4cced9cd3d2513ca6b387227b6602cd1
-TIMESTAMP 2022-07-27T18:39:58Z
+MANIFEST Manifest.files.gz 29648 BLAKE2B c1023e26366c5a2dde9cf48f38c3f0638751fd1cab8d72f23282072e4daa9896366be47c55db9cd2cd6f2345b07f4c343a7dac0c88a4be08e9a04aca4da7c728 SHA512 47d820a7ec3515ced756cc77f47d2dea08758a6632d2f909076402059fe20b89dcdfee230dc25d3d8f901a06ff698fbf3e0a552e3ab3f8468dccf2d7e683775d
+TIMESTAMP 2022-07-28T00:40:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLhhn5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLh2ulfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCnaBAAqFJnzkTBV0GVhoegto3HK1zJfZJk48hFkQUy3hylH6xIard9JTnJ1NAP
-XYSCyc/sIFBHaCnTc0CWr6hXSEaSN79JD3AxzI/yX43iLEzkYQANzugHGlIaDcPp
-rSbnt1YHMTFir7nZ+ItiG2BoaFgv8B7pEmf8BcKFvoiMEPS1tNPC1uV4qieuyLJN
-kj9BBGNdjeDGEa09DlV369NALF9iYNnodeZlVXCXy1bisfZnivnVk3yBKqSurZwJ
-WP3wKM8oOpZS9kFwE/1n34yTUp7vLqu8NP5vrbPEwMgb7Ex3/n47tqK98GoCcTmT
-W9LhhF4Clv4MLHzW7DBb4feh2TE1tfdFhvldVtJ94ZCyCJ2nT3Wc5P6sCMW2fFQ1
-lp8RB4YNca8UeKGABpkOyJDhwfOW+SoPjgDMmXague7DQxbA2z6898DLARviYGZN
-Jkpm2F8j1vqTm5yug4olBpvFkbj8Mdgq7HsWaGihuzEjD4M2Bab0/mGeiknZTKQG
-VQVq1vQ0rg4a4VGZQ9Wqmb1Lo3gvB/PKFUpirZXBtQxYcrvhZZ5qRvdsxLiV+A5X
-bBzl9kpIyCkdQUFC6sMLG2iiOfaLdAgX/yti1c+VxwzEmyhZtMzk4D2KmslcLmoo
-l/XVfGpv6q0C1mvBBlhUroUHv9qfvH1E04MzmzqLLF+U2siADLc=
-=jhVI
+klDKdRAAkwrwTM8odwIdKup1N6nX0xLih10WJ8hkbd51DOV0SjIflHyURAzeqRNz
+tXiTvhTm1ETOeF76lVAKsvda5sjee67k5HaiDc2Xq5NROVyP5mxJokHPCRqlMcme
+t4m6tvvPj7u2vAd+arQg5f4+ewVTYcW+9mBqJshuH6VrbkpmJydSoHtaRy5Eo+uP
+/hoRf84rPbJaH2L4dVroW9G3+O8q8TUhEpl36pvWzYJ1irWFlcnAu8F4J9sDJf7i
+pY4YxrDyh1W2ofHcDtHmj24jrCsys1UV3YyLVXw03kavyJfJY658BeVcNLRDrL5G
+T57LbGTJ708KWECouOL4AxXkxP/x4pS6zIjGq31buo+KzHuhCOIgPHz2CzbIYN7s
+VsGyOcgrAPTNQ/sKE5XIyhaXhF5Pgmdw+tYyY/pZV4FcIuJP+C2Q8iVOPPw2MYKZ
+9hpoWlclfD9N7zJ4LTWEakbFBEH22KJNmQe5IonYWGUO4gVdNpLnHpDATHHxGZd+
+qZ8rPef9NRasJLWWReY3sdRtoBFwS/6eTq1v5c8wbdeNr9rIuDilpojczx6fS5Vi
+znU68G6Hqrbo+/Va7cE0+mJ3fSE30++eXBb52dxfwXFKgChLXDvAT3aGNj0YgfHQ
+l4/zYgutIVCNzPbUOyVFYT0KOTlNfAWYJXoHzapYPA/LDM6OSRA=
+=/w08
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7b57b4c2979b..c9f1fb410138 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index ffbcc89da95f..8b150d8c3780 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/firebird/Manifest b/acct-user/firebird/Manifest
index 567e529f239e..bb6240a30256 100644
--- a/acct-user/firebird/Manifest
+++ b/acct-user/firebird/Manifest
@@ -1,2 +1,2 @@
-EBUILD firebird-0-r1.ebuild 334 BLAKE2B 894bf988a7f95829d7e04968d1c9493c921336873770cb9971ee9d5777a8f41dc6ff6201bc6a4e0f28fc377e22f1413ee09f1479085883d60546c9af34abfb44 SHA512 627dcbb67880f75fe9ff94c6e8454294f845e3915e47aa22be7f626855b9f5b9b3a4f9067c1d94e5a74680097594f43bd50725385a482f32f91453b813bd0f4f
+EBUILD firebird-0-r2.ebuild 334 BLAKE2B 3fbae4d4fd057416bd2cdfc86188c89aa9f323385f643c265e541c02f61ab1a4e4049520732e81aa6ca857dbb180a77f7cf86fdbd7f2a9a8de3c64364cf70193 SHA512 38b2d474be130550cb220757400b41373010343bd104e237b464b590d668ed5843eede53d6f12305668faf4eb63b52315d2b9fcbe6e1bc1064377eec08506145
 MISC metadata.xml 219 BLAKE2B 5b3c48d040de522ffbcb035a9704f5b71799a5a2e45172b39ea97049733842723503ff69869946c69808c965b7ef9eb40cbf1f2a5277815c4bb2e4b7ac978001 SHA512 176cc78690ba2800973fc6fa926e7bcbf3e18e8f45e925491f2349ff8619ef5df4b4a0f01b0a33f9fabbd2218c09581ff028f56379daa85494eaca9387a745e0
diff --git a/acct-user/firebird/firebird-0-r1.ebuild b/acct-user/firebird/firebird-0-r2.ebuild
index e921fc0b8276..e34d2c1a8ac7 100644
--- a/acct-user/firebird/firebird-0-r1.ebuild
+++ b/acct-user/firebird/firebird-0-r2.ebuild
@@ -8,7 +8,7 @@ inherit acct-user
 DESCRIPTION="A user for dev-db/firebird"
 
 ACCT_USER_GROUPS=( "firebird" )
-ACCT_USER_ID="520"
+ACCT_USER_ID="450"
 ACCT_USER_SHELL="/bin/sh"
 
 acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3d8d6c3afa5c..443fbdad7cd2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 3de618838569..1ad6170442e1 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
 DIST lib_users-0.14.tar.gz 25746 BLAKE2B 4aa2dbbd7c53be13f79988a62c7997f0787ea9b773fc57681a021ff75ba9ff0988ac3032b21150c4e4958849a6195df09d388b6341e1ac139f34ce9555786233 SHA512 533c6e8f486e58d0fd22aea9a30adf91c3a8340a8a3719f6374ddfa8120d402c8202ab8ceb0e78aedd46e3e5875795392ed40497a66d51de5c2ca6a275a1a777
 DIST lib_users-0.15.tar.gz 25899 BLAKE2B e54dfe20cf5e3e3da3bddcf044cda36a5d51dec9baa808202d81ed0ef8a8b434b3c6f31a279b544308a32e6ebf91008ac2db49278da7624a6037ffdf1db309b6 SHA512 f9eab0d7c634602c496154dc20bd8374842df77c6abfaf69a0c34013f01c3a7541a006cb2b027539f6c088a55bea78682bf156723899d614f39ee48773fb9ea8
 EBUILD lib_users-0.14-r2.ebuild 1094 BLAKE2B 9e5e78a2856eb557d720f6ef6b8f955b9b61222a4defe146d5d92dc59122aa0464bd2a8f35b4c9efb7a98110048c6a1d7dde6f3264c04843a21a705190cc0e1a SHA512 522f398f0e0f803bff7a3c82887105216219dc5924740d1f68f061c8083626c446abb99ab8dc7ab0aed1150f84c000b6c062f4eb85ab4360efdad288981214a7
-EBUILD lib_users-0.15.ebuild 1071 BLAKE2B 2f6d8c61d619e2726ee835f5ddb687bf6c4aac5e26978be8457208bb10f7d8890b35470fc6f3231c27dd686d7557348c7efcf563d8de2962aa22bab055adf535 SHA512 207d66b9ae3d7081ff7be5503fa42a0d60c5f9ef49fd12ae9d896be4e2f2039021cb86900e7a192925dc2d6497d919da6a7d23ca9384c267e05a04d7812a7611
+EBUILD lib_users-0.15.ebuild 1069 BLAKE2B a556802385ee94c8477d45b7a8419e8dc5f40a2b9c3efb89850a6155587113d1bc162dd19740c06b4da6462e056f4a57492b21956a6e409baaf8c13aba660d7a SHA512 3feda20b6402c6a1a0fbbd7b4d32df9050dab285c1570fb0842d2a372a1c97434b1746cfed02b917c4188a181a978d8eaf7360439c2d6ec31283049b37269613
 MISC metadata.xml 344 BLAKE2B b11cff8e0077d50cf43e98a4c0502afec9c3c966f83513f392b97c1009fdaecbd73cb58ee8851e993e8e751f75f10adad6db97bf305d4f47afc016bb4b30f8d9 SHA512 ed9a5449f5efc28cdc6a615c889e2a312841db90524d3e12899c10824896f82535cc5c302b26525ed523f7e90cdf133edda0e3ee77f32563f3bfaad7b997301a
diff --git a/app-admin/lib_users/lib_users-0.15.ebuild b/app-admin/lib_users/lib_users-0.15.ebuild
index 8fc1cc4fadb8..22f48820d779 100644
--- a/app-admin/lib_users/lib_users-0.15.ebuild
+++ b/app-admin/lib_users/lib_users-0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 1431f6ad5489..6ff9f9ab75d9 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 61278d18ae44..e7b12a26af42 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -21,8 +21,10 @@ DIST clamav-0.103.6.tar.gz 16491761 BLAKE2B 3c43bcda4a613f81d1b31036e7323a7af770
 DIST clamav-0.103.7.tar.gz 16501741 BLAKE2B 49fc1c8c42ee8168dbaec4aa13ab0dfef7fa285e335cb38b17bc020df7400ee1daae49e06ba5b4ae0364d47d707cb83c0b1a8442d5b01d2bba5827606fe27fb4 SHA512 d426169889d94411b20a2c9c9579fc22a15090c9847849822c63fc6b404075feba0ff3663ee1382b2af5300394c7a93669844736f7473bfdce3250e1fd130326
 DIST clamav-0.104.2.tar.gz 11950409 BLAKE2B 7d7eb9d22ca519f7ad0c171b6cab4b59cb52787a897ab31b9567166be2223f9ea89e79f42f1e4e0caf32fcb4b008f5ce755fa136566f85fe1de7808b436f80fa SHA512 8c89a05dec6650677125177434cc49ec2298701525508cdda52358e8f98086d80892287f6267f8b7fda0aef2ca361616cb584c3059f3b066bfde65f7f1ba2df5
 DIST clamav-0.104.3.tar.gz 12017176 BLAKE2B db97a3d3ca0a2c5273a175ee3a30fdd07eecd13588a39d39e4d07f91034016ee6eca626b0ab7bf548121e4093ea612f9932512bc021326e4bba8b0844af73664 SHA512 d38a2427df29813e4d0f41d480cda85f6175e617c397ab39d913000fa43fcb44f1e0b97d7bd558bc62369e8caeeb2b3aeb4b3dd575b9da4abb91f8b67a6b8431
+DIST clamav-0.104.4.tar.gz 12027448 BLAKE2B e8627b49b46e9bf5669b7186d829fd2caa76d9071b1533da252fea1bdeed1b78ec4a138db8957b0d121df1180eb37a6230f5f0db1e4d3f2de80bf7dddad5b47e SHA512 5aa8abe96ff49548cf74df47a7e56279c3082dc8ca98cab02f64f44b2da0230e75b5f634b3086ba8ca155052cbc22a2a47ab3dd159ae033d3f599dcde1f2420e
 EBUILD clamav-0.103.6.ebuild 7353 BLAKE2B 9849983170e473ed2c906cec47b2e99727e603e0f3f5c72ddcab1cbce3f9255101bc5be34544b89037b90bb967d1ab29c93ed77d8e35ac611493020d0165f5d2 SHA512 b70196e273dc8668bc77211c702dcafd218d7aca2a3ea444ece7a9c132aa3bcc551ba0f07a016fa13963f7642a3716682e00a353c3bc044779081b399226301d
 EBUILD clamav-0.103.7.ebuild 7359 BLAKE2B 95f3aebd8de5b0cac2ea20d5bc30848dce838d0cf4b56765c4b9a19aded0e430f132ab82eccaa08fbbe5e718c1d0bb6bb9b9fb904964e438087dd9b2ead6b848 SHA512 158ca8a5f39932198e0fcb89c07ca492f0db9b527f2d321e11d36403f7830257412d5a6cbb5aece5fb7f3f643cbaa338f1ffc377e69b84a10ab69ba64ddf88fd
 EBUILD clamav-0.104.2.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
 EBUILD clamav-0.104.3.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
+EBUILD clamav-0.104.4.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
 MISC metadata.xml 1287 BLAKE2B 75d0e2ee639919863a0b12951c04f6338fab836812a930b5cae82adc9546f0d9115c1c12a233b08e7bcf1810b38f8d0c119ee44a7640ade191f9bdb5c2bdf759 SHA512 2ef5d16db72356b72cfe6334b5a9b6c6e4d491ab445debbf9433d44c843e27d03aade9cc49a4fcad151ecfbb3dc4d99903e5a27eac8954991822eca3bad2b6c0
diff --git a/app-antivirus/clamav/clamav-0.104.4.ebuild b/app-antivirus/clamav/clamav-0.104.4.ebuild
new file mode 100644
index 000000000000..d9ec6a29c4a3
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.104.4.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic python-any-r1 systemd tmpfiles
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc clamonacc +clamapp libclamav-only milter rar selinux systemd test"
+
+REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
+	clamonacc? ( clamapp )
+	milter? ( clamapp )
+	test? ( !libclamav-only )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+	acct-user/clamav
+	dev-libs/libltdl
+	dev-libs/libmspack
+	dev-libs/json-c:=
+	dev-libs/libpcre2
+	>=sys-libs/zlib-1.2.2:=
+	app-arch/bzip2
+	clamapp? ( sys-libs/ncurses:= net-misc/curl )
+	elibc_musl? ( sys-libs/fts-standalone )
+	virtual/libiconv
+	!libclamav-only? ( net-misc/curl )
+	dev-libs/openssl:=
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libxml2
+	rar? ( app-arch/unrar )
+	test? ( dev-python/pytest )"
+# TODO: there is no way to use this with the new build system instead of the bundled one
+#	dev-libs/tomsfastmath
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+python_check_deps() {
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+
+	local mycmakeargs=(
+		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
+		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
+		-DENABLE_EXPERIMENTAL=OFF
+		-DENABLE_JSON_SHARED=ON
+		-DENABLE_APP=$(usex clamapp ON OFF)
+		-DENABLE_MILTER=$(usex milter ON OFF)
+		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
+		-DCLAMAV_USER="clamav"
+		-DCLAMAV_GROUP="clamav"
+		-DBYTECODE_RUNTIME=interpreter
+		-DOPTIMIZE=ON
+		-DENABLE_EXTERNAL_MSPACK=ON
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_UNRAR=$(usex rar ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		# Used to enable some more tests but doesn't behave well in
+		# sandbox necessarily(?) + needs certain debug symbols present
+		# in e.g. glibc.
+		-DCMAKE_DISABLE_FIND_PACKAGE_Valgrind=ON
+		-DENABLE_STATIC_LIB=OFF
+		-DENABLE_SHARED_LIB=ON
+		-DENABLE_SYSTEMD=$(usex systemd ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# init scripts
+	newinitd "${FILESDIR}/clamd.initd" clamd
+	newinitd "${FILESDIR}/freshclam.initd" freshclam
+	use clamonacc && \
+		newinitd "${FILESDIR}/clamonacc.initd" clamonacc
+	use milter && \
+		newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter
+
+	rm -rf "${ED}"/var/lib/clamav || die
+
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			# The tmpfiles entry is behind USE=systemd because the
+			# upstream OpenRC service files should (and do) ensure that
+			# the directories they need exist and have the correct
+			# permissions without the help of opentmpfiles. There are
+			# years-old root exploits in opentmpfiles, the design is
+			# fundamentally flawed, and the maintainer is not up to
+			# the task of fixing it.
+			dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
+			systemd_newunit "${FILESDIR}/clamd_at.service-0.104.0" "clamd@.service"
+			systemd_dounit "${FILESDIR}/clamd.service"
+			systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
+							"freshclamd.service"
+		fi
+
+		if use clamapp ; then
+			# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(LocalSocket .*\)/\1/" \
+				-e "s/^#\(User .*\)/\1/" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+				-e "s:^\#\(LogTime\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/clamd.conf.sample > \
+				"${ED}"/etc/clamav/clamd.conf || die
+
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(DatabaseOwner .*\)/\1/" \
+				-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+				-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamav/clamd.conf:" \
+				-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/freshclam.conf.sample > \
+				"${ED}"/etc/clamav/freshclam.conf || die
+
+			if use milter ; then
+				# Note: only keep the "unix" ClamdSocket and MilterSocket!
+				sed -e "s:^\(Example\):\# \1:" \
+					-e "s/^#\(PidFile .*\)/\1/" \
+					-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
+					-e "s/^#\(User .*\)/\1/" \
+					-e "s/^#\(MilterSocket unix:.*\)/\1/" \
+					-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+					"${ED}"/etc/clamav/clamav-milter.conf.sample > \
+					"${ED}"/etc/clamav/clamav-milter.conf || die
+
+				systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service
+			fi
+
+			local i
+			for i in clamd freshclam clamav-milter
+			do
+				if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then
+					mv "${ED}"/etc/"${i}".conf{.sample,} || die
+				fi
+			done
+
+			# These both need to be writable by the clamav user.
+			# TODO: use syslog by default; that's what it's for.
+			diropts -o clamav -g clamav
+			keepdir /var/lib/clamav
+			keepdir /var/log/clamav
+		fi
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+	fi
+
+	# Don't install man pages for utilities we didn't install
+	if use libclamav-only ; then
+		rm -r "${ED}"/usr/share/man || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	ewarn "This version of ClamAV provides separate OpenRC services"
+	ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
+	ewarn "clamd service now starts only the clamd daemon itself. You"
+	ewarn "should add freshclam (and perhaps clamav-milter) to any"
+	ewarn "runlevels that previously contained clamd."
+}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index ca45ae352a59..508fe94c5509 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/cosign/Manifest b/app-containers/cosign/Manifest
index c461aec872bb..e5070d86141a 100644
--- a/app-containers/cosign/Manifest
+++ b/app-containers/cosign/Manifest
@@ -1,10 +1,11 @@
+AUX cosign-1.10.0-fix-makefile.patch 1272 BLAKE2B 3a243bcd768b782da852389489fbd208f5c106f93973e855db765d6e92df02548f687aa758d754cd289b7a330f361f7e79e6f7f7f7afce66b8aba00dfb98370a SHA512 b4defd13c441b294a4ef1f8c518a2c55e9d9ae17f9b1fa00eb0d7b948ce6d201da081d4ff17cafd7939204e78cc39b0c9a0bb4020aec5b91249f45b6a4070f30
 DIST cosign-1.10.0-deps.tar.xz 393342088 BLAKE2B 527a143a1a81b86c8d2d2186c6e18111aa46a7cd908c77bf8f6cc7ebd53a4a8461168dacf46d97dc7e2a14d9e7fe1d7cc59cd81a4fd695177863ec5893577ba3 SHA512 9b764f7d642fd2b7ad3210d7b0fe16b1d5d24ea581266e4f43b0039cb63b1dfbac8fa6826d0359ac3a85575fb03562938ced72e6673fe9a5a4fe85601001adba
 DIST cosign-1.10.0.tar.gz 7140596 BLAKE2B 796ada75ce24ba8d2c7ad8702b9abeb82fd3ae75decac58c8e95f41bda7420056659cf76b4d79a1eaf3e3752c91ebb5da7bbb8bfbcfc0e99bea335ee7566183d SHA512 8ce41349737835945b0a5fe66d9b87b8747301c4e067db305ad7fc573bb8e86b2c6ae787944e01f8490a6db7aba72c33e285f098d0b7c710f1e54814a9cb2cdd
 DIST cosign-1.8.0-deps.tar.xz 541301856 BLAKE2B fb1fd9c2570f327876a5d151261f906951c57fdbaa6eefe1dcb84166f71ae381053f44a3d8a5707660cba066435aa6747aa5c47896b19b461954f6c824c33cd2 SHA512 b2773c1f07d32edc6a4ba02c487a3620eea141f29b425159eb2973ef32867afa7f334fdde2a23d00c84314a236b3bd513f1ea8faf231204a7fd9358ba0ba5234
 DIST cosign-1.8.0.tar.gz 7217748 BLAKE2B 2d9625609f86cad05770085617cd80335d62554e608f64abf96a3dcf5f0d4449b850d493ce2faff2593d0f996d2ace3f304d89ef99c7bfa2a2027a419ae6da1d SHA512 7d45e80ae5fa15fa7fe14bc5cd13a159356b58afc3baebac5d2c64fa38c74e73a3d17f75bed0730fe842da63de5487c54dfb9f77bbffa1f943281b74d3b30c94
 DIST cosign-1.9.0-deps.tar.xz 543778128 BLAKE2B 56f1e75c4199ae8bb33e71546709ebf621bab8123036f80e61624929e46d679353a211eb2da30197181f285033293c35f055977d762684bfc88d843deb06edc6 SHA512 07942be16e53e4325b3026b51557f352d45eee0d0b4cf84d823ebdd53573630c9e461f8dd6e93068dc20e6f25d589241a4e809839c7aa2aab65e3b7aebc2f3a3
 DIST cosign-1.9.0.tar.gz 7240352 BLAKE2B c6b9c617e288b6104d683a1b1ce8c22897e122a70429dd3db2a4643b91d4cf492c1fcd016ac4bcae32de51464aea538babbb04a8fe7d3b3275310adba528d945 SHA512 1a2a7b32aa0d4f2ad90113a3b5923390d29564d3ddc5e9c8539c8ad646541734164942e93d56321b9ff78910532911272a0e3ee007c2066e40656caac17d6c16
-EBUILD cosign-1.10.0.ebuild 608 BLAKE2B 82d6bcc2fcdb44150cb2bade0338fb578210a7b72165a1fc12e0e74b46a006a0cdd51875503768c99d0507231407d39f509c1269824a11b22f31e0872bb79bd3 SHA512 b6437ef76dae9ac0fbc1aa241a0fc4f6e3cddf1e7750b842ebfca265a13d75173099a705dbace009eea15e576bc02a6236d89d8891ee2763ed23cb07bc86b8d5
+EBUILD cosign-1.10.0.ebuild 660 BLAKE2B 02f37073a0ba0880057985eccb0815b261d6c2508d8473cb29e9782d228c976bfd8b6711d81b2ef31267e10c68848b37d562087623861c7fcc2de9cf2ed41f9e SHA512 74c2c90c9ed9801bb212cfe3e6a910e66b068540a7346481bf31f011d6a3c89bc0a16d4846b1eb6236ebb2cbfba4dd575cc5c8618edb8beacd2829ba95b9376a
 EBUILD cosign-1.8.0.ebuild 608 BLAKE2B 464b5611d6dc9bc0027d14ed821c90527cdb6c7b739b1658d2c1eb4ffd515fa75471685f5b708772e39cbc20ecf77f77b66fc54ea02e735066a6fd34ece51247 SHA512 7d2404c8bd7d1d74e246592ed9bbe69af4c337c8dac09882eafaec32589ba9639f430b2b31381506e32f2775edce4a383ee78b40b28cbcc47712c14946436ed2
 EBUILD cosign-1.9.0.ebuild 608 BLAKE2B 9f4853c72225e3e4a87e6db4baf5324a08bff02e3ca3e3e8164a90d5f8b228d5b14eda18875b545295b2b8b347409a05b2017658e5303ab42fcedad886178a6f SHA512 1673577c5978614568be95eb6f7f002d1ee93229942731272482659b9af1cb0fef459e7d2356ee66bcd41d07240aeadcf31fe93e916476ff42f684c744760b80
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-containers/cosign/cosign-1.10.0.ebuild b/app-containers/cosign/cosign-1.10.0.ebuild
index 194effdf1cd3..7adb2e5ed8d1 100644
--- a/app-containers/cosign/cosign-1.10.0.ebuild
+++ b/app-containers/cosign/cosign-1.10.0.ebuild
@@ -16,6 +16,10 @@ KEYWORDS="~amd64"
 
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-makefile.patch
+)
+
 src_compile() {
 	emake \
 		GIT_HASH=${GIT_HASH} \
diff --git a/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch b/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch
new file mode 100644
index 000000000000..5699bca5732c
--- /dev/null
+++ b/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch
@@ -0,0 +1,40 @@
+diff --git a/Makefile b/Makefile
+index 3b6dcb5..8981549 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,8 +20,6 @@ else
+ GOBIN=$(shell go env GOBIN)
+ endif
+ 
+-GOFILES ?= $(shell find . -type f -name '*.go' -not -path "./vendor/*")
+-
+ # Set version variables for LDFLAGS
+ PROJECT_ID ?= projectsigstore
+ RUNTIME_IMAGE ?= gcr.io/distroless/static
+@@ -72,18 +70,6 @@ log-%:
+ 				printf "\033[36m==> %s\033[0m\n", $$2 \
+ 			}'
+ 
+-.PHONY: checkfmt
+-checkfmt: SHELL := /usr/bin/env bash
+-checkfmt: ## Check formatting of all go files
+-	@ $(MAKE) --no-print-directory log-$@
+- 	$(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)")
+- 	$(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)")
+-
+-.PHONY: fmt
+-fmt: ## Format all go files
+-	@ $(MAKE) --no-print-directory log-$@
+-	goimports -w $(GOFILES)
+-
+ cosign: $(SRCS)
+ 	CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -o $@ ./cmd/cosign
+ 
+@@ -121,7 +107,6 @@ clean:
+ 	rm -rf sget
+ 	rm -rf dist/
+ 
+-
+ KOCACHE_PATH=/tmp/ko
+ ARTIFACT_HUB_LABELS=--image-label io.artifacthub.package.readme-url="https://raw.githubusercontent.com/sigstore/cosign/main/README.md" \
+                     --image-label io.artifacthub.package.logo-url=https://raw.githubusercontent.com/sigstore/cosign/main/images/logo.svg \
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 77a2c1954848..c47c79216d7f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 5b3803bc360b..2e95af750599 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -7,8 +7,8 @@ DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
 DIST vim-core-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
-EBUILD vim-core-8.2.4586.ebuild 7145 BLAKE2B b80dc1b8ef8b8b8601445d66396d0e3ee4a13115552930cacf8de13be456cd54c474025a7e45de83926d691ba0c4850524e5a076ec6905a5cdcfc117185d6adb SHA512 86e425f416065660943f5ef7f34bad34e5fe97ae95c07d3c17f391abc99f0326515ac4718d10a2e8b6dccf3197397cd84fe78f3e4a5bc2b27be6107a1c3c14f5
-EBUILD vim-core-8.2.5066-r2.ebuild 7215 BLAKE2B 3915017e4f5bb0241f83045433e18c8155da47b11020d189635c5942dff09ef743924b03d49dc45849045e387b4229d88fdcfe6ef7bf70aea5a5b0e275e59bd1 SHA512 4cd36bdb6bf47e22014498bbd7979b8cd74235dee275c66de44f53339b2d2eaee8259739448787896b138bc70a386d2d0dd9d257ed1ad76c725fefe71aa5a8d8
-EBUILD vim-core-9.0.0049-r1.ebuild 7138 BLAKE2B f44bbec015c986fcda81624f067c6dc947e1956b375efd17f16bf0564a08005252405b36e49a2de9e194f1acd3cfc3d9dac7ad6cdfaf33ae7cee3326f73d563e SHA512 313564150510a92c6ddf724a8b08984cc3c54044e760d8737e9e7b1b69c756946e2d086f17a4633d04db2d91ec2faa867fb8e39c24c3c2297ee87f448c5c264a
-EBUILD vim-core-9999.ebuild 7138 BLAKE2B f44bbec015c986fcda81624f067c6dc947e1956b375efd17f16bf0564a08005252405b36e49a2de9e194f1acd3cfc3d9dac7ad6cdfaf33ae7cee3326f73d563e SHA512 313564150510a92c6ddf724a8b08984cc3c54044e760d8737e9e7b1b69c756946e2d086f17a4633d04db2d91ec2faa867fb8e39c24c3c2297ee87f448c5c264a
+EBUILD vim-core-8.2.4586.ebuild 7060 BLAKE2B 3833f51bdbe7eb68035a36797ad39aac82377ee8ad578aeccf2444e6f199055850f38c1ccb79bfba1afc28927df10784a3f4a5f2916d135266ec3351828b69f8 SHA512 2b4ecaebbca12e1c53cbb0659a12911db64666a04ceb38de6c2ae769ac36536eafeda2451134defd634c06971673d587cccca7f52dc7fb89848dfae0152aff27
+EBUILD vim-core-8.2.5066-r2.ebuild 7002 BLAKE2B 18d0d3115af5efb7392c9a0b44311d5d96a15ba8c811e4ccb3109d3e2a0fd42ca6fe82b73d099cff0ccdf9b132ee6ea52c08ca95c79c133e99a0b4c347d2ddc4 SHA512 66fca357c4dc61d443baa0b49100aa3104bf55137d37d4bb57aafd2cf19e01ee43f6058e36adb393df2fd39ca3ad7a2179f05d8608fb9ef34a564a36cf7c308a
+EBUILD vim-core-9.0.0049-r1.ebuild 6925 BLAKE2B b447b47be2018f52609880b7bb06597f5c940fd7441e105d9af396e778ee8c2ee6645ca97980af50f76dbcea7b840de61632f561945a2043ba4fa1247f88fdf0 SHA512 cc52a48f196b3703ce7cf92adb9131983697a1cae48b5bee2d42147717d9f3423975cdabd462452191baa9205b5ac9491aaba73ba771167dd86ce616ae2cd87e
+EBUILD vim-core-9999.ebuild 6925 BLAKE2B b447b47be2018f52609880b7bb06597f5c940fd7441e105d9af396e778ee8c2ee6645ca97980af50f76dbcea7b840de61632f561945a2043ba4fa1247f88fdf0 SHA512 cc52a48f196b3703ce7cf92adb9131983697a1cae48b5bee2d42147717d9f3423975cdabd462452191baa9205b5ac9491aaba73ba771167dd86ce616ae2cd87e
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-8.2.4586.ebuild b/app-editors/vim-core/vim-core-8.2.4586.ebuild
index 0d7a502efa63..ab6f035d555a 100644
--- a/app-editors/vim-core/vim-core-8.2.4586.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # Please bump with app-editors/vim and app-editors/gvim
 
 VIM_VERSION="8.2"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -188,24 +188,24 @@ src_install() {
 	if use minimal; then
 		# To save space, install only a subset of the files.
 		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
 
 		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
+		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild b/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
index a9c02a3dfc36..c11d467f2a5a 100644
--- a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Please bump with app-editors/vim and app-editors/gvim
 
 VIM_VERSION="8.2"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -189,24 +189,21 @@ src_install() {
 	if use minimal; then
 		# To save space, install only a subset of the files.
 		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild b/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
index e808fd2a2495..555b9e91b8db 100644
--- a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Please bump with app-editors/vim and app-editors/gvim
 
 VIM_VERSION="9.0"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -185,24 +185,21 @@ src_install() {
 	if use minimal; then
 		# To save space, install only a subset of the files.
 		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index e808fd2a2495..555b9e91b8db 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Please bump with app-editors/vim and app-editors/gvim
 
 VIM_VERSION="9.0"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -185,24 +185,21 @@ src_install() {
 	if use minimal; then
 		# To save space, install only a subset of the files.
 		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1140bf9b56b9..87f3132d7b6b 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index ba32a734e262..cd724defc2c4 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,7 @@
 DIST VBoxGuestAdditions_6.1.32.iso 62388224 BLAKE2B e8e4addf5d3a61ff193fcccf185353aa4325ed3747f1bc9afb376276cd38857cc2a087e8c6872cef083ea4eeda20a0c29bac62263c378b6c608e5fb6424623a0 SHA512 268526eec6d07e69e3ab583a11211331c103db87162be045e0068ebd6beeda491e215ea6de6ca2aed10e4312dd9b2904ab315f05bad7041ba6787bfa61aeb6e9
 DIST VBoxGuestAdditions_6.1.34.iso 61538304 BLAKE2B 7709ef735fafc7dcb78dba8ce77a5afbffbe23e9b83c46cd930519150a60eea7c9399075fde58c6f7be07adb82752352f5db7d9f59b3eb5fccc6c55cbdba36ee SHA512 a3b5977fe773bdc5d67bf9fbb529fb8f77e01a95af51a6681a1716ec300eb574e669bf9d57d0d1663c33440cce92b499efffbf5e468830d82e0c072ddc2d9d31
+DIST VBoxGuestAdditions_6.1.36.iso 63803392 BLAKE2B bcd795e4f4ed5b25542011370b0d0ede0a163c89df597d085d731627bf041a5bc8eb8d60c2041bfe1654986751e16bb382680ad487d90def2e8a7d9fab21dd24 SHA512 cf07e77ac882eb9cd6da39c6491f2536ac8c1e4bddb27e50bb6d1016ab7a291746cd59c6966c54ba007bb4cb79b82ebcfacec5984a6e7453f60ad167014542aa
 EBUILD virtualbox-additions-6.1.32.ebuild 772 BLAKE2B 6000f1bed33d03ef878d0fe5eab56add0d30f6c8c5304cd9c02350319a4dc5ac87a25cd66251ac329ba4be6c034629e92aa951b2a80d8f74c378d1bcd4a03b13 SHA512 870f6a6566d2bf68dc7f4a11aff124771c10e8adb67b4dac4d3c08e174555469d377e8db3d2f88209b96666484c5777c15a070ee2480e6fa63e38be6dc90f6e4
 EBUILD virtualbox-additions-6.1.34.ebuild 772 BLAKE2B 6000f1bed33d03ef878d0fe5eab56add0d30f6c8c5304cd9c02350319a4dc5ac87a25cd66251ac329ba4be6c034629e92aa951b2a80d8f74c378d1bcd4a03b13 SHA512 870f6a6566d2bf68dc7f4a11aff124771c10e8adb67b4dac4d3c08e174555469d377e8db3d2f88209b96666484c5777c15a070ee2480e6fa63e38be6dc90f6e4
+EBUILD virtualbox-additions-6.1.36.ebuild 699 BLAKE2B 0893b9ed5284f8b713e828c670ad2a7929e0532f02e1226b97b791e1eb5d9e9cabd22c71360aa3f095f96ff3ef613141c0423a6ff39109588c8ec3448e0b4c83 SHA512 7c24e2216681f62d3f4cc125c26998bcaa04297de7d6e02b8e81d317995eda150813d6fbf4d9cac77b2a5c534cc5e3e710343c4ec128e4d7532d478c3621af4b
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
new file mode 100644
index 000000000000..e989261fd89b
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 3f40616903b0..92702e264f7d 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,7 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.32.tar.gz 11137804 BLAKE2B 376274d56ce61a9da785be0a3de63566bc39e9c7a2915a33ff7792173f7625c21d345da757e9963d9b1833124c3430523bc89ba0a0ed27b66a6d87a07d6d6602 SHA512 e7297a9fccd6c74a7986496da71bd6a0970bc53c49845b9bc44714ab04e90e9a4c427f1491f6ec287cdba87a93733de7849f5e78ab7f3ee1a127e8ac4ea20861
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.34.tar.gz 11137259 BLAKE2B 81709b2f3e67cafd9cffd80de2d07cfa5a64054b590455f7393ab701984b469b2677ecae8ba82aa812c17688a9212ef2ee97be6584bdefb1eb1a53643ba92d17 SHA512 ec41e31bff4bcb79d46957c8ee41e561c9e3a8932152633a16953add38f142e8ac4029bbbd67d72bdb64784819db2f52c4d66a9a7e8009435231c98d88676cc4
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.36.tar.gz 11231896 BLAKE2B 08872189b8be959e13f07b69635b08d41661841cc30bdea1bec73c8fc87f1e374e53658e160cd290b919465bad62ef633cdc79e11d477a6bf0b9a67ae8131f73 SHA512 98ba542fbe60848877c25cf8e8f252081e231687d8b4cc4324283e6e787c00cb83c0570379a50364ee239a10195b25740f9c2e0e559cec28b75f56717623df16
 EBUILD virtualbox-extpack-oracle-6.1.32.ebuild 1064 BLAKE2B 63d4c01cf703966e7c9a98be5df8dd0b81b51ce7781e8014bb8e37585cb4e02401e113cc925d43b494562c13beecf080a107ea10b6a45a5186ce7b91cd93c11d SHA512 61063ee060f2a0352a66de441128c5f21b52f41149067f0f3f544e627e7c2b018e1dcc608b6c228e21323eecbc4ace9eada07bdd8b192d9f785289ebf9c593d7
 EBUILD virtualbox-extpack-oracle-6.1.34.ebuild 1064 BLAKE2B 63d4c01cf703966e7c9a98be5df8dd0b81b51ce7781e8014bb8e37585cb4e02401e113cc925d43b494562c13beecf080a107ea10b6a45a5186ce7b91cd93c11d SHA512 61063ee060f2a0352a66de441128c5f21b52f41149067f0f3f544e627e7c2b018e1dcc608b6c228e21323eecbc4ace9eada07bdd8b192d9f785289ebf9c593d7
+EBUILD virtualbox-extpack-oracle-6.1.36.ebuild 1065 BLAKE2B 692e1eef70426e91903205198e6a46e90a8dc39e34ec7d5a095a98edb47419f71b7e35de75023bb3d9b5dd0b0e101b8bbb833bf2c895e5a35fd438b7230449e0 SHA512 242d3b0bd1ed0d988825acee325c36f2b1754a4281efcb8f6d0d026da8c69815a2d4e561b08558b5df352982ac1f52de9e566f05f381031a426876d3ee77c992
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.36.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.36.ebuild
new file mode 100644
index 000000000000..10b24ce1fc11
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.36.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+#VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}" #-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 543dca0fba30..58d61aa6fd08 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,5 +1,6 @@
 AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947329c9ffad4955665b142576438dd124bc323d540cb2f6229c722b2611d4ba405521432965d9d0bddd8f SHA512 90e2ff4b8a67120f7f3c116676c7553243a1bf3c9a76f71ef471bc556c4eee55953e6a5dde952688d4892d469149db8704a921a14755eea66b1789805fe3ca42
 AUX vboxguest-6.0.6-log-use-c99.patch 282 BLAKE2B df1d521c39ab6b3fa421f866fd83545bfea972dbbb1a952ce6aa388845175a4a3f71bc1cd34151f537994713ad1144fb0497f1383ed116357e7971f02c38ada9 SHA512 31fc13e5bb6286f80fde312aeb7917f662addc5b889ca1aeafa4f3545bece46eccface3b94df01c25a33d60302a14b3ae5b1eef87f25a4eef9a9dd4a75b3d7cb
+AUX vboxguest-6.1.36-log-use-c99.patch 288 BLAKE2B 7a869ea9c46d91b64e6f062173bce10db25581b2390dad517016eb35cdae0727579e374318afdf749c3118436c667dacaf670f93698894b972b3badc60a80a43 SHA512 c66d75e77d84f081095de91248f236606b5e0bcc50a5525918fce979c97d84dddf6d10fc2a21832db74b5ef632949d9dee8ec30b4f1ab05bcec1aa75da681971
 AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf62f698485d63a0487c4cc4fc9906b8ced191f078e2b794ef9db9488de9e92188c73812c16e37ff542f06e0d52a4dc62b631960 SHA512 81ccc8d3edd965feb55290cf1281a97a485f14fd1de07cd59479bd7746291d41abc45c2e7e209f17f7df057528be83c48f3e270b526e6b86d85c5ec4be2d3944
@@ -7,9 +8,12 @@ AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-6.1.32.tar.bz2 165758238 BLAKE2B 24873d7cc8bd306ea3552fe75379fbe7be767c85406042344eb047ed31184c3357aea07dda5e15c275f5036ae63106ef1d2e6524b143bc645a6b5ba0016f1391 SHA512 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
 DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92819c871359501ec4fa7212bf7cdc852613e2e4703d8650371097a5bc805efa04ea75bb03ab83d24a869a677555f6e22d5 SHA512 46d63a9fd9df76af654af59fab5cf555858bc2c4b5dc34e2378d85ae784e6380b6def4aab06909a9b5e114a7297269f90cfb2c3d8d6529b423d703afbad18c64
+DIST VirtualBox-6.1.36.tar.bz2 165685382 BLAKE2B 98dbb06450b9df650cb72493bcdea4b88fa9dd21f76d723fdc0bb2c1ab8266f67e972a7222dc9b5bd0d43754911710664bddace753995be025cf6bcc05a24ae5 SHA512 cc3b984a7da40c9bf14831808a2bc2bf7bf6821e53c25fa11cb4b4275feb1d4b0cb4a47d8a360b90c89e5a4038481efe8fe28ee22996dbefb6446761e88a8dec
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
+DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 EBUILD virtualbox-guest-additions-6.1.32-r1.ebuild 6280 BLAKE2B 68ef78d95ffbc6847b3a7d948848741e714c57788535c9ecd639b3969bdb28048b4075aef131d5614a3da51d1b603a30d6c9b7b289fd6ea8c912ed52de0613f4 SHA512 7a91705459852d2d53debaeaec17027ee12138926395c46181ffc603232775e16986a35a9e3d287b889e262f4ed7b115251f4e00b01677da51f9b1a325081ad9
 EBUILD virtualbox-guest-additions-6.1.34-r1.ebuild 6282 BLAKE2B 696de6d8cf22409ddae78794d4d3d12f3d8cea49884d6317420baefceb3554354d63234fda6b20027293939aa4629e9d84cc241a343f0bb08a84c7a78d8db696 SHA512 37b29dedd36f3bc43753f910ba2dd57c36f84be2c097ca56c6c1b5b52523645d4a0ceff537716fbf673726009c5e2e40884023458275cc0ee3b2c5c9c00e1419
 EBUILD virtualbox-guest-additions-6.1.34-r2.ebuild 7469 BLAKE2B affb2aeb74ed6ca588418c23ab2febb374ad7ecc532e056c12c6636f4d433e2eb3e59727a2b1cc6c57f0dea0dcbfa20e67260b95b44bc98c9c0cf5903eac93c4 SHA512 8154a867db0bf5da50f66dd4ba53af4586f3e8a90ba5c693c046bf38b2201082a518deb532947b0abcfe70420273bb5eed8c88657d4c6587580108836c22c57b
 EBUILD virtualbox-guest-additions-6.1.34-r3.ebuild 7668 BLAKE2B 331840fbcbf2aa2240fca277830150f6519731c5343e48becf0498d8e3ca6277bced1a99958c37569689eca95c640f8443000db3a1fdcf4e2cd9f393135805e8 SHA512 0c960875f24c56d1214aa4b020b21377c2ed8e8c9ccdb029b780dfb08297d122ecea7b9a58c53a2190d56864fbd6786d84509fdee694fc9abfdb2fae7b618ba1
+EBUILD virtualbox-guest-additions-6.1.36.ebuild 7704 BLAKE2B 01d1b7926be2f9181f2ca5b72beac93842515ffe49d05fdb98d4dec999aab51ddf7f6760885d641efebbc93b379bcf377810f0b5aa9626c2261e6e4ca95d72b1 SHA512 b502f136bc0674929d4c1a4de74891d7fa2e4bc11d28b754266eefc20c9359c8ea84550c92c6c0e71e269fe39eb289031f0af9ae8fc40b2ff76e23ef589d19e4
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-guest-additions/files/vboxguest-6.1.36-log-use-c99.patch b/app-emulation/virtualbox-guest-additions/files/vboxguest-6.1.36-log-use-c99.patch
new file mode 100644
index 000000000000..41641f2336a5
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/vboxguest-6.1.36-log-use-c99.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/298988
+
+--- a/vboxguest/Makefile
++++ b/vboxguest/Makefile
+@@ -149,7 +149,7 @@
+ 	IN_MODULE \
+ 	RT_WITH_VBOX \
+ 	VBGL_VBOXGUEST \
+-	VBOX_WITH_HGCM
++	VBOX_WITH_HGCM LOG_USE_C99
+ ifeq ($(VBOX_KBUILD_TARGET_ARCH),amd64)
+ VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
+ endif
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.36.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.36.ebuild
new file mode 100644
index 000000000000..90faf81beab9
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.36.ebuild
@@ -0,0 +1,280 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod systemd toolchain-funcs udev
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
+VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
+
+pkg_setup() {
+	export DISTCC_DISABLE=1 #674256
+	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
+		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	eend $? || die
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	# Respect LDFLAGS (bug #759100)
+	sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk
+
+	# Do not use hard-coded ld (related to bug #488176)
+	#sed -e '/QUIET)ld /s@ld @$(LD) @' \
+	#	-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	eapply "${WORKDIR}/virtualbox-patches-${MY_PV}/patches"
+	eapply_user
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+
+	# Build the user-space tools, warnings are harmless
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+
+	# bug #843437
+	# Respect LDFLAGS (bug #759100)
+	# Cannot use LDFLAGS here because they also get passed to $(LD)
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+		CCLDFLAGS=${LDFLAGS}
+	EOF
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_ONLY_ADDITIONS=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LD="$(tc-getCC)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_CXX="$(tc-getCXX)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+		TOOL_YASM_AS=yasm
+	)
+
+	MAKE="kmk" emake "${myemakeargs[@]}"
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	# Move this here for bug 836037
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	udev_reload
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	udev_reload
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 733840f2812e..99aab7ef91c4 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -4,6 +4,8 @@ AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.32.tar.xz 675300 BLAKE2B fc843779ae9348203f2528009880e2d2dde65102c8be1837eb3a362e2703f9ecf54f7a10939318cbecbb41b4790a8b7d56c98ad82a4e83592b4c5491af0772b5 SHA512 e1c00be4fe2a0447c30ae0d380fc7a78fec1c3f52fb0cf0d20ccefcd174bf11097a91aa862ef8753be012e546a31555f5be9c1136cbaefc2240708b3adde7e5b
 DIST vbox-kernel-module-src-6.1.34.tar.xz 675236 BLAKE2B 45385b4e60f7f5da8ebd2bb20ebc706ec8ac48e698dc62740ead31bd77e059bfb2980a83f8781832fe8e5faaade88db97c73f25096724ae4f29aba6daf04f7a0 SHA512 313dda056cb5e4020bfc9bafca2d05ab628aa740d174b9457f860ce0cd8eccaf557798cbb5fc1efeb36dc0f1f0320034ee86e48da03b33779eda1093b50d6c64
+DIST vbox-kernel-module-src-6.1.36.tar.xz 678624 BLAKE2B b09a9f4281287dc3a356e2af77fa024f06f64db41eac10efe8cf2b4ab39df292fac13a75247bdfa8b22dc3fbbc3747d217651da11c4788cfd08a2b6d775bb4f7 SHA512 b00c99a2db57c78c538539afc900ffa1e4729727f39ed68565a18c3fcbc28080d1ca340ee16f45e5616f535ce38ba646020a5373acc124a15821287fa29ddd52
 EBUILD virtualbox-modules-6.1.32.ebuild 1892 BLAKE2B ca266c5f8ef7d980b92052f98ef4a8c2d5f087325f88d8cbb0f324a765ebf2cdf1e304bac2544a21204b7cbafc74a1b9052ecae2edc8dcbf6c6a9a2f7623e377 SHA512 7d4fa4bd54f0fe527eca8d98bf09fa8983913ad2dd8d832643abb5933d2ad0b80eb69f5f2ee554ce41dd6d3bf65cf326a8ea7ae1f30253aa612cda9885390b49
 EBUILD virtualbox-modules-6.1.34.ebuild 1892 BLAKE2B 5b6b3ffacf3dddf7113251b6a7e7f7b10249a3b384caf40a5c5612fff8fe7536aec8c632ca06ee3d0ccff788b1fac0a5f36f6fd5551b5886c057e695b430619f SHA512 6e0bcc667cd75f5ccb8eaa5cf188a64db6948fd256b33955b303ad1b585a46a77bd5de2ef2fccc9d18ab0a921a848e6f650fa802a154b2b071122e6acb8c4e83
+EBUILD virtualbox-modules-6.1.36.ebuild 1877 BLAKE2B 331631020f4440c7e008c21cfc634582785583c0198e796d0a4756349c2581d52e0e2aee69caf2ce850440f9c2754124d96b810206dfda1cf10e5a7cb8d75295 SHA512 0d3fedadd583dd16ccc0fc6fd06660339e87d7be5a7e97b40bdd9a52f7bfc23d29e7c56bc693bcef903958ad24a9d32bec34637b1d0e60da43ae206591d4c61e
 MISC metadata.xml 510 BLAKE2B df97f34230d3350b0f5272ddcb4d5a2ebca06520de69446d83d3a0fc422d1320c202f7fa1603731de14d30001fe92aef830706ccc90b692ca9a6d72eedb106eb SHA512 91e5d17c1f5cd04f08751e8b97bcee1461d32d0a0cda0ab6d9a8307731948b029585d4752c51177003f21396eacbf7cb4ced592b3802ece1d8f795902e1544e2
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.36.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.36.ebuild
new file mode 100644
index 000000000000..d293415c5d91
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.36.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+
+EAPI=8
+
+inherit linux-mod toolchain-funcs
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://github.com/ceamac/virtualbox-modules-dist/releases/download/v${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="pax-kernel"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	if linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
+
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+	# Remove vboxpci.ko from current running kernel
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 15ac43368ab9..8bf88a6c4a91 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -11,13 +11,17 @@ AUX virtualbox-6.1.34-python3.10.patch 686 BLAKE2B 708c4b70c50024dbbd200bdd2af51
 AUX virtualbox-6.1.34-r3-python.patch 343 BLAKE2B 6eb68ba31ab57a1f2065a7d48ef75175f5c3ba45ff9514c1f1ece8f6f54c1d8fe907ca3a10e411bc6b4474cddb39224d54b4bf4cd7b57522b2ca499ce85061c8 SHA512 a22f46e82f163676a5c07b8010160444cc621f9d12ec1226a304ebdf0800f8f24174dec2fb5e8999ba51f574cd2d290af1c7b94b54ca8c2cd6abdad9025e7fea
 AUX virtualbox-6.1.34-r3-python3.10.patch 4187 BLAKE2B ccacd5649bccd0ed7810a411b55c19565387b0fa4dc32c7c416c8f080ff45fd4cb6fd6cc16f88b7198350a166ae1948b247b7546731842c7e69578c2aaf1b04b SHA512 eb8b38375bf7464656e09635f341a03aae6648bede0d95f93b0d9a579421165568dd2be667cca05e7a3eca8695f8ae4ee91e3f7f4ce5f0c28c2e828e29581902
 AUX virtualbox-6.1.34-vboxr0.patch 1565 BLAKE2B ec47a42b7574def3ac3ca482db14cca96af855652b0ff11e4ef49cbc7ea2bec4e134b57e18df85b07d8a8f3efcd1d0fa69380cf32bf544781c6e14437f124a11 SHA512 3feb258993509e2bd3c13130fb227883960e6e3b3e14d146d04cb222c7323689902fcf581ff207ef70a985eaced02e303a6d93e55261db499f5c54eb3e007f57
+AUX virtualbox-6.1.36-python3.10.patch 855 BLAKE2B b6df3e3bf9d9c8d6cfc21a1a21373de02b98dc7178542bf7fe43499eaf77c98b95bcf51795e5c878e5433aec6557552407fd063d63a957450a3682cf0f423b77 SHA512 8e16ab0655909fd0301a4ff3fe70cd69787ad9d92d253888f6a05b8dc2172727e176ac3899b2efc4f50038b4f07b82df2252bceb05e2dc7b5a420302d0826e12
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.32.tar.bz2 165758238 BLAKE2B 24873d7cc8bd306ea3552fe75379fbe7be767c85406042344eb047ed31184c3357aea07dda5e15c275f5036ae63106ef1d2e6524b143bc645a6b5ba0016f1391 SHA512 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
 DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92819c871359501ec4fa7212bf7cdc852613e2e4703d8650371097a5bc805efa04ea75bb03ab83d24a869a677555f6e22d5 SHA512 46d63a9fd9df76af654af59fab5cf555858bc2c4b5dc34e2378d85ae784e6380b6def4aab06909a9b5e114a7297269f90cfb2c3d8d6529b423d703afbad18c64
+DIST VirtualBox-6.1.36.tar.bz2 165685382 BLAKE2B 98dbb06450b9df650cb72493bcdea4b88fa9dd21f76d723fdc0bb2c1ab8266f67e972a7222dc9b5bd0d43754911710664bddace753995be025cf6bcc05a24ae5 SHA512 cc3b984a7da40c9bf14831808a2bc2bf7bf6821e53c25fa11cb4b4275feb1d4b0cb4a47d8a360b90c89e5a4038481efe8fe28ee22996dbefb6446761e88a8dec
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
+DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 EBUILD virtualbox-6.1.32-r2.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5d18f556f71857d120ebb6db5ce4d33005ab9769f698a902b6fb1028702ae686380337aed2500dedbd5ec3dabec8ea82ca SHA512 a65ad608a408c1ba38f0ae11f91167f0376c0777483f0bd4dc882e2da9144f2ac48f6a4f225eb8bb67bb369df5be38ffaa694e4e0a028bccaf26f7c92e6df887
 EBUILD virtualbox-6.1.34-r1.ebuild 13699 BLAKE2B 01a96acd3f1e734536372baa60f0adca25d0153e5c7dc986ac51fa1bbd67a4e3e6fbf71a0b5865a5ab92f236e598c86dd4755c72e1a83ee95a44f714d6e0c877 SHA512 d647990d450c92d8eba46250e7a9f058c1f887fd0b0bc9b6223197973561a60bbef6f7e8133352baae034ae4014040bd325747644bc2eec286e56f71363ccab3
 EBUILD virtualbox-6.1.34-r3.ebuild 14573 BLAKE2B 110221a46466f9f053b231424840c73a00b665ced4d597fa7807500d65e18b189a8b8336e827d3caf40af251c60ad8b379578a978b7f5cb3c3d81c0cb8ae4da4 SHA512 3bbfd336e3b6306b04137314df32767dead2ba4f1821f1213ea32e5b00ce80e5e4d83df5b2647d846d5f91f9ee1efd2678dd4bd1767adfc7edba2cee856ba0c5
 EBUILD virtualbox-6.1.34-r6.ebuild 17645 BLAKE2B 0e54ea42b509301396b12aa95bd306d65f436367749d3668deb71f651cd5b0cfdfdfa38d879a5c3ba2f224d5a63dbf4aff833b9fcad60b1d906a17a58a720811 SHA512 2025d3687cfa697309b42a4daba5832e8c17beb17a5453a635ba1ab4b4bfd13641093a1f745c74e9811eac62bdd906c5e4bd42a79f03b89853f1556deb5a510c
+EBUILD virtualbox-6.1.36.ebuild 17819 BLAKE2B 839fd78c73e4e483036fa98010b9013ee3ba4aaada77301f213df40266db9df8b34ad69ba3ddbfe75a6b858c022da269ca30037afb94cb275898bf0974012639 SHA512 3cb3e5ec9b0e1f6a744079cb18401f73b51e62f1c82b88615c66d34ae56735713feb20afa6f64a8b2386c580c4bdcb45da2fc0637ccb18ad82ca81fb2e532022
 MISC metadata.xml 931 BLAKE2B bda8433410b0bf400bee4795ce53cd85554463417beec3d7f60fe5fe090317b2d75671a2c091718d4d57c5cc8c2961e0e93fbf9f6d70c652f812317ce4fc1b20 SHA512 0d7e309078a5b5c5cf891da6e8581fce8563e9014e822e9c99d6c7c62a88173b2536fe2554ea22f93965dfccd505543fe2022e6c064acc8d836ced0150fe491f
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch b/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch
new file mode 100644
index 000000000000..90157ada7d96
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch
@@ -0,0 +1,16 @@
+https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/002-python310.patch
+https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/003-pyunicode.patch
+
+https://www.virtualbox.org/changeset/90537/vbox
+https://www.virtualbox.org/changeset/86623/vbox
+--- a/src/libs/xpcom18a4/python/src/PyXPCOM.h
++++ b/src/libs/xpcom18a4/python/src/PyXPCOM.h
+@@ -137,7 +137,7 @@
+ #  define PyInt_Check(o) PyLong_Check(o)
+ #  define PyInt_AsLong(o) PyLong_AsLong(o)
+ #  define PyNumber_Int(o) PyNumber_Long(o)
+-#  if PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
++#  if !defined(Py_LIMITED_API) && PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
+ #   ifndef PyUnicode_AsUTF8
+ #    define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
+ #   endif
diff --git a/app-emulation/virtualbox/virtualbox-6.1.36.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
new file mode 100644
index 000000000000..19b363fc34f3
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
@@ -0,0 +1,644 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}-${MY_PV}
+[[ ${PV} == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${MY_PV}.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64"
+fi
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #832166.
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	java? ( virtual/jdk:1.8 )
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( virtual/jdk:1.8 )
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( virtual/jre:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
+	"${FILESDIR}"/${PN}-6.1.36-python3.10.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-${MY_PV}/patches
+)
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something more sensible.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch ; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	#856811 turns out having march defined produces buggy executables
+	filter-flags -march=* -mtune=* -mcpu=*
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-dbus
+		--disable-kmods
+
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile ; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/./_}"
+
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
+		if [[ ! -x "${python_path_ext}" ]] ; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev ; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index df83f0678a06..2ba96e578954 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
index 17d63eb242d1..791da4e1d528 100644
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@@ -1,5 +1,5 @@
 AUX tp_smapi-0.40-confd 785 BLAKE2B da1e2a5ce6e441eebf1a3dffcce8a863688a525f6ee4c29537b1783e3283c5a0311e4317617cff4be8c35246accf69738778c6c34e4d2af77a18f23a1e84b363 SHA512 a08f0b15ea37f79e1a8b41b3a3a59421dcf26e482d2eaa269e7c3f728c142e68e8c130c8a53f4c14829436a20e1354318464de780d9fbe10777d7929d7944dca
 AUX tp_smapi-0.40-initd 1851 BLAKE2B 852fc13e2d74a570918c451966214ed8ca3daea9bdb66e856f48554261f4cafc8d8be7b76889a6a639f0dc1310d34036131a9982be0cdcf0e458707e7938b161 SHA512 ebf8ac628e00979f21e266fb6d187f02bfeeafc9482a0c5bed4fd4f092c7a27158747ccf629c802969ad2a8f13124276ef889927b3f1f01a7ce44fdcde103698
 DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7
-EBUILD tp_smapi-0.43-r1.ebuild 1970 BLAKE2B e010dfff03f66720c9d6774dcaeb456dfcca508c246bfbc4145f213d015353248d3f18903ddfd9801e11e43b55f804c02e41c6f77352ba92c92d60c498c0a161 SHA512 c227146e725fefad8fdafdd7ff9321faab17c44df523ba7d4f63e82814d6284490eb780b5160b92028324b9229bf958bafafdf0cdb82e38417597b9c439240fc
+EBUILD tp_smapi-0.43-r2.ebuild 1972 BLAKE2B 7233b4d28930f40417981c4f3b68924ffa505149970dd989e2487e529eda0b24fa4ef76902fdc01587d0837cf371430a68c7551724a1d9e6123bf6e451b4ed10 SHA512 7216a203f3330a6b1c6299ddc9ac9c3f6e511453e95fc11b12bb45dba9d9613ae56fed73e61ad469e46f70460770a05512804ddb24e6aa3a6572c5d279291b8e
 MISC metadata.xml 474 BLAKE2B dc28834282453dbb412e11a3677d2c4fe8bf2b9f90b4c700aa4de53b87ea0b1e80a9aeb8d24254a6e4d61e3e55c8fa3bf34db8eb55015ea788c5d49363618edf SHA512 94866e40b00e2ea573ac250e8e4f715c7cefc6118eba385ebbbfbe641d8ab6ccb691def271873bb50e6454f2bb7834fc7901c7dde8fa0ed5b132afee3af20970
diff --git a/app-laptop/tp_smapi/tp_smapi-0.43-r1.ebuild b/app-laptop/tp_smapi/tp_smapi-0.43-r2.ebuild
index ca46cf62c791..dab1bde4c144 100644
--- a/app-laptop/tp_smapi/tp_smapi-0.43-r1.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.43-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="8"
 
 inherit flag-o-matic linux-mod
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8b951baef17b..474e37d8ddd3 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest
index 1212fd6cca32..15620ce249ff 100644
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@@ -1,5 +1,3 @@
-DIST mysqltuner-1.8.3.tar.gz 254525 BLAKE2B 7fa1fe24ab454aa15a03e62410e08988a4a0d3ac9b1e4df0219a67bffa4d6113d8c89d6f93f8e6d08a35ecc4bdbf5c0148d8e53138f05a5c22899ecca98b3614 SHA512 965ad0204cb449aa113bf1880a91468d48467c84e7d42ac8f12e7ee4035e49dc7cb191d2b11b6e5b084a60c3857e92ac4d1bef63f688538f3468fda32304a702
 DIST mysqltuner-1.9.9.tar.gz 225048 BLAKE2B 5c22ecbe3ab8ab2ad8712c6cbdfbc6bb182e6211d7894c2dc10c68b5b31f74f7512747c983844ba6ce9e12e422f510e4e68a18e85e29f443424e4dfa7055e1f7 SHA512 9373fcbcf514a989126b100739a87d711b4c2081e2608b4576d0ab88590ffd85fae57f1587e1d9f44cf0d89baa92eeb9115db2c4c6c491b701e965de7a549fa0
-EBUILD mysqltuner-1.8.3.ebuild 846 BLAKE2B bf7565388feb5f59462e4337a27477522f181ce1e95370541aa747e7e0f1531ec5d7bc26fbac877bf40767eade4eca4d7a6a91b202ac0dd474bb30d5c9e0552e SHA512 74071256672d4d4590ca5d46e493581372a856f0b5373cf81047e1ce1303ae9c25e6ef8b1ad29c2f51e70e5c8d03a11bd5caf4d84ed33a5e1ccfb4a7a8a4f4ab
-EBUILD mysqltuner-1.9.9.ebuild 859 BLAKE2B 32dd5330b520f4c6cfe417ba4b168dc5b8c88d8a95bb7cdb6b96289db70aa334395469ccaa4ee8cfd06c69872f863a382381661ace6b10ee56163744bdce4d1a SHA512 2147210529114da6a36f56261f43581d6cb6aa5881345f388f8897883363aa3e43b4d75c038933c319937de484a71b311acc76f73ac19dc24784a22ee3033ad1
+EBUILD mysqltuner-1.9.9.ebuild 857 BLAKE2B 58afd1b3578c0b9b499a0b0b027dba0b7f73338076450a8a5c0307bc82ee1d2cec42d25ae1bd3d1201821ddb8c7bb46750dbf08630595dc1329d38aacfccc75c SHA512 147c718b7f13ea1fd0ea0907cb65d5a5d4a1e6ebe2ac60209d0d70a3b84809a52731dcce925f4a4e6418ce69e82d9add4d0d9b9bcd899002497e042c7e66a6ad
 MISC metadata.xml 607 BLAKE2B 51f3f5075cefa6184953d66ab4267463138fb02ae96f461f61eadbac9f49bba644f8ed4f293a49d4f56cdd361975a713b8ee08456874fee2a694d75cb99f3b7a SHA512 bf276a0a678188581b493b791771ad4c5508371b9db2a6dbcaf1afa401b7959179bdaaeea7c33c42ec4733fb78093009e5459a06de799bbbecc85150434a3397
diff --git a/dev-db/mysqltuner/mysqltuner-1.8.3.ebuild b/dev-db/mysqltuner/mysqltuner-1.8.3.ebuild
deleted file mode 100644
index 3dfa05a3ba1f..000000000000
--- a/dev-db/mysqltuner/mysqltuner-1.8.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="MySQLTuner-perl"
-
-DESCRIPTION="Makes recommendations for increased performance and stability for MySQL"
-HOMEPAGE="https://github.com/major/MySQLTuner-perl"
-SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/perl
-	virtual/perl-Getopt-Long
-"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	newbin mysqltuner.pl mysqltuner
-	dodoc {CONTRIBUTING,INTERNALS,USAGE}.md
-	einstalldocs
-
-	# Passwords and vulnerabilities are meant to be fed to the script uncompressed.
-	dodoc basic_passwords.txt vulnerabilities.csv
-	docompress -x "/usr/share/doc/${PF}/basic_passwords.txt" "/usr/share/doc/${PF}/vulnerabilities.csv"
-}
diff --git a/dev-db/mysqltuner/mysqltuner-1.9.9.ebuild b/dev-db/mysqltuner/mysqltuner-1.9.9.ebuild
index 04400f30bd2b..025f02dedce4 100644
--- a/dev-db/mysqltuner/mysqltuner-1.9.9.ebuild
+++ b/dev-db/mysqltuner/mysqltuner-1.9.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c82db14a4f8d..e81a8ca4d461 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 2d767e48dffa..73999da7f077 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -170,5 +170,5 @@ EBUILD rust-bin-1.59.0.ebuild 6408 BLAKE2B 6e90ac8111f916b0314508392292a4ceb92ff
 EBUILD rust-bin-1.60.0.ebuild 6441 BLAKE2B 20e13211584ff99a3f26f146e9d08dba49534a3ad9700280f9240dbe9ab6534e01e2f00ec4ff8c692fd24608be7e39f63886dfade88251ab659e888f10581718 SHA512 312fb2999e1e0ae51c0c3b17965438af8e7002ef6901e9245471aa5c8387f55a09402231f0ba258b359bac5245e6cc287a0bd3e145f8773797ea442af583b45b
 EBUILD rust-bin-1.61.0.ebuild 6636 BLAKE2B ec6cb60a496aa25093e64e1bbf8987dde73979cf450772962d5ea346dc338ded919acf3a75c273ac468240b248877c157f1f434490b89afffc1cb2c1e88764d9 SHA512 9b828c3d6873e315cf105c5a7d97a6185ebbe3889f2cd410aec3d47d80e4ff018600d970d4421321faddcf713bbc89bca8c110b16e4687b10a1fde89031560f3
 EBUILD rust-bin-1.62.0.ebuild 6633 BLAKE2B 81c2d3ba738cd054efdf4362f61905726a99a3521a2188918694987999fb32bc129538b03734826bfa33f9545c118844d49a1ce2404bc77c9a54a774f321026d SHA512 15d5ef538ae16bb10b6fa323e6b8ad334c5cd67d00e5f2cde5ae7f9e7a2a268facbf609fca9b544f3fde38b68df7b1fc15eeeab4178433cb016ee0ec68d03282
-EBUILD rust-bin-1.62.1.ebuild 6623 BLAKE2B 9fdd9152bf69e4665cf461512c4fb8d070a98133eca89b44aedc7192f55bbc57b0592b98b233b3f5d0d84095ed0949ab7f59845a6b0892b72877ed8da0692589 SHA512 9a888b4792ae5927d4dae589d74bacc29ab809307247b7e0e82c68c8583cfac942379406b3d579dd0159af9bde6bf51102db38cf5ddc525193b8dddf0fd2b4f3
+EBUILD rust-bin-1.62.1.ebuild 6622 BLAKE2B 0ec2445f312afbf6815afea4813450580c452770b5b67bb2204a6138ecac900c194a6edd9f246639452a939e7ccf357b1c9a559f6cdfba35d05301f0cfff6674 SHA512 0e383c8bd286d31d1bcba934dd24e26c6be97c07c84296d5106b66e24471b05f8401566f11ebe71a8962a15cf2f24abde984925b7e95a2c447e4316326cee259
 MISC metadata.xml 591 BLAKE2B 6f9d494e400400b8b957eaa3c242b5f096808cc8372360eac0d9ae4bffcd2aa75b35bad4acc7248543b08466d8616b0145ae8a9b1534db1ad5ee838f07f9dc51 SHA512 9f59ea60d8ec9b748eac0789fa6750f32e4867e1c2cbe106ce270acdb7306d40fe8754315f8c65a924af43d5b3e88f4f50dec6361299de80ef1a25665aa03182
diff --git a/dev-lang/rust-bin/rust-bin-1.62.1.ebuild b/dev-lang/rust-bin/rust-bin-1.62.1.ebuild
index 24f04d55025f..6f53c5025f1f 100644
--- a/dev-lang/rust-bin/rust-bin-1.62.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.62.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index a0a9d78fa732..643e26908418 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -146,5 +146,5 @@ EBUILD rust-1.59.0.ebuild 21153 BLAKE2B 0c8da01c7b944faf9bda62d5033421284c0e3c58
 EBUILD rust-1.60.0.ebuild 21376 BLAKE2B 406bac0d9acf6ffe0666fa319d0cfd9238c0f09400853e88b8ce9ba609962ea48e2c3f93174886b1b03786db25d122edd488c0f898c9304e4e85acecf4d6674c SHA512 8e2dcbb727399e6298c007c0a31d636fb27c8afce01ee1e9191bb0ed7e29d73646eea3b6e7a994f71891fa4bae32c0d6b509bfba6dfb818f11697101d2dce21d
 EBUILD rust-1.61.0-r2.ebuild 22299 BLAKE2B 28fb0eda506e8a0c92c0e111ac92c0b70d1cf6cc632457f80618f07b803f00bdfc2b63d74f08113e3f70fbf3f9929c3e887662585f78c733549a49e4f5656621 SHA512 4bcb94dd2e7094762d087f02b765664d5b086f1425c3140a92bc698e0cc335636748836397c7ee35f0366544a83b52c66460979ec727534c0d853f98a1c24c61
 EBUILD rust-1.62.0.ebuild 22169 BLAKE2B 1312a6c142db66a6813ab74ae7dce0eae8d6c70b4addc8de7277f7164122a002dae94ea6e7ba8d4f4ce1de6e158081b4773382e1f426b6f6f65917093c43399e SHA512 c0fbd201cea468da83d63f6d8d72b38ad11d1428269ebf1913a487d096497ce38bdc781077549d4f48afa4f8ea18410b7a2f4d78640c76e2502936b8fce79bc1
-EBUILD rust-1.62.1.ebuild 22166 BLAKE2B c44cb0a0dcf216780474d9962ccd2033e2ab5dfe1fd747a2f196243b1739fdd1f641c923519987eff1876b2270dcd8031078d83ed73d29f620e6aae2a22e33c2 SHA512 50e6b22f46ad0546f70d6e96af8d9bf8ccb2f0e61b97c8c31ee40eff2df150dd93940d5b4ef97fba9b8d3ee00a6189b17d6abda966a3fc1fe1b99004a8e81f70
+EBUILD rust-1.62.1.ebuild 22165 BLAKE2B d333310b52cc84819180f0e3316988edcd17e307b12ae28501c2fa4d91ec0f1c149ba97760e1749fd62f388043feed5b615810f5b45478325884d0bcd54ef7d2 SHA512 7ab0f349756ac3002aba39f6128c1376732401f35a68ea68b98cbfb8056f30f4e8d5b0cf460e2ab9abbc05c17aa683267f11281da9a623ad81e06ab5733ac0ed
 MISC metadata.xml 1586 BLAKE2B 4d9530ee760d64480e32f899a1e343bee6e7be7e079ec3ce6e36403793f3fac7a2d45ad7415bce59750b0ec8f986708b80cce0aee80b4b7192a078a7053bc461 SHA512 e79110cc72691757b137dd904291f734f877786c72e5da9f4dadc6f3d6fd12e7d60b4ffd2fb1400ce408e82733f5b5a5d7230d0dbdfb5634a031cd17f24446c7
diff --git a/dev-lang/rust/rust-1.62.1.ebuild b/dev-lang/rust/rust-1.62.1.ebuild
index 0934a55db1aa..a9256a9f7183 100644
--- a/dev-lang/rust/rust-1.62.1.ebuild
+++ b/dev-lang/rust/rust-1.62.1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv sparc ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 70c30146c9d1..16729a7d5e9a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index b4036df7462d..6cada8fcbe4a 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -2,14 +2,9 @@ AUX apr-1.5.0-cross-types.patch 1969 BLAKE2B 1ded46da99aae4a225eef6c6c4e7ec8b27b
 AUX apr-1.5.0-libtool.patch 514 BLAKE2B b9d33d1317293c7614a3f0f753e466c7f8acf0792ee5776c68ec9abcacc74d6c55fbd50a3996b06655635ff10e110fa2a8277eb343251dbf6229f8212f481e41 SHA512 e8c2a7a2b5c8171a0d2c8920e053bd861e4fb2044428cb3f6ffc9ccea05694c20b879411f86b967c4269918b5740b1450ecb0e720d74ea0fe9ac305f58ee88d5
 AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba219ff489f67dd03b58fb07a05f9e67c54cdff330c65e579c41c992446a465104661bbacbb2525a5b9518eb SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf
 AUX apr-1.5.0-sysroot.patch 1309 BLAKE2B de3dc13a44a9d5071c249875322b7d6be9ed765176f8232b96a5e5088c5764dff8b810377b214999b59380522fdc9d0577217fe1acff5a7ab4b17461d6daf909 SHA512 48609c522225b47df96039174dafa043f77ce5b91f464b14250dd2b30590d6685c9baa03d4ca34937532c26afea8d208fb78158dfc8026a606ff90543b5c8d5d
-AUX apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch 567 BLAKE2B 7a41d3aeb1e69af2a90bc55ac5aeb1e8395c5b0f6ff569f65f88de15c29c1df794415526b1ef13ca2deedfe48f8801e93b2eca655086518d9cd7bc5159252d1a SHA512 d2c4e0fbd9d4b909669820c30642c34de51b87edfc746875c0743430a7cc2599b68a037a6146f9c0f49d8e78844617c392819367636e2b6175bd919fce5ec5a8
 AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
 AUX apr-1.7.0-autoconf-2.70.patch 1970 BLAKE2B b552e2bb1be932a692e2d1fad5124b5db9163e45b1bef1fe97082db28efd6f6079d75253e961ca257bd31f53f814bdb11a2c6554fd5d1925d26fe7b42664db42 SHA512 63a56be83f555a78f422f9ce7074e5c3a497a4996d32ead78d9e1a05fba2e0dbdfb135c34143676b8ad16e8276642843d5ed8b17a540be58c6bf7e9662896c2f
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
-DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
-DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r7.ebuild 4588 BLAKE2B 142e2a5f12b048898ecaaaf1dd49db3fc68e771f3b34efd04f4b60bb2a54f99c7fb2b6625ce6c2d2bcc5428e2a614eace274ce141496d0a1ee4cf7163b6dd6ae SHA512 9e45f291e168356a9c9f02a714e2ae3c98318d4eea91b0bbf9ec2eea7c81cfa235fad4e21a1ad0603f636e68c77cc10a9ad4e3c09c8ee9153030a587fd5a2a12
-EBUILD apr-1.6.5-r4.ebuild 4534 BLAKE2B 0a20eb3bdeb8b01e642ed75e7c3390f866cb38fe8dc264bd3aa32fca93ad72ed1e4aa1e006625bbc9e251caf2fdfb5e8b7df655f3c6e6336aacd8896f614c7fd SHA512 21b961189842eed4739c024977334b3b061e125d5b7bed61e7dd1ad7ce4c8a2e8026a4962203d9018a7af6f17ddc25660c9b7765aa0a8e12504eb2219eaade59
 EBUILD apr-1.7.0-r4.ebuild 4511 BLAKE2B 74ea0dd4227e2785e1a45eff3d1293d9fe937b57917107e736c0a1b056623eca5524e2bd3fe6c4f53c807e41394beca57513fed1318cf34c2b96abe8dede4c40 SHA512 dcf4320fe8c7ac38b3e89fe32a94fa9f4150d2269fc0e49822a9f488c9de485449f1ffa9e4d370b2f2c8ed1aecf46eea5313dfe779c1b08f55f4baa13bf0ac51
 MISC metadata.xml 436 BLAKE2B 10a7569fc43b8bfd36e5fbaddce107fff931d357da646581973c2e4c115eb2ceac3e9d337a1ee82673e5b17b9baea4cfbe4523770d864bb85b727adf093ec311 SHA512 16ba3177ac02121c30d5f4790aa136bf001e7ebc670e7da3243df344d1a78bef9fe3ee317fef6a43994818327945beb85759cd9ca911c07adda4738a14a0b794
diff --git a/dev-libs/apr/apr-1.6.3-r7.ebuild b/dev-libs/apr/apr-1.6.3-r7.ebuild
deleted file mode 100644
index ab54bd385307..000000000000
--- a/dev-libs/apr/apr-1.6.3-r7.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
-
-# See bug #815265 for libcrypt dependency
-CDEPEND="virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
-	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
-	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		--with-installbuilddir=/usr/share/${PN}/build
-	)
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-	if tc-is-cross-compiler; then
-		# The apache project relies heavily on AC_TRY_RUN and doesn't
-		# have any sane cross-compiling fallback logic.
-		export \
-			ac_cv_file__dev_zero="yes" \
-			ac_cv_func_sem_open="yes" \
-			ac_cv_negative_eai="yes" \
-			ac_cv_o_nonblock_inherited="no" \
-			ac_cv_struct_rlimit="yes" \
-			ap_cv_atomic_builtins="yes" \
-			apr_cv_accept4="yes" \
-			apr_cv_dup3="yes" \
-			apr_cv_epoll="yes" \
-			apr_cv_epoll_create1="yes" \
-			apr_cv_gai_addrconfig="yes" \
-			apr_cv_mutex_recursive="yes" \
-			apr_cv_mutex_robust_shared="yes" \
-			apr_cv_process_shared_works="yes" \
-			apr_cv_pthreads_lib="-pthread" \
-			apr_cv_sock_cloexec="yes" \
-			apr_cv_tcp_nodelay_with_cork="yes"
-	fi
-
-	if use urandom; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-	if [[ ${CHOST} == *-solaris2.10 ]]; then
-		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-		*atomic_cas_ptr*) ;;
-		*)
-			elog "You do not have Solaris Patch ID "$(
-				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-			)" (Problem 4954703) installed on your host ($(hostname)),"
-			elog "using generic atomic operations instead."
-			myconf+=( --disable-nonportable-atomics )
-			;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		emake tools/gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			tools/gen_test_char.c -o tools/gen_test_char || die
-	fi
-
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	# Parallel install breaks since apr-1.5.1
-	#make -j1 DESTDIR="${D}" install || die
-
-	if ! use static-libs; then
-		find "${ED%/}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	# Even in Prefix, we don't need this on AIX.
-	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
-}
diff --git a/dev-libs/apr/apr-1.6.5-r4.ebuild b/dev-libs/apr/apr-1.6.5-r4.ebuild
deleted file mode 100644
index 47fc612f3ec9..000000000000
--- a/dev-libs/apr/apr-1.6.5-r4.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
-
-# See bug #815265 for libcrypt dependency
-CDEPEND="virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
-	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
-	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-	)
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-	if tc-is-cross-compiler; then
-		# The apache project relies heavily on AC_TRY_RUN and doesn't
-		# have any sane cross-compiling fallback logic.
-		export \
-			ac_cv_file__dev_zero="yes" \
-			ac_cv_func_sem_open="yes" \
-			ac_cv_negative_eai="yes" \
-			ac_cv_o_nonblock_inherited="no" \
-			ac_cv_struct_rlimit="yes" \
-			ap_cv_atomic_builtins="yes" \
-			apr_cv_accept4="yes" \
-			apr_cv_dup3="yes" \
-			apr_cv_epoll="yes" \
-			apr_cv_epoll_create1="yes" \
-			apr_cv_gai_addrconfig="yes" \
-			apr_cv_mutex_recursive="yes" \
-			apr_cv_mutex_robust_shared="yes" \
-			apr_cv_process_shared_works="yes" \
-			apr_cv_pthreads_lib="-pthread" \
-			apr_cv_sock_cloexec="yes" \
-			apr_cv_tcp_nodelay_with_cork="yes"
-	fi
-
-	if use urandom; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-	if [[ ${CHOST} == *-solaris2.10 ]]; then
-		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-		*atomic_cas_ptr*) ;;
-		*)
-			elog "You do not have Solaris Patch ID "$(
-				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-			)" (Problem 4954703) installed on your host ($(hostname)),"
-			elog "using generic atomic operations instead."
-			myconf+=( --disable-nonportable-atomics )
-			;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		emake tools/gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			tools/gen_test_char.c -o tools/gen_test_char || die
-	fi
-
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	# Parallel install breaks since apr-1.5.1
-	#make -j1 DESTDIR="${D}" install || die
-
-	if ! use static-libs; then
-		find "${ED%/}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	# Even in Prefix, we don't need this on AIX.
-	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
-}
diff --git a/dev-libs/apr/files/apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch b/dev-libs/apr/files/apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
deleted file mode 100644
index d6e1f54fc074..000000000000
--- a/dev-libs/apr/files/apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bz.apache.org/bugzilla/show_bug.cgi?id=62056
-
---- apr-1.6.3.orig/test/teststr.c
-+++ apr-1.6.3.orig/test/teststr.c
-@@ -307,10 +307,15 @@ 
-     for (; off < 999999999; off += 999) {
-         apr_strfsize(off, buf);
-     }
--    for (off = 1; off < LONG_MAX && off > 0; off *= 2) {
-+
-+    off = 1;
-+    while (1) {
-         apr_strfsize(off, buf);
-         apr_strfsize(off + 1, buf);
-         apr_strfsize(off - 1, buf);
-+        if (off > LONG_MAX / 2)
-+            break;
-+        off *= 2;
-     }
- 
-     ABTS_ASSERT(tc, "strfsize overflowed", buf[5] == '$');
diff --git a/dev-libs/bcm2835/Manifest b/dev-libs/bcm2835/Manifest
index 83fc578567e2..b89da7f9ecaf 100644
--- a/dev-libs/bcm2835/Manifest
+++ b/dev-libs/bcm2835/Manifest
@@ -1,5 +1,3 @@
-DIST bcm2835-1.57.tar.gz 262233 BLAKE2B 618a6089f773b874905ba8341eb42b6751355dc8607c51957b6020a0d484734ef5ea4e49a6086ba25cc820c57cb077f292654fdc4eeb1b293746f9cbb83ca462 SHA512 0af59c22869511465a9fdcc384d7456f04bec06a1480e0575b7756628f0ecc72648974a9ace7a46df257b0fd45a117c89c430c3e97d214081d038cbaef398821
 DIST bcm2835-1.68.tar.gz 272796 BLAKE2B d848e901b1b3a51712009e3fbf00c43f870fd6c28812be710276620f80c4173e92529891e53ec02e2076069a5da8ba7190f8dcc620ce4a843773cb85622dd830 SHA512 bdc91af8f28755899611d41cf954c9b2ca107befe984b79ee6fe23b66bbb7f50e746e084c3e431b1b0cdf1b0735cec8a54018ebf12b713380e5db97e3564f477
-EBUILD bcm2835-1.57.ebuild 579 BLAKE2B c3c00db822c408dedadf639f05e12bb49b1a935083678f84c4f16a71e42ac9184d934f0c9c38b22078cff55055ac5b1d3b2ab2f77d1e8ee50a0761efa317d772 SHA512 8cd5eb782fd264cf3c2354e7212f1e55196b531c606cf58affb99160de5aeb03b732179d322f5b70f6b24bb702d5bed78f47cf0e0468ac164431235062b3d987
-EBUILD bcm2835-1.68.ebuild 646 BLAKE2B 5b0abd1092a7263cfe9a4d162bb5da182cc6575ac7218b15f47b176115bec876cc80b4c54c679f9c389acb9563e4a972c83c54f46587674d03b29c3be61162ef SHA512 f11a85289aba36e1a4c7098821e27f8f198d02c12b18116ab544311e1acb016b0d1c7d3a03d8df9ac220fd569b538d03fe2854f7e707e2856716d655d6a61786
+EBUILD bcm2835-1.68-r1.ebuild 634 BLAKE2B 9ce2628e471e3124056341d63def76bd1ebf7c742629e2a942f95df64291556f0b6313b6aead59f7272bd3ca3ad5e9096d6d506318840f7e8b59fc798f8967e5 SHA512 a5b1a5b093b99ea440641407b86d784874ad86adf66bcf30134c25430c4626e220c35311ba9be00a527b9d40bfc08e564f189f0f740f9919f890c501dfa84614
 MISC metadata.xml 267 BLAKE2B 15dbae618f9047d37b671714f3615b968ff63cd013ec0dfe03fefd1b172d68c19f27276151efe8e005b7e59c4eaa017ec6693f2f03ec005894d8c67b1c8e47c2 SHA512 391ca69b1498920f9678a1e8cafbe14090bfdf6666fac4b508f11990f656de77717ce124cf435c2025474cc2034a22bc7df47257b5dec44c55d7bd99108fcf55
diff --git a/dev-libs/bcm2835/bcm2835-1.57.ebuild b/dev-libs/bcm2835/bcm2835-1.57.ebuild
deleted file mode 100644
index e81b5e6bba57..000000000000
--- a/dev-libs/bcm2835/bcm2835-1.57.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Provides access to GPIO and other IO functions on the Broadcom BCM2835"
-HOMEPAGE="http://www.airspayce.com/mikem/bcm2835/"
-SRC_URI="http://www.airspayce.com/mikem/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="doc examples"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	default
-}
diff --git a/dev-libs/bcm2835/bcm2835-1.68.ebuild b/dev-libs/bcm2835/bcm2835-1.68-r1.ebuild
index 454774b9bb63..6974a3fc9586 100644
--- a/dev-libs/bcm2835/bcm2835-1.68.ebuild
+++ b/dev-libs/bcm2835/bcm2835-1.68-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -14,8 +14,11 @@ SLOT="0"
 KEYWORDS="~arm"
 IUSE="doc examples"
 
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
 
 src_install() {
 	use doc && HTML_DOCS=( doc/html/. )
@@ -25,7 +28,3 @@ src_install() {
 	fi
 	default
 }
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index 66b3428d35f4..4f33114d774f 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -5,5 +5,5 @@ AUX libtar-1.2.20-bin-memleaks.patch 2571 BLAKE2B 72217c256a8f504e1647ecd8157bc9
 AUX libtar-1.2.20-fd-leaks.patch 2021 BLAKE2B 73e9ca5475e86fc6c5cddee5f608b0a1e349e987c17c0a1d1d9406ba2b3efd414a138402f2d78f925a736dc1a0bbe1511e2047fec5c6c25891f0874f233f53fe SHA512 93312a12b14f47d80a81368438afb4af9883d95691f4c33a2443c595808943087e31a00b44038028106ed99a23343efa41cd7ba432a8c8be00c5ea0d51817a26
 AUX libtar-1.2.20-tar_open-memleak.patch 630 BLAKE2B 31616574597017dc5444d0b79aa6084c55f3eedf5c23099663da2905bdf8be8d499c9a81228b268840524e286e06b18c3221a60c95f2e3effbb09beb8c0712f9 SHA512 a37df7b6e1e98298f622c1cbef348861c187409abf6614eafac21d802aaa1418081281db3e03fda0ba9fc5a690f4fb00b61fbe277c4c34c82443d4fe4548e317
 DIST libtar-1.2.20.tar.gz 63542 BLAKE2B 57565fd703aec159a0b30280c026ce82d4a74fc658a24e589c2d9fcf11ff0e8c79de172df8b4cfeefa776eb27bb4b1a65951739ec37de4300da47d508a8d4227 SHA512 360a0296af99bedd6d93236c3d6d6746fd38deaa5287e7a138d303e1072bc8871437a693dc926d82af5b54dedba2ebdff5a3edb1f7d7dc494b4235439e477dec
-EBUILD libtar-1.2.20-r4.ebuild 1491 BLAKE2B e942b27bd51f1722686f5e07fa0417b23db897eb834e708a4e2beb08d14f61191a7ce5ea9f12d92eaebe3008caf84863b9e1a3e43e6dff1f47cc15b8dd061d37 SHA512 76e36be232c36672b6d3f9a86882df1abe774fbf5556f4a364e90bd53745f1d5054cb0570ff72c0320670a8b7e3c2fb21bc2e495791fea4b855f47a69092ba44
+EBUILD libtar-1.2.20-r5.ebuild 1391 BLAKE2B f841d185d89602a73bc4c91b8846c78bcf811f25c3cd35534bb9ad0ab974a51738bd8db1ee56cd4fa4716fc00826d7f3f942290bee4ea04f3e8604344a344b83 SHA512 d649a27ed9b78d82b57711c4363359528fe2c7dea170d625836d2f618e274cf4298c881ef494e0592fcc69ff96d39c21ae76af4f435d85ebaad13d5fc22319c5
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/libtar/libtar-1.2.20-r4.ebuild b/dev-libs/libtar/libtar-1.2.20-r5.ebuild
index 087a633aa6f4..c9c26bbb3adb 100644
--- a/dev-libs/libtar/libtar-1.2.20-r4.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r5.ebuild
@@ -1,34 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="C library for manipulating tar archives"
 HOMEPAGE="https://repo.or.cz/w/libtar.git/"
 SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static-libs zlib"
+IUSE="zlib"
+# There is no test and 'check' target errors out due to mixing of automake &
+# non-automake makefiles.
+# https://bugs.gentoo.org/526436
+RESTRICT="test"
 
 RDEPEND="
 	zlib? ( sys-libs/zlib:= )
-	!zlib? ( app-arch/gzip )
-"
+	!zlib? ( app-arch/gzip )"
 DEPEND="${RDEPEND}"
 
-DOCS=( ChangeLog{,-1.0.x} README TODO )
-
-S="${WORKDIR}/${PN}"
-
-# There is no test and 'check' target errors out due to mixing of automake &
-# non-automake makefiles.
-# https://bugs.gentoo.org/show_bug.cgi?id=526436
-RESTRICT="test"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.11-free.patch
 	"${FILESDIR}"/${PN}-1.2.11-impl-dec.patch
@@ -49,22 +44,20 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--enable-shared
 		--disable-encap
 		--disable-epkg-install
-		$(use_enable static-libs static)
 		$(use_with zlib)
 	)
 
-	econf ${myeconfargs[@]}
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-
+	dodoc ChangeLog-1.0.x
 	newdoc compat/README README.compat
 	newdoc compat/TODO TODO.compat
 	newdoc listhash/TODO TODO.listhash
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 5ee2684b8216..34820aede20c 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -1,6 +1,6 @@
-AUX libx86-0.99-ifmask.patch 584 BLAKE2B 33c0ebeb0ca32b892cebf4bdd91bb2f82fefa3caa3c7c30c31e806aaeb96b36215f41d9389242ba45c2e8c69b4eedd1742092be77b113a7a0311e826cd863206 SHA512 781ea16e535ca1c0a54552b51d67b0901102f20ab63ff5ff39f9f2bb513abb53867eb5e52089e72afa6c313380b2033881f17cfe233b09a38ed5a9e95ad8d5f8
-AUX libx86-1.1-makefile.patch 853 BLAKE2B 48a25cd96bacd2e39bc8ecb4fd7988ab3775441f259bfe56fedf0f39f8cb894f3f4bcd64a03a6a5357ed064f9dc0e0b578cccbd760cd2056c564f2502f065d6c SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6
-AUX libx86-1.1-x86emu.patch 1194 BLAKE2B e4f721ca09e081fb9f528ec95ea491a8267a9be8a169a12ebfd05d18425d473b89fe3e6d121ece254b6764a66a4adaeee9d811e619c6db1ce0c62178185d1ac5 SHA512 476d0bc7d3e903c1b1dff75577ea0caa80a5dd06618a08b24300367031ccb578322fcc267746285bcb671583407f22bfb7165374eeb2301ed67177ee18ec549e
+AUX libx86-0.99-ifmask.patch 511 BLAKE2B 3045d7a7bf7120e3fb3f560a33723a924eed9f6fad66fd8881540d6c5f2b3234f7440338c857244af4316594a0619e6749e0895e09a849f20c188e1b7e71a099 SHA512 f716f9f24deeb3e3361c55055d15b179a0bc03983619f5eddea3a12e5c0b0a0dcb545a8f8671d8998405410f59220e1dbb1160ae00d75579da4f4182c769986b
+AUX libx86-1.1-makefile.patch 780 BLAKE2B 76700465271145a274232c7c8108a29bf0f1084209444017a0cab101cf6b8b9132c84505338d4ddd1acd252dc44464d551b1843d85bf537e1d46d459a090870d SHA512 2f3a9af34fd85af463a493f49b10cc1d943685601ef09088448a64d3a0d6fa1073b45ff4694ff6cf1f6f9664d299b8592000de120aed94bd53557b7e316e1645
+AUX libx86-1.1-x86emu.patch 871 BLAKE2B dbe290cb89f5dd6607c8aa0c39fa41a3f6f3abef058f7c2f18c6221ba5d3af15f68e3123ca1ea141fe89733599fc519fd1710cb335e6b0778ff27201da631eb7 SHA512 80a68aba6d4dec84ee5a39eec97916ac7e13fb5f4ab1c65bf93f8292ec94bbd33d226b8cab56cbf258ce3cce72346c843c8c8c9937a39cd2d69d03e466e7f793
 DIST libx86-1.1.tar.gz 87428 BLAKE2B cee90a446994816ce925a5b9edb3de5256f404bcadd9853ad197f13bdf4c86bf4c2def6d38e342ed9af5eba9e87400bfb76cad56852d44583b183853b65dcfff SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280
-EBUILD libx86-1.1-r4.ebuild 1242 BLAKE2B f982484fc4e2b7f8d4c8c92171ba039ed808eb503ccd205b366a6a29a4d8f0d0de6048921be7538055948c1fb379b0bbe1241d7dccff07a98e29f2a096ca450c SHA512 1a39f419d07d2bf5200ae07e5a4aa0669a96d728be24f2d2a5e6a1c1d5b9eb371d02c890c1a7c35b6742dc09de254a07424ff68aa279bc9dc7dced4b5b654cfb
+EBUILD libx86-1.1-r5.ebuild 958 BLAKE2B 9bc1b3ec2dfb6743af01386b1c6676b7b75e2d95787a12d1d505824859979452eac5b90049c6262e37009fc2c4c0073e3887da8b8000493748e0aeb75da3bfec SHA512 aac69bf341e4b01cf959ccb2f61feaf1f75a730cb28337c0b939447dc52f38ffad39255d86e0acfc37b5b71754d829916473ffdb4b2069b7366c1c26a56ee41f
 MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/dev-libs/libx86/files/libx86-0.99-ifmask.patch b/dev-libs/libx86/files/libx86-0.99-ifmask.patch
index c99eeb819f72..2a6aaa6fbe47 100644
--- a/dev-libs/libx86/files/libx86-0.99-ifmask.patch
+++ b/dev-libs/libx86/files/libx86-0.99-ifmask.patch
@@ -1,5 +1,5 @@
---- lrmi.c.orig	2008-09-06 12:24:36.070136428 +0200
-+++ lrmi.c	2008-09-06 12:28:10.584287458 +0200
+--- a/lrmi.c
++++ b/lrmi.c
 @@ -55,6 +55,18 @@ OTHER DEALINGS IN THE SOFTWARE.
  #include "x86-common.h"
  
diff --git a/dev-libs/libx86/files/libx86-1.1-makefile.patch b/dev-libs/libx86/files/libx86-1.1-makefile.patch
index 471c3fbc78fd..4cea20c81a08 100644
--- a/dev-libs/libx86/files/libx86-1.1-makefile.patch
+++ b/dev-libs/libx86/files/libx86-1.1-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-02-11 16:35:56.834368910 +0400
-+++ Makefile	2013-02-11 16:36:02.587369368 +0400
+--- a/Makefile
++++ b/Makefile
 @@ -22,7 +22,7 @@
  	$(AR) cru libx86.a $(OBJECTS)
  
diff --git a/dev-libs/libx86/files/libx86-1.1-x86emu.patch b/dev-libs/libx86/files/libx86-1.1-x86emu.patch
index 7b4fe428e1b3..685c7a9ff6de 100644
--- a/dev-libs/libx86/files/libx86-1.1-x86emu.patch
+++ b/dev-libs/libx86/files/libx86-1.1-x86emu.patch
@@ -1,6 +1,5 @@
-diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
---- a/libx86-1.1/Makefile	2008-05-19 12:28:59.000000000 +0300
-+++ b/libx86-1.1/Makefile	2012-02-20 01:32:03.750068423 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -5,6 +5,7 @@
  ifeq ($(BACKEND),x86emu)
  	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
@@ -9,9 +8,8 @@ diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
  else
  	OBJECTS += lrmi.o
  endif
-diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c
---- a/libx86-1.1+ds1.orig/thunk.c	2008-04-03 03:48:00.000000000 +0300
-+++ b/libx86-1.1/thunk.c	2012-02-20 01:12:56.468820192 +0200
+--- a/thunk.c
++++ b/thunk.c
 @@ -32,6 +32,7 @@
  #define TRUE 1
  #define FALSE 0
diff --git a/dev-libs/libx86/libx86-1.1-r4.ebuild b/dev-libs/libx86/libx86-1.1-r4.ebuild
deleted file mode 100644
index 350a47c4a088..000000000000
--- a/dev-libs/libx86/libx86-1.1-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
-HOMEPAGE="https://www.codon.org.uk/~mjg59/libx86/"
-SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm -ppc -riscv -sparc x86"
-IUSE="static-libs"
-
-src_prepare() {
-	# fix compile failure with linux-headers-2.6.26, bug 235599
-	eapply -p0 "${FILESDIR}/${PN}-0.99-ifmask.patch"
-	# Patch for bugs #236888 and #456648
-	eapply -p0 "${FILESDIR}/${P}-makefile.patch"
-	# Wider arch compatibility, bug #579682
-	eapply -p2 "${FILESDIR}/${P}-x86emu.patch"
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC AR
-	append-flags -fno-delete-null-pointer-checks #523276
-}
-
-src_compile() {
-	local ARGS
-	use x86 || ARGS="BACKEND=x86emu"
-	emake ${ARGS} LIBRARY=shared shared
-	if use static-libs; then
-		emake ${ARGS} objclean
-		emake ${ARGS} LIBRARY=static static
-	fi
-}
-
-src_install() {
-	local install_static;
-	use static-libs && install_static='install-static'
-	emake \
-		LIBDIR="/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install-header install-shared ${install_static}
-}
diff --git a/dev-libs/libx86/libx86-1.1-r5.ebuild b/dev-libs/libx86/libx86-1.1-r5.ebuild
new file mode 100644
index 000000000000..ac4aa8723d12
--- /dev/null
+++ b/dev-libs/libx86/libx86-1.1-r5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
+HOMEPAGE="https://www.codon.org.uk/~mjg59/libx86/"
+SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm -ppc -riscv -sparc x86"
+
+PATCHES=(
+	# fix compile failure with linux-headers-2.6.26, bug 235599
+	"${FILESDIR}"/${PN}-0.99-ifmask.patch
+	# Patch for bugs #236888 and #456648
+	"${FILESDIR}"/${P}-makefile.patch
+	# Wider arch compatibility, bug #579682
+	"${FILESDIR}"/${P}-x86emu.patch
+)
+
+src_configure() {
+	tc-export AR CC
+	append-cflags -fno-delete-null-pointer-checks #523276
+}
+
+src_compile() {
+	emake $(usev !x86 BACKEND=x86emu) LIBRARY=shared shared
+}
+
+src_install() {
+	emake \
+		LIBDIR=/usr/$(get_libdir) \
+		DESTDIR="${ED}" \
+		install-header install-shared
+}
diff --git a/dev-libs/libxdiff/Manifest b/dev-libs/libxdiff/Manifest
index 05b286b24c43..2f6ab3837354 100644
--- a/dev-libs/libxdiff/Manifest
+++ b/dev-libs/libxdiff/Manifest
@@ -1,3 +1,4 @@
+AUX libxdiff-0.23-tests.patch 148 BLAKE2B 7379675f2a1e65870726e80d99a29c41daad3bda675913cff8e39157b0021924deaf3b88a0635924da4d0a467f5fe501ca4e8aeab1a75be48c61aca8cfaa0015 SHA512 538570e166592cd0f7551671cfd82dcbc167eb3d3462e88f6cc800c8bdb9c741361ce137717b25b4dea7fd563c16c1b085ff73e1cf75617ed226f77937f0b11f
 DIST libxdiff-0.23.tar.gz 412088 BLAKE2B 4b06dd7bc079491cb2257bdba82b41a038d232fc9811e3684760d9470055e9a2835f5ac651aca64c2a5ac242641a3bb91b5d62a1844c216f58337179bd88a657 SHA512 b6bae5ee9d21e615d7beeacd9ceefd01eff1830734b1c28a4751a6b0182727afa957e072f7c7dc492d9448e502d1ae52deaaceb0dfce4b32a3c089cbdc3c7e18
-EBUILD libxdiff-0.23-r2.ebuild 556 BLAKE2B 802fa7aa5cfb2f5dc50b7fddcf1d417e6c07f5c8c32a576b83cfb4ccede873112c1a6cdc8994faf8b881a9c0ab79c57d50f7c584e8e43360aa98acca032fb62a SHA512 1aac0c86917761f05e190b86c7d1095683a875da5375d07ab09cdea70e197fddd6c92275310d989fb5c9c946214f48c981c9ccf9d54d212228b4b97232884ab0
+EBUILD libxdiff-0.23-r3.ebuild 485 BLAKE2B 8ff193ad4ba3ea656a3f9a17d2bcbb3a53234efcc2a129856fee806bfb69cc3cc47a1321d4d8e94fcd34d14f37ab414cd2bd9fd8ee206bb3d0359742fb46b7a0 SHA512 42f984989b84c4d8aa3f01c9b1eb00874127f2cefac2645309860325b5f4638188dc8a9e49611f9e670c06636075b7cc84609188a6947df69d9c7fe03c1ea222
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/libxdiff/files/libxdiff-0.23-tests.patch b/dev-libs/libxdiff/files/libxdiff-0.23-tests.patch
new file mode 100644
index 000000000000..72d2e167427a
--- /dev/null
+++ b/dev-libs/libxdiff/files/libxdiff-0.23-tests.patch
@@ -0,0 +1,9 @@
+Tests are hopelessly broken
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,3 @@
+ 
+-SUBDIRS = . xdiff test tools man
++SUBDIRS = . xdiff tools man
+ 
diff --git a/dev-libs/libxdiff/libxdiff-0.23-r2.ebuild b/dev-libs/libxdiff/libxdiff-0.23-r3.ebuild
index 608ade4db081..18a0d8bbac4e 100644
--- a/dev-libs/libxdiff/libxdiff-0.23-r2.ebuild
+++ b/dev-libs/libxdiff/libxdiff-0.23-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -12,20 +12,15 @@ SRC_URI="http://www.xmailserver.org/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
 
 src_prepare() {
 	default
-	# test utils require static libs ...
-	sed 's/test//g' -i Makefile.am
 	eautoreconf
 }
 
-src_configure() {
-	econf --disable-static
-}
-
 src_install() {
 	default
-	rm "${D}/usr/$(get_libdir)"/*.la
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index 8c618f5009bf..cce9d8fc53e6 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -1,6 +1,3 @@
-AUX log4cplus-1.2.0-fix-c++14.patch 897 BLAKE2B c4067272e84b2e442ef61c5468734ee985a9931171e7651242e79029dd6c5c6a9aae03fb9aa9a3ec9c1d391763c7acc7d57c794904636a261b2ebefda4986fe4 SHA512 9771a43add0af52417d67f54c991d637928d5f8340e90a786f2e9714cbc206e4ce6e7cc55face0f2ed0ed2c34e0a52bd922fa11978b85ffa48f02235df7c2de9
-DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626
 DIST log4cplus-2.0.7.tar.bz2 1210637 BLAKE2B 59e9c3c351c7893c7e9c39e9d12616579cff3b4dfdd3e069f0adb4b75fb2b46d6fe8efceea2b6103c5531a723f015518bf10ce6a581724b6ae5f49e994b74c72 SHA512 9d1b36d0c2347dd9d9ab8852114b8138f56063c51625eaab7f4c680ee852e1e6872c6712465b10057ec9e42305b83d956f6753100dfd3ec58518d6620cc4106c
-EBUILD log4cplus-1.2.0.ebuild 1608 BLAKE2B 9a57f60b53167c615a168a58eb9d6c600c22de0b6494256ee433c360cfb9fcff284fd531ea6c728f56b72ce508c0ac400d01fac0eff27273aaf674a78d908945 SHA512 0a2827afef22fbf973f3dc67edf8c9491e29b754770896c819d1e0ef468b933036e0751a0f7c610a4962c74993c34676d83d89ebf8596e4311cb56ed634ffe32
 EBUILD log4cplus-2.0.7.ebuild 999 BLAKE2B 485e5b26b1b5cc036b169af385ef4d9b238d2fa90c9609b3e7b90fdcb4806c7343477404bd8a3e35c2fb79ac17c4122f93354bfc95aeb5f92c6a2c57998eeb73 SHA512 a58a8dfd2300a3d2f6da90deeb5bd1b7baae33d34b0858efd413eb8364c29e24b65b7f16c44738dae09be692ca2ed47bcbffef9fe398686c4be885fd676616f7
-MISC metadata.xml 1019 BLAKE2B 4656573d247296e8ef15672860d7131eb38e2ec19b6a020d545a0df5b2cef3bb2ab23098dadb747960914a0b1afe0e95b3c9598001b4f23f43e531d0ea04c765 SHA512 e0568fab0d1b3d20bf05c3cb1feb65f3e6737de39e5df251ab9fff20b4142e67b143c99749e374edfd6c6c23326e90a4d294551efd2be60b2c849bac40bd6593
+MISC metadata.xml 716 BLAKE2B dcb81a8ab633126286970909239487cfe302b1f1a0132fee4bc3c9b453f9fe82fef578f8a3a5b6c5ccd8a91ca7be33b8991b297d9b4b0235ef6c36c786702449 SHA512 37b620663b8bfdf5c1e2ee9d8d351bd4c91cf48500363030d6c3096a567610abc76646ee3145a8e49405c13c91a83194e473dcc4cde079f30a940002abb7e832
diff --git a/dev-libs/log4cplus/files/log4cplus-1.2.0-fix-c++14.patch b/dev-libs/log4cplus/files/log4cplus-1.2.0-fix-c++14.patch
deleted file mode 100644
index ccd6e1aadd2e..000000000000
--- a/dev-libs/log4cplus/files/log4cplus-1.2.0-fix-c++14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Make dtors noexcept(false) when compiling in C++11 and above. This avoids
-silent breakage due to the semantic changes between C++98 and C++11.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595424
-
---- a/include/log4cplus/hierarchylocker.h
-+++ b/include/log4cplus/hierarchylocker.h
-@@ -48,7 +48,11 @@
-     public:
-       // ctor & dtor
-         HierarchyLocker(Hierarchy& h);
--        ~HierarchyLocker();
-+        ~HierarchyLocker()
-+#if __cplusplus >= 201103L
-+        noexcept(false)
-+#endif
-+        ;
-         
-         /**
-          * Calls the <code>resetConfiguration()</code> method on the locked Hierarchy.
---- a/src/hierarchylocker.cxx
-+++ b/src/hierarchylocker.cxx
-@@ -62,6 +62,9 @@
-  
- 
- HierarchyLocker::~HierarchyLocker()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
- {
-     try {
-         for(LoggerList::iterator it=loggerList.begin(); it!=loggerList.end(); ++it) {
diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
deleted file mode 100644
index d0049f0f238c..000000000000
--- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
-HOMEPAGE="https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-SLOT="0/1.2-5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="iconv qt5 threads working-locale working-c-locale"
-REQUIRED_USE="?? ( iconv working-locale working-c-locale )"
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-fix-c++14.patch" )
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with iconv) \
-		$(use_with qt5) \
-		$(use_enable threads) \
-		$(use_with working-locale) \
-		$(use_with working-c-locale)
-}
-
-src_test() {
-	cd tests/ || die
-
-	local t
-	for t in appender customloglevel fileappender filter \
-	 hierarchy loglog ndc ostream patternlayout performance priority \
-	 propertyconfig timeformat; do
-		einfo "Running test \"${t}_test\""
-		pushd "${t}_test/" >/dev/null || die
-		"${S}"/${t}_test || die "Running ${t}_test failed!"
-		popd >/dev/null || die
-	done
-
-	if use threads; then
-		for t in configandwatch thread; do
-			einfo "Running test \"${t}_test\""
-			pushd "${t}_test/" >/dev/null || die
-			"${S}"/${t}_test || die "Running ${t}_test failed!"
-			popd >/dev/null || die
-		done
-	fi
-}
-
-src_install() {
-	default
-	dodoc docs/unicode.txt
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/log4cplus/metadata.xml b/dev-libs/log4cplus/metadata.xml
index 29dbbbef8a20..a7db4616f45a 100644
--- a/dev-libs/log4cplus/metadata.xml
+++ b/dev-libs/log4cplus/metadata.xml
@@ -6,8 +6,6 @@
 		<flag name="explicit-initialization">Require explicit initialization</flag>
 		<flag name="iconv">Use inconv for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
 		<flag name="server">Build the logging server</flag>
-		<flag name="working-locale">Use C++'s std::locale for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
-		<flag name="working-c-locale">Use the C99 locale facilities for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation </flag>
 	</use>
 	<slots>
 		<subslots>soname major version number</subslots>
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index b450437ca6c6..c4fa00b9f406 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -1,6 +1,6 @@
 AUX 1.0-asneeded.patch 4260 BLAKE2B 1ca62ef0541f632474d8be23cf23caacc8fe153c70dd58c51af173a8e4b8c0a7a743b425ade6bcab422974e0f41f11308569d94316d44587328079f0fef15299 SHA512 36031e48cdbc6a94b18a399fab3257b433ef5ea873b3fbe57e373f87f491945aba5c99cce901fa4203cba04aa5f420872a957dc066f53afe5315a41c233b450d
 AUX 1.0-doc_install_path.patch 1010 BLAKE2B 1f8f1b488e2ee87ad29738d175e2a2cb205c174553bdd5f7f6d6095fb371e8a255e2fefe023ada1fbcbdd8fd60953c5d944bf74566975fa0b0a1cc6fff1a2d1c SHA512 1f72992eaef44bfb214132736590514b57bb4321d3fc28412b19e5f9f6a7a67fc63a00e91af9cd85f6b921de36b835ce238b40590850f1a7f19011dab595b73d
-AUX 1.0-gcc43.patch 1166 BLAKE2B 2669ceaed022d24e5090a6b96e856ab9612c5818b216949c78732d887e0749818da1d94ae7f9e85d53ec2631e73b3baff2c2cab98ef926d38e0fa6bb0b2c083d SHA512 61ffeddb968a4cc138db1ec854460ad86d864cabc48e4801da8e6e886783d34b112115441090039307d2f7305caee1c0275ad988176adf339170f981fba41262
+AUX 1.0-gcc43.patch 1061 BLAKE2B f139f522885af9f7376220af297028fd55d97d58bb3fef7c4af6fa378f1497f26a61b838498814aba8db8641a2b85d117513770d1c6a820b71d257bcc1e7dafe SHA512 66b2fb720460aec8519ed804a77ea78cd92fdbd5b3b2c41b971b934776730097b25f5e67be075c2769298a00f411268f46ed09b10566d03b0761516474abcf0a
 AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5
 AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf
diff --git a/dev-libs/log4cpp/files/1.0-gcc43.patch b/dev-libs/log4cpp/files/1.0-gcc43.patch
index a60f986e9c0d..53441d4a6ac7 100644
--- a/dev-libs/log4cpp/files/1.0-gcc43.patch
+++ b/dev-libs/log4cpp/files/1.0-gcc43.patch
@@ -1,8 +1,6 @@
-Index: log4cpp-1.0/src/BasicLayout.cpp
-===================================================================
---- log4cpp-1.0.orig/src/BasicLayout.cpp	2008-03-14 16:06:57.000000000 -0400
-+++ log4cpp-1.0/src/BasicLayout.cpp	2008-03-14 16:07:11.000000000 -0400
-@@ -15,6 +15,8 @@
+--- a/src/BasicLayout.cpp
++++ b/src/BasicLayout.cpp
+@@ -17,6 +17,8 @@
  #include <sstream>
  #endif
  
@@ -11,11 +9,9 @@ Index: log4cpp-1.0/src/BasicLayout.cpp
  namespace log4cpp {
  
      BasicLayout::BasicLayout() {
-Index: log4cpp-1.0/src/PatternLayout.cpp
-===================================================================
---- log4cpp-1.0.orig/src/PatternLayout.cpp	2008-03-14 16:07:33.000000000 -0400
-+++ log4cpp-1.0/src/PatternLayout.cpp	2008-03-14 16:07:49.000000000 -0400
-@@ -370,7 +370,7 @@
+--- a/src/PatternLayout.cpp
++++ b/src/PatternLayout.cpp
+@@ -373,7 +373,7 @@
                          literal = "";
                      }
                      if ((minWidth != 0) || (maxWidth != 0)) {
@@ -24,3 +20,14 @@ Index: log4cpp-1.0/src/PatternLayout.cpp
                          minWidth = maxWidth = 0;
                      }
                      _components.push_back(component);
+--- a/tests/testDailyRollingFileAppender.cpp
++++ b/tests/testDailyRollingFileAppender.cpp
+@@ -40,7 +40,7 @@
+ #else 
+ #define PATHDELIMITER "\\"
+ #endif
+-const char* const nesteddirname = "nesteddir"PATHDELIMITER;
++const char* const nesteddirname = "nesteddir" PATHDELIMITER;
+ 
+ 
+ class DailyRollingTest {
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index a6789caa263d..7099168e58ae 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,6 +1,9 @@
 DIST nettle-3.7.3.tar.gz 2383985 BLAKE2B 8d8efbbff98fc1f3eff3296681d3d72346e78392f356aebfe80138ae6ae1ebf3695bd7f74b906beef0cf3625ba6d84bdb43c0f6707f54f4d98870d50c90ac9a3 SHA512 9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437
+DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e46285682020c90e03ecaea386ac9b48eaf91ee76ae3b86b6060be355de20c320ab3b74958074ad23fc08ad9ab6a4cbb SHA512 a405da3438d185d96917b03b00abb9ab43e04f58f770f657f716c25d64bb258ee170a71328e74736caa7121f50c0c89d3cc840c1201d2a92cfaf1357d24bdc6a
+DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09
 DIST nettle-3.8.tar.gz 2404258 BLAKE2B 4e74104d04ccce2d0a531b703e4d4c2e8da24d5b7ac4d769d1bc5011fb5fbe8a016a6de84e0af9804c8b259b163fb77729181d64b81b3af4e8a0c2037e52087c SHA512 af3a910bd661ed9691b1bd66b0f8147aaebdc92ae6ab47640675df263409ecb8d25f0403fcc7dc6471264b9df0a47c025244404f0691ef58c133762f64b67610
 DIST nettle-3.8.tar.gz.sig 374 BLAKE2B 8fd841116bf99a1d7535359ee56972ddda33c9551c1327bf30ec1a6842104d3429a8fdab7a044c0d32c7689f28abdf75f46b9bec3daf78f58167c3e0a5b91da9 SHA512 cbcfb6088a88cbbc573fe477f73db750f3379a4778e4ddf1158768c5d09b12ea0ff65f4f6552f3cb3d18c851199870827f76836bcc8df61ffc35ef67bf98f3b3
 EBUILD nettle-3.7.3.ebuild 1843 BLAKE2B 8cfebc0a207c45179d76614e20099f47f45bee0c9578d8516c14127ad24b47f73985277540638a1cb1fa447c85587928ca0cf142146eef67d611b925ffdbed52 SHA512 ea1906c52d027e64c37a173761542d5cf65d4eed6c1c9126627235d6138203536f4e68188043f96f7ba9303c05e42e1aa8514d8db2a026784e2b6584d6861e46
+EBUILD nettle-3.8.1.ebuild 2610 BLAKE2B dc6b89bb7e4a1a05c59ea43b754f36ac2e548eb4cf0e84ff50a5ecda3e033d646d1db21b1f8721ae75e16a3e34cc70392bed6ce6c135cf3a7ee5dc38555388d3 SHA512 3d32062a15d9329781364ecaa93d3d51b3c00811a442ea7750fe0ad320b31372bfec60052c4e96a58443f3e7698f802938c4df0017650cb2b844509c06d7eefd
 EBUILD nettle-3.8.ebuild 2610 BLAKE2B 812a0ccfe3f91a1ef8417724540c4b42f438cc1cd3ddccff3c415ab0d06a914b5177e5b04dc7cbc8c42a7eed0c1032ff3d44f485f2e3dc796736400cadd14de4 SHA512 25dce3a8de08bb9159dc0d0a0354afd9e229ef21f0451828194e3df127135ed5f2379094699e12289703927a8207ea17dfb805b7a1d40e44578e26c2f05ad6e2
 MISC metadata.xml 461 BLAKE2B 889d1a948d2d5406c6995c4be856530d296896031dfaa6a1e910d9ce60a892514f82907208c385c21b5cb4451c19b73145d7e32f46f92487713661def0b829b4 SHA512 76db4561bc4547b0d5a3244bb3fb0c55887d1b4263e75d41ae9ced4577a90fd6be0a6109c201c90a64ba6a7173b33559874dabac6beb066a02923d572d6f1df7
diff --git a/dev-libs/nettle/nettle-3.8.1.ebuild b/dev-libs/nettle/nettle-3.8.1.ebuild
new file mode 100644
index 000000000000..20881c96af4c
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.8.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nettle.asc
+inherit multilib-build multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+# Subslot = libnettle - libhogweed soname version
+SLOT="0/8-6"
+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"
+IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
+# The arm64 crypto option controls AES, SHA1, and SHA2 usage.
+REQUIRED_USE="cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )"
+
+DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( sys-apps/texinfo )
+	verify-sig? ( sec-keys/openpgp-keys-nettle )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	default
+
+	# I do not see in config.sub reference to sunldsolaris.
+	# if someone complains readd
+	# -e 's/solaris\*)/sunldsolaris*)/' \
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-i configure.ac configure || die
+
+	if use doc ; then
+		DOCS+=( nettle.pdf )
+		HTML_DOCS+=( nettle.html )
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+		$(tc-is-static-only && echo --disable-shared)
+
+		# Intrinsics
+		$(use_enable cpu_flags_arm_neon arm-neon)
+		$(use_enable cpu_flags_arm_aes arm64-crypto)
+		$(use_enable cpu_flags_ppc_altivec power-altivec)
+		$(use_enable cpu_flags_x86_aes x86-aesni)
+		$(use_enable cpu_flags_x86_sha x86-sha-ni)
+		$(use_enable cpu_flags_x86_pclmul x86-pclmul)
+		# TODO: PPC crypto flag?
+		--disable-power-crypto-ext
+		# TODO: cpu_flags_s390?
+		--disable-s390x-vf
+		--disable-s390x-msa
+
+		$(use_enable asm assembler)
+		$(use_enable doc documentation)
+		$(use_enable gmp public-key)
+		$(use_enable static-libs static)
+		--disable-fat
+
+		# openssl is just used for benchmarks (bug #427526)
+		--disable-openssl
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest
index eb7576545970..85b835f2ca8f 100644
--- a/dev-libs/pslib/Manifest
+++ b/dev-libs/pslib/Manifest
@@ -1,4 +1,4 @@
 AUX pslib-0.4.5-fix-build-system.patch 530 BLAKE2B 69693c754bd4e348e8f4af2876ee0ae19b9278bc192194e9d61bd007701868bd1d676d1c19133aa390301aef7eeee9a5abb7cc8750a05f1ef1d93676dd1df917 SHA512 d9baf7bddff0ebe673d7396e4e4873ba71156d149b4544a537d31734771f4b91b8bfa809b92fcc44f3f9a9f28bd758bcf805ec26cef3e8731281581ccf933044
 DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f
-EBUILD pslib-0.4.5.ebuild 1058 BLAKE2B adfda61c63d050870643b144db59576869ad3ff4257c50357dfd330ebe7390a8749874b2ac4139b456990e10a80098092b54919da8396663ebdce65cbbad2cfc SHA512 2e535a7cd988bb67614de27f7af194a091b7de426b8a32a235212d8429f4907943e4cbb7ab3e196fe15ea250cd24863e84e506b0016f5c2da136b7f9f34b52e4
+EBUILD pslib-0.4.5-r1.ebuild 1016 BLAKE2B 9bc6ef561b229f0d4d9babe881fae80f705890d3744afa2f6478368c522082c48aa3678db4df96a18aaa4d86ba3a2648b4c592cfdff39cbfd364c38a92b59b0c SHA512 3ac50cebf5bd6c53ccc4ae1cb84036d98b779db7dcee066df4ea77ce3660c0d026a84e5cdb2744e97dd9b252b6a1310453102b23f9492d0cbaec3176f29c59db
 MISC metadata.xml 445 BLAKE2B d79021aa9674d0593bd738a9ef628315f3ae161f4d71c5c81e560ddace1ec730d6a6355ef70577148d2cca9ce6e012e0ccc828bda43711f2dbd5821a7dca394e SHA512 4f7425589cd82e37c8a282e070a80ed69d33c262fa34e378f0d749a2cfbc1c1f82900bded74a71c30659d1a18c6806b253a0924347364a6798b3e361bef99ec1
diff --git a/dev-libs/pslib/pslib-0.4.5.ebuild b/dev-libs/pslib/pslib-0.4.5-r1.ebuild
index 4896e8951eab..39649f9e486b 100644
--- a/dev-libs/pslib/pslib-0.4.5.ebuild
+++ b/dev-libs/pslib/pslib-0.4.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -12,31 +12,31 @@ SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug jpeg png static-libs tiff"
+IUSE="debug jpeg png tiff"
 
 RDEPEND="
-	png? ( media-libs/libpng:0= )
-	jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0= )"
+	png? ( media-libs/libpng:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )"
 #gif? requires libungif, not in portage
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/perl
-	>=dev-libs/glib-2
+	dev-libs/glib:2
 	dev-util/intltool
-	dev-perl/XML-Parser"
+	dev-perl/XML-Parser
+	sys-devel/gettext"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.4.5-fix-build-system.patch )
 
 src_prepare() {
 	default
-	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--enable-bmp \
-		$(use_enable static-libs static) \
 		$(use_with png) \
 		$(use_with jpeg) \
 		$(use_with tiff) \
@@ -47,5 +47,5 @@ src_install() {
 	default
 
 	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 5f9d4d077fac..2c3cccdedd0b 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,8 +2,8 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 AUX weston-10.0.0-backend-default.patch 828 BLAKE2B 2c6712737bc6e2d1a37d89b5ba4ea93fb30d137b8d76b77496f82503892bc295d19e97d8de223377328f8aa32721544f7a67f904c22bd1f1483fa99bf6c5f15e SHA512 e3cf66567ed8878ceeb0cde40f3c3aac8d20a04ce501d4fba8429f9d7552dc53ef4eec0cf103bf7e1e93fc9bdf224b20c628c9dede3e545455735fd95ae5dfea
 AUX weston-10.0.0-test-deps.patch 1052 BLAKE2B eaa6d9950a7a932686d11d9b9efb9ebfc602ac82db14348d4c1701a0420a85469e05c5af76568a6189546f4d8b5f05bac85c64e7168522af4cc0a5a3d31a8050 SHA512 7f59b5da1ec7a885d53bf48c12a13cceed6e7306c018e9921d64ec1856b8d125421f7af0aa227785d794924c6f035bc79a681eb9331adb17fb790f82c28d0f10
 DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4
-DIST weston-10.0.1.tar.xz 1776740 BLAKE2B e672d3d7d87782162fd79778fb7dab1e81de688d33bc470bb3d151da991ac94e680903781a9d7d8130df6136931d0d2badacc6aede09c96094f9fc2698ea4545 SHA512 688d843096a95b463161b98e85ca3443b31ba2ee49fc8d456a2780cc96f576e9d097054e9f361997a66e9cc8373cf29e406a742dae3884b3b50b26acf1710c8c
+DIST weston-10.0.2.tar.xz 1776748 BLAKE2B 6caad07ffa8b9eeb048e8e8bd1383c16f373fb1170c3705fea070d3e3d27b68cb4678424866ea23d46ceb93d3fa01d305418501b387780c07d20cd583e006ce8 SHA512 1b9e9162bd13c2424c8c495274be406cdd5a5ea7f5901b5c5f87b46cca546e73e98bc4b55af17445e60c9544b34022bf9f9a915fc5133c50f607d376b064f2ff
 EBUILD weston-10.0.0.ebuild 3934 BLAKE2B fd140a51aeceac3251a2f5f0878cb5f4e37b630c4ad7807873ac041c863f490bb7845d29086dc17d169856dc8e9dd9a1e87c042b94c6e46ef2b5ae0810412ef1 SHA512 f48f41f7fdf96d2b1a9842150d57e1fd394b7e86725318aabb8bc472d7fab2483e1e4654c37271f13dc92efc92139e58c12bf8972d250028d9f7dc7dfd469921
-EBUILD weston-10.0.1.ebuild 3872 BLAKE2B 1375a741be055b8d4a107a4e1d340053bfa2d8e792efecb0a40728bae205124e02bdd34d7a8db5d190b9d85022030f7117f068c225a8492f4328f5eaecee73da SHA512 9f948f3bc883290e058244149c9de0e0c11132fceb9f8c142003765d4d7a16f438994ca8423c2dd2c1f060b9dcdacc516b3672d9dbf9c790dca817850fc5eacd
+EBUILD weston-10.0.2.ebuild 3872 BLAKE2B 1375a741be055b8d4a107a4e1d340053bfa2d8e792efecb0a40728bae205124e02bdd34d7a8db5d190b9d85022030f7117f068c225a8492f4328f5eaecee73da SHA512 9f948f3bc883290e058244149c9de0e0c11132fceb9f8c142003765d4d7a16f438994ca8423c2dd2c1f060b9dcdacc516b3672d9dbf9c790dca817850fc5eacd
 EBUILD weston-9999.ebuild 3736 BLAKE2B 9529febf4619e0464c7e479a2c064ea3811c18a2dbe750656efd4459f666bf6f81669c1f3e62b82a9d10fe6e04b3f424251ff063209aefa7408d81aa0e6a2948 SHA512 fea8d317c942d84333ffa7456f78eef654a0127c94fca386ca2402234d156a919f2223fc0daf2b2879f33c17c930f3f3e31c46df98d3a2c6f7a3cc8e5d20dbbe
 MISC metadata.xml 1520 BLAKE2B ac2338fd000b3549fa197f281e439a09974d1bfd13afa766f255727a58a793fc8b4a6bac2237afb59029d11b02fc7d1dfb69072d9db227dd6f7db783fd842fad SHA512 434b1fa93ce9e1b8329301333ea47b73def8377c068735ad12d57bd5fd2ebdb5fc9e778b8df04bc4ac7b71dc7cc004fd8750581a17624d3cb3d2ff6faf81218d
diff --git a/dev-libs/weston/weston-10.0.1.ebuild b/dev-libs/weston/weston-10.0.2.ebuild
index 8e4f335e1688..8e4f335e1688 100644
--- a/dev-libs/weston/weston-10.0.1.ebuild
+++ b/dev-libs/weston/weston-10.0.2.ebuild
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 1ea94dfdfa7b..9cd6625ff90d 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index e99e810128f4..a16e9fefea52 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,5 +1,7 @@
 AUX luasocket-3.0.0_makefile.patch 2322 BLAKE2B cf9d871de75145812ebdce00bf7839e8f1f019658410eb38bd724cf9ce919d021ff2362d072c611c85d280eca2c0c6e485f608eba3f61fd612ae6ff5bde6d917 SHA512 43b6951d2a834ff88088bc6bf16e0ee3b7c28e602b06f66e1476bd4cf840f0d43328fe3eaaa7e4f0360b406525d213d12d4b97984de37c3381f8c1e85fe518fd
 AUX luasocket-3.0_rc1_p20200328_publish_API.patch 10781 BLAKE2B 783e223732aec39b4c7a7b6c49f051d6c3e9c8f1c8b1e91df68265598b9d1a5929f7dff21642d0ea4aba6a2d5ebda6cdf0eb2e567b6f996d260e8119da704952 SHA512 697d37344684bf6943ca360d1b25440e7b678b12e7cf0735c62985deb32862351ec63d8a6192dc732fd832dc16a9172e3ff13ccce52aeca4f4665bcf4555ef2c
 DIST luasocket-3.0.0.tar.gz 336231 BLAKE2B 71b87041a1edb2616ba269160382ac5cea6ba9b623281e8069e8adf97b6898d7836add7eff949010a1bc890bff8d2e4797a2ff5c619b45f8ee3adee5d6633843 SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6
+DIST luasocket-3.1.0.tar.gz 336542 BLAKE2B 64d3ab7028050a93a93db444a4d1757f579f111e79c2f84629d0eb9558fc594918614a48cd1cb522d573b84bb4096537fb7950834adeacfffb3e060721402f71 SHA512 1e9e98484740ec6538fe3d2b0dab74d31f052956ecf9ee3b60e229f2d0b13fcc6d4aaf74cd2a3e2ee330333dabb316fe6a43c60baaea26f0cc01069b6aa4519b
 EBUILD luasocket-3.0.0-r1.ebuild 1843 BLAKE2B fccc27d0d193207d42093831a24237957702d27e442ed0a56dfa8d649a2c99448f648306dc981615cf237055f534c73dcbe9ddaf09519b2390cb25e898dfdad9 SHA512 5845a71bb98b1f9230934597e64e00ab9682681c494832bd56450a6ad33e41756524b5e6a37d4af5413fdee5337eec9da96fb5622888ee11cd88d6ae13835bea
+EBUILD luasocket-3.1.0.ebuild 1540 BLAKE2B de95dffd9abc2bf1527f2094d753f26f418cb0491ddc4a65d8bb6c92f71bb8ca7729016540fdcf6dd27a3785986e879a9e6217a33db61fc6790b34221f761d25 SHA512 c251a6930bc415882533cfcb54e144a28009dd6357d4ea684659d9779224ab3660a4e165f05f6550e1905b96c4c0bc51db2c2f718a82b220708dd9a6a61b1e41
 MISC metadata.xml 605 BLAKE2B 2358c705cc7a8345cd8975154db2074b70682ae723ad265ed350a49e3958959ea8402405b6a0827d9d7debfcd7bf2d7814211d282492ffea21017dced0b7d5dd SHA512 25b09ed61b7256d5db22ca630ae9067f90491142ff5c3810ab41dadd537cbfc41b08cf6bce55b8c03910b221fefcda72a34afc996184d238af0323a8ac9a5474
diff --git a/dev-lua/luasocket/luasocket-3.1.0.ebuild b/dev-lua/luasocket/luasocket-3.1.0.ebuild
new file mode 100644
index 000000000000..d46fffc97228
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.1.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Networking support for the Lua language"
+HOMEPAGE="
+	https://lunarmodules.github.io/luasocket/
+	https://github.com/lunarmodules/luasocket
+"
+SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS="docs/."
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0_rc1_p20200328_publish_API.patch"
+	"${FILESDIR}/${PN}-3.0.0_makefile.patch"
+)
+
+src_prepare() {
+	default
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"LUAINC_linux=$(lua_get_include_dir)"
+		"LUAV=${ELUA}"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}" all
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CDIR=$(lua_get_cmod_dir)"
+		"DESTDIR=${ED}"
+		"LDIR=$(lua_get_lmod_dir)"
+		"LUAPREFIX_linux="
+	)
+
+	emake "${myemakeargs[@]}" install
+	emake "${myemakeargs[@]}" install-unix
+
+	insinto "$(lua_get_include_dir)"/luasocket
+	doins src/*.h
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	use doc && einstalldocs
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2e1fab5b6bf9..7b04a371cb78 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/configupdater/Manifest b/dev-python/configupdater/Manifest
index 32ac277c2db1..f53c03fd8abe 100644
--- a/dev-python/configupdater/Manifest
+++ b/dev-python/configupdater/Manifest
@@ -1,5 +1,5 @@
 DIST configupdater-3.1.1.gh.tar.gz 138777 BLAKE2B 9fef5815bc41903a65c2c53c6b9ff3d00d1f4efe65008c725afda8d12694be4d18810cbfc03b291246789d736f1a2933061f2683bfc62e9e1d72e2e4f159d772 SHA512 1e499f87d0ac3d75f32aafe532d7c83b4b86fbaa204fcdbaf7a3dcb5262d936fe027ee0b21d169ef69a0590edbe965a872390b14be274fbb1c893f2d4695b92c
 DIST configupdater-3.1.gh.tar.gz 138671 BLAKE2B 48e349780e11ca26b4b15b44aa298058840cfcea47fc7b2e555f3ca743de1956a15255bfea2c5f96624e02e399bed99ae45f3422ab1660b8ae83087ddf6117e1 SHA512 89685a93f3bec907184d818b5adea4f87967df313fe4e4216aeef2c227fdf0b0f98757ec27da7f43adff6e2ee37020dd57b98569d5811c9dc7c3201852b27432
-EBUILD configupdater-3.1.1.ebuild 693 BLAKE2B fd1c8b10619c7b2ff849c59a467687e53b653188b2395aadf47e4731eedb967fa93d203cecb8d1bbd00b309f977ad242a21658cdd371affbafe79b44e03d5cf9 SHA512 23745443f9fa98695eac44e41559300c0948ebfe099aa7ae41450239040685acaa10c97c600c48fefc046ec2fd3cb934c400c45819ddb191fc636c0206132b71
+EBUILD configupdater-3.1.1.ebuild 705 BLAKE2B ab8dfe2134fa933eff387238d56afc48103d86d5edd156ed74e83de219d82715a05fb862329428232b84fd7c628f0a5121b4c529dac88f972a083ced2eeb2d3b SHA512 a4d43623b6c5c0d2229beffd37b9fb2c049a4b799867aa3841b6e7c355b398d1d93648395a101f7c2020c0439e821ec7462bf02aad6fa05c138e82c9ec1265b2
 EBUILD configupdater-3.1.ebuild 693 BLAKE2B fd1c8b10619c7b2ff849c59a467687e53b653188b2395aadf47e4731eedb967fa93d203cecb8d1bbd00b309f977ad242a21658cdd371affbafe79b44e03d5cf9 SHA512 23745443f9fa98695eac44e41559300c0948ebfe099aa7ae41450239040685acaa10c97c600c48fefc046ec2fd3cb934c400c45819ddb191fc636c0206132b71
 MISC metadata.xml 359 BLAKE2B 59eca20050b8eb4620813ab2bc61abec0d905dba4c38d35806f135cc3f165634cf6f1df124d77e294dbcb3d196b521bbfaa005979e0c63164004d4942afe4717 SHA512 8ce147cc56b7c207125e40d9ce54f692f62f2ecff1944e74d661b2656e5d479e8072e41fbec7451e58976d3453c5dd0e4eff0726ff9f2b502b505926fd2d851f
diff --git a/dev-python/configupdater/configupdater-3.1.1.ebuild b/dev-python/configupdater/configupdater-3.1.1.ebuild
index bb6d09e8a58f..1713e7d16881 100644
--- a/dev-python/configupdater/configupdater-3.1.1.ebuild
+++ b/dev-python/configupdater/configupdater-3.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT PSF-2 PYTHON"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 18a601d6e8c3..02c9e4c5fc96 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -2,6 +2,6 @@ AUX ini2toml-0.10-test.patch 1883 BLAKE2B 88402feed5aa7e51587f7297b8c3afa058d04e
 DIST ini2toml-0.10.gh.tar.gz 93535 BLAKE2B 8d8a5b31c53b9194e578b473dfd562b1b569d701b36b267ec4f59ea75ec03abd6e1df5541327b9414a2f1c04b1cb41ec57c6f900007f69a3c51a172143d2eacd SHA512 3d88f97c50a13fe3878e3fa35d70c9051874bec99d278411dcc7098d86898deb0e490be26f293e9a304d4c9a2842274e68126a2d20dac77b526161fde682dd75
 DIST ini2toml-0.11.gh.tar.gz 93696 BLAKE2B 0fb52b346065421049fd377a62de4189a6d261ad12c00679c97568a0e7b7f8fc7bf1aae2196b8fc70489d547c0ce9be1347336d25769c7fb383f9fec4d4aa205 SHA512 7329fd3ba31567638fffce22f2370c2055503bd4abc3d7dab30b1828eb54204d31036753efddfab52e79703ce7583f6070e1207c95345096c0751c2d429fd6ea
 EBUILD ini2toml-0.10.ebuild 1755 BLAKE2B 4c7a421ba090d291b492c5284c77ab8d606d720e377f94e8b7da7a15188fea23694be7d1bae37f5d3c05fbe2e9a29a6111dde08c389456204faeb8446c4ab23f SHA512 0e1aae211ad3a54bfb2964b0a0e08572a5832ee351f40fc92019ce9c5f9ae3e36091f62ea94478076f97a381aa049fbc568df3ba190ba13224e7aa19500e617b
-EBUILD ini2toml-0.11-r1.ebuild 1132 BLAKE2B 66ff865c1eadc8c03713a42efdc4aab5aea87ce6d08896ed0856ea4335e8365b25850610a28102f0e2a6f3cfa142f30d430aad2e2636925cf62623a19966d465 SHA512 2689cb972d214a56501033ef7570af6a92aa9581f147640d323f2d893097763ad321be1c19d47c869536f24664fb4f29b6f14a4480fdd62c49d505882cc5df84
+EBUILD ini2toml-0.11-r1.ebuild 1144 BLAKE2B 0d4bf6c5aeb2230a534c8a8a8bcdff49a65b6c17cef0b88251dac791f0e373f3ca6fa58ade3ab037e3133fa3986abae2780581dfdf2b4d9060954b10f0465418 SHA512 e05677b8e128fc8a146838ebbff8b466878eb7ff7bd24eec0f704ef60e7a416e636bf3073264f5728707e4338daab0f2db9e05205590ac614a5ab42760b5330c
 EBUILD ini2toml-0.11.ebuild 1719 BLAKE2B 2e1c03d2c44d196372584a151063b5ad10ffacc89c6dba1ea9216c5bdce21799de25bb9d508362a255df0b8293e710edd33ec38a184f2a5ef1298b433fa4c2dd SHA512 470d4a9675fe624a7a15d7674a380ea514df4b5dbcc26b6d5f287450713018d5813213af3a23b9f2f23ac7970719a826efae3398f0c8a48b68f925ac494809cd
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
index 71e549fccc36..cd270afe7246 100644
--- a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 375b4a655280..4f831fbd53f0 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,5 +1,5 @@
 DIST nose2-0.11.0.tar.gz 159486 BLAKE2B 36167e492a49017e0f1474bfd5fd77782a324f7d884bc11c88cf9226090dce67d47519db00d3b57542dc808fb0db40942184b3c1804ad3923e3cf5fc03cd50bc SHA512 8e6755c0f5a25c4c53a35d93e5c7988523e03e978b0593d49b7917dfcb980553be9af0cc3c67c2db527c304d049d97a8d7f6f53b1a8b2875ab5456cbb7519375
 DIST nose2-0.12.0.gh.tar.gz 168454 BLAKE2B cce76a046c4285d7dbe6ad6a049628e23ddebd36eda4457eecb4f0e14b1559f8bd7be5bc80aa99bf965f530575c3f5e245d1a30b4115d5e8ee0aa4c8d93fb8f0 SHA512 7f1462613b7d38a77cd0764f721be4223b8f4ae4694c49ba416a076c321e07484969ee1a7c2d2f89484c0c3b2a96e74d6a42321981af4930ebe5f63f07df7755
 EBUILD nose2-0.11.0.ebuild 719 BLAKE2B 25bca47147d3cfe2a162e65881c8f2473752192372b68882ee707f06c3c5ad55d2da878f2cc52e0d067b663665a32e57717be225a55bb0c1dcbab6b75a22db33 SHA512 18bde37d9b07ad94826cc988cbcff087fee518096bc1e33050bed01fbb515693de3410591a30ad180bcfe1c0e48cc860d8355154b80b91f5480acdf85fb76ebd
-EBUILD nose2-0.12.0.ebuild 959 BLAKE2B cbf079ca4c293034bca82e6a60c45b8807030201332f3f51e8550fac10254928a1bdefb89e23149deab2048be5ccf984a15997fe85cd16492048c5da508de726 SHA512 44e29ae91af60c71766c120f2052290d250072bd3ae5bdc242e8b8ff65eab931d140f10506973d0f05ae6203e926e694079da98735fda3404af6efc49f6d7c87
+EBUILD nose2-0.12.0.ebuild 957 BLAKE2B add2f126c845a6f61431d4a8a4f4e71a8cd5db4579c3bfe6c91cdc865d7d4db3ba29efeb7f62a782c3b514a4119cde17abd1e019a19068fded8d46ad571a19df SHA512 02611df357aabfa2cdefdf2af11af40554202502821b3cafb10bdd2569762320fd4a1865af25e3121f338405210002c9d5469ba7fd436cce0ec5b9494f25dd21
 MISC metadata.xml 313 BLAKE2B 6723fb509a4391fe826f0adf0de0d3cf12013c07c4090f7dc258a7be6c3903f1cdeef469712b3db285edf7680ee30b1808c8e71f433d8c0e69853912996e1ec2 SHA512 7140c75549a66cede53b1d5e54451565f5b84a8ef00843e6f1ef8737b8f103fac8a66e96e8039b2bee32e65d0f07e12e5f9c27fbe72c334eb4f37998f5e51654
diff --git a/dev-python/nose2/nose2-0.12.0.ebuild b/dev-python/nose2/nose2-0.12.0.ebuild
index 67a1e62433f1..a1a9d444e8bc 100644
--- a/dev-python/nose2/nose2-0.12.0.ebuild
+++ b/dev-python/nose2/nose2-0.12.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 134671c96b48..680bb81f324c 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,7 +1,5 @@
 DIST pyopencl-2022.1.5.tar.gz 454129 BLAKE2B 266bc327c9af5654287fc47cdf4e6002c7cddcd6f5e55bb70bb62aaee666dc5c102f78d4e946f010c1e109390c1d2e981e7ca6ca002d10f66248cb008b308734 SHA512 e6eb3e6d886d8ca1d94867a398b286556fd2d93535bb8481c7603cd521cd47606ce3d9cd6422830c6404305a4a1293234d8774fdda6923bdd2b4fc21fb39d377
 DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b73e9e7fe50f73cec3dd752fbb699adab63e08d60f3a54c8fd215cbb82c81353d28e875b953686b05e188df78cfe237 SHA512 a1e404c4c5f95d111690c969ae5c5d34f0deca2c8b93a5ce4d90e003031af7eb94a7708f878170a9b6e001b899d321f7dfdaa6f7545af3237d30d237d44bb45f
-DIST pyopencl-2022.1.tar.gz 452537 BLAKE2B 0d4d178a6bdf14dc3769dcb78c42bc894c0a443a6811fe9b25dedbc4a43debc06d1a1c32cb2a0df06fe16d1b2e78e65ef4f3ca8e9931be39384b3c8c813336de SHA512 e873807e757c19b59dbac2a0522fbb9c6e8af955d62bdcf06d8f3d792db3c9d2ce15372a6eefdca5b3f6756c35a85b5ff8d7dc1b6449bfd12c2b588576dd6f24
-EBUILD pyopencl-2022.1.5.ebuild 1525 BLAKE2B 58d1545624645c11beb3ba321a408fc3923efcc62d798ecd93457dceafad779c4b037ce5e3cce8a59f5f0a69adf12e47ae797ceebeaf499f6e08839fcb5a5275 SHA512 2b12e270fc76c324ce5e44085705e04eab5b79232c5b452492bb9a74870b324dc9a31eec177530c1fa1811c555d2f95531f1ca0ed18b55a711db6e6c9fe26458
-EBUILD pyopencl-2022.1.6.ebuild 1533 BLAKE2B 68ce81df540844a0b6637b5d1ca685c70dd38882dd9e143998bd87f520dbae5f5dae3169e22cb217bf18a75f44c0f39334884007f9af0055b4a5cf14790afdae SHA512 380dabe0541fabf9fa9c8b10404e98ca4f9633571b9660230f93cfe95adc7653696f5b8ae7f473bbee43b83464dae9c7388fe0176afeb71aad66377b2859dc23
-EBUILD pyopencl-2022.1.ebuild 1520 BLAKE2B 5ff0a66be8d8d323038a93879aaf5a00d8559a4271c7c1ecb3b7ce484b5b33b00ec6fd860f4ce0af533b690cea87c74ffb8f6e4b4b9c6840bbbc72c82a19a016 SHA512 e5257aa3af1faa3ab801b1765b25175f45baec990c3033243a71d3ac36908fc2d1bdb24f34d33163f59636cc5d7bab7399fad4e5eeb6f13ffb3891036452bacc
+EBUILD pyopencl-2022.1.5.ebuild 1572 BLAKE2B aaed0c92df6a752644454b17cdddb25f9c77179404a02b76ad3860d862faa9ff8b108b7f3330e385ab22360a41a25fbb6a4378fa4eee683d20955d71ac15d481 SHA512 60867d0d0708fdf047d72d8fd80a49c2b0b88abecb45a859f5690d9ceb07bb171e8789c9e7239d3f2c428ac2d4fb96fdbbab13d94a034e5c600e7caa196251c8
+EBUILD pyopencl-2022.1.6.ebuild 1599 BLAKE2B addd81de214a3c33e515e7716eb07ce1be83f487470a811e6df4de207bb315501f928290ce831c79f792ea7d67761725f656e8a71916393bcd48e9010a8e358f SHA512 36dccf1dd5cd846a64d6eeeb5fbc8fde0aaeacf7fd178531aa039341d69255a09a6745440980ada2983a0d4a59efef87edf21e358aa0ed34a7d7c9976a5fda84
 MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
diff --git a/dev-python/pyopencl/pyopencl-2022.1.5.ebuild b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
index 261ffbe3f5b9..b6ce5908fee9 100644
--- a/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}
 # libglvnd is only needed for the headers
 BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]
 	opengl? ( media-libs/libglvnd )"
 
 # The test suite fails if there are no OpenCL platforms available, and
diff --git a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
index aaaad732504f..19e2c5a987c8 100644
--- a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
@@ -18,16 +18,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
 IUSE="examples opengl"
 
-DEPEND=">=virtual/opencl-2"
-RDEPEND="${DEPEND}
+COMMON=">=virtual/opencl-2"
+# libglvnd is only needed for the headers
+DEPEND="${COMMON}
+	opengl? ( media-libs/libglvnd )"
+RDEPEND="${COMMON}
 	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-# libglvnd is only needed for the headers
 BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	opengl? ( media-libs/libglvnd )"
+	<dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]"
 
 # The test suite fails if there are no OpenCL platforms available, and
 # even if there is one (which requires the presence of both an OpenCL
diff --git a/dev-python/pyopencl/pyopencl-2022.1.ebuild b/dev-python/pyopencl/pyopencl-2022.1.ebuild
deleted file mode 100644
index ddb481845549..000000000000
--- a/dev-python/pyopencl/pyopencl-2022.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples opengl"
-
-DEPEND=">=virtual/opencl-2"
-RDEPEND="${DEPEND}
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-# libglvnd is only needed for the headers
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	opengl? ( media-libs/libglvnd )"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 7f479eccc0aa..66fe6c904e74 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,5 +1,5 @@
 DIST pyproject-fmt-0.3.3.gh.tar.gz 14399 BLAKE2B 82af6d6c4424f83ed9a5539d64bfd517cf08df4bb14b7f1321a379a4d87d140f1518444b503731344e5fdbb4b94d92ce23605fe2a1cc978d26901eae98a31b8c SHA512 49c4648e140b34a6d2f27cc01be7253693e79687f2ff8dbcae5ca3cc64c14f5945f942ffb42d1d286ff221e5aaed22dc1f9953216f49232ce311c4c18130754e
 DIST pyproject-fmt-0.3.4.gh.tar.gz 14400 BLAKE2B 3ab116fe4d4f683eb3700ca2cb855744111b806514ef18f56cbe6628bfdb6935b813e852ff6ff64716959f1580e8817f485ddcdec6c463ecf5c8935912316528 SHA512 0e3adddfbe8afe3b9da85033ceea7c4e37f59bf48722a5897f6e7f2963cd95ba9eef7309c095f4b3fbd927a6486a058289cc3fa5f90c0108a75686b1b81d13e2
 EBUILD pyproject-fmt-0.3.3.ebuild 776 BLAKE2B 6cacc964e5da9df0ed7b6a89e6cc4b2a1177ee2fca7dfd97b4e1564f0c9e13644ac2897f9bc8193cd7defaec18820a5f5d0b70740d5a82dc5b734ee2f480383e SHA512 7521d1c96aff9a1b3ea7d84311e410c5730b7a3cf83c12543e49b62c523b688ef009493fdc05de3a8debe29276a884fb5be3e9d01bbca505f0125e0da1ed3fff
-EBUILD pyproject-fmt-0.3.4.ebuild 776 BLAKE2B 6cacc964e5da9df0ed7b6a89e6cc4b2a1177ee2fca7dfd97b4e1564f0c9e13644ac2897f9bc8193cd7defaec18820a5f5d0b70740d5a82dc5b734ee2f480383e SHA512 7521d1c96aff9a1b3ea7d84311e410c5730b7a3cf83c12543e49b62c523b688ef009493fdc05de3a8debe29276a884fb5be3e9d01bbca505f0125e0da1ed3fff
+EBUILD pyproject-fmt-0.3.4.ebuild 788 BLAKE2B b2549c3511f44db59aa858ac1958a8fc53c60720a18454db1e38c90ba46ba1e3670a9902d59f99504fa7b03a36a78d6dbc7f6fbfdf31624bd044044f30d3aa55 SHA512 f91b7586af192edf27bfdec1e8c8a9bbe772bfa59f9ce00a990a103d0fa370318c932ac1ab00103d3aafd5e3608bb7815beb4c8334b0796e95cd3b1a311c7d46
 MISC metadata.xml 356 BLAKE2B 9d15eb809d02ee235382282c3eaaea6ae0f3c0192045829495fae1244f88907673f5e5ec26ee5234f25267add21b34fe416d1d48e54f3a899773160bad1cbc8d SHA512 77a3e6273b92141d5a337ab28b162ee27f3f1970316fe42becf2efbd4cdbc5ed6cb26f1f24201d0605c26dfaac75db467f42b00cc47df0093336bd0629f0a1cd
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
index bf9e0c458bdd..c3e5778a3cf0 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 
 RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 7305e41efe0d..3f16556922c0 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -6,5 +6,5 @@ DIST sip-6.6.1.tar.gz 1134991 BLAKE2B dec51bce80566ffad25dd67686a746134e032f3cf1
 DIST sip-6.6.2.tar.gz 1143535 BLAKE2B 92158af35be47a7581b71d97d1d79f6ca9022144144e3e44e09ccbfa3a285ebb4cec1264e621275159345c33f0f45c86183f7ea1fb3792aca2aeb64d9e46f7ad SHA512 5e031baa9ff6d8d19f4c36ef7c3900c6440d261102259cdc12fce28471a849fed80c123bf31ad506b099a925b2967eb5863e6736ac00fbcff99198711cf0e5e5
 EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
 EBUILD sip-6.6.1.ebuild 1082 BLAKE2B 8f06f88625a1118f8ea004d1c07ccc2297b090c9adcd16506dc54572f9ba9d39d34f427880754b76a07c7bbd0d8a36b28806159329e31faaf3ec361506abd783 SHA512 4e4e6e5480243ffa5c75efe45896d143614a41f251012f399d894249fae70a92df6e23276bfe7bcec4d0535898b72d7b10db44c2f76d90f955dd591e8852269b
-EBUILD sip-6.6.2.ebuild 977 BLAKE2B 62ed7695f779f7536a65ea12e3e167b6beacef500cf8396f498d8e515c468d9e43f842abbc61340bad0c20efd3194637231245ebb980dd62d7aa468f0d14d5ec SHA512 52733a2e98a3b25f0d9c86c59bed383b2f02008821a144bec1dabda153af4c9c184f925f0cf68ff77e9b4138f95c09ca439668607b016643ea1d092576e80680
+EBUILD sip-6.6.2.ebuild 976 BLAKE2B c0f32348d8468f2239e520dfd63958080f6022be9a79ce7533a68d2860c7f683076b36ce7870d5c5247eeefac2eeca5728d87797e7986908bd67ffc6b768d420 SHA512 8102806660ba961aab371be6376223957b0f40717068c6c22ee19c9182120b83d647df33e9f8c761ce6bd98546872b98a58139efe62932d3212766a398bcfa7d
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/sip-6.6.2.ebuild b/dev-python/sip/sip-6.6.2.ebuild
index 943f9b57870b..df066a1203af 100644
--- a/dev-python/sip/sip-6.6.2.ebuild
+++ b/dev-python/sip/sip-6.6.2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7e8c9cbf1f7c..10aaa72afb48 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index d54076f88ed1..39b908923e04 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -9,6 +9,7 @@ DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d
 DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
 DIST anyhow-1.0.55.crate 44429 BLAKE2B 9d6838c859bb5a37a0558b7a4d8af245fc2db1e8418252575939ef74851e547549459a97ffb9e512f0d5c6d5166a82cc03c18cc3e8a1bffa79f2d3c5f0c94a14 SHA512 d789d56eadb1a6a6d8bedd20d318747a9ad11598d84239ee9214fcfc319f729ae61e09f6d2d7e54ec5553ee65b6a4428b793adc17fb158dc07a69f15c8fd818b
 DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
+DIST anyhow-1.0.58.crate 43137 BLAKE2B 8e797dfab555d7076128851203ec1c6cb3c448bad52fe28c82b10518549971e6daaaca52d4a0dbb126549fd819706d6788e5322c6433ed71836c7f6051230b7a SHA512 78b21c51efd37e2be8f5672dc57f23ecd222d910604276da094754e06b86eb5a899d7ca7fb9f92566a13f70c116b05fed93d68a06320894d76a14a31e6c557b7
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
@@ -28,7 +29,9 @@ DIST cargo-0.57.0.crate 1461559 BLAKE2B 775e532b4ad2baf7383038c40a3d07e7c32e52c9
 DIST cargo-0.58.0.crate 1464921 BLAKE2B 8d4eb5cafbb1e893bcc1e9991754c9533723758ddd7cd584f85e37bd816e6e2b5d9a09a8e2fe923ac611c5828c92fa1bab419a04db57c93dd79283e820c15c8e SHA512 c277b6b9728dae83a0fdf04728e266e7c3e30234cecd3ce0d57fbc8837e839d910698ec43bd1f9a5efc5375dbf63da890e2a184632ff47cda4444ed6c13c6e69
 DIST cargo-0.59.0.crate 1846698 BLAKE2B 9b8af5a240db05e0319444086b00b9c927ca8a6de42ab3d8b4448551043129409fc7ddc08c0af5641a8431339b48345d5f59f537a445855d7e95adf6292765c7 SHA512 79812f7725e9f908df9b8c772e0e62fca878cafee9ac6ca79d646b7f378b2e49e206d39effd1a2a66a1ca528a67261c08a77c0d4bdf83370474f64c78252f247
 DIST cargo-0.61.1.crate 1862870 BLAKE2B 6488473a7b012013f919eb84a519caf7e1822d0a45ad949888a8de5c7bdfdd9e44cd9277af94ed69578ef1de0b21910a3fbbc3d2d62a4a2f52f6ac966c2c375c SHA512 67ff34faec369694668eff4d045f8c758703072d1cbc7ec365c380ef0e1cdcc0f744a131d1b3acc07306276f0299953c7aef497b26231f71861651e759e1259d
+DIST cargo-0.63.1.crate 1965382 BLAKE2B 01f0272c665f741752139689044b614f6ec6d3be4f20f2511041b690006bcc30a5181bb1257392b66ae56fe3cf76537a305bcf5ddd2c3fb00878f9788f709068 SHA512 6e6da3bd50b6055299a6e1450e0c2ef6240f3cd4ea1a734eb531e5efad154f008923f14f87b4f3a191f75db40329f8878c4deb58028b8d18c477334bbd348f32
 DIST cargo-c-0.6.2.crate 19994 BLAKE2B fe2c9a8eabaf940082628ffcc481ff45640d16fd95e6e9dc8fa447aef13569db3257e73c81b1b0abea6a61aa57ca2a86eccc28f2a9ecad9bc698c6e73f9fa6c6 SHA512 430a5c96ee230419b79d80cd979d8baf59ebd93bbb75115c0c77dcffac1dc6b1c9bdf1e91fcf45619d3aca608f91573e854dd41921c1cc2a53655a7d7c7c8f0b
+DIST cargo-c-0.9.11.tar.gz 29072 BLAKE2B 3b0e1a10bb3b20bc288683dd4343105df569530ae4e91e8d54e5d222ca153e8e2eb2ffbb328257265ffc68f5aca5ec71790efe6ac09391f09c7c711fccb20e70 SHA512 ab815d6a5a6d37ff7cf57dfb50732e709fabc7a7b8a1135ecfb4cf0b036782edb378315cb7f9f2a632e2893215d8c046e18fe62f823bf7bc02c361afd020551c
 DIST cargo-c-0.9.5+cargo-0.57.crate 34508 BLAKE2B 3fd754bb51749eeead651f14eb19554fa5c9da9b347ba81c8557b0b80614e277e5f7d0d1ee743d49bb6c1dd51ae3dead256bb185dca41bea42a2686dc1a227a1 SHA512 3f18879b0d818e902ad65c4af075635fccb69a65cf1945f22608d94938d083df4b816b9f7e2eb7eab640f42359e4d8bec36957b8709ef6b334d7e57bf68da44d
 DIST cargo-c-0.9.6.tar.gz 28487 BLAKE2B d626eaa7e8c421a0e238efc176d32ade37278a73b7daa5e50f7063d901f4c906e0b2391dbcbd6f735bab6623cff8a2e48ca69c5416fc2510fe5857eb9047f57f SHA512 82ff71b1b1ec80ce01cd1b04eaa7bbb927964f1ffa8aa039d3f64b953d6330c75fffa7d372bd884ad9481f2ad84ab45cdf5e6d6ab6bed920df49683425c1f230
 DIST cargo-c-0.9.7.tar.gz 28714 BLAKE2B bdf12d43dc24661239bdf87d172ede36e08b73cdd934f91cac2391fd2e571dc2b9900b3ef98e9599f5bfbb0f601ed7b1ce16f7b5c0091a1c3b3958cb48b8652f SHA512 3305945b26ff0bddc357ababe9323af2b4a57060902cb1c444750c0a4ab13627a9c5bad5c9614481fcb2d0ed4baf05fa875c7c92e971d14bf1be9dedca9bf8fb
@@ -37,9 +40,11 @@ DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f6
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo-util-0.1.1.crate 21250 BLAKE2B e4c4e318b3b35d6acb9287a5cd027a54c6580600e32397f07319fb7205dc76ae7d9fcca5364e89f933d9122d500f00215f92d87b906a52fa7ff1663b3098edc3 SHA512 590e97897bd0a12151d3a260647bb735251a48a3ee9ff4028a609c6a39b5f696db9d42403c72bc6e6df939eb5012c18129a4ec1cffea617112fc2e66450ec05e
 DIST cargo-util-0.1.2.crate 21287 BLAKE2B 9d583646a14570329a17a2a4a3b315e324e8e38415ea6485d5c996e7758e516c85e277d4c729d27dbcd97ea42eef8443da712c1bf3f0c054730e0920a947ed51 SHA512 a9ffef744e4d8820ac5c47332cc555c731061e8e5416ba55730e8efb4b109bb55598e9b8d91b04da1c77c6757e648f0c677db0eb3a327353a1f2cdfea2170660
+DIST cargo-util-0.2.0.crate 23703 BLAKE2B 8058558bc6a60390d832cfff109a347c0924c6d09258b3f209f1a448b4e2182920492180493729d78d5136de5596681b76b01a2283d608e89835a04920bb9389 SHA512 6425ab5252ffe19921aa6ead4d97e607c8114c030478f38d8b6386b65ffbb26ff92c4c8252d541b336d4dafce7ae7ccf585e5a83c8fa662b60e8789ae81de90e
 DIST cbindgen-0.13.2.crate 160484 BLAKE2B 9c69f957305c3bd2c3056b45875dd2115309f01541bec4bce718f5d843dfb5b3bb6746474fe8149c42c194922ff618d9e3f6cfff13f7cf9069afb81d2da3e569 SHA512 2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66
 DIST cbindgen-0.20.0.crate 183277 BLAKE2B 51529b21879e3a3212fbb951b3bdd5c8c396dce53e9dbe568bfe1e752caf3060bc784909cb4b37a6e6e80d357d5a8e2bab8d10d4470563358407bceb814bb7fc SHA512 83c2b0da580f0a2fc9a74922f3c44d0e73ce0d1de8b5a3f5819c7fcf1c481df1ff0346e84c5b4c199a9364542c85fb81ece4e1deca3a6f12231a4478f76a7c02
 DIST cbindgen-0.23.0.crate 188128 BLAKE2B cca6830ad99538e4e6697ab5fe6b6d36c96efbb33a9e971cf54923f0da327bdedbcae73d388fe522bf0e090b9b90041d6e32f5b083402590ba3de858bcdc6d10 SHA512 d7218e55526abfb226df524e634a72060de752eafe5b7f5c60bb746e2c4b105040455cfa16859e6b231c07cdf0256bbd608fe1afbec35fabe2f961927c19d04c
+DIST cbindgen-0.24.3.crate 195698 BLAKE2B f5c65e9c77a7c2f98a44382a6e4b852071b70bd832a3da3220bb8a7c4729a44b5964e651cd63577f555c5bf4e6594b1148a5afd96dc1d3f599b2fd1d523b54d4 SHA512 3a39be67a87aa7a4dd9baaf6b803215f4587bd7925c4315c5ec93954e021471919fa977ad2084f099c606daa392350de3557bba56cef77806def99c40318ef05
 DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
 DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
@@ -50,8 +55,11 @@ DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
+DIST clap-3.2.8.crate 208903 BLAKE2B 93598ddd7fe489b2072160b5880822dd4cf5ee7762946ac927b53fdee0f715267d9f7f6ad60e9e45f0dc93b16ddffa71414f7c46c755906f7a70fd1869a12990 SHA512 1cf2c86038c46af697ff23b7ffb9025f96d4fa025106e08bf9f85679e4a10c80ee4ccac0b8a6899e9923916e32c0572310385f21dac62afe4920dfa4fab813ba
 DIST clap_derive-3.1.18.crate 25521 BLAKE2B 4c46e0793bc945d9ebfd7ba104264a8cd7c92782c24a9116a8cbf92696476adbe6d5059ee0c220bf71c297bd66f976b91ab95ca75d4ba56714a2824ca7e1af7b SHA512 9bf92e45de15bdfe1ca9a1363f1d243b8df1e5e7d957d6240fa351387b362ef91dc9acffea7256c2161ae8472e35ee2cd678c0bee1f9a27771ae9f4f3f71b351
+DIST clap_derive-3.2.7.crate 27649 BLAKE2B f8e27a1902302946cf46beb03f3cc7779fd90c3902f38a442c722346e89309be3a150ffd24c932ed9ad67f50cea5215359f993e423ed62ee4ab1cece16c4114f SHA512 ac6a7004281c99306dfb6ab75e8a66c300c0b6ef5db84098eb76369d2e9939b59ba2e4a175abe2cd9c243d61e19fb5948cfe30d72adb60d53304306340f5cedc
 DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
+DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST combine-4.6.4.crate 132144 BLAKE2B 9d6b513adc63b49888dc33444e3db2c0c4b950a6c4e30ff17e0bbf4b3bb39fbd679cd31ce7e584a1bedca69868606a13c0e3bd0a136a1fca1dbcdb516452d34e SHA512 2550aba009b8ab66230e7b21fd1cb5085c92bc280e31f35c9b02dc78fa138ef9b9ece0d7801473b88d11866b013c6fa3bb6e9611bdc1a7b85144e50a49829774
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
 DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
@@ -69,6 +77,7 @@ DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crossbeam-utils-0.8.10.crate 40672 BLAKE2B fbc65ab8a68d66f27cfc8495652ec5ff31a3b8c4de41464bf3a9f673249c2fd5ba4bff7ec8c7b838d5903328346214f91fe075bbe7a05a9b11055b7b17376ac6 SHA512 e0ac772262677e7228e4f2e06099ca788f4906f40fe5dbfb0891431c993c7e4d755d3ad93f55570ae06c1f06df14801edb3ba4f28271c4e83c80dbba2fffe24c
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
@@ -84,15 +93,18 @@ DIST curl-sys-0.4.51+curl-7.80.0.crate 2966807 BLAKE2B 8552ba08f01aceede0f35e76e
 DIST curl-sys-0.4.52+curl-7.81.0.crate 2984593 BLAKE2B 7fb0f8c76acb8491fb0f953e92318713e7b4b74a57ecb9332f24e96668c66f2a8e99e66822205e8f2a63c0e569abad718c5e1fcc155425b9d69eaf6afc10249e SHA512 86967a065902b06fa00ca23c253e9915fd8e5db16fc5731b4327d6b2bd77ba5552ec96349070329ee15c2b32798b727275305a96e8720c0aef8b47e5a989e640
 DIST curl-sys-0.4.55+curl-7.83.1.crate 2954115 BLAKE2B fee8dc2805ad2facc667b09f12c39c6375bd57045780a4be1ca483f3f83422b77cbdbed0c05986ae925266d1c533f592b76ebaf04b9bab2b17284e1f60cdedcb SHA512 94afabd076ca2729feaf7374c77bc25325439bd556e95d7ee50bed852eab21baa71cfba9a0235aa6438477710324a1589c3b5a9e943aa5cb7dd68b6686cbd947
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
+DIST either-1.7.0.crate 15492 BLAKE2B 3ed1c5c27e7bd9453f83b82d3f57a4a73f965b1943a7a17d3de45ee35f62db53976ba9f2055ba28c555500cda528ff3a2d7ad6cd957540c91f512bd3adf9c5e6 SHA512 894bf3980def07848a2911734c02eb0c5c5d2ff3ab7656413d2acfd164d120a7c075e0a5f3fb95243b8bda0257a5f457117d5c6eafc146f3f6aaf6c6fbc4cf33
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
 DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
+DIST filetime-0.2.17.crate 14484 BLAKE2B c181cf4c3ddc5831c006917e7432620a62a0ca7aa379ea7f1aab9b99a8cf725055e8510f7f63ae5add770dc8f91c824d3b4e9e86ec0f3e7faa4e9a647c431a8b SHA512 3f7cc4e64381f4076ae04bbc0adbe2ecb024719f1f2fcc2ef537b0285261e03b8af7655d2db72358185dcce109df060d4a4a4015b3168fae0f6a952878860087
 DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
 DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
 DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
+DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
@@ -112,7 +124,9 @@ DIST git2-curl-0.15.0.crate 9293 BLAKE2B 855f9fa8ceef00d76afb19b52cb0ff60f3dfaca
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
 DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
+DIST globset-0.4.9.crate 22929 BLAKE2B 91dfaeb99a3f6f40a5a025ad8527c91770545487324e191801eedb6f916739b5efe687d84a43eb8b712cd181d98d3ab17b839f30c19e0da041b4c34d9286089f SHA512 66841495098b028b8d294c0832276b8864760df3a16b93b57222037c351591ac7773a99a65b85a20c438fbfc04c56ea4901188cb18ed470d3481eeef29eab708
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST hashbrown-0.12.1.crate 90855 BLAKE2B 0d38ca94f1a7b750b31bc5469ffc1fbdb79a789d0410dc51583f0319569c94ed03b7a8b5f02972cd370a48ad8252eaa6ecc6eca4cb92911ae7366992b9b43cba SHA512 a037554dda19d8c1d79e74fe59f0297855173a1bd0b119c8fbe724b18a07ec7c2475162213d2502483279712a46ff1247f1681aceb97f67c2e7a53b60779b418
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
@@ -135,15 +149,18 @@ DIST im-rc-15.1.0.crate 194077 BLAKE2B 327132f1b7cdb993c041e0083838cae9fb99dd202
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
 DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
+DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
+DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
 DIST kstring-1.0.6.crate 20728 BLAKE2B 28d5fc4553d44658bcc0eb06e79ac08aa3b2e86971e354ea50e51f349d8e5e74edda491c5c3cfadf9111dbcd19ecc42d73a44f7f3fe0590225342f8f4517ff84 SHA512 e1920ab6da39e414e0f89e0728a1993a516d201149a922e58a326c5392891919746891a61847f0c56b67d9ef5d3bc346cb00b2da1325191dff7d9661a5a12ba4
+DIST kstring-2.0.0.crate 22063 BLAKE2B 71e58489a167d57326ce974c8e05dd4d2e18f7fa142249aea86594b56b83d566e14fdd79b7202a20ca9dc9e0911f7f873454925fed642d51241e6fc920775831 SHA512 17cf8f86f0a1df9de75ded552c4bfb9f7f0567802c83c0a8fa71625aa33cc537b498c3a247716a7b91b01c609a3722233d6316322210aa44850fd564ca16f624
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
@@ -151,6 +168,7 @@ DIST libc-0.2.104.crate 548775 BLAKE2B b70af0cae086352f61cd56522b6d468640aa8e18a
 DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.119.crate 575749 BLAKE2B 5fa2bf66a4d642e1380335fde0fd190d5168dca58376379caeb52171a3382e5342c727eb4d92f1e27adde58a24d00352896a73c45309d947f56787a99f2753f8 SHA512 a43f8d1cac7a0d8c1bf6f2125695c03d91243498d2dea19a3a674ccb2c64fd00bac4040c42130a1a096b2148451f62e1292c5c71f424f51f888d6a37c7db0bcd
 DIST libc-0.2.125.crate 589236 BLAKE2B 57ca3aa19687b5c5702b66ad690a86ec7639dca41c5846c7cc3500f2d0fffcfee95a2def7695652174862fb6b8d211e7564fef6bef6d1197c481b5b8f18a9c74 SHA512 64ea5bb20120b9893bf5a3648f28da07384972e3cbad13da40c3ecc501efe1bff0bd6b71f52d5f253f00d7a97c2f69d86fba490955e8d70ca1360b8db1e431cf
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
 DIST libgit2-sys-0.10.0.crate 1530695 BLAKE2B 1a46359e2a61aad9f3dbb6eca54325bbb8e39c99eff53b4877796b8007eab61801ef7ff9c7331352396c689b134bb42e2d50bde42bacf2eb7aebf97a75c8a272 SHA512 3e86cf98c01f33a242ff0117bebd1a2dfc33100ee00c46cf538d61eae56bda4b93d479baff186837d5b8dc1ba7fbaf1942287df0487a50ac23cc75efe3a1cf7d
 DIST libgit2-sys-0.12.24+1.3.0.crate 1476766 BLAKE2B d1164bd49ac122692141ae6f2a38fde941582668169960e9af98bee7a4a26e57b34522057c8503146fc5b7fb1ab646fbf2548c7a3994299fd078e5b835041ff9 SHA512 9d738c318a15b70c749aeef777aebaf59a40912da5e4f23fade1e84a6425acdac6e6a59030811f5cd974edddd965c0c9514f7b5a0286d32d4d7f6ebb6e6ae21d
@@ -163,6 +181,7 @@ DIST libssh2-sys-0.2.23.crate 493516 BLAKE2B 00c0c1396f3d6723ad750112e7af8c8ac09
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
 DIST libz-sys-1.1.6.crate 1508051 BLAKE2B 4cb522640d27d8e2a31050bb5c44a2c4fa0bb01a467f18e1e89e5fdba594b3c14e14ec4c47ed93f09e5374757c3f73e2f2394b6321ad72ef3fba6e35abb02399 SHA512 18fd3800c38444aef381f7b360b9cd46678c560b46e7c5a286989fb9e689f2447e84f29e4ce195c1b8c2a89584eaee838c175821335accd13bd8d4483c3b099e
+DIST libz-sys-1.1.8.crate 2481844 BLAKE2B e890a3850aed5348afe7558168c7571564687d6a7d3567a4d53ffdf79444d38c4d70d35891e16f496f31169bf73b669534f5fc584f9ec520b518dda05e80b882 SHA512 0766ab72cc1414160ccefe4812e6204cbed1341607e5d17607f24fd4ff81dca68d8f2cf43e1d27f332a508d602bff0ad340c4c647a5d5f85acc120c19cfb4100
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
@@ -175,12 +194,14 @@ DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a8329
 DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
+DIST miniz_oxide-0.5.3.crate 53452 BLAKE2B ae99baa01c493b5eb779595be0d77a064c4624397676d3a023cc2a54941b0b3e7c80492ac47c8a28d78ec36e2f04aebe5af79f0e714380061c5e0139b9dfd9fb SHA512 cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5
 DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
+DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
@@ -196,14 +217,19 @@ DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf
 DIST openssl-src-111.16.0+1.1.1l.crate 5095644 BLAKE2B 5c0f1e5348d283355a61d2479dbef138de71cbc459f406bb6765923fd15b7a47e529567e1f10fddf56f3c6d9d1dd9358b671adb465b4f9dad3b7382a6c4df1c6 SHA512 de5723f7745fc3d445856a7e8afa0e1053afeb63d11a13973c772ff94eec9d09a69a593d24d1de0cba289eccd14a079683af554ce5752ea32e7e76c40fe78cf2
 DIST openssl-src-111.17.0+1.1.1m.crate 5097946 BLAKE2B 2315aa82144e27a4b6df50d468665cab2efe1a0b40a41e1c07d29ac11fb5e66165558f18979a2e0454d71b82957d11683e404ba35730e2dd5121df8f65ad5f6e SHA512 b22a6620d91936ae942597aa430675e7ac2e9b7439fc2c51ff820b2e1f1322a1a51a7d2bc4aad73ec544d142e79154d5ed74cbc94cdd1a665fe02ea26d5cf282
 DIST openssl-src-111.18.0+1.1.1n.crate 5100899 BLAKE2B 2f5e44216252b33c07876e7b7627799f882f53e3ec861ab8526a1e1027e179ffd19b55a9a979c898686d6127e2c83210cbffd2c97e9db942af5ef5baa8f9530c SHA512 e82d90e38b8d57be7494221c0aa069fce072ec545ff8956370cdc6d29a53e9c67a994b1ef0113fe0f87431a1666eaf85e45c2803266ec914156577a7480699d7
+DIST openssl-src-111.21.0+1.1.1p.crate 5102958 BLAKE2B 4156423d559f1619e1dae256895cab8c8cef8818fffdb4c23abdda1706642f279e11e15462438614bc95a56b3eed7b68dc3add41be7d7fef734033858ab70587 SHA512 b59a084e672d41fcbb89b62d1a483a349e20f985475801884352f433108423bec3f78a6f6c9a71ed9bef9fce8a5e72addbfbc7ce8b7681fc30b26d5ebc9ff18c
 DIST openssl-sys-0.9.54.crate 45751 BLAKE2B 7d21482f56568cdd7f8d02063f1c9b51ff355d67d20d44397f31332dccfbad36af9d6dae3294eb28feaf607b5ffcd13437ccc28df2ff0e43589b5e51c5faa012 SHA512 3c3271ac3b3825c6b8182e3d699835a4d73d774b43e9f694f4d9f1b9644de9ea1b8d8bfc2b98c9fe7af4c652d0eb7878001cd688f797d3b81bf5c8a72fd0334e
 DIST openssl-sys-0.9.67.crate 54600 BLAKE2B 8371057756351f2e77e953e2a827e812477fd404a66053047f6a1dd891d5374ff6f6666e3c8af5f858201814d351e72a4473f95ca439c2c0b02e08c89a1ed336 SHA512 cca7edceac5a11f3e3ca0c4c09aada27f94664eb9c7ada4784dc147fdd1c9cbb5eb1ad1ec145957155aff006a21e7c954363c0f72691bcd241cb43dee98b42d1
 DIST openssl-sys-0.9.72.crate 56510 BLAKE2B 32a346a5c98fa6de7dda0c592ebbe5144de777ed5fe63b96e5ba1891831c73099e7d01ec2c1a6890150d01a77d909fc18bc961b3fd8ea7c4b85317a79d988e98 SHA512 c1a6a50c4ea30b2bd7da520bc98bbd22a22ebc327d71c12f807f518cdeb10d81117b65df9294ba9391513a60577709723b93e75fc75423e970e9fa552edad32d
 DIST openssl-sys-0.9.73.crate 59581 BLAKE2B 77b56f2defb4725daf671e1651d0033909bfcdf8cb7df8ed7c942f2b2998ef17d7c5aaa335e48566d2988ee0f489545266b2fd1214c0dd5de732dbdd34201909 SHA512 b17ba906433b212587d6274def3cfc1beba2c50497f5653eb1a3ce767924dbe279f750ab58c77c216de852e2a3aea8c7cb0c2577c67dcbff1b6584c7d55866e0
+DIST openssl-sys-0.9.74.crate 59808 BLAKE2B e616a0194828afe67d617e4032ed354385935ff7aa40eb495781b38b134226d5c5cfc5f9405e6273c96622245b6d4771a71b7b9512e3be7feba9a2ce88b66ecd SHA512 18015ce4dc8f15f3c371d393f4654db11b6e5ecaadbdf6cd9f020ee9aee29f3fa12a8dd74d432d8e8b5889162491b722f855b02fbf0892c8f2003bc4e692254e
 DIST os_info-3.0.9.crate 20240 BLAKE2B a6f7b7a7956d230c96c81c5200e5c6fc8640746ab67798c75632bb177029fb6bd451a9bfa3d0db2b9e2a2300c50033e356a629fdeb31956dd2bec92b6b6eaa15 SHA512 97f1e0093aa0e2655742d8e76df5bec87f082ab1319dd09eceffb57b6477911bf5fa5dec3a48900ac0c15ed5e48efd69ce42151cc92b2e8bfb261a8df012efab
 DIST os_info-3.2.0.crate 20477 BLAKE2B 371fd4c342bc96f0b52e6e7957976d95be29811c4b0da8ced05363653e05886edf58006e788f77d93d0aebb324e32cf5c01b1a64f36f800316f097d7a6e81ef4 SHA512 a0e0771b12fcfc36dd06753245945723684aa3c96e2491fd95eba93e9f4c753f73fbf4d3e988e5ed8b9d7f98279c66752e3bc138d04c224e6b66b333fcc91409
 DIST os_info-3.3.0.crate 21285 BLAKE2B a0e3c83a9e9d89d065e449526286c8368a598a3d0e1c214dc070e7d1e4a422948c79e374875b8115beb68649a5737f471b6d65baa50f7b7676f6068230d49ea2 SHA512 803095998ac2b790395e894472bbef9b877f96dbf379820526278ded703b1041d4868751e132a04f8abcfdd1178c8529fe7284a2ff5b864184d4438f236336a8
+DIST os_info-3.4.0.crate 21316 BLAKE2B 5bc4df84b238bda3a7440588dbeacd8ed490169f5efef8623ad0342e977b230afa07ec91637ea9472d213a48a583a92da46a8aa0cfaa931d3ecc314d275b1358 SHA512 17c398759d8cca08b4042f1ff0af243912921668e94bf45061d2a054df2c77010cd952f971ce20fbb5de2d2c3882b0edae868e71f5f1dd1393cb254050e7c254
 DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
+DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
+DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST pkg-config-0.3.20.crate 15395 BLAKE2B d2727edcd04135783de0c1f27fe1cb052bd9255be88c935bdc2ca04f09694b7986cf66325761f2742a34c4b851ae3c48d3e01030c8ea1c19642de064d78ad574 SHA512 6c69010f122d0f7dcbeb6301aee9175617294fe7eea384201ef0dfcf83124b00d0727fc0460da797882e91153b677cc5b16eba98d19484c3a3ce4dbb06c7dd6d
@@ -220,11 +246,13 @@ DIST proc-macro2-1.0.30.crate 39155 BLAKE2B dd0ec47a3a54fed6cb3b03e5edb5c3e065e5
 DIST proc-macro2-1.0.34.crate 41072 BLAKE2B 6b507e95802fd8dfca422deace25e328b1e4c5a9515c83ae55f8a34b1c1d34ce427afea7d7a748f582abf903245ed8c2b3f4175d78c8c9dc9f467c9805329d47 SHA512 960036a077c3869386ecb5c2019816adc70e9a9b32ceeacd4b14b39a91dbffe0b21764ead7237ab3aa553b26cb6732bbeccacbaf83c8dca9069b11b9a85dd1f8
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST proc-macro2-1.0.38.crate 41687 BLAKE2B 226f76a1c264d6e74b72fe1f1a10fa8ab1405b618d0412863cc7e04509f682435dcc2703bf196e4fb1628219630d882d2be64926da19903b36d052113dfa60d8 SHA512 f360b00b4b1e05df52ca1714df34c719778f7bb6ed54fab04a84811acd0a29f7c4d4871fad7d988f0c042fe0fc326d7b1fedc731c55fd32c7257dd1895203080
+DIST proc-macro2-1.0.40.crate 40559 BLAKE2B d83cf7283393a82ca65263afc375d123bd2f48b719c9eab6859c52dc0c2b9b4b5af3090a0ebd0fedf0e1095f0bafbc443016f751a0485dc654bcd80a6f71e326 SHA512 bb179524bd41e36735010a7ec53e096359ffc3688ab97806a45ed9cfb17e8688ce352bbb8cd3bd4e15a4299e8500603c86591b17cfa31bca03f299f6f6347992
 DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
 DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
+DIST quote-1.0.20.crate 28160 BLAKE2B db257025f64817b1b58eecb8e64e63f1782d8a7fcb42ed6c3364254ec5a26705e49ce0637c880b0355b99a77473ce3083caae2cfabbd1a1a7e4fc826bae2cb7c SHA512 d12f4a425273b99ae655da11fcf5dad2609e20ad3e7d85cde08c7d09f444a5c7a3505470bad2d48b1ba8ea59ebf38ab87aa1052e47ec414acfc05dcb07d438be
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
@@ -242,21 +270,27 @@ DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c2
 DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
 DIST rustfix-0.5.0.crate 18370 BLAKE2B ec580a65720ec56031efd96f082625063e85671c4877fc96b9e73181ee15c565a83f4085a26d2a2d1bc57689bda34bff7233a3e4e3555d8d1b9fb8ddccf3b281 SHA512 3bc67adb7d1012c8e832d67491c619ee376df505227738a0d83bd129c360dcbcf6330cc9c5b18038428bd8b6baa7af79686420f25c428fa8a50c9e8403706cd9
 DIST rustfix-0.6.0.crate 18128 BLAKE2B 6ccfe47c67257c0f336eda4a2e228b4593a9be1eb883ae46f74f8158d26cb90181fd10443623add662f9491d823006e3557a7c9b212a4cdc608a832a94a9f7b8 SHA512 289511e3d454807015a2b8e869a458d764512754431bcc595cf3e3f147ffdb172a872363988b10a0d699d2de7734cde47901f57df965eee831854653cb35cad4
+DIST rustfix-0.6.1.crate 17352 BLAKE2B f353ac56f01bf9e1b164ca6d835f408be5189644b3db328cfc6bac8532704af8fb85f916f2de2a4cd7f4d3c0e9a8c2c8415a94d7f19737bda6796ac0a83ddcd6 SHA512 17113d1349a0caff8c93888d5cc8bcf943b9ab9033e87e9851473ffc115d4721125225d433384c375fc0df00edf3d4b6388ee507d0fa0c95b7a6c22e020cdeaf
+DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.18.crate 42693 BLAKE2B 78aa68189d2b0620e139010b64a962d47096410c0dc6b839a173d4e8e7808da9f460c26180511412711448b4a30adb072580a5c485d8d2257afc5100f80589ac SHA512 eba32bc2a9722fca9b97388c13f9cb99db4f2ebfc54f28f09525ba531297303ee601cea1995334bcbcfaff207dc5c906596bfe951a948221f26f25df65517fe3
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-1.0.12.crate 29615 BLAKE2B d0a8e7d148859c402c6a84ed8e261e738879079c5f755a80af6a210696ca157f1153d61596bf40f83d75bb69f27c045791ed141a32441e5d8c906aea495bab69 SHA512 d9c0984e59c8abee49418f785fdf5f7110dad8b4c84368723b7682bde3b9f97eac458f4a7ae2969548757b6d989bfb45909ec4a26b191ef304995628c7c78440
 DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 DIST semver-1.0.9.crate 30843 BLAKE2B 52c90056ec744bccbeb4a603b8e138a9b980a063c05462011d3b4cd11c5272c5284d0eec427ffd1e838d73f97a21af70a6c7f8094b6faecd3c18adb1b0be1449 SHA512 23da181209ca26a9e78d8111444c465273cdaac23ef6023b1e9a9a10e2ab9dfb13baf51f8b6f597598bde84c36910e0a45bae4f14555d731a9c9a3e94f37214a
@@ -266,11 +300,13 @@ DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e
 DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
+DIST serde-1.0.138.crate 76271 BLAKE2B 9e5021cbb5e4bdc82f8bdb3f079a24cb7909acad498fcd7e38b03bc75e2675dfd99658507b3208f5b1fde69f79c29f546b16a4b1be17da0e4b155acd92dd6b6a SHA512 e303d863d5ebdef27c38047427789ab6d3c4e1034d3e2bdd4048c09ef0da0e5f5b2cb25d00e1d47269fcc345458cc496af4e1a0ba64a3d627205337144a1c854
 DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
 DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
 DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
+DIST serde_derive-1.0.138.crate 54841 BLAKE2B 14a21c6492862aa2f7ef82c5668e2aada623c700b2450b547529cb69906d65c557af8414cdda1c4b962b0ffbec48d80b2732cc7ebea5d573860115f5d72a9d02 SHA512 c1dafc5d6ae273b2572eda1e986259393b96b4d37dc21622888546435d63af9117cf0ad4b13d260367a2bfe5cc194481fce624fba27df516e2567428410ef64c
 DIST serde_ignored-0.1.1.crate 11083 BLAKE2B 990f549b8b4fbd6b67f5bfe06fa6278f357ccd1014ee3a95561a09edab7f7f2e209d80c59ee749c6bc7524a07f0b357601e327d2f96bac0cfa514b3ea73afeed SHA512 1ef241d6a22f47c22305da613554e7c62cab00584e06c81381eab9c1e3e12e7ea9a516f845a5818b33bcbe72ee7dc9be686598bfc0121b400b0a8e165c8941e8
 DIST serde_ignored-0.1.2.crate 12179 BLAKE2B 45b8cab135fac2d7b23443462fe630212ae170207061f968540dd2b86a1f8c1203a185dfaa158f87dc36ceb8f769ea6c57e67c1497f2374444424237b7275af2 SHA512 c6f76051a5397615eea4aa953535ffa227cbdd6747f8f2ed0bf57d0a0b7bfa71536d8372a6cb8eb046b9a761e36f273e019754f607e6c84ae71bce25e25132cd
 DIST serde_ignored-0.1.3.crate 12434 BLAKE2B 665fffd6ed4c42b331f3589d7bffa48d581ea730d352a5f26c7d133a82b77a3eb0f29bd22da19df6a7fe08334a262140d44195d7c591991da174ee29d0e3e444 SHA512 9c459540b614a2075cc4d6a6d5bf1f3b3f91e8e48687388b1aee4872ca0eb95b1c265fb2c918929f99d0d8f2dae22f9eef4c67c5ed2fc5376b391163b20d7bda
@@ -279,6 +315,7 @@ DIST serde_json-1.0.68.crate 114986 BLAKE2B a588a87ac9fe2b3635d7bf72c185801e3866
 DIST serde_json-1.0.73.crate 115922 BLAKE2B 5f304d127c3cee17d06cf30ace0fa8c75374293b64751e45938a283a9451e3809ccc0a1cc1b64b33f526585744073b4b35a366a404772fd37856e4fdc128d786 SHA512 0d7bcf06eb2d78f768c4bf54429439a1f6e8b7097fda6e7547b4edee1933a69307ba9b758fabb6ac918cda216c7744a0b906d7a38fd13c51e16e6e25881df748
 DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
 DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
+DIST serde_json-1.0.82.crate 144514 BLAKE2B dd4b5ee1b93f04be09b1c204f8484091d608acc3966ed4c8252a1d46003dd154666e2731e761828dda4123da5c45bda653f453454c5c7c11977aef05bd0e9e9a SHA512 39e4cb0d8b22c9beae6decb87b9692581698c6309b2e9fd78e5e199a200da563e7459d34435b7890e274e13357195392cab69d73d3ee2ff537c1667de32f92c3
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
 DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST sized-chunks-0.5.3.crate 40643 BLAKE2B f08b893f2e32eee10372c75fd6bb41b667f004e044bf271d8a4a0bb6bc9f393662ed685aae3046ec05823f0e9c70b3b7e15c40b94bd22a5aa2079873d4b4c842 SHA512 9ffe2b6d0510d8cad010f4e3015f605ea0d0f4e27ded1fdfd7d7080e338bf239bec30fe85ef4576160297ad287ed006097ffc12151a2cdc578d7031d1501440b
@@ -287,6 +324,7 @@ DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d818399
 DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
 DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
+DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
 DIST strip-ansi-escapes-0.1.1.crate 8668 BLAKE2B e140f9cf55224953f0fc64480cb62a8191ac7fead81cfb891009ffb379085d121c577d6b40b726c52e9eebcedaff617554b0e0b56975048a99dde33b85de367f SHA512 ebcddc0af68f7263726d8f9dc3825819ea75389bc6f97f97f0238b17a06e0596f1562ddcf065178940e4f1963bf7a2b99eb02ec124f9f633b2fab1b443bb5717
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
@@ -301,6 +339,7 @@ DIST syn-1.0.80.crate 234102 BLAKE2B 97e13bdf99f9d50b352eaf87ceb1cf27f74e59df7e4
 DIST syn-1.0.83.crate 234750 BLAKE2B bd4162b01c8f2a1a46b60f4b380fbc1d83292c4c5400e9ecf59bf86ea35f6eda1c3e868ded25c86d6dafe973103c89aaca6dcd67a45a5bcfb111508e60e6ea08 SHA512 83bfe34f52bf20dd5c1465840652066ca8d99b10113048e753a323d7f20fa28fa1977156dd6b420a4e34ee3f674aa1c36da4e84cb8175e9c0281f0bb460b7c11
 DIST syn-1.0.86.crate 235126 BLAKE2B 89973130279128cab73443ee36c8e0d7bc83364ef91d0f086a40c136e26e612428b867a54a1da8ee5b1778cedeafc7403180bd84df2c21017ad5bb76bc0c9138 SHA512 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
 DIST syn-1.0.94.crate 236697 BLAKE2B e3e37de7ed5fe8ec78e3e65de9e64e7328769c5352e4db9c92d00095607fbdfec0a662deba507afeeee5a173c3c1b99d101268c4692752100198cfaffdda1a64 SHA512 2bdde4584b9d95f93f629083fbedc4a7148aab702775513a602ba2d122ae57a84e6d42c38da820b15ff66743dc49624287daa0c9b6d1fcaeee102b2879ac7a1b
+DIST syn-1.0.98.crate 235451 BLAKE2B 0667c24d7f6b9bf4c0a5f45fb51c903303a87c72d445ad824e05ab98a158f9beda0d00721144c486335b6a830db47fe57a34831cff6995f478c969c4d0a039dc SHA512 fe5dda742e085e14b6aea5617d3f9dd19ffd46009f34b119c0d74ec693042f641e594f75ff027dbfa38f3d5149a94eb6187248ee9d09d41dab9cc2cfc18fab18
 DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
 DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
 DIST tar-0.4.37.crate 47381 BLAKE2B e1114952758457ece466afecd083344f52ef6893d5eda0faa57957a4fe6625ea63500717533bf45f1f50c9cff4476f756d78ea1afb3cdf7397b8d4ac91f79816 SHA512 ca0df9922fab708c8a03912010421dea8d8eb3281108f822e9edc4c4bb7a0f5f800aa2d971ddedb8a4c24ba22308ec07e7a04febdd53665c948f3b8ca0be7fb1
@@ -324,14 +363,17 @@ DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e103
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
 DIST toml_edit-0.13.4.crate 104817 BLAKE2B 7a75d97b84012795dea220c457c713d03420432ea76d5dcef8b597793c6ae5216a1cfa13958f50929fcf2850c907b09a84a1f0103ae1e62020c6747e0996bf2c SHA512 7a1c915eb4e916d976882f64f5956c1a1ac2a1842882fd307b2a6044d644b25058be7c559b276b4632238b1d24418ed79c68ea4d7af0a13a47fef45d4338a328
+DIST toml_edit-0.14.4.crate 105387 BLAKE2B 63b364d812969fb206ec8ec38e8c0264bdea3a3e7482e2f253c8b0c4e9903bb5becbea6ec03f38d9236be7cbe8111a437e667b901ed75fe32d6de3f94d3a2790 SHA512 613aefe6b648eb202002d447a63cec1b83aaf6ba04e964491069198a0fc39ad11268509a2ebaddd68ee3253bc28df2a0e771cc2876c57136e517850a3926fa4d
 DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
 DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
 DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
+DIST unicode-ident-1.0.1.crate 33770 BLAKE2B e028e9f1d6c01a7a37c8f9ecd6b1d99041b45674bc7699066bb7479822cb8d5a1b4083db1117d9d44ab05096d8a37a9bd5d93dfe8cc5db6bb58950b4f5d5c8e8 SHA512 505650712a51c6f309c97bf72029de1eede33c71b84de9733f5f987859a61225e3d07d369b85a89797d870ea436f30b5b5046306f3d5fd672551a4b30c43e428
 DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
+DIST unicode-normalization-0.1.21.crate 121745 BLAKE2B e67a472d39b72be66f5f8e5b924157232dcd73edb2ecc1bf4f1aa078ea3b9860838afcb1710297367fd8c95f3c1331c91a520ac46c39b94f58a633919f124c95 SHA512 2994104d3393a117cf3eafc147ec9599c870b3bd4fbd096980534c8aeb48c6ba05bcf3f9804e3f2a0148940186dfb27871b23a991360bf8253a5a644f3cdcb12
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-segmentation-1.9.0.crate 93241 BLAKE2B 359904bcaadfd161128d40a896a2d10e5dfdb4098de245c949ae3fffecce9b4b6b999bbc2c6ca522944733ab0074e50fe829690183639c312bba8f8d0ad24456 SHA512 7d0ea37bfb24a1a803b1cd40b7b0c0e6e44ebf9a474fdedf0dcca1ead25662e19f44af29b87de1b000c3cc75fec93320938bb3ab9d9e82298eda324bb97e7294
@@ -364,7 +406,14 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 EBUILD cargo-c-0.6.2-r1.ebuild 3175 BLAKE2B 2c874c41711c25304f94219377401e6e698b8a0959b94892755c648ed4d302047a63ca9c7d6d6af8405ac01b8d59c7448cb1fb3b0aefaa97bb9e9885af95c9e5 SHA512 881d948993dd7e1cb3eb818702c9340fb4f02bf4452b6e494090e39e40b8a7e2448fbc17fa79aa3f8c09dbc1b96f9f2b60655988000385835f41a071d527f667
+EBUILD cargo-c-0.9.11.ebuild 4034 BLAKE2B 61d63ff1cb7df5e3b26b7543eb0d3d316a8ae0f6f380ec3b468d2861b73dd2eaf9a94fd5cdf1e43c513c1fe69f2d279772bb8169cb79c2559e92558789367c7c SHA512 3d118b8773467337aaa563f7d40bf0747dbcb9a8c760dbc7dbc1da142ae14ca4a32db1436b77e6844f3d204376fe1cff092c4950f42130a353ae076c31ce9a84
 EBUILD cargo-c-0.9.5.ebuild 3815 BLAKE2B 8d109e828cb4050fe915d8a3668bcb1062c3a26d22564cbe669da2f497685339f6d9519e55b58c09b79284265fb300f734349fa6dc6cacf64661179d4ffd33bf SHA512 142e07703f03a64b5d0515e3556c319bd8e131a33841de2fabb8cbcdce5edb74b96cb54e5acba9af47b28640b894b9fffe5bb833a2081bbf699b20ec292f5664
 EBUILD cargo-c-0.9.6.ebuild 3885 BLAKE2B f871c7652dc425140df2df1a042d3b68475df79ae162151f1e4321693eb17d7293fdbf465fd4dab966d7d3909acfd7c3870e6bd79b0760c8280407e95fef76fa SHA512 cd154b5099fcb4d6b1de515dbdd710a9f06e968c0fcefcc5e34481042899a85835763bf8eab55ca6bb4f077b66224f995c71bfb01b9907a3cbd2d9f4aa00b28e
 EBUILD cargo-c-0.9.7.ebuild 3647 BLAKE2B acfd347dad8e68d53e77afff0b8dbf90268e15cd12955b6f5b2aaa7c12c3ef5b0007a95504d1bf8ab9cac45aaf3917d3be192eb123f85fe51c32d0d7f4d28716 SHA512 3dbebfb37aa8dd21713f290ec0eca35f71ba6bb2950154d91bde378f0ecd4bb2801130ce39923ae08bb039ff2a41d86118734579e8cdd07d61f05ac0a457167e
diff --git a/dev-util/cargo-c/cargo-c-0.9.11.ebuild b/dev-util/cargo-c/cargo-c-0.9.11.ebuild
new file mode 100644
index 000000000000..012e3cb1069d
--- /dev/null
+++ b/dev-util/cargo-c/cargo-c-0.9.11.ebuild
@@ -0,0 +1,200 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Only bother defining this if the github tarball doesn't work!
+# Otherwise just comment it out and things should Just Work (TM).
+#MY_P="${P}+cargo-0.59"
+
+CRATES="
+${MY_P}
+	adler-1.0.2
+	aho-corasick-0.7.18
+	anyhow-1.0.58
+	arrayvec-0.5.2
+	atty-0.2.14
+	autocfg-1.1.0
+	bitflags-1.3.2
+	bitmaps-2.1.0
+	bstr-0.2.17
+	bytes-1.1.0
+	bytesize-1.1.0
+	cargo-0.63.1
+	cargo-platform-0.1.2
+	cargo-util-0.2.0
+	cbindgen-0.24.3
+	cc-1.0.73
+	cfg-if-1.0.0
+	clap-3.2.8
+	clap_derive-3.2.7
+	clap_lex-0.2.4
+	combine-4.6.4
+	commoncrypto-0.2.0
+	commoncrypto-sys-0.2.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	crates-io-0.34.0
+	crc32fast-1.3.2
+	crossbeam-utils-0.8.10
+	crypto-hash-0.3.4
+	curl-0.4.43
+	curl-sys-0.4.55+curl-7.83.1
+	either-1.7.0
+	env_logger-0.9.0
+	fastrand-1.7.0
+	filetime-0.2.17
+	flate2-1.0.24
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	fwdansi-1.1.0
+	git2-0.14.4
+	git2-curl-0.15.0
+	glob-0.3.0
+	globset-0.4.9
+	hashbrown-0.12.1
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hex-0.3.2
+	hex-0.4.3
+	home-0.5.3
+	humantime-2.1.0
+	idna-0.2.3
+	ignore-0.4.18
+	im-rc-15.1.0
+	indexmap-1.9.1
+	instant-0.1.12
+	itertools-0.10.3
+	itoa-1.0.2
+	jobserver-0.1.24
+	kstring-2.0.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.126
+	libgit2-sys-0.13.4+1.4.2
+	libnghttp2-sys-0.1.7+1.45.0
+	libssh2-sys-0.2.23
+	libz-sys-1.1.8
+	log-0.4.17
+	matches-0.1.9
+	memchr-2.5.0
+	miniz_oxide-0.5.3
+	miow-0.3.7
+	num_cpus-1.13.1
+	once_cell-1.12.0
+	opener-0.5.0
+	openssl-0.10.40
+	openssl-macros-0.1.0
+	openssl-probe-0.1.5
+	openssl-src-111.21.0+1.1.1p
+	openssl-sys-0.9.74
+	os_info-3.4.0
+	os_str_bytes-6.1.0
+	pathdiff-0.2.1
+	percent-encoding-2.1.0
+	pkg-config-0.3.25
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.40
+	quote-1.0.20
+	rand_core-0.6.3
+	rand_xoshiro-0.6.0
+	redox_syscall-0.2.13
+	regex-1.5.6
+	regex-automata-0.1.10
+	regex-syntax-0.6.26
+	remove_dir_all-0.5.3
+	rustc-workspace-hack-1.0.0
+	rustfix-0.6.1
+	ryu-1.0.10
+	same-file-1.0.6
+	schannel-0.1.20
+	semver-1.0.12
+	serde-1.0.138
+	serde_derive-1.0.138
+	serde_ignored-0.1.3
+	serde_json-1.0.82
+	shell-escape-0.1.5
+	sized-chunks-0.6.5
+	socket2-0.4.4
+	static_assertions-1.1.0
+	strip-ansi-escapes-0.1.1
+	strsim-0.10.0
+	syn-1.0.98
+	tar-0.4.38
+	tempfile-3.3.0
+	termcolor-1.1.3
+	textwrap-0.15.0
+	thread_local-1.1.4
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	toml-0.5.9
+	toml_edit-0.14.4
+	typenum-1.15.0
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.1
+	unicode-normalization-0.1.21
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
+	url-2.2.2
+	utf8parse-0.2.0
+	vcpkg-0.2.15
+	version_check-0.9.4
+	vte-0.10.1
+	vte_generate_state_changes-0.1.1
+	walkdir-2.3.2
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+"
+
+inherit cargo
+
+DESCRIPTION="Helper program to build and install c-like libraries"
+HOMEPAGE="https://github.com/lu-zero/cargo-c"
+if [[ -z ${MY_P} ]] ; then
+	SRC_URI="https://github.com/lu-zero/cargo-c/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SRC_URI+=" $(cargo_crate_uris)"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-libs/libgit2:=
+	dev-libs/openssl:=
+	net-libs/libssh2:=
+	net-misc/curl[ssl]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.62.0"
+
+QA_FLAGS_IGNORED="usr/bin/cargo-capi usr/bin/cargo-cbuild usr/bin/cargo-ctest usr/bin/cargo-cinstall"
+
+src_unpack() {
+	cargo_src_unpack
+
+	if [[ -n ${MY_P} ]] ; then
+		tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_configure() {
+	# Some crates will auto-build and statically link C libraries(!)
+	# Tracker bug #709568
+	export LIBSSH2_SYS_USE_PKG_CONFIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 74fff733711c..de4259d58ce2 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,5 +1,5 @@
 AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4
-DIST ideaIC-1.4.221.6008.13.tar.gz 672307485 BLAKE2B 87256b920764d45d823349eaee30002c0ba587a49a1269c30071f826da7746f32538ac1f3ad6211c846970a029fc3775741b8c74d67bdabbb51820a407ac2e5d SHA512 9387de6b19ed1ee0f0b0745d900bac9d70adb7f42986c17f7b0736816a19491eaf541c4a6f7920215ba2c412710d20d289b1b24e8a733dcb52fda14ff480fbe9
+DIST ideaIC-2.222.3345.118.tar.gz 683048510 BLAKE2B d0504108c6eb099c9591f2a629dfd708577573c1115403562e2ecbbfdbd09748b4e0cb3ef0c86a2e97762c5395435836fde0ca6f99b9a8dec57c5a8ac58d454c SHA512 fdbcd77d78be23e7e3285bb4fd59f7a6363b480a23695e18f5d1392a7a9b0e29b82145ab0194fb2b50bf4d7a1d9b6e205ac8723f0b9d113c2115e10ce7c738bd
 DIST jbr-11_0_13-linux-x64-b1751.21.tar.gz 295860296 BLAKE2B cd6edd69fa34896a388ec929d5f53ebc1f078ceebbed8d4e414a19eb91e004e8f53cbae95c2e3b191c39aa89b307bc8a1854b8a86ca2129eb3997c62705563bf SHA512 7d97e520b67197718951609370e90a1e08ef1daca1433373ff6e34fc9c6f4f005478b142190ef5dab46f14e85440f9daca5c662348bbca5207fc2f8d7892361f
-EBUILD idea-community-2022.1.4.221.6008.13.ebuild 4236 BLAKE2B be11e284549b51641a452af9d7579024b5a21fd98c4928ccc4905c77707e7ff4ef1e95c9b6b56e644eec4d747a1f2f3d8040a385e30c136c9d28c56a06da04d6 SHA512 a81307a75eecf019df7c01025c753025ebda46f41427ed57098d12343a4f1c478b85da7ae17f93e3485d63d6d1254090bbf147667b7300f4bd747c45379c6d96
+EBUILD idea-community-2022.2.222.3345.118.ebuild 4178 BLAKE2B 66db386c550276e725ccbcdf5c2dc81ca2e88d329848970e4955d0259ff6b7ccef154c109263befa64089f3848a643f4358b85f95aaeb2e2f298d7b853146656 SHA512 9edc399963ac6065ec06418cf5f719a3aeb7f6d15bca737915a0a1745e4d7999fd130e507b761659c5ef62a32a1ec8e229f561bd0f584460a7e00da30dcac458
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2022.1.4.221.6008.13.ebuild b/dev-util/idea-community/idea-community-2022.2.222.3345.118.ebuild
index 25ea0ac3c085..7d58f6100aaf 100644
--- a/dev-util/idea-community/idea-community-2022.1.4.221.6008.13.ebuild
+++ b/dev-util/idea-community/idea-community-2022.2.222.3345.118.ebuild
@@ -6,14 +6,14 @@ inherit desktop wrapper
 
 SLOT="0"
 PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
+MY_PV="$(ver_cut 1-2)"
 
 MY_PN="idea"
 # Using the most recent Jetbrains Runtime binaries available at the time of writing
 # ( jre 11.0.10 build 1304.4  )
 JRE11_BASE="11_0_13"
 JRE11_VER="1751.21"
-IDEA_VER="2.61675052.105843767.1658527855-1305167137.1658527855"
+IDEA_VER="2.49836838.1031729952.1658961170-1305167137.1658527855"
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
@@ -49,7 +49,7 @@ RDEPEND="${DEPEND}
 
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 3-6)"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
@@ -81,6 +81,7 @@ src_prepare() {
 	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
 	rm -vf "${S}"/bin/libdbm64*
 	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+	rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-aarch64/libquiche.so
 
 	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
 		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
@@ -95,7 +96,6 @@ src_prepare() {
 		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
 	else
 		rm -vf "${S}"/lib/pty4j-native/linux/{aarch64,arm,x86}/libpty.so
-		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/x86-64/libpty.so || die "Unable to patch libpty for libc"
 	fi
 
 	sed -i \
diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index ecdcdcef2a78..b540975d3dd3 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,5 +1,5 @@
 DIST uglifyjs-3.16.1.tar.gz 519333 BLAKE2B 6e4978aa776256be575ea91fd6cd584fe8885886300db1b77cc889af5112615175cd40d527ac6356d653e60ab3ed404670355f80e0391da538313b494bb1104b SHA512 e0ef3e2b82cb6f211120b1d66132b5b5b13bc48dd946d7e7bbeddd1bee16330c9a3541d07f51b6eddf9036b0e520a527849ddc3cf6de467331b42f1fba37e66e
-DIST uglifyjs-3.16.2.tar.gz 521877 BLAKE2B d9c40425b7911a08f90b64c1bbafe1d69ea2b7f7127b2f6b08065d5d99f776a582c27f29c827394ec89f0652cf03ef51bf1da24a4428ecd6b4dd1fa59107ce1c SHA512 ce714f8fab93c4ce3e9774321c6fd81dc050962a50b599ddff2a42d4ea60dc05f672fafb7cc473adcee37a9ce75f85e4d6fc58b1c174c559fe9a66a9230b9da5
+DIST uglifyjs-3.16.3.tar.gz 527549 BLAKE2B 9fa89b62d2b38a543c07d5e02c8e07228eadbf1d577e96491961af1e5bbead5e8268536cf3e2c64b5a6274d7badb22ea926b87e9faddc9ed8b1d83642b69267d SHA512 173eacc7914fd4dba2671018760f0c1fb7c9d695c199003b80cdaa6ef8bda303efe647c0abbc3a7a95156512a6d2b99058340cc70a124758683d5c3829fed3bc
 EBUILD uglifyjs-3.16.1.ebuild 775 BLAKE2B bcc377d38ae642d595fdd2f0dc4a78ad946d4a2c29af09f1ae7e798e21caeb96a5b5f6ce4aea4338d4fb0e84934a1befc1925d056020620573225a9202fff6ff SHA512 e4928b36e7bf3e0b61173d1bef56a389cedac5e06afb6a0426ffb82f4f33aadc1cfa9a0e6151011bc2e671769be700d78c347426cfa674a76cbc01162dd21bb5
-EBUILD uglifyjs-3.16.2.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
+EBUILD uglifyjs-3.16.3.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
 MISC metadata.xml 328 BLAKE2B 74d4d808f158dcb49e996da74b67d65fe12956d7486b91941b03f3bb237d7d13387ac629b9689ebce8bd0580b0ce24d359a788911134fef6f006546c5365f2d8 SHA512 3db3efc0f0f5f0f3c7d453d4edae27d0ddfc62aa7cb778684d58460cfd55187fdd90c06bfb2629fb0d84874ff378dbccbc7ef182a10e35fd4b85991c5777a213
diff --git a/dev-util/uglifyjs/uglifyjs-3.16.2.ebuild b/dev-util/uglifyjs/uglifyjs-3.16.3.ebuild
index 1a44c1a32320..1a44c1a32320 100644
--- a/dev-util/uglifyjs/uglifyjs-3.16.2.ebuild
+++ b/dev-util/uglifyjs/uglifyjs-3.16.3.ebuild
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 243a05e4236e..6524a07610ee 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index f80d15722840..d0bf64c35127 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,5 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea788a50dc834ea761ef8dcbf21696214ff3370f43de3218e202a5ad786b972c77a679a7cd0d2d1ef38f43db67de SHA512 3281e15bf7a4b87cd1b53b755c1695d77f2de0b7ea23ebdedf0bea60013c5d79f563fdbab3de421bfa50c3d2f24e93c39f49525d8157ca9e649d206a1cb80dfd
 DIST bedrock-server-1.19.10.03.zip 73426046 BLAKE2B 8c8c25d0e811509329d3c1ade0e442804ed221530b5a915c0d41e58f249dd2b7863bb2d87d1d871635d2b1468ee0dc6c42727e70013164c2e65fb7f13fc5988f SHA512 f1afffc34a2c4cf4c1ee16cee3dd067c5544ae3ec4337cb26c5047cecbe1c1b9baf6a98d915b3c20629223c27b222e37c1c5e762fe90bcb9fec2ec7990dcafbe
+DIST bedrock-server-1.19.11.01.zip 73425893 BLAKE2B 06f10a24db3205da7f2c83f4646610fb66743145cf9afd1d6d7e0c973c9151aedb335364ceb57dc83f26ebd9640ddb863f46724fe6dc581a75b1b1649ec59cbd SHA512 10c74dc3c511310814b3f28ac55a80b63a476f01259b351e95f3b3bc095441175af2076aa97846c51599a896c08c2d3d202ede417c487482c912e254dfaa1fa5
 EBUILD bedrock-server-1.19.10.03.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
+EBUILD bedrock-server-1.19.11.01.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.19.11.01.ebuild b/games-server/bedrock-server/bedrock-server-1.19.11.01.ebuild
new file mode 100644
index 000000000000..16dd14a8e660
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.19.11.01.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	acct-group/bedrock
+	acct-user/bedrock
+	app-misc/dtach
+	dev-libs/openssl:0/1.1
+	sys-libs/zlib
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+DOCS=(
+	"bedrock_server_how_to.html"
+	"release-notes.txt"
+)
+
+QA_PREBUILT="opt/bedrock-server/bedrock_server"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	exeinto /opt/bedrock-server
+	doexe bedrock_server
+
+	insinto /opt/bedrock-server
+	doins {allowlist,permissions}.json server.properties
+	doins -r {behavior,resource}_packs definitions structures
+
+	dodir /opt/bin
+	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
+
+	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
+	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
+
+	einstalldocs
+}
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 0ae7061a6853..b419fe305d51 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -3,6 +3,8 @@ AUX minecraft-server-bin 427 BLAKE2B b02c5d3ee1256cc41b5e369cc0ed2f082e8045c1189
 AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r5 2014 BLAKE2B f38e398a0772918349797c9ffa46ee6ac0a14bbd48cdfe61ba88c54785f290f6f4643498bec5aac8943f45b5e4cc9c1af4af99577284c87442d73b827e141ab7 SHA512 b49f615d823e35545797d21430f33674f1345a059279dcaccd2a4a91d63a4b90b278739827c6af2c57de083c440f84edce684d28d6eb04d5a8d1f7e5699ea658
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
+DIST minecraft-server-1.19.1.jar 45609936 BLAKE2B 2d9fae53c78dbab85d768577f98f8ad9eeda6ee57c87a0585a706e209a6d7c8c4c30c84ba39ae4041e4753b511e9f35e48d441f6f4b00a83c5e27965aa62554d SHA512 9ba0605e29d0923170512412ec91e1656d4ddf7420a25f5b031c6e84551feb837398402171fea4f26123a72f0965bdba26bddb2626df51e71168408ecb081044
 DIST minecraft-server-1.19.jar 45538778 BLAKE2B 1f71b5f80746394fd747f6fecbdcecfb125f893dfc51aaf153150a16aa77894b6e8487dfd7b8f87000ff12f49135caa07221a2b885481ae20f54fa2cb4d6d1c8 SHA512 46db739cc49f5f3a31478467c0a470e35ef4c61e5030a9617f32da32efc45e290a2771d9b729b5272b1b6176cc5ca6675100f7fa1ba6e510a68b6cb96c7c88a8
+EBUILD minecraft-server-1.19.1.ebuild 1167 BLAKE2B 4c8b58891f27bda4b300727c0acca33c362cffcbcec0bfcfdb0dba0344a93f0dd8692953e8367ba3b7a83af1229d2c3e015e0a66f2f8e242335b40b5e5ef9b5a SHA512 5b1e174d735f014d1b24e27010838803f24495d5d7247fb921edca37debc171326acd9f44a08c40beef19ac1b8e9616b229ff3749fb8ec3ceb640d0fbac0b532
 EBUILD minecraft-server-1.19.ebuild 1166 BLAKE2B 8fbbc8205b8af725739aec461f891454852be963b5adfad88b4f762495d8d2f756ab4f6287db989833a4c7f59e0137a9305f11c07b5430fbdcb51db988ab0675 SHA512 d3ec698af5edafb48117efdcc8d56f1877fe8b2df103ed2f28e6c19c42f3d9b2a7184c944278143c8f286c8542e22727dff7a0cf24a171ade8551336f4163adb
 MISC metadata.xml 935 BLAKE2B 7147903a9b3a7405889a8ef3282569aa953574339af51aa27d1deea266795546defd6ff89e93aee06c82f2b5bee34a8aa3a9756f4fdf2bac0ff5565a7165e17b SHA512 46d768d34f586b1e148657f108b4a852dd6708d340a53c5b6fedbfe4dc4770f44313510a04d58ccdb59b13257a7d30801c38c6fa94dcbb16e3d438179fd6b3d4
diff --git a/games-server/minecraft-server/minecraft-server-1.19.1.ebuild b/games-server/minecraft-server/minecraft-server-1.19.1.ebuild
new file mode 100644
index 000000000000..e90f1ac555f0
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.19.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="8399e1211e95faa421c1507b322dbeae86d604df"
+README_GENTOO_SUFFIX="-r1"
+
+inherit readme.gentoo-r1 java-pkg-2 systemd
+
+DESCRIPTION="The official server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
+S="${WORKDIR}"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/minecraft
+	acct-user/minecraft
+	app-misc/dtach
+	|| (
+		dev-java/openjdk:17
+		dev-java/openjdk-bin:17
+	)
+"
+
+src_unpack() {
+	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
+
+	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
+
+	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
+	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
+	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 820f901916de..8589a3bec576 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 12280431f1ff..c74339978c51 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -4,5 +4,5 @@ AUX gmic-3.1.5-makefile_automagic.patch 5378 BLAKE2B 161a06be29e9dc4ac9d4f6234d0
 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
 DIST gmic_3.1.5.tar.gz 10782647 BLAKE2B 9334f61b4309dec31d5dd0c52b87a97628bfa819602f3bac03cbc74c26a65dc660c0f4ae5c84d2aba5062ebc2869ae3d656e6fc2b2f9c9d0565d07762a920d21 SHA512 7e27856db8b68fde33e50f09a9d07479b67843388a98edc891deab51828d922200af20afee163984e0c7660e46387d1fe514d35ac3e3d9c8ebe02b0aa89cbc96
 EBUILD gmic-3.0.1-r1.ebuild 4192 BLAKE2B e9da6acf816933b7a0e7becbe3f78dce521a05838ca397fc5e1d29154fa975eaa60cc9ca3fcd8c6287b1eac442382792dc4c1acf66a4376e7aa21968e74b1a9e SHA512 db4b500e695e6cc80b1b5b0df04659acf60e7018cf50f2c6a97fa325b070e20bdf180aaa46e1a693cab485cc00a1823cce1943306f4b9ed97d261bc490464684
-EBUILD gmic-3.1.5.ebuild 2571 BLAKE2B 1162b09b66387db3b6ef81794902ad2572415eee2780390b865853bc75656074fd894da846937476073f6e8a408d4671e749d5bc0e94c219579ee5e28560d89f SHA512 7d80dc888b363c8106033a7c625c503b7948bba054b9a475ee19349240ecd5c75ed04a72c4d1c007aa5d85f594b8dbd91eee61bff557c62706bca73f6fba49e4
+EBUILD gmic-3.1.5.ebuild 2567 BLAKE2B 307837ecf74743536e6094c599ffa217d6f968327652d50bc09dab81ae4d676d84b549771ba2fec71f9c32a464838b4ee3d225d9d9574fe332ceee2f22957c42 SHA512 3f176c15d09d0b3ca12a002291e538841e10cf3456dc7043c3fe9b66974e6c37ade6fe42e3862af54dbe8233e98a2ebae30e9bddc9cf93895936c989763ef570
 MISC metadata.xml 466 BLAKE2B aef1ab7a346d34ebdba8f6e09298d1bd96ed2771307fbd3e3cc15ed0774da1c29be9a3b260b9a7c287ce904685f708e56d59953fb92bf4d93d52227614f3c148 SHA512 755bfb920c6baa950716dff8a345540a730b1c6d179837d81ce1e1a3dcdc826665b61f9da8dcd007c44893f3310ace5dfe2a976a80926ab96170cb84a3f3555c
diff --git a/media-gfx/gmic/gmic-3.1.5.ebuild b/media-gfx/gmic/gmic-3.1.5.ebuild
index cd77bcb4433b..4555221810cb 100644
--- a/media-gfx/gmic/gmic-3.1.5.ebuild
+++ b/media-gfx/gmic/gmic-3.1.5.ebuild
@@ -29,10 +29,10 @@ RESTRICT="test"
 
 MIN_QT_VER="5.2.0"
 QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+	>=dev-qt/qtcore-${MIN_QT_VER}:5
+	>=dev-qt/qtgui-${MIN_QT_VER}:5
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
 "
 DEPEND="
 	sys-libs/zlib:0=
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index e56541d958c8..1c73c35a1947 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index dec6656d88b9..bad1a7311735 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -5,5 +5,5 @@ DIST easyeffects-6.2.8.tar.gz 3063821 BLAKE2B d64952ff1e04f0013cb2548cc62d67f401
 EBUILD easyeffects-6.2.3.ebuild 2008 BLAKE2B 9b434e4192e1948618cc9f596461d462e30df5c4cced38fc7ba0d9bc18e3c8d6bf743ec3086eb4c781539a20caf42125145830f686936ee5f9db211478b68cf0 SHA512 f81af4dba50434c0bedc5311e6a4d0445235088463bf430300c3cb869384a085ec3f747e3fda2b551acce8165ef7d365d3fcccd0e0985ead8e631fde72f57e08
 EBUILD easyeffects-6.2.4.ebuild 2008 BLAKE2B 5cf9a3ddf54274a37e560ba7cc69aebe2b76b5ce8138737c02ed40c679babba900e4fa024bd65ed9113282eb2e5c8959b1c552ae95debf26cf3b85778cd379a6 SHA512 7e95820c05679a86f92715b725a33ee61b7b5381fb1e3f2cd73fba0185de18bb2b24e3a25bafdbb0c25380c837ba5ddfa17a98de98b6ade47f3825e68ea27795
 EBUILD easyeffects-6.2.6.ebuild 2051 BLAKE2B a07ee0e8f1de9f8a82039ee3f203a77aeced2da5fc5d5095f7642f996f5662fe50bad4eb5261c86be9eaadbe286b294024da35aae54ad669d08fe3f00c443771 SHA512 bdfd04dc62f7a0125c50f9c7d1a0b1211cf9a341b0d86c076779f66852e5b23fd693ced02adc230e512aae9cd9bd8d2bccfc650b08075e1a026c7102d761c3be
-EBUILD easyeffects-6.2.8.ebuild 2051 BLAKE2B a07ee0e8f1de9f8a82039ee3f203a77aeced2da5fc5d5095f7642f996f5662fe50bad4eb5261c86be9eaadbe286b294024da35aae54ad669d08fe3f00c443771 SHA512 bdfd04dc62f7a0125c50f9c7d1a0b1211cf9a341b0d86c076779f66852e5b23fd693ced02adc230e512aae9cd9bd8d2bccfc650b08075e1a026c7102d761c3be
+EBUILD easyeffects-6.2.8.ebuild 1994 BLAKE2B e356cb3645d2e58b08bb7636b5f2a8150377ee86399ece0c1ee3a2895afb39c9df6aa75b95ca7cb42e42503053bd64f4edc38c49a4bef978936ad9f5c5726952 SHA512 dbf4e3c89ea1ab634d932edccc21d78d0dc58c25506c82bdcea047b4fd1a62f41049328334dbfe2813cf87943350ffd39f32b36c5bb490e757a0230f1002f8af
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.2.8.ebuild b/media-sound/easyeffects/easyeffects-6.2.8.ebuild
index 9250f1d82ccd..7df1501d43c1 100644
--- a/media-sound/easyeffects/easyeffects-6.2.8.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.2.8.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="calf +doc mda-lv2 zamaudio"
 
-DEPEND="dev-cpp/nlohmann_json
+COMMON="dev-cpp/nlohmann_json
 	dev-cpp/tbb
 	>=dev-libs/glib-2.56:2
 	dev-libs/libfmt
@@ -38,19 +38,19 @@ DEPEND="dev-cpp/nlohmann_json
 	>=media-libs/zita-convolver-3.0.0
 	>=media-video/pipewire-0.3.41
 	sci-libs/fftw:3.0"
-RDEPEND="${DEPEND}
+# Only header files are used from libsamplerate
+DEPEND="${COMMON}
+	media-libs/libsamplerate"
+RDEPEND="${COMMON}
 	>=media-libs/lsp-plugins-1.1.24[lv2]
 	sys-apps/dbus
 	calf? ( >=media-plugins/calf-0.90.1[lv2] )
 	doc? ( gnome-extra/yelp )
 	mda-lv2? ( media-plugins/mda-lv2 )
 	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
 BDEPEND="dev-libs/appstream-glib
 	dev-util/desktop-file-utils
 	dev-util/itstool
-	media-libs/libsamplerate
 	sys-devel/gettext
 	virtual/pkgconfig"
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 82f696efa540..65dbe23253d3 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -2,6 +2,6 @@ DIST mpg123-1.29.3.tar.bz2 1069979 BLAKE2B d01a8d77ffb6c344592d1b90026ee25ae12eb
 DIST mpg123-1.30.0.tar.bz2 1091578 BLAKE2B 6acdbfcc1119507c63d9da95afc747c43698ef385368b417e1716eadde6b74fc0618c3aa03a495e4415b5f14aef26d85f98832b3ba5f5bd17083651808a7f53b SHA512 cf508bdff1f75320c7c4d77653ba8170cc0dd8c565390cfb6ba745ce3853816071c86becff3ce304b80481d220cac2113ad244930832ccc78d3d8da74112562f
 DIST mpg123-1.30.1.tar.bz2 1092735 BLAKE2B 8ce6b964acf307ce4358b33468b7560e53024df2551a17602032260ac799d6c1ff0512cfb5fa6a59e3983c054fa82b1520f8329502fa4c351b94f66f9ccdee13 SHA512 098fcecc6a570e32ccd164b62428417186265905d148d009ea592c948a02027d67fc43e015ece21cf900008f31bbe35b3ec770faba5ae0b914db0022cb6b37fd
 EBUILD mpg123-1.29.3.ebuild 2999 BLAKE2B 179133f33e9c17de507caf6416b413808faf84a083e1cdefe6380931e21d0d368e898ad44a02fdd0d5581934712279fdb00645cb5974d5b4996fb4e21df062db SHA512 cad78654ea54c420135f2878d07825cdb3c67241fa6f376fe5828ef4c5e600bf8adcd5e1af61f430d70c2ffdd0f23f412971ef574836dd5f912266bc9dea904e
-EBUILD mpg123-1.30.0.ebuild 3002 BLAKE2B caee41823c614edd8df69e59e3e880a660e0a82683d82ee52a309702d6789dba91ac2f7558afb25bd28791f25775aa324602895ae9800cb5bdb05dfdbfd83671 SHA512 21b19d2493b8e6b75ea4b48ee88483fff153dff5f6e22a8add890348864b48c58e8ae1ae9b50238552c8257c29742728e883386c66badb9db011ba0b481dd1c5
+EBUILD mpg123-1.30.0.ebuild 3001 BLAKE2B a82f5e2758a1ce0509ed682161ffec56c09f806ca9628db79f105d335085c41e4ca31ccd8417565db1f5d6c15e072359352d5dce2513de7a37e61a5ecca9c9ab SHA512 c98f1184fd31e20f7277d4369f289e37f9da61803cc6b8cb1677865358b3c369350ad3290f80f37af3a96556563808074c5c4daabb45d24608b9886d5def42f1
 EBUILD mpg123-1.30.1.ebuild 3006 BLAKE2B 0c587a897a607c29f7192156e54618441667478361f2ea3a59b48944ab8c1a58d73ffc89b0910f227beeeb13388d3e48a4e14db2efd72f79d5e329eede813cb9 SHA512 a100bc2beb52f75de60726554a6409bb7064bb7c647103dd7061f9dd78c3095b7ba8b02a344d09225cc1ccb74569b07ba399c90f09e07b9b4e641f3009730e8e
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.30.0.ebuild b/media-sound/mpg123/mpg123-1.30.0.ebuild
index 14d0724697dd..b7be15319a24 100644
--- a/media-sound/mpg123/mpg123-1.30.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.30.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 2adfe9523292..74cb8f3cbb88 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,4 +1,4 @@
 AUX pulseeffects-4.8.7-meson_no_automagic.patch 1529 BLAKE2B 1a40bf0382e378129b784a1d65138e89934757b2e3580616e163a9f2be1675b6a181b3909b3d7dd25b5e1bc5243d316534e2eaae4d7f82e4764645be33ac6c15 SHA512 249fb9a3c4254c21a49c46b1eab4d0c9dd6081a1367d192be7f9446b97235aa2c5ef909465fe130c0d01024f6152a7208c5a2205781d8f84bf5b6bf1e10204cf
 DIST pulseeffects-4.8.7.tar.gz 2028489 BLAKE2B 705783104c7ce3f4ff1246cf05c1a31c09ef0507a720365b9a8914e6e076a209dcc56e240ae2de1981f3ab377f10947d08260fe8ae8b3cae5724db1235a0c01c SHA512 0fa679723ba76ab0a0cf3136dfa66fec09b16643f3f4f7bd1bb2826794d907c5c29a2fc7633e30d3542ddf755c842fdaa167528942fe459e3e697ac3524c0cb9
-EBUILD pulseeffects-4.8.7.ebuild 2270 BLAKE2B 1b230037c4c7a24a57ba08eeb6b665902263b077e18da372037b139e56275e737b2885eb4663a0b39710467780b243f13613e9b60c54b1d25a68e3ac04384769 SHA512 a0493b880ebfbf061104258dfaf89a6383a5f2cce08a4b9436e3b0ee4ee73570e6336bb08bdaae528e1f887ff9ed76396c3b0a80a78be6dacb6b94d337bd1bf7
+EBUILD pulseeffects-4.8.7.ebuild 2213 BLAKE2B 82c3d92aa2d9c476d4f4e9ac0480ffde9d62a7eae567a1e4aa53e2b3a35d82654cc86e6edb7d59c875b4250b89684b0b3485ad9318a25fb912f7e9a5f8c73039 SHA512 f78c9b7eb648218da1f5e7da700ccc03137fe13701e537d01c8148eda591dbcad6193247cc073c8c802e6f56722697a9faeb4b2c56c97122de4ec5ebe3068705
 MISC metadata.xml 1353 BLAKE2B 8a3ab829edb36bf0f711057096176b15fad113820ec9910d5791c20cf9bc2802396264c43550a8a46b1f8318357b4d4e6a99c264d7b0b89aadc201b8f5098dee SHA512 bab593219b241f0903415945c110bdbe08197618d648785bbe0a7ed5c8a53618e16d60f82e5456ccd4236762384ae571bfc484bbb2f6aac8c99bd9d339f30e65
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
index 6ecf39ee6215..f1b55c4facca 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="bs2b calf +doc rnnoise rubberband webrtc zamaudio"
 
-DEPEND=">=dev-libs/boost-1.72:=
+COMMON=">=dev-libs/boost-1.72:=
 	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.24:3.0
 	>=dev-libs/glib-2.56:2
@@ -37,8 +37,11 @@ DEPEND=">=dev-libs/boost-1.72:=
 	>=x11-libs/gtk+-3.20:3
 	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
 	rnnoise? ( media-libs/rnnoise )"
+# Only header files are used from libsamplerate
+DEPEND="${COMMON}
+	media-libs/libsamplerate"
 RDEPEND="!media-sound/easyeffects
-	${DEPEND}
+	${COMMON}
 	>=media-libs/gst-plugins-good-1.12.5:1.0
 	>=media-libs/lsp-plugins-1.1.24[lv2]
 	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
@@ -50,12 +53,9 @@ RDEPEND="!media-sound/easyeffects
 	rubberband? ( media-libs/rubberband[ladspa] )
 	webrtc? ( media-plugins/gst-plugins-webrtc )
 	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
 BDEPEND="dev-libs/appstream-glib
 	dev-util/desktop-file-utils
 	dev-util/itstool
-	media-libs/libsamplerate
 	sys-devel/gettext
 	virtual/pkgconfig"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ba5e523253fd..af3f2c2375bf 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fcc3521a81d9..8a9a1a6803fa 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 27 Jul 2022 18:39:54 +0000
+Thu, 28 Jul 2022 00:40:05 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 79e24497520c..427f3d0e6a4a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-27T18:39:58Z
+TIMESTAMP 2022-07-28T00:40:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLhhn5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLh2ulfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBvfw/6AyN/6I7wpcnfZApQIee7xCqnUIfFuNF08KeFMTZhoiBKrouj3VwY24Zk
-WrA/uXIayemVr65y0liZiaQa7qR/c5P1dhCndB1oBCZIK+onICPtu5hmZPyWLDCP
-qO/vnanL9vqlVWZJhZl356z4xUzCVjKXJtta5+zfpO46G4whbNwo7kmT/BrK2gS4
-y6T0OJ67WrfUFFurb0RG46CX+ABKpFCp6f5yaDmIlgpD8B66ywExsm3YTCZdM4RP
-pltDiFxQXOlsNVfYsuSZjVMwUekAKqHEGy4RCDALT1YLnc5QafyuqTRF+FnjXMzo
-Va4YJCH9VeJEtADz1VO0qgq7mJCwtdXi7XlV7FpGaAuMpzsuYb6ad8Qox2IugRD9
-gF0vx4GCsvD9M2Qfw5Tyo3L++PQRmwyZJ5N5gEKV2pkksxEGfKK0jJhG5rwroSGZ
-b9uvc/CE2Ib+fZXLfq2YKxh/hnBzJJs7qv4+obPC3uqIbfTPFcaCoQ8DwN7jYtzl
-Ew1P7EO/wMYXGy/YVghCf8GR6122JiHPe1a1rKMbIEfcI8cl+4Hg7wuIQAYbjGhA
-JHfrEr5NXqxCZup7hdbytM5dbDxavlM7U+AYU0xu27g7Brj0yGLnZXHohx7sxkWI
-Z3L/YHDLoakok2nMJC+AeY/EysHoNHpR5mChvv5zb05KAfKkifU=
-=fOWH
+klAtABAApz0Dxds/fv6SY85OQEv5VwS8I0/15TbEXwVUsJ1Y4Itf607mxR2735it
+ZJ4InqCDwVTpZ5ktEwWwOSjfX6sqHKarwzNYmD4b8cRfr/tHF2m+N3iMoOS2w2oC
+mfjQsQ5jGWjLoSyEBRCMtSVNnMvLmk6bcv6PrqIMp/ZwiST/Xdasxayi7VH+yt3I
+sXxBr58Rii+xu8cnYZDQy4Yu3Meq/TbuVJeJ5OHkvxoBzBgD+zoG7PUUMjaPU4PP
+c74BfU01uY0LAIcOCM4KOhJgEOW6bTaIyPHYVlJIjoJXwq46tBoSjwtDXNXHrtgE
+QdAfoYgKoMBerwmvOBJ7cMPaiGeNyQhDtRHbyqdNRFNVtj6y1HpRlrU4Couk66Dx
+K/+VWIncuzaVg2XWEdjJj8p1dgVjBrUsvB+9TdVI71Yu7j0JMYdNUfFUgX8qTDDG
+VqjdrT0r+Tjhe1A496TT5o/WQ3Iq980dQIksU9n/CaFElp4MM+yJGcNvgnsAOhL0
+7J4zgCMmehWCXu+Y/tKHUi7CFLAMuaxmJKQ6wLV0NYSDAxBef7BpeDBPMHRJCu1a
+hayr3Gg+NVNW7h1X1104sGk4I4sITqjniGcH9JiaubyiS7S+l55fZi9JAknWqIdN
+5gUASn2oaK9rzLUM+ONDQ5gxscB+srQrH+TCdaRYYAxsgNclJ+k=
+=fopY
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fcc3521a81d9..6e3a2cfd3568 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 27 Jul 2022 18:39:54 +0000
+Thu, 28 Jul 2022 00:40:06 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 86639e3a4dfd..0417f2412167 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 07d35057e4e6..a8ebf828dd0c 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/firebird-0-r1 b/metadata/md5-cache/acct-user/firebird-0-r2
index 2b8e5494888c..a32d3adb5651 100644
--- a/metadata/md5-cache/acct-user/firebird-0-r1
+++ b/metadata/md5-cache/acct-user/firebird-0-r2
@@ -6,4 +6,4 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390
 RDEPEND=acct-group/firebird
 SLOT=0
 _eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=564bddc8d0fee8edc00fbf050158c934
+_md5_=b3aa67d534425143142795aabe29cdc6
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index c39f46db2fc9..59aaf1e3dbc3 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/lib_users-0.15 b/metadata/md5-cache/app-admin/lib_users-0.15
index 63e5fdcbf236..1290c23ac973 100644
--- a/metadata/md5-cache/app-admin/lib_users-0.15
+++ b/metadata/md5-cache/app-admin/lib_users-0.15
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/klausman/lib_users
 INHERIT=python-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/klausman/lib_users/archive/v0.15.tar.gz -> lib_users-0.15.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=94534c27c96adcdc66920c0af3394c3a
+_md5_=af67ce7dd52734fbe14425d17786348a
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 554e9702c36e..2b656441d778 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.104.4 b/metadata/md5-cache/app-antivirus/clamav-0.104.4
new file mode 100644
index 000000000000..9cd8a9733e00
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.104.4
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pytest[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack dev-libs/json-c:= dev-libs/libpcre2 >=sys-libs/zlib-1.2.2:= app-arch/bzip2 clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) virtual/libiconv !libclamav-only? ( net-misc/curl ) dev-libs/openssl:= milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libxml2 rar? ( app-arch/unrar ) test? ( dev-python/pytest ) test? ( dev-libs/check )
+DESCRIPTION=Clam Anti-Virus Scanner
+EAPI=8
+HOMEPAGE=https://www.clamav.net/
+INHERIT=cmake flag-o-matic python-any-r1 systemd tmpfiles
+IUSE=doc clamonacc +clamapp libclamav-only milter rar selinux systemd test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack dev-libs/json-c:= dev-libs/libpcre2 >=sys-libs/zlib-1.2.2:= app-arch/bzip2 clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) virtual/libiconv !libclamav-only? ( net-misc/curl ) dev-libs/openssl:= milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libxml2 rar? ( app-arch/unrar ) test? ( dev-python/pytest ) selinux? ( sec-policy/selinux-clamav ) virtual/tmpfiles
+REQUIRED_USE=libclamav-only? ( !clamonacc !clamapp !milter ) clamonacc? ( clamapp ) milter? ( clamapp ) test? ( !libclamav-only )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.104.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=78021fbd941b73e9eb756a2bf6f40c4c
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 30049df57f33..b4221b8330f5 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/cosign-1.10.0 b/metadata/md5-cache/app-containers/cosign-1.10.0
index 45d9acef5860..a22065647560 100644
--- a/metadata/md5-cache/app-containers/cosign-1.10.0
+++ b/metadata/md5-cache/app-containers/cosign-1.10.0
@@ -10,4 +10,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/sigstore/cosign/archive/v1.10.0.tar.gz -> cosign-1.10.0.tar.gz https://dev.gentoo.org/~williamh/dist/cosign-1.10.0-deps.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=080b0a613383997c06848804996c26c2
+_md5_=641e24bf3767004db64d8db7e632937a
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 812df47e53e9..8722841ea92b 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.4586 b/metadata/md5-cache/app-editors/vim-core-8.2.4586
index 8ed61788ad97..c7cb50c5a822 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.4586
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.4586
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DESCRIPTION=vim and gvim shared files
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-INHERIT=estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+INHERIT=vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 IUSE=nls acl minimal
 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=vim
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648 !<app-editors/vim-8.2.4328-r1
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4586.tar.gz -> vim-8.2.4586.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bd930d70a00e4b9a5e70361fa27b2c13
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d0437afdfffc9cc4140f1852cd61f342
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.5066-r2 b/metadata/md5-cache/app-editors/vim-core-8.2.5066-r2
index a651db010498..53cafd2ae4a7 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.5066-r2
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.5066-r2
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0
 DESCRIPTION=vim and gvim shared files
 EAPI=8
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-INHERIT=estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+INHERIT=vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 IUSE=nls acl minimal
 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=vim
@@ -12,5 +12,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!<app-editors/vim-8.2.4328-r1
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.5066.tar.gz -> vim-8.2.5066.tar.gz https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ca201289d455c840cf692c34cd4a5f61
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f910dd1f42eee0f68dec8c23971ea316
diff --git a/metadata/md5-cache/app-editors/vim-core-9.0.0049-r1 b/metadata/md5-cache/app-editors/vim-core-9.0.0049-r1
index 65b3f24616bd..ccdefcb3fb74 100644
--- a/metadata/md5-cache/app-editors/vim-core-9.0.0049-r1
+++ b/metadata/md5-cache/app-editors/vim-core-9.0.0049-r1
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0
 DESCRIPTION=vim and gvim shared files
 EAPI=8
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-INHERIT=estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+INHERIT=vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 IUSE=nls acl minimal
 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=vim
@@ -12,5 +12,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!<app-editors/vim-8.2.4328-r1
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.0049.tar.gz -> vim-core-9.0.0049.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8f0f6a96cf2fafb2ae378af65132a19f
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=098bcd7344160d7469d01cb1fa7da851
diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999
index 9ceef68e15b8..b0db0801624e 100644
--- a/metadata/md5-cache/app-editors/vim-core-9999
+++ b/metadata/md5-cache/app-editors/vim-core-9999
@@ -4,12 +4,12 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0
 DESCRIPTION=vim and gvim shared files
 EAPI=8
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-INHERIT=estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils git-r3
+INHERIT=vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils git-r3
 IUSE=nls acl minimal
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 PROPERTIES=live
 RDEPEND=!<app-editors/vim-8.2.4328-r1
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8f0f6a96cf2fafb2ae378af65132a19f
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=098bcd7344160d7469d01cb1fa7da851
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index f71a6e75c6f1..0b42cf21ceba 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-6.1.36
new file mode 100644
index 000000000000..e4618e1bb416
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.36
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/linguist-tools:5 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.36 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2 dtrace? ( CDDL )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.36 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/VirtualBox-6.1.36.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=448b1668c0404f5728856ac52e6d2b55
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.36
new file mode 100644
index 000000000000..b08326924b73
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.36
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RESTRICT=mirror
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/VBoxGuestAdditions_6.1.36.iso
+_md5_=e7ea0ff9eb658e544c5d8f71d1b0d05f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.36
new file mode 100644
index 000000000000..3ff92b867912
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.36
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=PUEL
+RDEPEND==app-emulation/virtualbox-6.1.36*
+RESTRICT=bindist mirror strip
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/Oracle_VM_VirtualBox_Extension_Pack-6.1.36.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.36.tar.gz
+_md5_=1df13d75497e063d608096af4b52c889
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36
new file mode 100644
index 000000000000..c5b4d98e5a0c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+INHERIT=edo linux-mod systemd toolchain-funcs udev
+IUSE=X dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/VirtualBox-6.1.36.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=93ac3efcf88afd900ba5b7b5971becc8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
new file mode 100644
index 000000000000..5d56e70b64ce
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+INHERIT=linux-mod toolchain-funcs
+IUSE=pax-kernel dist-kernel
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://github.com/ceamac/virtualbox-modules-dist/releases/download/v6.1.36/vbox-kernel-module-src-6.1.36.tar.xz
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6fac20f4a65e16163ac678572e74a53b
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 7d98f17b7ae8..2d0612b3325c 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1 b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
deleted file mode 100644
index c70e0cd689d4..000000000000
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst pretend setup
-DEPEND=sys-apps/dmidecode kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=IBM ThinkPad SMAPI BIOS driver
-EAPI=6
-HOMEPAGE=https://github.com/evgeni/tp_smapi
-INHERIT=flag-o-matic linux-mod
-IUSE=hdaps dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/dmidecode kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=df35c217300f0cd1d55d7725b57933aa
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r2 b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r2
new file mode 100644
index 000000000000..32f2305f6479
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend setup
+DEPEND=sys-apps/dmidecode kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=IBM ThinkPad SMAPI BIOS driver
+EAPI=8
+HOMEPAGE=https://github.com/evgeni/tp_smapi
+INHERIT=flag-o-matic linux-mod
+IUSE=hdaps dist-kernel
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/dmidecode kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ffd27862fa7438d67122f743c900c76e
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index b0ec84afdc2a..688cd95ce488 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mysqltuner-1.8.3 b/metadata/md5-cache/dev-db/mysqltuner-1.8.3
deleted file mode 100644
index 1d6bc59b183c..000000000000
--- a/metadata/md5-cache/dev-db/mysqltuner-1.8.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl virtual/perl-Getopt-Long
-DESCRIPTION=Makes recommendations for increased performance and stability for MySQL
-EAPI=8
-HOMEPAGE=https://github.com/major/MySQLTuner-perl
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=https://github.com/major/MySQLTuner-perl/archive/1.8.3.tar.gz -> mysqltuner-1.8.3.tar.gz
-_md5_=dba9c995621f80dd0cb141e2e577f7e2
diff --git a/metadata/md5-cache/dev-db/mysqltuner-1.9.9 b/metadata/md5-cache/dev-db/mysqltuner-1.9.9
index 700bbf0b371c..29123f6206d2 100644
--- a/metadata/md5-cache/dev-db/mysqltuner-1.9.9
+++ b/metadata/md5-cache/dev-db/mysqltuner-1.9.9
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl virtual/perl-Getopt-Long
 DESCRIPTION=Makes recommendations for increased performance and stability for MySQL
 EAPI=8
 HOMEPAGE=https://github.com/major/MySQLTuner-perl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
 SLOT=0
 SRC_URI=https://github.com/major/MySQLTuner-perl/archive/refs/tags/v1.9.9.tar.gz -> mysqltuner-1.9.9.tar.gz
-_md5_=558a106b41275a959537f965fa5619c1
+_md5_=88ae9b204c96b76fa371e4862d0760e4
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 1cd4fec06f7d..7239d3fa83dc 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/rust-1.62.1 b/metadata/md5-cache/dev-lang/rust-1.62.1
index 69590cee8cef..678dc913c635 100644
--- a/metadata/md5-cache/dev-lang/rust-1.62.1
+++ b/metadata/md5-cache/dev-lang/rust-1.62.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
 IUSE=clippy cpu_flags_x86_sse2 debug dist doc miri nightly parallel-compiler profiler rls rustfmt rust-src system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore 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=amd64 ~arm ~arm64 ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:14[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:14[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:14[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:14[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:14[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:14[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:14[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:14[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:14[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:14[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:14[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:14[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:14[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:14[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:14[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:14[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:14[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-15:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust sys-apps/lsb-release
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) rls? ( rust-src ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.62
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.62.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.62.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e8c25a9a59a450bc580343dc752d2721
+_md5_=fc970bb921de819f14366d1b016ff74a
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.62.1 b/metadata/md5-cache/dev-lang/rust-bin-1.62.1
index 6760cfc59ff1..573fd1ad384f 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.62.1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.62.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
 IUSE=clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt 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=amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-eselect/eselect-rust-20190311 sys-apps/lsb-release
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.62.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.62.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.62.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.62.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.62.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.62.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.62.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.62.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.62.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.62.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.62.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-07-19/rust-src-1.62.1.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.62.1-sparc64-unknown-linux-gnu.tar.xz )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=8098608c5e201f1b71275ade89e8c830
+_md5_=d8201b56bee6cd5e336b82266f917e4d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 34c814289334..27444254f3f4 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.3-r7 b/metadata/md5-cache/dev-libs/apr-1.6.3-r7
deleted file mode 100644
index 70d0ce203d5d..000000000000
--- a/metadata/md5-cache/dev-libs/apr-1.6.3-r7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) 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=Apache Portable Runtime Library
-EAPI=6
-HOMEPAGE=https://apr.apache.org/
-INHERIT=autotools libtool toolchain-funcs
-IUSE=doc older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
-SLOT=1/1.6
-SRC_URI=mirror://apache/apr/apr-1.6.3.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ae905e6ec38febac78c77e1ace08460e
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.5-r4 b/metadata/md5-cache/dev-libs/apr-1.6.5-r4
deleted file mode 100644
index b558cf917ba9..000000000000
--- a/metadata/md5-cache/dev-libs/apr-1.6.5-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) 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=Apache Portable Runtime Library
-EAPI=6
-HOMEPAGE=https://apr.apache.org/
-INHERIT=autotools libtool toolchain-funcs
-IUSE=doc older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
-SLOT=1/1.6
-SRC_URI=mirror://apache/apr/apr-1.6.5.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4b77fbeb20d29d8025b21e769f286bba
diff --git a/metadata/md5-cache/dev-libs/bcm2835-1.57 b/metadata/md5-cache/dev-libs/bcm2835-1.57
deleted file mode 100644
index a399923df3e8..000000000000
--- a/metadata/md5-cache/dev-libs/bcm2835-1.57
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=Provides access to GPIO and other IO functions on the Broadcom BCM2835
-EAPI=6
-HOMEPAGE=http://www.airspayce.com/mikem/bcm2835/
-IUSE=doc examples
-KEYWORDS=~arm
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.airspayce.com/mikem/bcm2835/bcm2835-1.57.tar.gz
-_md5_=efa08964b47a85b2acb79cf7f28e133a
diff --git a/metadata/md5-cache/dev-libs/bcm2835-1.68 b/metadata/md5-cache/dev-libs/bcm2835-1.68-r1
index 487c6a6555d5..c92066a875cc 100644
--- a/metadata/md5-cache/dev-libs/bcm2835-1.68
+++ b/metadata/md5-cache/dev-libs/bcm2835-1.68-r1
@@ -1,7 +1,7 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile install
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Provides access to GPIO and other IO functions on the Broadcom BCM2835
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.airspayce.com/mikem/bcm2835/
 INHERIT=toolchain-funcs
 IUSE=doc examples
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.airspayce.com/mikem/bcm2835/bcm2835-1.68.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=865a6363a6bd357d913028d810b8be07
+_md5_=961ba4fe2484ac7040a5a02883017274
diff --git a/metadata/md5-cache/dev-libs/libtar-1.2.20-r4 b/metadata/md5-cache/dev-libs/libtar-1.2.20-r4
deleted file mode 100644
index 2d9413ffdb90..000000000000
--- a/metadata/md5-cache/dev-libs/libtar-1.2.20-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip ) 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=C library for manipulating tar archives
-EAPI=6
-HOMEPAGE=https://repo.or.cz/w/libtar.git/
-INHERIT=autotools
-IUSE=static-libs zlib
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/libtar-1.2.20.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=47a55775fa34fbd1bde55978ad2f6076
diff --git a/metadata/md5-cache/dev-libs/libtar-1.2.20-r5 b/metadata/md5-cache/dev-libs/libtar-1.2.20-r5
new file mode 100644
index 000000000000..b6982f93d827
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtar-1.2.20-r5
@@ -0,0 +1,16 @@
+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=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip )
+DESCRIPTION=C library for manipulating tar archives
+EAPI=8
+HOMEPAGE=https://repo.or.cz/w/libtar.git/
+INHERIT=autotools
+IUSE=zlib
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=zlib? ( sys-libs/zlib:= ) !zlib? ( app-arch/gzip )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/libtar-1.2.20.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8150f6a4bcd5924d931922c1ee311f98
diff --git a/metadata/md5-cache/dev-libs/libx86-1.1-r4 b/metadata/md5-cache/dev-libs/libx86-1.1-r4
deleted file mode 100644
index f4d6bba2a6bf..000000000000
--- a/metadata/md5-cache/dev-libs/libx86-1.1-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=A hardware-independent library for executing real-mode x86 code
-EAPI=6
-HOMEPAGE=https://www.codon.org.uk/~mjg59/libx86/
-INHERIT=toolchain-funcs flag-o-matic
-IUSE=static-libs
-KEYWORDS=amd64 ~arm -ppc -riscv -sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3d1538bfacbec4286c7169c14fbfcbd9
diff --git a/metadata/md5-cache/dev-libs/libx86-1.1-r5 b/metadata/md5-cache/dev-libs/libx86-1.1-r5
new file mode 100644
index 000000000000..60d65435cfd1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libx86-1.1-r5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=A hardware-independent library for executing real-mode x86 code
+EAPI=8
+HOMEPAGE=https://www.codon.org.uk/~mjg59/libx86/
+INHERIT=flag-o-matic toolchain-funcs
+KEYWORDS=amd64 ~arm -ppc -riscv -sparc x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=266613650cbb7dc70c7849c838dcc406
diff --git a/metadata/md5-cache/dev-libs/libxdiff-0.23-r2 b/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
deleted file mode 100644
index 6c0cb3a5483f..000000000000
--- a/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install 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=Library for creating diff files
-EAPI=6
-HOMEPAGE=http://www.xmailserver.org/xdiff-lib.html
-INHERIT=autotools
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.xmailserver.org/libxdiff-0.23.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7f559089fdcebe785917762b266d45ee
diff --git a/metadata/md5-cache/dev-libs/libxdiff-0.23-r3 b/metadata/md5-cache/dev-libs/libxdiff-0.23-r3
new file mode 100644
index 000000000000..15bd39755e90
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxdiff-0.23-r3
@@ -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=install prepare
+DESCRIPTION=Library for creating diff files
+EAPI=8
+HOMEPAGE=http://www.xmailserver.org/xdiff-lib.html
+INHERIT=autotools
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://www.xmailserver.org/libxdiff-0.23.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4bba8b8e0c671557f18b18a22030bd36
diff --git a/metadata/md5-cache/dev-libs/log4cplus-1.2.0 b/metadata/md5-cache/dev-libs/log4cplus-1.2.0
deleted file mode 100644
index 024320c2805a..000000000000
--- a/metadata/md5-cache/dev-libs/log4cplus-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 ) virtual/pkgconfig
-DESCRIPTION=C++ port of the Log for Java (log4j) logging library
-EAPI=6
-HOMEPAGE=https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus
-IUSE=iconv qt5 threads working-locale working-c-locale
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( Apache-2.0 BSD-2 )
-RDEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
-REQUIRED_USE=?? ( iconv working-locale working-c-locale )
-SLOT=0/1.2-5
-SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/1.2.0/log4cplus-1.2.0.tar.bz2
-_md5_=9b9188261cfd2d62b5c7765c60777ba4
diff --git a/metadata/md5-cache/dev-libs/nettle-3.8.1 b/metadata/md5-cache/dev-libs/nettle-3.8.1
new file mode 100644
index 000000000000..ace99bf2c1fd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nettle-3.8.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( sys-apps/texinfo ) verify-sig? ( sec-keys/openpgp-keys-nettle ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Low-level cryptographic library
+EAPI=8
+HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
+INHERIT=multilib-build multilib-minimal toolchain-funcs verify-sig
+IUSE=+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul 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=|| ( LGPL-3 LGPL-2.1 )
+RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )
+SLOT=0/8-6
+SRC_URI=mirror://gnu/nettle/nettle-3.8.1.tar.gz verify-sig? ( mirror://gnu/nettle/nettle-3.8.1.tar.gz.sig )
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=3e578f4af3eecd94d8c067506a5416e0
diff --git a/metadata/md5-cache/dev-libs/pslib-0.4.5 b/metadata/md5-cache/dev-libs/pslib-0.4.5
deleted file mode 100644
index 8131e9cd359e..000000000000
--- a/metadata/md5-cache/dev-libs/pslib-0.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) dev-lang/perl >=dev-libs/glib-2 dev-util/intltool dev-perl/XML-Parser 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=pslib is a C-library to create PostScript files on the fly
-EAPI=6
-HOMEPAGE=http://pslib.sourceforge.net/
-INHERIT=autotools
-IUSE=debug jpeg png static-libs tiff
-KEYWORDS=amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
-SLOT=0
-SRC_URI=mirror://sourceforge/pslib/pslib-0.4.5.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=826396099657e4ee285f360c6ddaaa26
diff --git a/metadata/md5-cache/dev-libs/pslib-0.4.5-r1 b/metadata/md5-cache/dev-libs/pslib-0.4.5-r1
new file mode 100644
index 000000000000..ba360d3605bc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pslib-0.4.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-libs/glib:2 dev-util/intltool dev-perl/XML-Parser sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=png? ( media-libs/libpng:= ) jpeg? ( media-libs/libjpeg-turbo:= ) tiff? ( media-libs/tiff:= )
+DESCRIPTION=pslib is a C-library to create PostScript files on the fly
+EAPI=8
+HOMEPAGE=http://pslib.sourceforge.net/
+INHERIT=autotools
+IUSE=debug jpeg png tiff
+KEYWORDS=amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=png? ( media-libs/libpng:= ) jpeg? ( media-libs/libjpeg-turbo:= ) tiff? ( media-libs/tiff:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/pslib/pslib-0.4.5.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c37f53c1effa1bd61ff044732f232110
diff --git a/metadata/md5-cache/dev-libs/weston-10.0.1 b/metadata/md5-cache/dev-libs/weston-10.0.2
index ffeadec35b37..ac0e155df6e0 100644
--- a/metadata/md5-cache/dev-libs/weston-10.0.1
+++ b/metadata/md5-cache/dev-libs/weston-10.0.2
@@ -12,6 +12,6 @@ RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-p
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/wayland/weston/-/releases/10.0.1/downloads/weston-10.0.1.tar.xz
+SRC_URI=https://gitlab.freedesktop.org/wayland/weston/-/releases/10.0.2/downloads/weston-10.0.2.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1870505cd2bcf43c56dabed47ff747a9
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 7b57c046df4b..cd49619d8858 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.1.0 b/metadata/md5-cache/dev-lua/luasocket-3.1.0
new file mode 100644
index 000000000000..7c043200d7ee
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luasocket-3.1.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=Networking support for the Lua language
+EAPI=8
+HOMEPAGE=https://lunarmodules.github.io/luasocket/ https://github.com/lunarmodules/luasocket
+INHERIT=lua toolchain-funcs
+IUSE=doc lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lunarmodules/luasocket/archive/refs/tags/v3.1.0.tar.gz -> luasocket-3.1.0.tar.gz
+_eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=599dd647e169ebbbf8dd33f9040d95dc
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 70af4d9cee13..96a824be2460 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/configupdater-3.1.1 b/metadata/md5-cache/dev-python/configupdater-3.1.1
index c3dbd4413fa2..425c6be28089 100644
--- a/metadata/md5-cache/dev-python/configupdater-3.1.1
+++ b/metadata/md5-cache/dev-python/configupdater-3.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyscaffold/configupdater/ https://pypi.org/project/ConfigUpdater/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc ~ppc64
 LICENSE=MIT PSF-2 PYTHON
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyscaffold/configupdater/archive/v3.1.1.tar.gz -> configupdater-3.1.1.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d08c201cc7c366e4e0f68b1f7aab0fb2
+_md5_=8b0608cf3397825152347c7b74fc38d4
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.11-r1 b/metadata/md5-cache/dev-python/ini2toml-0.11-r1
index 68b344b83ee5..19b1733374a6 100644
--- a/metadata/md5-cache/dev-python/ini2toml-0.11-r1
+++ b/metadata/md5-cache/dev-python/ini2toml-0.11-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc ~ppc64
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abravalheri/ini2toml/archive/v0.11.tar.gz -> ini2toml-0.11.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a97b5c755b953f411871f74d5345c41f
+_md5_=f4cc3dd26c23ad43cfda711a48cc62f3
diff --git a/metadata/md5-cache/dev-python/nose2-0.12.0 b/metadata/md5-cache/dev-python/nose2-0.12.0
index 6395f6655b32..c619990d95b6 100644
--- a/metadata/md5-cache/dev-python/nose2-0.12.0
+++ b/metadata/md5-cache/dev-python/nose2-0.12.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/nose-devs/nose2/ https://pypi.org/project/nose2/
 INHERIT=distutils-r1
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/nose-devs/nose2/archive/0.12.0.tar.gz -> nose2-0.12.0.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=015a6916b2eab52a7fa70d53f43bae9c
+_md5_=57f7b6e5e7ab2416b791d41bac5f57d4
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.1 b/metadata/md5-cache/dev-python/pyopencl-2022.1
deleted file mode 100644
index d8736fcc5ff9..000000000000
--- a/metadata/md5-cache/dev-python/pyopencl-2022.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/opencl-2
-DESCRIPTION=Python wrapper for OpenCL
-EAPI=8
-HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
-INHERIT=distutils-r1
-IUSE=examples opengl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=>=virtual/opencl-2 >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mako-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=184c3b79bf2b58d866f4a2040bde9f28
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.1.5 b/metadata/md5-cache/dev-python/pyopencl-2022.1.5
index 89b58ec6ccdf..eddaf9ba6c50 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2022.1.5
+++ b/metadata/md5-cache/dev-python/pyopencl-2022.1.5
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pybind11-2.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=virtual/opencl-2
 DESCRIPTION=Python wrapper for OpenCL
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.1.5.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=696fd37f6f1db7b15ca13a0ae78c5ec7
+_md5_=5e2e591d5fa5c41a9d84c11c66fcca89
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.1.6 b/metadata/md5-cache/dev-python/pyopencl-2022.1.6
index 9b363ed7e4eb..886f83a9caef 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2022.1.6
+++ b/metadata/md5-cache/dev-python/pyopencl-2022.1.6
@@ -1,6 +1,6 @@
-BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pybind11-2.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/opencl-2
+DEPEND=>=virtual/opencl-2 opengl? ( media-libs/libglvnd )
 DESCRIPTION=Python wrapper for OpenCL
 EAPI=8
 HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.1.6.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8bde328a21220e1812cc05db13cd67c7
+_md5_=7c2aefab37c26d6bdb192186d09c3860
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.3.4 b/metadata/md5-cache/dev-python/pyproject-fmt-0.3.4
index 95968729bd57..b6d500c864ac 100644
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.3.4
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-0.3.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc ~ppc64
 LICENSE=MIT
 RDEPEND=>=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/pyproject-fmt/archive/0.3.4.tar.gz -> pyproject-fmt-0.3.4.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=caa331479bf6c79d33acd99e50f639b1
+_md5_=5f06b4e112ea8911d1e54d08676b71ea
diff --git a/metadata/md5-cache/dev-python/sip-6.6.2 b/metadata/md5-cache/dev-python/sip-6.6.2
index 5ae205f72e03..698a0de4fd53 100644
--- a/metadata/md5-cache/dev-python/sip-6.6.2
+++ b/metadata/md5-cache/dev-python/sip-6.6.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
 INHERIT=distutils-r1
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=5
 SRC_URI=mirror://pypi/s/sip/sip-6.6.2.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2d39e35ca5a93fe0243e858b56988934
+_md5_=0ad0553da879403a044a2d8df0751222
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 8521ae188525..ee76e6b6b096 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cargo-c-0.9.11 b/metadata/md5-cache/dev-util/cargo-c-0.9.11
new file mode 100644
index 000000000000..30e476b6d61e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-c-0.9.11
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.62.0 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=dev-libs/libgit2:= dev-libs/openssl:= net-libs/libssh2:= net-misc/curl[ssl] sys-libs/zlib
+DESCRIPTION=Helper program to build and install c-like libraries
+EAPI=8
+HOMEPAGE=https://github.com/lu-zero/cargo-c
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense ZLIB
+RDEPEND=dev-libs/libgit2:= dev-libs/openssl:= net-libs/libssh2:= net-misc/curl[ssl] sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/lu-zero/cargo-c/archive/refs/tags/v0.9.11.tar.gz -> cargo-c-0.9.11.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.58/download -> anyhow-1.0.58.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/cargo/0.63.1/download -> cargo-0.63.1.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-util/0.2.0/download -> cargo-util-0.2.0.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.2.8/download -> clap-3.2.8.crate https://crates.io/api/v1/crates/clap_derive/3.2.7/download -> clap_derive-3.2.7.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/combine/4.6.4/download -> combine-4.6.4.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crates-io/0.34.0/download -> crates-io-0.34.0.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.10/download -> crossbeam-utils-0.8.10.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.43/download -> curl-0.4.43.crate https://crates.io/api/v1/crates/curl-sys/0.4.55+curl-7.83.1/download -> curl-sys-0.4.55+curl-7.83.1.crate https://crates.io/api/v1/crates/either/1.7.0/download -> either-1.7.0.crate https://crates.io/api/v1/crates/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/filetime/0.2.17/download -> filetime-0.2.17.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fwdansi/1.1.0/download -> fwdansi-1.1.0.crate https://crates.io/api/v1/crates/git2/0.14.4/download -> git2-0.14.4.crate https://crates.io/api/v1/crates/git2-curl/0.15.0/download -> git2-curl-0.15.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.9/download -> globset-0.4.9.crate https://crates.io/api/v1/crates/hashbrown/0.12.1/download -> hashbrown-0.12.1.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/im-rc/15.1.0/download -> im-rc-15.1.0.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/kstring/2.0.0/download -> kstring-2.0.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libgit2-sys/0.13.4+1.4.2/download -> libgit2-sys-0.13.4+1.4.2.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.7+1.45.0/download -> libnghttp2-sys-0.1.7+1.45.0.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.23/download -> libssh2-sys-0.2.23.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/opener/0.5.0/download -> opener-0.5.0.crate https://crates.io/api/v1/crates/openssl/0.10.40/download -> openssl-0.10.40.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.21.0+1.1.1p/download -> openssl-src-111.21.0+1.1.1p.crate https://crates.io/api/v1/crates/openssl-sys/0.9.74/download -> openssl-sys-0.9.74.crate https://crates.io/api/v1/crates/os_info/3.4.0/download -> os_info-3.4.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.1.0/download -> os_str_bytes-6.1.0.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.40/download -> proc-macro2-1.0.40.crate https://crates.io/api/v1/crates/quote/1.0.20/download -> quote-1.0.20.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_xoshiro/0.6.0/download -> rand_xoshiro-0.6.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustfix/0.6.1/download -> rustfix-0.6.1.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/semver/1.0.12/download -> semver-1.0.12.crate https://crates.io/api/v1/crates/serde/1.0.138/download -> serde-1.0.138.crate https://crates.io/api/v1/crates/serde_derive/1.0.138/download -> serde_derive-1.0.138.crate https://crates.io/api/v1/crates/serde_ignored/0.1.3/download -> serde_ignored-0.1.3.crate https://crates.io/api/v1/crates/serde_json/1.0.82/download -> serde_json-1.0.82.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/sized-chunks/0.6.5/download -> sized-chunks-0.6.5.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.1/download -> strip-ansi-escapes-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.98/download -> syn-1.0.98.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.4/download -> toml_edit-0.14.4.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.1/download -> unicode-ident-1.0.1.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=03bdfc9985d6f7b5f65fe1a5bf3d4825
diff --git a/metadata/md5-cache/dev-util/idea-community-2022.1.4.221.6008.13 b/metadata/md5-cache/dev-util/idea-community-2022.2.222.3345.118
index 68ed06546b27..c6f160252fbe 100644
--- a/metadata/md5-cache/dev-util/idea-community-2022.1.4.221.6008.13
+++ b/metadata/md5-cache/dev-util/idea-community-2022.2.222.3345.118
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL
 RDEPEND=|| ( >=dev-java/openjdk-11.0.13_p8:11 >=dev-java/openjdk-bin-11.0.13_p8-r1:11 ) sys-libs/glibc media-libs/harfbuzz dev-java/jansi-native dev-libs/libdbusmenu
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2022.1.4-no-jbr.tar.gz?_ga=2.61675052.105843767.1658527855-1305167137.1658527855 -> ideaIC-1.4.221.6008.13.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_13-linux-x64-b1751.21.tar.gz -> jbr-11_0_13-linux-x64-b1751.21.tar.gz )
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2022.2-no-jbr.tar.gz?_ga=2.49836838.1031729952.1658961170-1305167137.1658527855 -> ideaIC-2.222.3345.118.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_13-linux-x64-b1751.21.tar.gz -> jbr-11_0_13-linux-x64-b1751.21.tar.gz )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d44ff13a2b730d806da61f23b1cc31b8
+_md5_=866841cb95dd460b6f2940ebddfd4996
diff --git a/metadata/md5-cache/dev-util/uglifyjs-3.16.2 b/metadata/md5-cache/dev-util/uglifyjs-3.16.3
index d57277f66239..0dbc7cffb416 100644
--- a/metadata/md5-cache/dev-util/uglifyjs-3.16.2
+++ b/metadata/md5-cache/dev-util/uglifyjs-3.16.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=net-libs/nodejs
 SLOT=0
-SRC_URI=https://github.com/mishoo/UglifyJS/archive/refs/tags/v3.16.2.tar.gz -> uglifyjs-3.16.2.tar.gz
+SRC_URI=https://github.com/mishoo/UglifyJS/archive/refs/tags/v3.16.3.tar.gz -> uglifyjs-3.16.3.tar.gz
 _md5_=44bd2da544eaceb8bdf1c4717e18bda2
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 2a33845c6760..c5609158d9c7 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.11.01 b/metadata/md5-cache/games-server/bedrock-server-1.19.11.01
new file mode 100644
index 000000000000..2f345d1c9330
--- /dev/null
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.11.01
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install
+DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
+EAPI=8
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.11.01.zip
+_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.19.1 b/metadata/md5-cache/games-server/minecraft-server-1.19.1
new file mode 100644
index 000000000000..4bf53708f5c1
--- /dev/null
+++ b/metadata/md5-cache/games-server/minecraft-server-1.19.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=The official server for the sandbox video game
+EAPI=8
+HOMEPAGE=https://www.minecraft.net/
+INHERIT=readme.gentoo-r1 java-pkg-2 systemd
+KEYWORDS=~amd64 ~arm64
+LICENSE=Mojang
+RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/openjdk:17 dev-java/openjdk-bin:17 ) >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://launcher.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar -> minecraft-server-1.19.1.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e09a1aa5dbcc9c1ee671796ae1310069
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index c662bbb89490..3bf6d2195abb 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/gmic-3.1.5 b/metadata/md5-cache/media-gfx/gmic-3.1.5
index bc17181ba90d..c237496dddd6 100644
--- a/metadata/md5-cache/media-gfx/gmic-3.1.5
+++ b/metadata/md5-cache/media-gfx/gmic-3.1.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig gimp? ( dev-qt/linguist-tools:5 ) qt5? ( dev-qt/linguist-tools:5 )
 DEFINED_PHASES=compile pretend setup
-DEPEND=sys-libs/zlib:0= curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext )
+DEPEND=sys-libs/zlib:0= curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5 >=dev-qt/qtgui-5.2.0:5 >=dev-qt/qtnetwork-5.2.0:5 >=dev-qt/qtwidgets-5.2.0:5 ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5 >=dev-qt/qtgui-5.2.0:5 >=dev-qt/qtnetwork-5.2.0:5 >=dev-qt/qtwidgets-5.2.0:5 ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext )
 DESCRIPTION=GREYC's Magic Image Converter
 EAPI=8
 HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
@@ -8,10 +8,10 @@ INHERIT=bash-completion-r1 toolchain-funcs
 IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=CeCILL-2 GPL-3
-RDEPEND=sys-libs/zlib:0= curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) ffmpeg? ( media-video/ffmpeg:0= )
+RDEPEND=sys-libs/zlib:0= curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5 >=dev-qt/qtgui-5.2.0:5 >=dev-qt/qtnetwork-5.2.0:5 >=dev-qt/qtwidgets-5.2.0:5 ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5 >=dev-qt/qtgui-5.2.0:5 >=dev-qt/qtnetwork-5.2.0:5 >=dev-qt/qtwidgets-5.2.0:5 ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) ffmpeg? ( media-video/ffmpeg:0= )
 REQUIRED_USE=gimp? ( png fftw X ) qt5? ( png fftw X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_3.1.5.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d617ac94bebaf23d5a81308733208827
+_md5_=16ec5d1e570c74646b80fdcd62dae88d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ac35d794eb09..85043efe44a4 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/easyeffects-6.2.8 b/metadata/md5-cache/media-sound/easyeffects-6.2.8
index 783138ed9620..47140c70a058 100644
--- a/metadata/md5-cache/media-sound/easyeffects-6.2.8
+++ b/metadata/md5-cache/media-sound/easyeffects-6.2.8
@@ -1,6 +1,6 @@
-BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool media-libs/libsamplerate sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm pretend test
-DEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/fftw:3.0
+DEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/fftw:3.0 media-libs/libsamplerate
 DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
 EAPI=8
 HOMEPAGE=https://github.com/wwmm/easyeffects
@@ -12,4 +12,4 @@ RDEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.2.8.tar.gz -> easyeffects-6.2.8.tar.gz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=32c32c06c65d56ed33083db3db2b0d44
+_md5_=55e1670d08ba0d3bf6fff2c67f21ae5f
diff --git a/metadata/md5-cache/media-sound/mpg123-1.30.0 b/metadata/md5-cache/media-sound/mpg123-1.30.0
index 277d52087045..0f8fd2260ca0 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.30.0
+++ b/metadata/md5-cache/media-sound/mpg123-1.30.0
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.30.0.tar.bz2
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dc57a71ad6160c12239d98ed4742a07b
+_md5_=dc147d27f00ebded6c7ed3409b6ca4df
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.8.7 b/metadata/md5-cache/media-sound/pulseeffects-4.8.7
index 6344325862e2..fb8bd8d8b290 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.8.7
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.8.7
@@ -1,6 +1,6 @@
-BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool media-libs/libsamplerate sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 media-sound/pulseaudio >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise )
+DEPEND=>=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 media-sound/pulseaudio >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise ) media-libs/libsamplerate
 DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
 EAPI=8
 HOMEPAGE=https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy
@@ -12,4 +12,4 @@ RDEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v4.8.7.tar.gz -> pulseeffects-4.8.7.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d5821e85eac4786a49ae0f7150780c7e
+_md5_=91915300ba05613b4dffb57b0538fa36
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 8d78d704f67f..36d9bdc8212d 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.6 b/metadata/md5-cache/net-analyzer/suricata-6.0.6
index b81da0629caa..c21639d032fa 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.6
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.6
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_s
 DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
 EAPI=8
 HOMEPAGE=https://suricata.io/
-INHERIT=autotools linux-info lua-single python-single-r1 systemd tmpfiles
+INHERIT=autotools flag-o-matic linux-info lua-single python-single-r1 systemd tmpfiles
 IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.6.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=058fc8e18401be1d91e9954802bb6395
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a952ec085df06e3e7c52a8b6b56a14b5
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index f58f4b074371..db49f56e10bf 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
index b12fd4675b76..e54845125162 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=X2Go command line client
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.x2go.org
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=AGPL-3+
-RDEPEND=dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=net-misc/python-x2go-0.6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-misc/python-x2go-0.6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.1.2.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4311f335041e7f4b014789e0c70d8c2f
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=701597f86359ea7e65b131bbd364bc6f
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1 b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
index b90d0a67f32e..b63562497006 100644
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
+++ b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/python-distutils-extra[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/python-distutils-extra[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=X2Go graphical client applet
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.x2go.org
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
-RDEPEND=dev-python/pycups[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wxpython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=net-misc/python-x2go-0.6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/libnotify python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pycups[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wxpython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-misc/python-x2go-0.6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/libnotify python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4f2f42eef69ca56b3b5a81ac6c88902
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6a503132dee313e20945362c3e953b59
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 634831abfdef..7466133d74ff 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-2.4.2-r1 b/metadata/md5-cache/net-print/cups-2.4.2-r1
index 1cdee593dac3..f42ddb35ae27 100644
--- a/metadata/md5-cache/net-print/cups-2.4.2-r1
+++ b/metadata/md5-cache/net-print/cups-2.4.2-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.2/cups-2.4.2-source.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	1a2157392a869265b2afcb63a26c12ac	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=41e1127babf9323ea7eea397bac1d477
+_md5_=81704678a8789034bdedde7794106043
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index ccc5090c1eb2..58be232ec2e2 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/cdsclient-3.8.4 b/metadata/md5-cache/sci-astronomy/cdsclient-3.8.4-r1
index f56395b5a503..e468b42766c1 100644
--- a/metadata/md5-cache/sci-astronomy/cdsclient-3.8.4
+++ b/metadata/md5-cache/sci-astronomy/cdsclient-3.8.4-r1
@@ -1,6 +1,6 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install
 DESCRIPTION=Collection of scripts to access the CDS databases
-EAPI=6
+EAPI=8
 HOMEPAGE=http://cdsweb.u-strasbg.fr/doc/cdsclient.html
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
@@ -8,5 +8,4 @@ RDEPEND=app-shells/tcsh
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=ftp://cdsarc.u-strasbg.fr/pub/sw/cdsclient-3.84.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=5366dd2ad10012d0c4cb521a3cd95ae5
+_md5_=4a89666ca4893e39944806899c363dca
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index bb0dbd22f638..5ac0106e122c 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.6.1-r2 b/metadata/md5-cache/sci-libs/opencascade-7.6.1-r2
deleted file mode 100644
index 06c00a99f099..000000000000
--- a/metadata/md5-cache/sci-libs/opencascade-7.6.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) examples? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] ) eigen? ( dev-cpp/eigen ) json? ( dev-libs/rapidjson )
-DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
-EAPI=8
-HOMEPAGE=https://www.opencascade.com
-INHERIT=cmake
-IUSE=doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
-RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] )
-REQUIRED_USE=?? ( optimize tbb )
-RESTRICT=test
-SLOT=0/7.6
-SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_6_1;sf=tgz -> opencascade-7.6.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c2e4809f245c87ab9f70b5c0725d112c
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c670d2e6021e..f2b38b6a2a2a 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.8.3 b/metadata/md5-cache/sys-apps/fwupd-1.8.3
index 3995eb56fcbb..d2c0ee93d4d7 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.8.3
+++ b/metadata/md5-cache/sys-apps/fwupd-1.8.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.8.3.tar.gz -> fwupd-1.8.3.tar.gz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	vala	1c07e7167d9ef851ad187f5f3f02d34d	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=258ad276d609e47e8a80777fb715511a
+_md5_=6d50211fd9efcb2fb6d3ce8426dfcc26
diff --git a/metadata/md5-cache/sys-apps/uutils-0.0.14 b/metadata/md5-cache/sys-apps/uutils-0.0.14
new file mode 100644
index 000000000000..7a62a93ac12d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/uutils-0.0.14
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.56.0 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=GNU coreutils rewritten in Rust
+EAPI=8
+HOMEPAGE=https://github.com/uutils/coreutils
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 ISC MIT Unlicense
+SLOT=0
+SRC_URI=https://github.com/uutils/coreutils/archive/refs/tags/0.0.14.tar.gz -> uutils-0.0.14.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bigdecimal/0.3.0/download -> bigdecimal-0.3.0.crate https://crates.io/api/v1/crates/binary-heap-plus/0.4.1/download -> binary-heap-plus-0.4.1.crate https://crates.io/api/v1/crates/bindgen/0.59.2/download -> bindgen-0.59.2.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blake2b_simd/1.0.0/download -> blake2b_simd-1.0.0.crate https://crates.io/api/v1/crates/blake3/1.3.1/download -> blake3-1.3.1.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byte-unit/4.0.14/download -> byte-unit-4.0.14.crate https://crates.io/api/v1/crates/bytecount/0.6.2/download -> bytecount-0.6.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/1.3.2/download -> clang-sys-1.3.2.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_complete/3.1.4/download -> clap_complete-3.1.4.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/compare/0.1.0/download -> compare-0.1.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/conv/0.3.3/download -> conv-0.3.3.crate https://crates.io/api/v1/crates/coz/0.1.3/download -> coz-0.1.3.crate https://crates.io/api/v1/crates/cpp/0.5.7/download -> cpp-0.5.7.crate https://crates.io/api/v1/crates/cpp_build/0.4.0/download -> cpp_build-0.4.0.crate https://crates.io/api/v1/crates/cpp_common/0.4.0/download -> cpp_common-0.4.0.crate https://crates.io/api/v1/crates/cpp_common/0.5.7/download -> cpp_common-0.5.7.crate https://crates.io/api/v1/crates/cpp_macros/0.5.7/download -> cpp_macros-0.5.7.crate https://crates.io/api/v1/crates/cpp_syn/0.12.0/download -> cpp_syn-0.12.0.crate https://crates.io/api/v1/crates/cpp_synmap/0.3.0/download -> cpp_synmap-0.3.0.crate https://crates.io/api/v1/crates/cpp_synom/0.12.0/download -> cpp_synom-0.12.0.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crossterm/0.23.2/download -> crossterm-0.23.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/ctrlc/3.2.2/download -> ctrlc-3.2.2.crate https://crates.io/api/v1/crates/custom_derive/0.1.7/download -> custom_derive-0.1.7.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/data-encoding-macro/0.1.12/download -> data-encoding-macro-0.1.12.crate https://crates.io/api/v1/crates/data-encoding-macro-internal/0.1.10/download -> data-encoding-macro-internal-0.1.10.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/dlv-list/0.2.3/download -> dlv-list-0.2.3.crate https://crates.io/api/v1/crates/dns-lookup/1.0.8/download -> dns-lookup-1.0.8.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/exacl/0.8.0/download -> exacl-0.8.0.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/file_diff/1.0.0/download -> file_diff-1.0.0.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/flate2/1.0.23/download -> flate2-1.0.23.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/fts-sys/0.2.1/download -> fts-sys-0.2.1.crate https://crates.io/api/v1/crates/gcd/2.1.0/download -> gcd-2.1.0.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/hex-literal/0.3.4/download -> hex-literal-0.3.4.crate https://crates.io/api/v1/crates/hostname/0.3.1/download -> hostname-0.3.1.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/indexmap/1.8.1/download -> indexmap-1.8.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/ioctl-sys/0.8.0/download -> ioctl-sys-0.8.0.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/keccak/0.1.0/download -> keccak-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lscolors/0.10.0/download -> lscolors-0.10.0.crate https://crates.io/api/v1/crates/match_cfg/0.1.0/download -> match_cfg-0.1.0.crate https://crates.io/api/v1/crates/md-5/0.10.1/download -> md-5-0.10.1.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.3/download -> memmap2-0.5.3.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/mio/0.8.3/download -> mio-0.8.3.crate https://crates.io/api/v1/crates/nix/0.24.1/download -> nix-0.24.1.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/once_cell/1.11.0/download -> once_cell-1.11.0.crate https://crates.io/api/v1/crates/onig/6.3.1/download -> onig-6.3.1.crate https://crates.io/api/v1/crates/onig_sys/69.7.1/download -> onig_sys-69.7.1.crate https://crates.io/api/v1/crates/ordered-multimap/0.3.1/download -> ordered-multimap-0.3.1.crate https://crates.io/api/v1/crates/os_display/0.1.3/download -> os_display-0.1.3.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.1/download -> os_str_bytes-6.0.1.crate https://crates.io/api/v1/crates/ouroboros/0.15.0/download -> ouroboros-0.15.0.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.0/download -> ouroboros_macro-0.15.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/paste/1.0.7/download -> paste-1.0.7.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_codegen/0.10.0/download -> phf_codegen-0.10.0.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/reference-counted-singleton/0.1.1/download -> reference-counted-singleton-0.1.1.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.7.0/download -> remove_dir_all-0.7.0.crate https://crates.io/api/v1/crates/retain_mut/0.1.7/download -> retain_mut-0.1.7.crate https://crates.io/api/v1/crates/rlimit/0.8.3/download -> rlimit-0.8.3.crate https://crates.io/api/v1/crates/rust-ini/0.17.0/download -> rust-ini-0.17.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustversion/1.0.6/download -> rustversion-1.0.6.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selinux/0.2.7/download -> selinux-0.2.7.crate https://crates.io/api/v1/crates/selinux-sys/0.5.2/download -> selinux-sys-0.5.2.crate https://crates.io/api/v1/crates/sha1/0.10.1/download -> sha1-0.10.1.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha3/0.10.1/download -> sha3-0.10.1.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/signal-hook/0.3.14/download -> signal-hook-0.3.14.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.24.0/download -> strum-0.24.0.crate https://crates.io/api/v1/crates/strum_macros/0.24.0/download -> strum_macros-0.24.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/termsize/0.1.6/download -> termsize-0.1.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unindent/0.1.9/download -> unindent-0.1.9.crate https://crates.io/api/v1/crates/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/users/0.10.0/download -> users-0.10.0.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/utf8-width/0.1.6/download -> utf8-width-0.1.6.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/which/4.2.5/download -> which-4.2.5.crate https://crates.io/api/v1/crates/wild/2.0.4/download -> wild-2.0.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/z85/3.0.5/download -> z85-3.0.5.crate https://crates.io/api/v1/crates/zip/0.6.2/download -> zip-0.6.2.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=dc056ffe0a8b12a282e86645b3040382
diff --git a/metadata/md5-cache/sys-apps/vbetool-1.1 b/metadata/md5-cache/sys-apps/vbetool-1.1
deleted file mode 100644
index 6e20ab97a057..000000000000
--- a/metadata/md5-cache/sys-apps/vbetool-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1 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=Run real-mode video BIOS code to alter hw state (i.e. reinitialize video card)
-EAPI=6
-HOMEPAGE=http://www.codon.org.uk/~mjg59/vbetool/
-INHERIT=autotools
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1
-SLOT=0
-SRC_URI=http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f977810c4eccea2598e681cf8c7f9ec4
diff --git a/metadata/md5-cache/sys-apps/vbetool-1.1-r1 b/metadata/md5-cache/sys-apps/vbetool-1.1-r1
new file mode 100644
index 000000000000..b874e9bcec42
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/vbetool-1.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1
+DESCRIPTION=Run real-mode video BIOS code to alter hw state (i.e. reinitialize video card)
+EAPI=8
+HOMEPAGE=http://www.codon.org.uk/~mjg59/vbetool/
+INHERIT=autotools
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1
+SLOT=0
+SRC_URI=http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=715b69cb70c04aa9c1b6bc065df624c9
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 6e94c49811bb..22752530dea6 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ucx-1.2.2-r1 b/metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
deleted file mode 100644
index 773c09da1b18..000000000000
--- a/metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
+++ /dev/null
@@ -1,14 +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=Unified Communication X
-EAPI=6
-HOMEPAGE=https://www.openucx.org
-INHERIT=autotools
-IUSE=+numa +openmp
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=numa? ( sys-process/numactl )
-SLOT=0
-SRC_URI=https://github.com/openucx/ucx/releases/download/v1.2.2/ucx-1.2.2.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e48e48491c1b1f086d1f85b410a4576b
diff --git a/metadata/md5-cache/sys-cluster/ucx-1.3.0 b/metadata/md5-cache/sys-cluster/ucx-1.3.0
deleted file mode 100644
index f965ff73b851..000000000000
--- a/metadata/md5-cache/sys-cluster/ucx-1.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Unified Communication X
-EAPI=6
-HOMEPAGE=https://www.openucx.org
-IUSE=+numa +openmp
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=numa? ( sys-process/numactl )
-SLOT=0
-SRC_URI=https://github.com/openucx/ucx/releases/download/v1.3.0/ucx-1.3.0.tar.gz
-_md5_=d9079ffc003101678f3fcd41c21090e6
diff --git a/metadata/md5-cache/sys-cluster/ucx-1.5.2 b/metadata/md5-cache/sys-cluster/ucx-1.5.2
deleted file mode 100644
index 1efaf3ceacfd..000000000000
--- a/metadata/md5-cache/sys-cluster/ucx-1.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure
-DEPEND=sys-libs/binutils-libs:= numa? ( sys-process/numactl )
-DESCRIPTION=Unified Communication X
-EAPI=6
-HOMEPAGE=https://www.openucx.org
-IUSE=+numa +openmp
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sys-libs/binutils-libs:= numa? ( sys-process/numactl )
-SLOT=0
-SRC_URI=https://github.com/openucx/ucx/releases/download/v1.5.2/ucx-1.5.2.tar.gz
-_md5_=67ca008025c70972d186fc17f264d59a
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 45d81ee88211..37441928ed78 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.4.3 b/metadata/md5-cache/sys-libs/libsmbios-2.4.3
index 93627cd6ebb7..d839a830c807 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.4.3
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 )
 DESCRIPTION=Provide access to (SM)BIOS information
 EAPI=7
-HOMEPAGE=http://linux.dell.com/files/libsmbios/
+HOMEPAGE=https://github.com/dell/libsmbios
 INHERIT=autotools flag-o-matic python-single-r1
 IUSE=doc graphviz nls +python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm64 ~ia64 ~riscv x86
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dell/libsmbios/archive/v2.4.3.tar.gz -> libsmbios-2.4.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=569ea4c80b1d98d98c2ec36b4cbdb563
+_md5_=9885ef86e3e8be13de1a2c1b1fcbec02
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index f4e3f01ab137..9d8620ef64d5 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/rust-1.62.1 b/metadata/md5-cache/virtual/rust-1.62.1
index d15c69d41e2b..ea1adbe4c005 100644
--- a/metadata/md5-cache/virtual/rust-1.62.1
+++ b/metadata/md5-cache/virtual/rust-1.62.1
@@ -3,8 +3,8 @@ DESCRIPTION=Virtual for Rust language compiler
 EAPI=8
 INHERIT=multilib-build
 IUSE=rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
 RDEPEND=|| ( ~dev-lang/rust-1.62.1[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.62.1[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=979a01f5657b1a568b9a674368ae16ba
+_md5_=c6782cb72e340257af705c6339eb4ec9
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index f170fd016de0..90c5fc7e000f 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.22 b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.22
new file mode 100644
index 000000000000..7d4bbdc64ebd
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.22
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+DESCRIPTION=Nvidia 2D only video driver
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~ia64 ~loong ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-nv-2.1.22.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=2afb2137468664b9c9fccac648f144c6
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b21c83371136..97355eb2d64d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 13864 BLAKE2B 373887a06bb63946485d0b9e08e52b3b3c3fbeda530b58fbe19569ccedfd0a8f7c63f073261fcef68edcbf9331108cf543382117b2f60c464926fff49fff9e18 SHA512 b3adafe44390700af75c3b98d6b21ba11902c1f2033fb07a8064382a68a6b6c023b73b318e0a8159e5911175172732771aae9261f870aee90bb5b6e69de3f24d
-TIMESTAMP 2022-07-27T18:39:58Z
+TIMESTAMP 2022-07-28T00:40:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLhhn5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLh2ulfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD/LQ/+PNHNMHV8NhAzon1pvmBpcqwBDRIbsordQcdSkqN+M/jhr9I4O2B3zTiR
-VNS3CVOygZjX0Xnu/OFtcFkFwGyyWj65L9ikE8cAkDxM9/m2YhIfWq8raUTL1ABz
-ztDi+bcQvqbDwj7TFqkg29eaWnJAjpZMA0UCUEtOGCKhVN+STqAX1kyq1+hbtr3A
-gE3+seBgkJPvIxwOkBYtbogbWIHq7jsW9p5IiJ/26374yhNYwXQseDBsqZCMX6qg
-5OWgSVEs24CUgnScAbppxKh06pyGQHvczwFPcJ9bnL3oY+UPkk1VSebiLidimk1V
-bW40+UZLiSspbUX64cxZzW2vl5MV4wXAgEXzKkZ5/ANw28Zi6Ap/moVphYM5g3Uh
-tjKE+dkx/9z/jiwyJ4avfGFNe6SaK6JZ9KRtQroCFKgoOgwND9YQQWo0q04ez4g3
-9XLMABLzBgJBBGDCOHJdtkLHDM/BmozVlhwsIvPpP7otz9B/jj7pKKMLErdvMXC5
-IvY2CkEdmkPNakINYmRIqAY1mSHv7SDCOsxmsVMe1UfFazT8CzAtWbbx6Dba87Du
-yOD6X0B1l0lcmX4TROktApTyMDUNy2UhIIyiGwEw2aVUQuNsBBnW27ssg45+uTq4
-CUNL1XomkPLExPgrTH6gmDZNpWGBg8PxpgAco2ltXfBZgQ3iEDc=
-=WJm9
+klASmBAArcQBYug4y/3/t/pSBBd+NGGpdF6xEQv5OVXWnKhUrFgJ6KUiFU+nDuzl
+R9e0hrfF8goYrb54rVACTglDaioqvALFdGld08r4/Qhl680COAkXqoP0UuUAISOq
+uazUMyyGoSfwjtW80455FE9rnbQlb8NcpEJ4mJkJcwRoafvPlTnxWbAbLq+Y2O0S
+myVfGkNjKoNCscOUGsOqxcZq+ZIiIMW0N/ei5ZRLCPAyg62tkiQQqh0koAs1KA7+
++Y3Qwz60dVZ23DbpXGD4dxy7PhMzMFREfUIcAxXtPcLYM42yog9jERZosKu0c8Ui
+mU8dmxhk1zWlQRW6YQWZvxUA6+/ORShmiCaJgkh6Q6a2BvghFFme86AZzj5dOAwO
+RhtyhGDoUrTcnZ/sAwLTDlBDcVQX8AzD5XAzRp+rjQpVoL6VnMJmsERNv26du0bq
+xWieDLoIoLnHPAn6p9sNTpEjVz9oCOFmFd49CvUyIgkKlcOh6OQp7O6Oq8bZRw75
+jTDhZKcvFC5Cwvh2lMvyiGP4kbK/ZTo+gHky04MxmjPRelxx+wcW0tGQRAH5TKV4
+6ZDujbu0RVGRuIjJMCxI4YN4fYbP4aO4rg8Rz3sONEmkfOlBWg92d3OQYdoGj0ll
+JfQcs4Xgxu16nuP7H9N+F4OuSJTNyKTI+Ha83u9MzoQAMsnqAi8=
+=kyYw
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fcc3521a81d9..6e3a2cfd3568 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 27 Jul 2022 18:39:54 +0000
+Thu, 28 Jul 2022 00:40:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 94146df22bed..72b3d3a08740 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jul 27 06:39:54 PM UTC 2022
+Thu Jul 28 12:40:05 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f17f120577f9..be94b5b11928 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 27 Jul 2022 18:45:01 +0000
+Thu, 28 Jul 2022 00:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 118b4b1cf32d..b8406d0cddc9 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1a0f5051585bd0ea240da3f19a8ec3235ce88bc0 1658946048 2022-07-27T18:20:48+00:00
+6f7d9f7b6631cd693357fd67b66eb7a1804a9a75 1658968227 2022-07-28T00:30:27+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 502875eadbce..b0863eab6ea3 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1658947201 Wed 27 Jul 2022 06:40:01 PM UTC
+1658968801 Thu 28 Jul 2022 12:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fcc3521a81d9..8a9a1a6803fa 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 27 Jul 2022 18:39:54 +0000
+Thu, 28 Jul 2022 00:40:05 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d1d908657912..e5d94f8466dd 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 8ee262509895..8009b63bf52e 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -10,5 +10,5 @@ AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c39
 DIST suricata-5.0.10.tar.gz 29391642 BLAKE2B b5c83b9882e89894c3dedb7f536d584a20bbeab24236752e528171db6589a6308422c8b0be4f433fc63b8cfc227aa0b67935a4aece943b10f4577398ea9ed467 SHA512 c59719d42a236ac7421e0bcf6894f113c8f7518e2b5dde558cbe57c12b68b86ef700bae3f4047c6b2677a784061951fc9d058e9f59b11846279da06e9649ac56
 DIST suricata-6.0.6.tar.gz 32651139 BLAKE2B de0a73c618c1e2777019de6b29be5224db1885840cba8d05ad4a83fc082408e5d8b16d2c6055701f5d279852a99bea5dea01bed58ad0148afd76c1158e693f16 SHA512 184e5a2f3a68de33198f6f0e681710b3f04ed083081ef989dba77d1afb78922c5afdcdaa18ca92c6ed79b98134a3c42b13e1f3e91d20ea10ca74a692f93c5101
 EBUILD suricata-5.0.10.ebuild 6651 BLAKE2B bbc891ad292548d698f229233615875afa85bfe5700724348065a86cf5ba866c9bee00a3ed62462109c10c9ba7eeab1b6d2b2a08fd3c459dac4d5fd84e2252cf SHA512 b5466d2a19e7864f0d94c3767301689d6cf4ae03954b253066408e5cc5a020264c31ee4489fd1fa648471298086338d44c8849e672a97880985eb9fa6b36db30
-EBUILD suricata-6.0.6.ebuild 6757 BLAKE2B 6f92edfd28f88b469f8bbdc33a2f643d2738543d91086733bdde9db7858a072b077a469aff83896612c6044d50b47e9ab04c7cae7b5c31c6275ca8927f65fac9 SHA512 4ca66e5bf971feb60aa7342fc21571f567a6c76fdc58f0d4f474d8e896a60e92055b86f2c6388eabe0abe0e5b454b1b1565733c11d27d9fb19596fcc327e8eae
+EBUILD suricata-6.0.6.ebuild 6798 BLAKE2B 57e3dcc0facd0590258807f9709a4dfdffd7903fd329609d3ea4c8bf0f53322310ced6ca8b89f211e885cefa4148405fd123e93bdb6b7a9338879898f1c49484 SHA512 73b4b1c3e09fad5280658bcc1f9504d7d1ab04433c7c60a4901bee6e99829fcea75bffb5c798bc26a9866b2e8765c802a4a039e4f466a3eb013563312224fb84
 MISC metadata.xml 1047 BLAKE2B 8418aaa86ecf0e2baaf3f927c764dd8f0471f29c0b691ec3baac6988291e9e591ea4263b89a4a25b44cc2642d58bbffcfa5fdecd628ea101e4dd3d67e1914515 SHA512 1e6e38f2d0cd4335e274ab1ac72a445a3bfdd7a5c028d06a387e0f879cf7859681856ff03986816d5dae1ac841958652003b5c8057187885c579a695f8bc11cd
diff --git a/net-analyzer/suricata/suricata-6.0.6.ebuild b/net-analyzer/suricata/suricata-6.0.6.ebuild
index 1170a44de6b0..751a280a7b5d 100644
--- a/net-analyzer/suricata/suricata-6.0.6.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
+inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd tmpfiles
 
 DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
 HOMEPAGE="https://suricata.io/"
@@ -80,6 +80,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Bug #861242
+	filter-lto
+
 	local myeconfargs=(
 		"--localstatedir=/var" \
 		"--runstatedir=/run" \
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c73b0e4123c7..551e44951bea 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
index f11e7bc8f1ad..09b33d561c29 100644
--- a/net-misc/pyhoca-cli/Manifest
+++ b/net-misc/pyhoca-cli/Manifest
@@ -1,3 +1,3 @@
 DIST pyhoca-cli-0.6.1.2.tar.gz 41891 BLAKE2B a3183acc8b4a809e5b3894bbcb276972f3bf0178f2a9f596e697866db4217ca4e04d6b3d698b202e124a2e42a3b1f9b2f0fbd595bf0483f55dd7dbe9ea108ef3 SHA512 02bb6a0dcb72bc67e8b8109e554f04fa57d5b2da2682b50a081b60e19c257842ae31aabb7faa945579fb23d0e922befd0678c413b31393d368b4173e0d4315f6
-EBUILD pyhoca-cli-0.6.1.2.ebuild 807 BLAKE2B 75757366b32d2555c8c85396578e21a803406fa997bcdb47756c3ca9279225e7e9ea6511087144102dfab466dedf266e95b3efbb60853c7ce7a1a7e7d998187f SHA512 92d5561e6fa5296d4c803eb7451bb686e7ccff1f2ea67c4dc127433709d20d78c95e0b44c86ebd225d3af5036fd08d1af597c8bd2ed8ab217d6fcff9c6a9a901
+EBUILD pyhoca-cli-0.6.1.2.ebuild 808 BLAKE2B 8f88a288ef6d55ae3ebd433584607404fd417cc6b2cb23b8249d44df09afe7ef834f9bd3b153bf70889f4289ba5fedb035bf301ea96397129dbf687e73d7e5de SHA512 82aa774902b7091cb30a138ac9c897da3d3007d065d7461e950dc40a25bd63f673471a002fa907e85b7181050aec02832701ea4ce75f30108bef7aa9b708af54
 MISC metadata.xml 546 BLAKE2B cd794b3e556403990294a943ea4705813b33867c68f6a2729bf258d52b0ffca085b117bea7f26db21044cce96cc2bbff065c28f3ade8a270675898c74974d38d SHA512 63514d5f49ad45472c271a64b994c2c9ced6a15eb7d01660724392fce52be26b8ae5efb1e0ecce8b2e31128513461ef36d31aefd26a3a8e260e849eb63b26904
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
index 153510b8ebcd..1568b9c349d1 100644
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go command line client"
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
index 805faaf3c81a..306d657844f8 100644
--- a/net-misc/pyhoca-gui/Manifest
+++ b/net-misc/pyhoca-gui/Manifest
@@ -1,3 +1,3 @@
 DIST pyhoca-gui-0.6.1.1.tar.gz 2099727 BLAKE2B 944ee3cd743d502ce320759b9200c74de13802e23aabc2a5fe5659e123e2bbc368bf8a216c73de2c2ed22408d8fe50b4b945cc0714d05e1cb0faa1e5617dd4b0 SHA512 e7e24d60c1e4ecca2201c2a25bfc8c5552e54e30a5f744c5bc9c36ba4050a64cbb8616ab2e035b34cd14c62702ff88e32c863cac8aef0f8f4cb18db1d2e737b6
-EBUILD pyhoca-gui-0.6.1.1.ebuild 962 BLAKE2B 8218111efda5ecb83ead8dabb2df9a581467e62446006defbdb32af9dcacba3f73f99f517fcb2a56434931d8dde5c92f275ba500cd857ed1916b86e6956d2704 SHA512 4a7996ab9e4e64f166e600cf0f78716344b28e60b499e4d005a9736a6bffd55f2325bdd6fefc2b0fe3efaf98b861c31654c83579358dd3acab68af0be8a1fb1c
+EBUILD pyhoca-gui-0.6.1.1.ebuild 963 BLAKE2B f527244e3fbda395fd88a11176cd5c1aa71fb7148a48ac0573a0635cfa089b757bdee426965acbf0f9766d57ffa79432816ae84f2e3fa1a90972c968f01aa6c4 SHA512 579dc2310b107b28b1265f478fa14970f7ff1b49211895fff62588f23753d022d1f781f41461f6371c356c11e8a0fb07bdf7785ada4c09cf5859a5a168e797ba
 MISC metadata.xml 816 BLAKE2B de70719c61f4ed3ad3f95fe888283ec0983fa8d722b189370cf7337496727958f80d467bd43292544995fa6a563356148ee296f466c876a056ecfa60068b9340 SHA512 6290306e99d6609e9f71aee494c6de1bf7f7a02b3a89375fb24b2544b96d2c48ebf14f8e99df50cda107a973c30e38b84537524f753e59e8318125d67b4046cf
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
index 671e506e1ffe..3705cbbe5314 100644
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go graphical client applet"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 3de6c08534f3..9060d46f1ef1 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 410bce2c8618..12323be9e2f1 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -12,6 +12,6 @@ AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46af
 DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
 DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 SHA512 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f
 EBUILD cups-2.3.3_p2-r3.ebuild 9571 BLAKE2B 5afeb6352867c9069d4446c83e854f790b1e13b6a88a73f1fb72b27e139f2694435ac2db5328d031d91408f31ccbde60e7b29287dc402437e29831199e8ea295 SHA512 0265ec3ab43990be1917cf6e021049cf5fcae7e17a2e968ada26eef5a1e0f5cd9a2e5221781c2800382b943c08376947337e43aca6e6052e62fce28c2d448e38
-EBUILD cups-2.4.2-r1.ebuild 9434 BLAKE2B fbb1aa4b3e2d0e95e01ce8e0686b553a5517fcdddbdb136261dc995b747f46dc38d119c6cf3df9d8e60b8ae0b0064650a290c71a1c3ba03cd08bf3410b8354d8 SHA512 f3d19bde748b6e0b57472ad3ba90c7a4c27df262fa2f6070bf9cd2369222498660f9fbe8d0fd801e524309fbcc84db75a3e2ab580fc93e29e4fe121060ce0934
+EBUILD cups-2.4.2-r1.ebuild 9564 BLAKE2B 38eb693e5a18cb9711a5b05818453841e1f6b0d711473ab90e94c5a3be2e0399fd693526f41733856368410bfb3ce7e95536d30cf93d8a3b112419ac60a2f7f0 SHA512 81bbe8c959de1f1db340662f75f0b2ecc13411007007ffe11d86a2156732242becfef5f77934783d9a87e0bf4956bdbffec394a775237cd473a082978fe46dd8
 EBUILD cups-9999.ebuild 9441 BLAKE2B 0c3e0d14e8315bc487196ff8ed7f3a8ee79db6ec9943772982af652e0f104b301c0546a69a4d820231df362a5c15d1d00247b2f1321010dd6695adec26c125fb SHA512 1f194f9dde815b4f721fa8ec2181fca69a07e0a6ae0298b16be40148575b2d911aed3ed6af188e66850ccf6097cf1b45ee868bbc0311a9582c410198115f5eff
 MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.2-r1.ebuild b/net-print/cups/cups-2.4.2-r1.ebuild
index 98885fee4bcd..0b9465532f39 100644
--- a/net-print/cups/cups-2.4.2-r1.ebuild
+++ b/net-print/cups/cups-2.4.2-r1.ebuild
@@ -188,6 +188,11 @@ multilib_src_configure() {
 	# makes more sense when facing multilib support.
 	sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die
 
+	# Don't use the libtool build
+	# https://bugs.gentoo.org/843638
+	# https://github.com/OpenPrinting/cups/pull/394
+	unset LIBTOOL
+
 	econf "${myeconfargs[@]}"
 
 	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c4be2e5e80d1..c45949bf2e9d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 732e36cb6152..22eb277af38e 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2022-07-28)
+# Relies on unimplemented functions outb_p and inb_p,
+# support for which has never made it into musl. Bug #712972.
+sys-libs/libsmbios
+
 # Stefan Strogin <steils@gentoo.org> (2022-06-29)
 # Binary package linked against glibc
 net-im/element-desktop-bin
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 33e8d489e992..11b3bf20b77f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2165,8 +2165,6 @@ dev-libs/link-grammar:hunspell - Adds support for app-text/hunspell spell checke
 dev-libs/log4cplus:explicit-initialization - Require explicit initialization
 dev-libs/log4cplus:iconv - Use inconv for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
 dev-libs/log4cplus:server - Build the logging server
-dev-libs/log4cplus:working-c-locale - Use the C99 locale facilities for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
-dev-libs/log4cplus:working-locale - Use C++'s std::locale for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
 dev-libs/log4cxx:smtp - Offer SMTP support via net-libs/libesmtp
 dev-libs/m17n-lib:X - Build the Graphical User Interface API and utilities
 dev-libs/m17n-lib:anthy - Enable support for app-i18n/anthy input method
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index cb1eb9e9fbde..2e2eb3dbfb09 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/cdsclient/Manifest b/sci-astronomy/cdsclient/Manifest
index 84438bd90a8e..8c403e790698 100644
--- a/sci-astronomy/cdsclient/Manifest
+++ b/sci-astronomy/cdsclient/Manifest
@@ -1,4 +1,4 @@
-AUX cdsclient-makefile.patch 3036 BLAKE2B 6a1b7c794efec567b53953b7a7fdb8790d8f1a9bb3dd8caa0a9f96f96d855d21f45d3023500be1c161fe7779281438c0bf076fed5c20e13426c03fa1067fd4f7 SHA512 410538e4afc03fdb6f0f3e3bc929620a3ec15ea7694b95c1fffbba8a0c289393d1c6a33dde919c6831ddc8ebbb335a74d447e781efac80c507c050ad07fe86cd
+AUX cdsclient-makefile.patch 3252 BLAKE2B 30861a5fd40369c21ad0cc96bdfccfe40581da2fdd9303261b28b2621ad808f64ab01d2b950f35877d4fb2617c7fac5ff1ba88390620769a8808ceafbafda2be SHA512 6dbe519240dc997aa24b803a93916659f01766ab2fba36fbbf74c10727b426130440a1ca609bddf132f8a8da995c9031517fa44780971bfcd5649e861b6abb00
 DIST cdsclient-3.84.tar.gz 119585 BLAKE2B cf5d7fe3e7a1f4985949b8621122157178b856e82415e6bf12a582c67e6748bf9eb75209983baab9051919817b373b198748cfda5a1e4733784a9b98ab7659ff SHA512 2d7abf0079189b9dd19cb8919061445fd19ea9f7dfd54e8ceee26b743218cf62ab00eba0147abe82d9294223927f04b4cc3328620dfc9184a7049f8d515b29e4
-EBUILD cdsclient-3.8.4.ebuild 938 BLAKE2B 6e44450451bb3d79280eb7356e5a793d4774b989241f2d0eaa72dfdeb2d43baa445dba2081e41294d71d5ae81fc4cb6d56a13ec410669d7936fb0e1150b68c4d SHA512 541de82d6baea7b857322b492fb8bb99b3b48c9fa88da80e630c65a2f7f62a20d4c6316b80e6221f89ebf1cb4f8a28643ebc8d082a2294e538cc91a34a207e22
+EBUILD cdsclient-3.8.4-r1.ebuild 766 BLAKE2B c4c1a534310f2833bd16fc2e49ae0e5af539b17bed7e58a1dca03edad6139103362afc5a13119b1d8dcfa24ff6bd99fa67029bba41321c0e7cad6a67fbb7d3a4 SHA512 25f1d4c17ea21b295c0aac49a5321e68259c207025ee7ad24c093a7e974cff351b28ef7759fc1e7ad4600d8f1b56df356a4da91bf8ee16e40f6a7a551a25561f
 MISC metadata.xml 579 BLAKE2B 65c6b3d791ba4229c4a113a9d6ddf1c28146fdec27a5deec8415fdb42808ba7d4180017a6d043129cf7b4326c72f918e37b330d7571e0a39f42625180a2af5ce SHA512 bbbe890b4bbe27de08dffa9a26e3e1cb3e7800b75939fa3d44ca40299ce7bc0d6b7c43d772272772ac795cd0d939f0556d1607b2865e5abcf335a72cafb79a64
diff --git a/sci-astronomy/cdsclient/cdsclient-3.8.4.ebuild b/sci-astronomy/cdsclient/cdsclient-3.8.4-r1.ebuild
index 6ff53c45a659..3087cd4f8f5b 100644
--- a/sci-astronomy/cdsclient/cdsclient-3.8.4.ebuild
+++ b/sci-astronomy/cdsclient/cdsclient-3.8.4-r1.ebuild
@@ -1,41 +1,31 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit versionator
+EAPI=8
 
 # upstream versioning wrong: 3.71 is really 3.7.1
-MYP="${PN}-$(delete_version_separator 2)"
+MYP="${PN}-$(ver_rs 2 '')"
 
 DESCRIPTION="Collection of scripts to access the CDS databases"
 HOMEPAGE="http://cdsweb.u-strasbg.fr/doc/cdsclient.html"
 SRC_URI="ftp://cdsarc.u-strasbg.fr/pub/sw/${MYP}.tar.gz"
+S="${WORKDIR}/${MYP}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
 RESTRICT="mirror bindist"
-DEPEND=""
-RDEPEND="app-shells/tcsh"
 
-S="${WORKDIR}/${MYP}"
+RDEPEND="app-shells/tcsh"
 
-PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
-src_prepare() {
-	default
-	# remove non standard "mantex" page
-	sed -e 's/aclient.tex//' -i configure || die
-}
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
 
 src_install() {
 	local bindir="${EPREFIX}/usr/bin/${PN}"
 	emake DESTDIR="${D}" SHSDIR="${D}${bindir}" install
-	cat <<-EOF > 99${PN}
-		PATH=${bindir}
-		ROOTPATH=${bindir}
+
+	newenvd - 99${PN} <<-EOF
+		PATH="${bindir}"
+		ROOTPATH="${bindir}"
 	EOF
-	doenvd 99${PN}
 }
diff --git a/sci-astronomy/cdsclient/files/cdsclient-makefile.patch b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch
index 6d135a622056..d07928219b40 100644
--- a/sci-astronomy/cdsclient/files/cdsclient-makefile.patch
+++ b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch
@@ -1,5 +1,19 @@
---- cdsclient-3.81/Makefile.in.orig	2016-02-26 17:33:14.217750589 +0000
-+++ cdsclient-3.81/Makefile.in	2016-02-26 17:38:22.463875411 +0000
+- remove non standard "mantex" page
+- respect user flags
+
+--- a/configure
++++ b/configure
+@@ -3938,7 +3938,7 @@
+ 
+ 
+ EXPORT_SOURCE_FILE="aclient.c wwwget.c skio.c skclient.c sk.h"
+-EXPORT_MAN_FILE="sk.3 aclient.1 wwwget.1 aclient.tex"
++EXPORT_MAN_FILE="sk.3 aclient.1 wwwget.1 "
+ EXPORT_MAN_TEX="man.tex"
+ CASE="dev"
+ 
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -31,17 +31,17 @@
  #################################################################
  #PREFIX  = /usr/local
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a0e75df567b2..735a65cc7aaa 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index f0f17e7ada1e..7bb8ad49acea 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -10,10 +10,8 @@ AUX opencascade-7.6.2-avoid-pre-stripping-binaries.patch 1187 BLAKE2B fbfc9f3aaf
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
-DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61 SHA512 1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
 DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb SHA512 fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
 EBUILD opencascade-7.5.2-r6.ebuild 4937 BLAKE2B 7e864ea1414609e1475b222628d880142496e3e0cb0d5d1dbc850d92a484a17f2c7287b3d214ee9bf6d11ea11a2bbb427b8d28ccd6efafbc4b94de5747f56b1e SHA512 f689e21037b0aef011b2e9946d498eeaf52161e286a4112976c534f043e5aeab50a18fe67f49599a990d89c660cc37df4fde638657faa7e258774efad56d4ec2
 EBUILD opencascade-7.5.3-r8.ebuild 4970 BLAKE2B dec350db72a38f08fd6ceea88994219b504637cd2f62f4a5eae147c7c79617ccb1213e25ec9d2b77acde5e70e87b82ae4fd9667bd2d1c572031878e5214da002 SHA512 aa50be18383db9144e7bf791e08a3b6e2b5bae3ea194db7480429bfb62a6cc8697aecba29b3539c2ae4ff9093750fc1e56c253b0df65ace5e4c385f1b2db5025
-EBUILD opencascade-7.6.1-r2.ebuild 4676 BLAKE2B 5bda6fc2f7848ec7a0656a1b76c1a6dfd63490c50c3ca10619daff3a3428a3b6f9ef489b9da00bef1ac47021dc8e9363e71aee7759e435e1a9007400f8c4dc51 SHA512 67a2480662dcecf1e3413e80c37d2f5c79f560cf1a5e346a0cc574321b0319938d8b00ecc4c2db27b7e3147fbd8c4f1ea64ec66dfa290a0dd6bb5fe61f0a309a
 EBUILD opencascade-7.6.2-r1.ebuild 4694 BLAKE2B 587eca1709ce95ecaccdc573420e71f8e158466d04ed1f421b2aa4879831865f1210ad394c519c39fa75b9e4208066ba5f9620dbbb38ab9c21b7c00b31d25e7c SHA512 1f53e149b69b2ee9c8c801dc7d026155fdbafd080f65349d24c0c364620676940cc4627e5c80f12d9593cca39b386921bd5758a9ee298b89c4b8c66df28b511d
 MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8
diff --git a/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
deleted file mode 100644
index e11b24187775..000000000000
--- a/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="$(ver_rs 1- '_')"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk"
-
-REQUIRED_USE="?? ( optimize tbb )"
-
-# There's no easy way to test. Testing needs a rather big environment
-# properly set up.
-RESTRICT="test"
-
-# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
-RDEPEND="
-	!app-eselect/eselect-opencascade
-	dev-lang/tcl:=
-	dev-lang/tk:=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	ffmpeg? ( <media-video/ffmpeg-5:= )
-	freeimage? ( media-libs/freeimage )
-	tbb? ( dev-cpp/tbb:= )
-	vtk? ( sci-libs/vtk:=[rendering] )
-"
-DEPEND="
-	${RDEPEND}
-	eigen? ( dev-cpp/eigen )
-	json? ( dev-libs/rapidjson )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-	examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
-	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
-	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
-	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
-	"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e 's|/lib\$|/'$(get_libdir)'\$|' \
-		-i adm/templates/OpenCASCADEConfig.cmake.in || die
-
-	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
-	# assumptions it makes about installation paths. Rather than fixing it, just
-	# get rid of the mechanism altogether - its purpose is to allow a
-	# side-by-side installation of release and debug libraries.
-	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
-		-i adm/cmake/occt_toolkit.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC_Overview=$(usex doc)
-		-DBUILD_Inspector=$(usex examples)
-		-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
-
-		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
-		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
-		-DINSTALL_DIR_DATA="share/${PN}/data"
-		-DINSTALL_DIR_DOC="share/doc/${PF}"
-		-DINSTALL_DIR_INCLUDE="include/${PN}"
-		-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
-		-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
-		-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
-		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
-		-DINSTALL_DIR_WITH_VERSION=OFF
-		-DINSTALL_SAMPLES=$(usex examples)
-		-DINSTALL_TEST_CASES=NO
-
-		-DUSE_D3D=NO
-		# no package yet in tree
-		-DUSE_DRACO=OFF
-		-DUSE_EIGEN=$(usex eigen)
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FREEIMAGE=$(usex freeimage)
-		-DUSE_FREETYPE=ON
-		-DUSE_GLES2=$(usex gles2)
-		# no package in tree
-		-DUSE_OPENVR=OFF
-		-DUSE_RAPIDJSON=$(usex json)
-		-DUSE_TBB=$(usex tbb)
-		-DUSE_VTK=$(usex vtk)
-		-DUSE_XLIB=ON
-	)
-
-	use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
-	if use examples; then
-		mycmakeargs+=(
-			-D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
-			-DBUILD_SAMPLES_QT=ON
-		)
-	fi
-
-	if use vtk; then
-		if has_version ">=sci-libs/vtk-9.1.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
-		elif has_version ">=sci-libs/vtk-9.0.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
-		fi
-	fi
-
-	cmake_src_configure
-
-	sed -e "s|lib/|$(get_libdir)/|" \
-		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
-		< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
-
-	# use TBB for memory allocation optimizations
-	if use tbb; then
-		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die
-	fi
-
-	# use internal optimized memory manager and don't clear memory with this
-	# memory manager.
-	if use optimize ; then
-		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
-			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
-			-i "${T}"/99${PN} || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	doenvd "${T}/99${PN}"
-
-	docompress -x /usr/share/doc/${PF}/overview/html
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 180ed1d2b78d..e5ebb89b58d2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 332451f2cb67..fb48895c32c8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,4 +1,5 @@
 AUX fwupd-1.8.3-docgen_deps_test.patch 671 BLAKE2B 3a39ca3d9c70fc0f18ce4d3b9efaaf2c9cba8ef11b3e9cf9501ba32a1a2e0ef6b6e59dadd0a13bffea77f227d917893609033764c0cad268fbe65826f5f6a11c SHA512 7a81b69349fecf0b9730e3c11e33044a4ee1728f8b61ee0d1e737c74f33fde737111eb7f55fc8e0975e2b72b4df08b4f9c466c4c2ab2c586f2bc1c18e046c648
+AUX fwupd-1.8.3-gresource_quirks_paths.patch 421 BLAKE2B c21f9756c92fdb104bf0ac2d1edd424b9ddc68a4ca192d5569745f2ec332068c3d6d69c16c3c53652c0491a28b23c533752367341e73a7ec7dec9bac8d82709a SHA512 eb272783f1ff849190e7dbb3762b118d661aacf975516948558fedb2aceefb8fab8d1c96e165408b50bccacfce4b1046603479e7234fbf8c81a08c7d9e531128
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31
 DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
@@ -9,5 +10,5 @@ EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9
 EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
 EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
 EBUILD fwupd-1.8.1.ebuild 4922 BLAKE2B 99f3888b9c3c2ce2f793f14ccfdf7a4ce725a6c9a026cf6cb9090aaad0e800d2524932fbfccd92b6f9c1753d06aa0de010beed72dec663fb384edc376accd831 SHA512 f333e07a813fd0e25d9b48731454f450f8467e60db6732a40855c4934e9e1354da4e6f6bbab6fb0991d3502445c694b329d40eabd4ce7104a27d5c54ab84a213
-EBUILD fwupd-1.8.3.ebuild 5136 BLAKE2B 1e0987b45a9b6b65c60eeba06f3aaa31821a207346383945e296a37c403d818076777f4ab54f51b37393aa8b628cf42ef372f6621d0847c3fbf0e528e8bf8445 SHA512 d45622d5bd055e365db269071917b8d2e129aeff988d7f25d11dfdf4c6879b2aa4ec0c01f1f1b837277c4a682bd1d1dc2bfef7c5b8e2215a607e98a7a4ffbcdf
+EBUILD fwupd-1.8.3.ebuild 5224 BLAKE2B 5a6cba4d1da6c0af23594fbd0a29c70e99a8bf4574a4c4da048e339a2e72c5a4a4a0d6792c8a13a342337f40b30621093c21eb1d3d37f2da4ce00a56b20786c5 SHA512 86d946f60e969c552d5276673225415cdc84186dac8a57425b5d2ec3f75dc46bd2211201fe42b4e747d639f8e715680e672f67d0713295c68b6acc195d56c468
 MISC metadata.xml 1527 BLAKE2B 0cbeb805ede86d77bbd736349c84de642534059b2c90d938bd68c3caf0ff90257f3579d20eb38313f10a99f72780accd242601d778fd73386a727cad362a9f48 SHA512 9a541ecead0fc13a5cd78bcbcda425b9b2f4029dd921f01dc0ab1d2055ffcb0690d1fefdfbb98c68ef168c150178f75d085eeedf0699d35fd440d0b4d730a8d2
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch b/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
new file mode 100644
index 000000000000..f4f628adc7c2
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
@@ -0,0 +1,11 @@
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -154,7 +154,7 @@
+     error_message: 'meson >= 0.63.0 is needed for -Dgresource_quirks=enabled').allowed()
+   fwupd_gresource_xml = custom_target('fwupd-resources-xml',
+     input : [
+-      'org.freedesktop.fwupd.xml',
++      join_paths(meson.current_source_dir(), 'org.freedesktop.fwupd.xml'),
+     ] + plugin_quirks,
+     output : 'fwupd.gresource.xml',
+     command : [
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild
index 6e7df4eaa3c8..2d52acf698a3 100644
--- a/sys-apps/fwupd/fwupd-1.8.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild
@@ -94,6 +94,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.3-docgen_deps_test.patch
+	"${FILESDIR}"/${PN}-1.8.3-gresource_quirks_paths.patch
 )
 
 pkg_setup() {
@@ -150,6 +151,7 @@ src_configure() {
 		-Dconsolekit="disabled"
 		-Dcurl="enabled"
 		-Defi_binary="false"
+		-Dgresource_quirks="disabled"
 		-Dsupported_build="enabled"
 		-Dudevdir="${EPREFIX}$(get_udevdir)"
 		$(meson_feature archive libarchive)
diff --git a/sys-apps/uutils/Manifest b/sys-apps/uutils/Manifest
index 5cb43baba56f..655125134dc1 100644
--- a/sys-apps/uutils/Manifest
+++ b/sys-apps/uutils/Manifest
@@ -9,6 +9,7 @@ DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bigdecimal-0.3.0.crate 26679 BLAKE2B f0bc55c8b90b6cee84b3452a078008263bc04590adcc60f680e833ebd8b125699af05073e4e3cc739dff7985a481601be466c349a8125db69c7d45c62bca9890 SHA512 3a55f6ab1450974fe58dac268019fa7f76b0dee131ed66f5c5529ea28da5d9e7d11579585f28c0d3d45a6456992cdeee81df524c0c7bcc5c3dc86b26d4f12981
 DIST binary-heap-plus-0.4.1.crate 17088 BLAKE2B 55913d260748f3031e4aa37637bf66ac4c7b22f0104ac854c5c8e45e62e0ee5200c030bd4512839631bf14aff1bb861cf3c88b6ecab74fc4038581b86385540a SHA512 80c6957cdd7dc1f5bc6feebb12ed834474980b22c37c653246972fb4358ad9f802b83802050a64541ec2553bb92ae37d6a9979d3dd03fef73f73366a5a387f29
@@ -20,47 +21,64 @@ DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59ef
 DIST blake2b_simd-1.0.0.crate 34136 BLAKE2B 0c79e2126010647c92984db0110997a0a7729cd2b62b7b54b6b64c358f845ee76a698c074ab11d69eadd6c10d672173dd79a738554957d098656caddb0dc8f11 SHA512 cd5267891fd402504f41ef87c49db9ffedd35326a8b3906235754455a4e7fdb6aaa5fed7fb854c67968c5b6c1762f13b1c6dfc4ffa8d573ea3c0059c56072e48
 DIST blake3-1.3.1.crate 157714 BLAKE2B 70168ed3d1c7ad519db0b05c53ede5812086c45def1d8359ed60a27ed62356d4aff4258afa507262cd3f860cad29906aa2f456286f9f8140b31a78dfffd6221a SHA512 7112e8c22248ec123c77f2dd74af00306915c092bf74998171adb34ea02cdb191472e41697c0566558a020965ca29f1ffcca6440b000208f356864edf4d05c17
 DIST block-buffer-0.10.0.crate 10088 BLAKE2B 4af449e0071de2b367f7311f8e4a18b29ed2bdd1d0f5f623a45a9287af040cb2e0a8ae088d817e8249130a64abdd9df2b3909eca7f64a717d952a0b1cde4f54f SHA512 aa71e7463ce6520b2a8e1b1e571474c16a052129e0b0dcb8bf57bb4304182f5a75a079311a50363fcf2368318c277c2f3cc06ea9cac47764e0cedc8ecb79a7b6
+DIST block-buffer-0.10.2.crate 10258 BLAKE2B d3ad2f9f0379e04320e954e1a2226949d83cc1acdda806b98329a5ddcfdbbafdf511907d99ad7daae271a2981ad0c39de218968c22c3487e21a32817d41c23fa SHA512 8f1d99af7c08bf3b54ba7383cf0272eb5a8137f6244bc2d7e6d6761016614514ad7d27c5c51946c5cd7becd84b320f62fc2770e7aa07038d370505c29e032078
 DIST block-buffer-0.2.0.crate 6953 BLAKE2B 50824cd61b043523e1fb1a09da064b5fbc6daf46aa35683a1e3d64cbf313775133aedfa781f82550e1029ba56212e85c4a6b206a622c3a45f3eb10155eb9df72 SHA512 4d3b4dc5ffa3083e27781482993349c712c43b737e701d371a4e50bf160a1f850db2ed453dbb3d4b25145f3a1d590cba2660e835239a8103843289cfc9b670ac
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
 DIST byte-tools-0.2.0.crate 6454 BLAKE2B 8fac079ccb1f8bdafacfd54d0bb20628b3c1c08ffdc86feb70c44ae973cb36dbdb8bf92fcf859535d5de0098b936592db68e4951edba8890902107d8952fc314 SHA512 bad83b237d3f8dd1784f9031f26dd8ce2772aa9d307951cf6f5eb6c445567f80b554c26f597a2933d4164adc110e42db618f35ee68e951a0bb837abf20f6b0b5
 DIST byte-unit-4.0.13.crate 10846 BLAKE2B ed38559dc0883590fba933c6326d6722cf151257df9350f3730a7ff90a37a2f5a95bfb3d5a337e7c0b9fa2ceccca26671e9ea10b668c02c4b9e6403f70b699b1 SHA512 d100207e25d2a6e7a1677ba13703518bf157aef3a641020f9b569546fcf7d0405d73b8a9aaedcba812584537c0ee5d94a048e04673f49458626bd63274afe197
+DIST byte-unit-4.0.14.crate 10805 BLAKE2B 671ffbbb7b092d8c7962586bacc52595ec00dbe50dc321f2ab1708ff729283773e48c7773d5ab7ede2a99005eee9964456c8e4bec67a9d04cb825794f6744ab6 SHA512 0f551029a1750b3576d2518f7198176bfc6bd0a98955af6935f6bc4144397b3ffabe22f39d56ab882f33997d907f135d9633c19ef8f29bf17517751fe2eefd34
 DIST bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa6cd77696a57bb94c25650f02b2f0e1e476fe9cb024a17d910442b940ea21bac3a99588146b8d89ab4adab0eca SHA512 990460eedfd41b6b52278c9dfcac81872e755d40cb839d162bddf44a30eec3a9fd76369847f10edf6c2b2d95cbec562e9a2a6c6dce37f2ee59ca9edfe972a279
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
+DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
 DIST clang-sys-1.3.0.crate 37713 BLAKE2B ca7ee0771a970ed67b02d55d9027bab061c52d624540894cd00d09d847f6f35c58e76a1a6153309f8af709474df64b46f4764c2036883a688ffb8154d77ed123 SHA512 80c78c53a877cd8208730885214c135dd65a208cfd047dba7595283bbeec266f4d39cd1e0b3c2c69a474569ba68e4db93636e31a77c350d7bb2337e06ee7cb74
+DIST clang-sys-1.3.2.crate 37904 BLAKE2B f6000d5e9238c662c7c3f0f886de0916164bc115be7fd846640081a0506fb8d60db34ac62d8c83f6bd25a87eb598eac719f0f17a9a37180c72ec2362549483d1 SHA512 500cee4af6510741e5fe7b72d6e25a513072aff26a90ce9766a70cb5e266e7c76bb4178f15ad517a0dea0d1e2f61b8b5953a2639e8cb87525bf2bb62b64847f4
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
+DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
 DIST clap-3.1.6.crate 202211 BLAKE2B 9fbd6d5ad8442118716e01c10ec9388644ef6e5621019a1245ae937324265b96d50aa70777d149daeea6f812ee05414623f938a056c38a201d9f6ee0b98bded5 SHA512 397c277eeb9acafc1098f6b6aa7e428cf7c7016356a99139dbff66dd6c6e12434b14a457679fd99ea50c1fb0b54b9b96bad65f1198025986835810484e542824
 DIST clap_complete-3.1.1.crate 22432 BLAKE2B 8eb0696e76f3e82a8e4efa644e35d97276bd60c49d8d38b2844b4f47abf4346911bfa11bb54681eb07cc552f97b0959ab6857b2f6dba279e81eebd10fd2c10cd SHA512 73ccd96b2116e756b6d4e00b28720e1e66984cd0efde5f2ec80a8a4c00737a9a096472f96ac6430c7ab586de57e38639ab15484ea6b088ddafc9f021b4680c8f
+DIST clap_complete-3.1.4.crate 31223 BLAKE2B ee08809da96889594fcd7f85a63ef9c4ba9bfae3feb5b7b7c491c39712b2b1d2e98e734ed4b138f919535ddcfb20cc093602cc1587ec58d97a62fe008e86714a SHA512 3a76e4e94090c8fceebdaed4e6674ab8af2e5282c72e19643998e55dcc8e07298153baf67b4bfa430ef814c92a3c3b8513d2c857eaddc7a586693bd3a9d2b1ec
+DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST compare-0.1.0.crate 9291 BLAKE2B a181687c26ed0433afbbbcd6f6b3d5af43aa5ff5f2305d79b334bafe54732a4d17c82e8efaa19b346e01a3af33a20abc5f7375c52253b0e3b80317a7873234a4 SHA512 ea2747232b94e1233a3ae4f4c5c80ed5280457add6e213f278276912cef904b255c46a3c977f2b769536551a6f9c83eedab132576661cc55abfb9d1fddb25322
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST conv-0.3.3.crate 22124 BLAKE2B 9a05d9beecbd288168438e920ab4f42075f1217f224c9dc91d8e23869808868274e108ae5f881da157276cd407a63f2e8dd990b7cd9fa1731045c2cbd2f3a48e SHA512 f050cff8528f0fb5a8dd936995c423c5478afc47041c3a8cc8611ceae3228098b80589fdadf78d0028e960fa354768440dd7084cf295a29f2c6aeb554f47a8cb
 DIST coz-0.1.3.crate 21914 BLAKE2B 4c79083d5e699824015e71c8ceae0db119567f34969e644ed18249d7210c92ab503e0384a3b521aae7a5c469a26881840fa4b24c983d4139ac59178c4d8a28d5 SHA512 476b8627d9694813fed0ec262681e18f296977da8fc3ad9d749008e4406a77add8d3c2b15bb82a397d435d99bf8edbeec001a438d64d50038a0a47ac462230de
 DIST cpp-0.5.6.crate 5856 BLAKE2B 19156cc19af6538d23ced81ee7bbd6640b8ff44055cc7b13e80bc7a5aea0c5c6081990a489891b3fb08eeb66f3a3eeba668b2dfdde049a6ebcfcd142e5f7f397 SHA512 9bbe849212f479d34ddf6b0ff349662d168465067205b51e250dc517a8e858bb37fe2000685764ff58fdcc7d2ab8a48e012741c3bbc104c4830564dd6616dfcd
+DIST cpp-0.5.7.crate 5862 BLAKE2B b38553fdd88280e7cd71d5ff52541dbbc1a362605c6b0d8b375d48652cdb772b8f3f167dcc19c6f13b8cdc256d234fee2854b934c024016a6b52d4bd78a57f81 SHA512 2b3098c2b45081459a2e085ad31a156de1897124b5d1bf142a8f09089e44a0167ba530ebab2adcf0f8db2cae77338d7a69bfcdc7a15855905898ed42f35c1025
 DIST cpp_build-0.4.0.crate 9037 BLAKE2B 270b3d00892483950de0b71d6b85d91516d219bba5ab29cb8d67323f2a4c10c6f508ae6e2cfce0f1c20ce25d979eca36b440ca3f79e072ccc185e8d96f8c5823 SHA512 da63c22fdb7713d442d1f73b4083f282505bbba2b6165ca5239de463cd9e4de7a7d7f8317ab4fb592a1df5ae5244b74f9a57f63f68f0894f0a778025c2dfb86c
 DIST cpp_common-0.4.0.crate 4300 BLAKE2B 8f9877cf924dd6cd8148d04832d754b9be6b1dea8279c040f83558e981413fdaabfbd29f337335ba4d1dc705a0e0c43e5b6a61989d456f81ca676e424ed95290 SHA512 6a9fb6bde2fb6f0897b19eb05ef48a3ffad94f74d550e02f2c933f712869a79cf0534c6982b4b1ec151224415c2ad4e37a606a442d11650d7c36a41c32892248
 DIST cpp_common-0.5.6.crate 4023 BLAKE2B 9b49614f971564560bcd10a364ac73e10124f87e63f6d01c3eaa8dad736cb60ec2f8d60eddc8a0ce54b7d6147b09b69b8e4b5917d5cd99f536d5fb27d64da3e5 SHA512 0a9bb663a6316e8e57c7ed9f001088052b41cee5dd94ad742f13f16242a343c88c8e1d53669845719820a7a94b68fe645562591998b0ff334c49076f7391d7d5
+DIST cpp_common-0.5.7.crate 3994 BLAKE2B e326b28d2667be93ee6fbacb04078bbd63b4ed5bbbb2a408010b3b3018164cd38d6c98927de74ecdbab725e2138248f325761b10eb32c8266d37944ee72283d5 SHA512 447be2fb6a0afb27d963dfb928b7d42636b5102fae2130c6895abc387c74740bbc2ea73f22855c0fa8c03d1ccdeb6012d29b0069b548fc1f707f25dc25afb453
 DIST cpp_macros-0.5.6.crate 6346 BLAKE2B f52cb8e92e46f1fd595709b3eb3299dac06dbc11d0e8d3a278037d3e7c19ab5e520d20cd7303bce7154360e30806ae1b921983156548fe593f44c24614dd9a46 SHA512 258522e1f177995e179b629af92945f173a41046ef2dbf93e41178434c4f02a97c0b02cbd3dc5da3f38ef86c3a18cf76304c5633adb4c38e4179feccef43269c
+DIST cpp_macros-0.5.7.crate 6357 BLAKE2B 729b9502a25d959f23eb6a5e5c1355665187f5b9822638a76b0cd96f2b48ce14a75436feb0982f8950a12f29c155da3efc1b2ca03ac67227db001d3ca75d7663 SHA512 ce76c047793c65c65004dd844624d6d975051bb310d833f289763cf022f20563216553948eaa029f645c2c748ceba386a106373e5acc179207347242074f6bd0
 DIST cpp_syn-0.12.0.crate 56642 BLAKE2B cb3d090a88157d116f5329aaaf423d0bf90ca6d81ae7993daece8621c6ea2ba7991182f34281df3c9bd0f38e29c0417959cd9d744aed063aa8c7c95608603b45 SHA512 8d2859e646491558ec0630d790e7d3be34456d5f765805b46a7c75bc7734a335acf16c118f40954a580a6836c7427aece143960a5d20ca5ed0108c0e8e89ab9e
 DIST cpp_synmap-0.3.0.crate 4708 BLAKE2B b42526490ffa516835d04a3ecf88e19acf001f81bddb1663b52291e4a5439bf197feb1f457a8da16e0b401186c28154ac5da01cbcdf3f8dae69681df0d664158 SHA512 b502c0dbbd18796590e09b5be66ad9cb476a9e5b9244de160372f701e8f3ea76024f2599d090248f4182f75fc1e229a6b0cc4568f28a45bad4c0d1f7433c8407
 DIST cpp_synom-0.12.0.crate 10731 BLAKE2B 2e014d4a9ad3ca758bd8366612c50273538a366431c7ac89453950260288cb12a98e04cb83134138a1f00c6c27b91ae706be4acd7d2daa6e0724579c1503b333 SHA512 b8db3b154b0906e2d74010138da9f8bfb3775be671835f729447704ab99bcbf50ab8b2f63ccae25d0239605a319cc544f7e86ecd3cabcdee985f200b22faae4f
 DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
+DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
+DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
 DIST crossbeam-epoch-0.9.6.crate 46055 BLAKE2B dad8d1181a2b68f6ecf4c620c6222e24850db5f76b99f402f7b79bacaae910effa776c0b72796271b2c9ee8b34f05778998cebf2f25fd88e0bd2f936580dea94 SHA512 5a91cc7ab84b802b9b2d74760b548da9c07e13a1926b9c772c3fb0e8003a27e4d7043c400106175b5009b93aaeaff4ce758a758aa6866d6c60c4c67813481e04
+DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
 DIST crossbeam-utils-0.8.6.crate 38841 BLAKE2B 90729cb53f5bdabaea522ac72e06e411a9737398c7970b1805a40bfc3e4d8717eb04c3afac8cf31a1c29c5ef4f137713bfb56320aa5c0e2cdaa6d49e3426b29b SHA512 ee47913da20440fc5b276d68913ab86f12e05d962daa2bfa9c1dc11a0ae775ecd4029584730fa09812d691b64dcb25ec9ad2dab5284fc83962a8e219924119e9
+DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST crossterm-0.22.1.crate 105450 BLAKE2B 4e90dddf5da88dd94c4ae82d0a6d989126b063fae56e5e0963414f196d779f4fdd265d528ecfda387a604866efb41943db8ceee124c2e97dfdcb1f092678f76b SHA512 2a8534a12bb119be583d491b3595259d164de6922ce2a17bbe6f19fcff93339a6d0d8c08398958a7592d6aa765eb2ebc6e61b54211080785357c711b2c454d91
+DIST crossterm-0.23.2.crate 106712 BLAKE2B 6b3730d9653a9d130f0399ad8cf9951b1527834560ed84a25815482f226ce5693c78b6a7e9fc52678a097dfd677d86e87eeb88f1aa6da5db4becebedb84f55fb SHA512 3299e47dedc44988d2f0508a5d81345092f1495c1292994d237c7222b4b52fe91b98e12bfdd88b322242661eaec75857c59f13a430691d4aa867c0e3914254a3
 DIST crossterm_winapi-0.9.0.crate 15561 BLAKE2B f84604f1da9cfdd0fc69742eef8088e7d0959073c6f7f37507b065b8537faa20bea8e349bcb1d6836be97f06b4a2c55c4dc63f50eb2f2aba1f34df9b8c9abf1a SHA512 b8c32a82cc83244e8991931e3fe0d85527ee2cc5e6b4a0839d633448dfa8a137c87684e8e079f44edf5a994355e0106bb573b36b57c7420ac5cb6fb0ce20ce8d
 DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f
 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
+DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda40c01add4bdb7a81e9136acb1208c79763cd612160bf39b342460fecc334c6e421e7f7ff610c4bc44e2f SHA512 cd7c60dae8fb19c3b10e0bf1ffbcedac90cbbd147d564335e4da2d5483f64ea3dc10ad17d7573b00958db0a72cce45f8b7bc10c32864dd943fe64df8d22aaaab
 DIST ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
+DIST ctrlc-3.2.2.crate 12699 BLAKE2B 39d2e05a943280f3a62f3464bd77cad5f606ebf912c6430f4b49ec07a3cf2b1fb19ef5be5d589e931b9d79c5af882d51782b580d1a89a48bee221585c1212b1c SHA512 9536489c3b871685f20eabe7b8fa4a1a4db8e362e8e83b4b2fe244d98eb4da8f84737d26854505cbb53a311e6aab6327b0644689206a19dc5f7d3b88bac580d9
 DIST custom_derive-0.1.7.crate 10700 BLAKE2B 205c46bd4f052873ff9790974052f8d81ca1fb16815b591d20db96fb330ef5b782a54eca9c07615edc5e55ba93eb38fcd37c1225f49251e83ea6059ed2cc3910 SHA512 593a98f7c9adfbd07eeacbc6915d3de053ffb33076099f425f5a72c089ee0dfabab8ea31f525cd3eb5da5c19782925ddd14a3672bd9999c6866fd9f14150518c
 DIST data-encoding-2.3.2.crate 19159 BLAKE2B 43208abc26b243537e9a2556bc3ec5db53ff1aa0cc9c0111728d51b4fce6c6b4314ba445bbb9ac7d813bea57ab600a3a671c5167257f0c344e5e3b149a01f6dd SHA512 b62d0c9a937df59f3c84d4c27bafdac9088370a250d3b85e259258cb0843ee32ccd0a9fb1a01ecc5929dcb22e36bf82f7c1edbc9981acec70f5a1a01f00731c4
 DIST data-encoding-macro-0.1.12.crate 3730 BLAKE2B 5a56bc42b5b1b228e3153a4c344c014475b820f6a9df51e6b503885769ff8cca08d78231fb0feec535afe583b20dbacd2d6db524884f26e994eff2e13855b98b SHA512 2b3aa08f98f413c3c0f8a67cbf7907c913a358a0875b7e231c2cfb956d2e8fdf745c65aeb01d54bf2be0b4206233b08cb606666dc1c109816b18ecbff7aa5d59
@@ -76,11 +94,15 @@ DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f6746
 DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049
 DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566
 DIST exacl-0.6.0.crate 54894 BLAKE2B 2fee75fcbd0b0291afce72a2d042c0a9847ae018d66cf019c21dc4ef5611e9d529068efdb1d3790951b9a8e82b6e518a6400f228d0d041699bc0e3ac5e04721c SHA512 2c1048343540d9a5de311bf5f8df2259b2e5c3f917b4372132ff5db838bac937e8a5e5ceed80a323d660becca067240ad068b5658b852b493f7a8b2c99d88691
+DIST exacl-0.8.0.crate 60105 BLAKE2B 9203249224b8da5de47c36672275d3eb59d9d85800e27888b9ab5a74c88231b655fe18ca477d297dbd48f6f22b1657ca5e63159b466ae700519e3aa95fbda8f7 SHA512 55b6c9cba65a1c8a2f05f3cb541fa96a2aa09dfeef2bfe94ecb0ff2f82bb040276f92e6278c2cfe9fc33dd054d8c70fc2df4773989625b9c9f9d68dafe97c6eb
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
 DIST fastrand-1.6.0.crate 11338 BLAKE2B 2862c5d40364b3412c7a6fbceab0f883a012412f22a24b960008b7951f3d6f0d5410fb28f75913d0bf3ac6254fde72b591343425e4e1016d77b9e53c8f5a934f SHA512 85f0c5e01b9e549b6a170561600138caea9604f18eccafcc4c37c2bd70f992e77e852bec20302028ffeee40d85fe8e8dcb812c0d996010a0427fb68a0ed7b029
+DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST file_diff-1.0.0.crate 282318 BLAKE2B 628bbbd75e7a8f192e54f75e3898b2c128f23c0111299fe54676f00ebfe532794f4b7fa28b27df3f94d96c8e4405fb9d2dd73e3459dbb888a38a4e99c6383389 SHA512 260313bcf0860e63d9f78523d81416fbc360a33c7c1740306d9d5b8aa1640e509b7330313c38105cd662881a47c46f89193e473f0b7da12d3848ed59d84e9905
 DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
+DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
+DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
@@ -92,11 +114,13 @@ DIST generic-array-0.8.4.crate 9820 BLAKE2B cbb5eaddafcb58b9f2ed5b02196dc3ebdf21
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.4.crate 26800 BLAKE2B 68836e848f1f87f5db77e64314b027bf47517746ddfa7677191ab518c9fb77d9a554cf4d1f9490bce1d8aa22a35c1952b088e200374dfd5c5d84555ed082510f SHA512 a7e63985824dcc8459736e44b1c0c4798a212955c89e5d3a3b852a3f80643d0231c4825f6cd416e87724aab80c19097210b06bccd2006e56115ae94920241716
+DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
+DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hex-0.2.0.crate 12368 BLAKE2B ab1294efedcb16c18e0a624bc67ea17430dea26eff34071df16a211d79fdd54c7a05b00a516f7561b19bcdbd28907863ecf2fa5022a539fc682a3e2a7e21e335 SHA512 9dafcd03e7e244b8134cf33141888788c722d64c6099946ea63d6ac714e9a1b2a6c158a19c2a85ee488ba32429306174a4778488579a65da08084b468259ec25
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
@@ -106,11 +130,13 @@ DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST if_rust_version-1.0.0.crate 9976 BLAKE2B e9e72b64d99d2e3d058fddc44ccd947337f59704b2f103832502bda59bc4e5bfbb426a921309597cd47148843c9ee7124d26b8b592d918d3d2ce208caf6bbf95 SHA512 8e57d7a54dbb783cafd58825205844419b3a8ae531bf16aec2ed8ac6038c58a03ab4035818e89dc784c7ecddd54ac41e114634e67ae952bdab93c0361aa95fa4
 DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
+DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST ioctl-sys-0.6.0.crate 2673 BLAKE2B 9cd99c4a2bc8d3227d91957b70ade7ef520f63b5611f1c456d4f04f3fb13ddced4249ac6d593c6431b04c6a4b0c4c54db8a3c9db3cf201f05e770c4d4c75e7e8 SHA512 70b3dbb9ac02c24c0692c1ead480cf14eefe7d15f10d68607b881273706e1bd31f3071effeef894d6832e6ff5f82191bf5414e3adfc7824da7b2edd956eb7703
 DIST ioctl-sys-0.8.0.crate 2948 BLAKE2B 9499d0fa9d5ead81c4d9ff80d0d5e37951fbfb41fb059228854d847644ffb5e180b89b34d20cbd5d357da7fa755a5da8289090493ce4ea73fac7437bb9597b21 SHA512 c1d2548d62764d7652162b053536ecfde7fb5d6ddb3e586a8e6d6d9d6d6b274bdab043c292ea89e0744996756bfc8fd4454b4d5ac841fc4da159f02358b857af
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
+DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
 DIST js-sys-0.3.56.crate 70520 BLAKE2B 3ea566b937221963b0aaa037b3b702e5d4143300a5463e8474cddeed0c82612b76711518b91b2bcb63f5bae4c11a207c0c1a33d23f9c8ebcf5b54ae1109fd1e4 SHA512 52c2020d2bc80173a2ba5c614ed07d86755e969f4d6b071b5857259cbfdd3eb5a62a5abadd42ebc0d673397ad18721e1ce55e177fef831ac13e15971373056da
 DIST keccak-0.1.0.crate 5849 BLAKE2B 7795f1f9918d8723eab2b4e6dd99c371cf90e43699154356052fabdd1d4736765c13ccdfab51baf63088676d521ea674ef1b742f0ea8613049f0da2c46df4be8 SHA512 5514a50d52979ed616290309cb27d17fd1521ee89ff51131fc2cd2ab38bae2a22f00749b8de2ab75420d557c7400b4f59a9bddaa532efffb22a5fed5fbcdf65d
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
@@ -118,9 +144,13 @@ DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.121.crate 574702 BLAKE2B bae9215a7318e5b5b6d821d2320ce28e883d04af0bca40ede49b9c5d575d28307b07077b3d59be28347bffc4c69d6c9dd334733f0c519c16de704360f6fa8738 SHA512 aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
+DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
+DIST lscolors-0.10.0.crate 21103 BLAKE2B 886e8703818bbd286deebd57e1ccf846a2f8a44decea6e24496b1285033d1b07f9527a0078f943ab45df86d0a052152c0d734606129dfe32b027bf8f34dd7a7a SHA512 2ff4b1234cb42128f9eb53e3a35484ccde51621292c61ca6ff5442e6f5a343a3dfebafa9f2ba45f7bc3e2211f152e629e6812b786f53d277791555b67a4e3cd8
 DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776
 DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
@@ -128,27 +158,36 @@ DIST md-5-0.10.1.crate 14184 BLAKE2B c9eb7b25ec8f0d334555e52ca8febfbd08850aa6d87
 DIST md5-0.3.8.crate 6177 BLAKE2B ccfe37b9ec1284e5b7a1532d521ac2a96f3a77488166a71b5e57ac5d848db6db9a3b43cda0a5f8d2ec35f353b0576f4c16f50a6fb5041844c668462f0afcd05a SHA512 3cff7965ac287077803a1cae6e808f8157ed182ab282c948fae6f936692b08ce904ecdf53d37b83989aaf57dceaf1e82984c749ca27a2ca83f8eed2945f36398
 DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memmap2-0.5.2.crate 21294 BLAKE2B 824057d1fd90f30656814ad349a8056fc9b3785865e458ad893f6cdfa1b0c02e42afa0c94bbded213c37b91a51513cbc56fe50bc54483b046fb1181c208f0d0f SHA512 3b85f9436e0ece40d5fc63c7c64b8e92b34d60ccf7bd4937704e99de46306567481d0ac1f9e8659e3610e50d1166bb27dbbf15bf8b92dada4b791aa69fcc1632
 DIST memmap2-0.5.3.crate 24967 BLAKE2B 743b61983108eeb82e547b216c71039ad8606d2fe533694415233d73accc14388cfbdaf9048fcf13448abfb4a49ecc3f3c961a8ea8a364a428626fed499eadce SHA512 b570f0ea37ba18a8eb22c9207dc952456864fdabf0296bac63c4741e0aec424ac7932fc0dbbd0292ad94406b1e6911826406fa00d11b7590c54816fb7898df5d
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
+DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
 DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
+DIST mio-0.8.3.crate 92506 BLAKE2B 4ae9e7f68921d7102274cd8afe2dbdd59393f9a0f63a1d4a1d9418ba8978e31d521ea73eac7ed1b27bf31d67450952b28964f6d35b14eabf2325c08aee43bbea SHA512 c6eaff99cbfe797dd97e6d29da09a6bbb2a46b3f3ddab7d75fb756950d463545199d13ccb2d51d367a2499d18f88500fce8084b82b2f020865dec0d9d9ccdfbb
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST nix-0.21.0.crate 220596 BLAKE2B 9a9c8bc8c1161b4a642eaae2dca8dee7635168249ea724d59e425253895236a1edebdc82828ccebc577edad2c7920cd918ffab1725c89068c9ef21386208714f SHA512 a3f96ba6eb976867017bf372d8e804b8048a29d32cce962d75199f10621719fe9ed3019bc40f4c8e7a683b6dc82cf818476ec9481c927a5e14b09a738cfe74a7
 DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
+DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
 DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
 DIST nom-7.1.0.crate 115647 BLAKE2B 5adbe8250d168379aa7051a4fad7fce3cee74820043ba8233f1016417f91ecff64887c3bec1dd6bf4cc6b3b3803a2c19a44513f1affc635d8be6212bdc8ee47d SHA512 aacf14e84be17edced412e3d256734508426a8acb8352e83a5d9d4f26d640f60a881d8f70fbc6edf1843173af63ec05be7694fcd6c6287d871e40518e2ed04ee
+DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
+DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST num_enum-0.5.6.crate 13721 BLAKE2B 8257cb2a8ba51e5936fc998d3af39b2bbff9631abdd8b0c063bd26912e562e387953d6f2002b5837accea122ed0720c870d8626c85ce08bbd0f2f1225f65a8dc SHA512 a8b73276374b9bbba4803a054af214f6a4c7569acf597f438da56b50c296aa1b6109fd9d2d83548c0bc2e31f90167dde7dc91734bca0955fd240d6a7835c301b
 DIST num_enum_derive-0.5.6.crate 11672 BLAKE2B 81535facdcb2059831f09112519683b21e2bff19e7f611dbe022501f95a57a230ce2d9c48b64b1da53963e9207e4d1b6c572b0cf0995ca2fbaa8692f1660e183 SHA512 28cedf7a7f1d00d8e9ef89ec9df1b0bfe5133108661729f1108a1c1f724f21f6c868b0f29e29cb9dd46845893bd201d9f2ea3c51168dc2d8ab80174ea707ecc9
+DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
 DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
+DIST once_cell-1.11.0.crate 31121 BLAKE2B 02ff93cd8845bbc3f7741d0e05fee11df5e1c35961b505b2717e697b9c503891a89e15b2c71b76a66f5f239c5ee650f2ed6105b445a4f977578a4243b4dac96e SHA512 3769223beed1a7c8c5625e18dc000b3ab296c7c3af21bb6cb563ad9d130bbbcd447d420d0ec591e6366652727de11dc76dc8f7720110de50be7cbf177587cb15
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST onig-4.3.3.crate 27408 BLAKE2B 03bf3d7d72c0022277f2c96123c4d5588b2ba672ecd893e30b30da834e870a12009fcea484c1461beb2839ba15df141a0e4481a1a279a030e07307c1efe60ce7 SHA512 6c8e06a9c2f0aa130df2e3ace50d3b24b8da6906ed6dd153d34cc2036e886e8c7848dd3861218a8981aeda30813c9c86d7d0b5b98eca20bda4632b56ae6d67c5
 DIST onig-6.3.1.crate 30879 BLAKE2B e371f003ee19bdbb9cf9fa0e5f18ef14841cbae40f66bfbb367401c15b1eb50b3661accc0609a43dce41f8272ffad8a4b41f75ea23267ab8c7cdf4556d67a7cd SHA512 5c487063b669532e31acce0788b690c53a8d95eb628cea970dd335bb721fa99e67bb6c531b0a9a388354b7e1a6e1621cc953e029f1791dde43736a577002d955
@@ -156,16 +195,22 @@ DIST onig_sys-69.1.0.crate 544763 BLAKE2B 29e614a2c2eb191e0f132348f841613d85e987
 DIST onig_sys-69.7.1.crate 631301 BLAKE2B 4c593f3b7a83d32edc92db67d6f2f0460e43bf34611751f8a5941ad3cded459cdd582e9067291d1fa1e2dfc316b276080b99f85f0a98dc9bfcc531af2f289b7e SHA512 5be8c31049ad741fa06247bd22813374f71397481cea22be3d83bed720b512b9cb10d6028072fd92cc09ac0e9ca8fb977ca49fb59d934dd61f84c4634d28ffb3
 DIST ordered-multimap-0.3.1.crate 20631 BLAKE2B 2d874bb9b37ea109cb7840209c4811c872bddb96f4fec4c936400c57e9a16c04fe801eb72a5b4877762dc9afb7d778c15f2c1efdc34a05b9405212cbf14e6c51 SHA512 37b827165659529e02e303a15ae51c1291e521510a11703ee4245f899d45a2a33237a85bc5e10aeb229f16647f544b37f45a35721c6ef6d6c3c75874a373fdc3
 DIST os_display-0.1.2.crate 15165 BLAKE2B a6a31e9d9a63b173b61038c3e5f5f21f9f7eae80d7b1d0067f78a069175f972ba16393d1faa7be84224eda28a28d1cdef5bb93cdf594b467c476f694c835e12f SHA512 4655672bd57ba97155eee880f18db96d34fbd93ff4cff4cce3d66a1ce588185ae0045b2422d992866e476baab6abf766ac10de01805b36ba324c73b3cab4ea23
+DIST os_display-0.1.3.crate 16800 BLAKE2B 2d3a46bee2aade195bad0080178cfba0c5a5eb178211bceebc6e3c894ba1644667fb1713a6df9b0dbc2e34810bc6c9140641f4f2dad784845e7d1ad38a74b4a9 SHA512 2a413edc3237743a3dbca9645a8f813992ebbd57a9e7b1209a121d6914756bc0ddd4f3e11a1a5e55fb861f44deed4462a1e52dfe96e9f2f1d612c18b1062a165
 DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
+DIST os_str_bytes-6.0.1.crate 21079 BLAKE2B 85c4a5f450d74bae23e2d2ad1c20cc944ff93fee1ab2fb700692645586acb388d552dca2b326f7df2cc4d07f6a3bdf7aa6704833be211f392250a56786519224 SHA512 16035d3032d499575faf5e8114868d57826acf2b4a54e848f9101713b7965a2fecd6c486945b1c8ccc3ddacdbb95a1c6f8a74ca4fcdee24729648edc817c4472
 DIST ouroboros-0.10.1.crate 5956 BLAKE2B e16b423f47834e550356f0dfac46d16fb15234bd98451c44c348698cbd02f2c3722a4336321bb81def67f8da6e84d8077ac5a3c9df98658e34c40e7e7c315bcb SHA512 ab6e715e6246f1f7f76345194efcbbd7e8b86e88fec9a4fd3ee3e0c22965e57336fc73f7b9b0099eb8436b7c6d60a13f925753c2e5a6d3b1caf9691ef2098cc0
 DIST ouroboros-0.15.0.crate 6177 BLAKE2B 70989f764e3b83cf3f3ed598290540370a305a9b5e22f76954117a19c9bb0ccd4723892c0cbccd361a13e4961c49b3383a3f216b368d70de9d4908da87db1f72 SHA512 20e1dd42bd5789d3822c7f7d862f69c11695c19475cd943ce049b33184e231dac32d89745cf57a2db822f5f2967ee84b29320f40708612610e336aedb0c08be8
 DIST ouroboros_macro-0.10.1.crate 13432 BLAKE2B 7e32d9c83c3bf305e5487c86e8a50e9c002190d47079b4765be9690019b21ad3de5ebb3d2a4b1b8d8d10908ce71ffee24f99a2778922d34fd3e4c7675c12023a SHA512 8844b862625d9bd20163e201c6f3397a504200fe07cc881314d2bbcd31f567d2b9c2f8af1a087535b3847a1627b86d5860b40b7e903f3c1f161c7ffa2f27db98
 DIST ouroboros_macro-0.15.0.crate 16239 BLAKE2B 6e40a0bd4f04dfe5f1b93f2ff0f9d169792e8f5c9c57089061f488b4d0907d0b45c63d0ccfe2ee7e0989c7009d96760bb4c873afa688e1359db09c1ee8ce0a68 SHA512 78003e89f1a062957d66261474392b32d67a75ab1933b2dadf9c6a8c8ecd29d184ef4a1f25cadd7e1afb23aa58dacf69ca6969c327405be5dc97b8fbc09568ae
 DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
+DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d70376be6e438ee1a4de83a8c3c535d4cc866849aed91df74aa9b22d41d428b1142cefe035dab7404ec89af9efaa832 SHA512 ccca3b4c582e860b0643dea78302fbcb96f8f86b356041ae9c685e7c48f1721fd3366dd1bea39afc1bcef03b298d0f6c87918a1ba92a56e6b06bc8b4123c0d89
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
+DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
 DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
 DIST paste-1.0.6.crate 17808 BLAKE2B 8659076678f659ab0bc5d9c626d405f1f545742c79222348ad6d974beeef4541663e166247433c617829e5e65fb7a5b4d00656d95d37bad214bcfb2182d45677 SHA512 cf7795c64ded12c16ed7bc90a29bb36156abc8c424066c62d3eff8831a86b4133965d87b8b76b17ed5487ec286fc80e05fff1180833dee4b48f0429016bea25e
+DIST paste-1.0.7.crate 18285 BLAKE2B c32095dc3e828fb91aac7af107af824866d2efb70ad6e01faea4862156341130ca686076e3cfc1b5f127354bd4ad513f47da553577c91437794f63d2a8b6f29e SHA512 6f203485cd916f68c4acac6fe6193e2ed8c5a36a6f58865fecbbc4e112e14c6e849cf61cfdbe22fd5b6311d60f1831d726da519a51a1a936552c3b39f01c90f0
 DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
@@ -174,23 +219,28 @@ DIST phf_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0
 DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
 DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
+DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST platform-info-0.2.0.crate 11571 BLAKE2B 4cb4f50d878175e080144f6d96b3ee3f53a49c1c889e96a9fc45595518db45c46e4f24d491dec20ea27b336942023118ed0a8bf01a17e1d2d6cb5218825c86db SHA512 9420f1fdde9e3b47720c312eea5056970c38422829a5768cb280dcb876f12c631e5a64b73a0f4120732a823fa75abcb3a45c117777e453b48b2e47659d378f62
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST pretty_assertions-1.0.0.crate 73836 BLAKE2B bfe519373be45508354c160acde346c17bea9c1d6b1b3c8e1b96025a6d690e42759cbc54369b458308fab3db1df734d6d6640b8d3c544d0dd696ec83290a4f35 SHA512 65065b7efc5e7003499063464e4b996c84f22637143a01f8857552369960425156e0ce0571a62e876df3a8ac9d1361548bf5d4676749b0baf5bdd3a22f66b1a5
+DIST pretty_assertions-1.2.1.crate 79474 BLAKE2B fbdc7c7ddc40aedaaa845f9096d52eeadd9772f64fda71eb2a2ecfd40745ae6a7ed8baa2a83c909f2a01bfaad31c00aa7c24af6d449022486dac204a3671dd55 SHA512 6e6cb21bf03f34effe3c38ab9b31d768c7a7c02dfb385efb5c1dade7547a367276c5b00c4eae11aa85d90b6f2dbe5033acdf109200196e225e335e73bf5e0ad4
 DIST proc-macro-crate-1.1.0.crate 8535 BLAKE2B 73e4d8c7c19d122a74961ddcbd04b003418e61bbddac092e14e4f4a85bb5bc132289096b719f533b83310e1d2daae3e125dc63cb96cd33c8fbd8aacc781a0d45 SHA512 dd23638f127c46c24e7bc360a9f108ced8124acf8b0558b95021c40a59259f80c27a6ee6e366d72fc120908ae254c58feb7a73969457fce94fc1d20130ee590c
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
+DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
 DIST quickcheck-0.9.2.crate 27401 BLAKE2B 673b583a26e241134d5176bf3aa9edc7934b6eab54502cca339a697841e3b010244e499dce5659f84e41fa5bf6714e196e84ae74100e224f2f0e840d5c2fcea2 SHA512 a136316dcf7daac3d879a660a61c768bd14b647fe53e7a5c2731f197106fa9a351456417ae8e588247d3b9da0c26707c6dc55c1e1fa6f8bf47e40727ce0d5030
 DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a
 DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
 DIST quote-1.0.14.crate 27252 BLAKE2B c744f787e311f9c42b2678f88978d68eaeae87324f07cb28042152a77244ff973e3bc93b8a277f590abe1b6b7c37f6b095ac4a75c96ef9590f7d9d397382b62f SHA512 b2879fa8ae5ca80fb8aba56da016d9b8aab0f1014cc67fe597f42999e8042b2178b98dcb09109edc74b6bd1dc542341a72d11e4880273ffaaf766da243e687e4
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST rand-0.5.6.crate 137236 BLAKE2B 26ce5ac8fa86492fed467b68047a6a47f17af3720099410a3498c95531efe9d8329998df0ce693190c63d371c2efc67f07df9c1bed624ada18b5365f555b6c5c SHA512 0e2a643eadf6cd9f035eb720b540b838a00d6c790b1a99b36cec349c2e24dcaadcae6607f99fe86957e77b244d356dfba436a03c1d4d0756d6f8362c19087b64
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
@@ -201,18 +251,26 @@ DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6
 DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
+DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
+DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_syscall-0.2.12.crate 24081 BLAKE2B 0c1cc5d82038df2ce07a65cefdd6f473f1403ab9c50f8bec1f33c5b1387b1fb887f07068b5a2ac53a64c8408c82d4e5d9407fca81da3b599e087bee9b40e9f3d SHA512 c89b2aa6ab9b34ba10983c9b6c90108e0b7e380357c9b5f50a72ea6ab54311437c88859d2345b28747d2539fdac29a597b72e7e47b4ded9b6dfbc54ea9792048
+DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1
 DIST reference-counted-singleton-0.1.1.crate 6145 BLAKE2B e0004bef8503cb4bc0a84dd5451fdd6724896b0483d690ca86fc0b9dbc1ab902ff6fb7b18663b6344b256e0aac1e8c5dd6859079a88f40218a1418ac8b035b99 SHA512 6903043fa9d849790827685c0c5042e8553319d249e91e8af0a3f1561e6cccd9e8cbd467b231519b83029f1e41e5376213e757febf230df143e6636ebda1810f
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST remove_dir_all-0.7.0.crate 9041 BLAKE2B ec298c4c6ac01bff3af5618ffa59aca535d74e06cbddf86c765318ded226c3fadb7f8277c572f173ae7d04f16c2b504375e400fa4e228d8747604860fb25660a SHA512 a4a426e7f3e9f4d3925809e22ebb61d06be04703ecabbc07aae80894458f29a146bc6aa6540ab4ac96c74a160a5520ea079ebb6ac6cca489ba036ece6678339c
 DIST retain_mut-0.1.2.crate 2723 BLAKE2B c899036528da0047e8c833bb9c7e0710cf56eee1088bc2a3f5df497cbdf3687b00fae032ba9fd807ba2995438e4d0734405e100db658194a235685709b1340ac SHA512 2e45b0091c97d92894731b17726c99cddbc7866d92af3bbc7b83f5721ade4bd8bb2e44570e100229ed33fd6e96de48045da025a15e37ec17e46561c47a5d1189
+DIST retain_mut-0.1.7.crate 3945 BLAKE2B 475a46e0e3df8a55305b0d14d6da595874a3c3bceefc4a4d4feabb5ae245d48190bbc7ec325499d2aafb4ddfcc0906789bee89689fdbac261a92b66bf33cd493 SHA512 c90538becfbac41952a0d5ea1ba0dfda4ef6fc8988ae60080c0ac32e3abfcb0cd674be7e7c221debd916060c6447ac59ef8b3cd93fd9d558228e70d0dacfbcb9
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rlimit-0.4.0.crate 5294 BLAKE2B ec55f0f9aeabe8fd030a41570885dfcd84e8d5ca0fbfc81fa43e4088bb59be4c5572db32b4d6dd9bd8c4774fb468933070083b4b7cec7ef1570d3c9e436b5571 SHA512 2687e303c4ddceadaf21ff23b1b95f572186aab2592332d8f5d542497bdeb5235d5ff22dfc37e4244511c27acc9e03cc6439542276d362ed398bca7d4ac9c08a
+DIST rlimit-0.8.3.crate 16575 BLAKE2B db1477bd44f239d7f1e39e67c279d6229b139ef8e1581e4329694de703c6360b85c1d8f18ce600d6ce45ab183b5addfce3c6be86cd5cd294bd174733bb845385 SHA512 81ae2fa0bf6798abe8ab569f8165b33a2453ccbfbdff21ce48b4ff7d811d4a190e88b94a474c6c90e6fc0297cc5c1565b32b230cfea054e50c8d70a2252b5326
 DIST rust-ini-0.17.0.crate 15155 BLAKE2B 654c74c69dbef6ccea8a31070683b9008160340c0768b2e2d169554032cf5ff58533a824c42af83924eb10c2273bd0599bd397ae8322e7179c978015b31249c7 SHA512 2e89d4a60ba33115d3de5b7da551fd47f2350b3e77cc1148c5141134c7ac2bb87de152c67d4c782ae69d3dc04b4159c28eebab1810ce8b9b11bccc3f1a804410
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustls-0.20.3.crate 256192 BLAKE2B 66833e09bef1629ecacd5de63f766491c227c0357339ddddcc1f1a0451a1a23406526c9950d47e3cb23f73901dcd04f2f1db1678f48d9b88ae98ee20b1b15fa7 SHA512 d7f087b84cf7c0832ede25dbb7b71f4989a1c41a2e13e53e53d36eb027f9f9f63b641269b5145c3f1079a63ce102b15aa13ab8ac2c2dfc8a393943b09e8c44c9
@@ -221,7 +279,9 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046
 DIST selinux-0.2.5.crate 33886 BLAKE2B e5f518bbb12a69f522db92e5b191fbc754c115e8e5ee9fbfca140b3a05f3a3ff9cc9053df61054536bd412baa163251fdfb67aa7a6593f1ae502cb9a9bf5c72e SHA512 e6a01150977e47f1d761e688fa4e248df237e988b4a765dc98706759191c5ac694bdf10ce8b59fafcd1bfa3dd22c7c301ec74bea5f6aa52a538a298182ce91e7
+DIST selinux-0.2.7.crate 34078 BLAKE2B ae4a7b50a06307dbde1503fdde6465824e2879aef75fbf90b76e8cf60a785ee95683cb34dcb3a1c1e60715ec46619e9b1b36de56b71c4ade4feac97bad404b18 SHA512 36b508eb31caafa6bf35da8efa14ca4a86f93698c8dc6e5557952018e7387e5d889c11394213abe3fadfa000668b38f7a7cc502f46c8472c76ed9db401ec7155
 DIST selinux-sys-0.5.1.crate 8263 BLAKE2B 33aef6eea96c3b13d65be4f8397cf1f526cb90eab70c588e95011f0641d29f06a02c979e86478f4043602063914e3ab9780871e7393bd38fe79fde870339912b SHA512 59885ef9af1d547a1deb980620ebf044c96c5d959d7811a22373e3faf86e384dd3268274794ce9b34f6171591876f8a167db0e649d85986e9627634cdfe916cd
+DIST selinux-sys-0.5.2.crate 8332 BLAKE2B 79f421b71247cbcc6b26634fda7fbe4ca0748730611f39687078407dfeac4ba2d4b365158fa200138e8f99f0b93a14da8fadd5018fe3ac35f4c1e4f134cf5cba SHA512 451aac53f9aff6987010962210f38a4b663445143634fe7e300872706373309fd689f6bbd564e7db6c2fd58ae7533c33e85132bebd21ed8a5de2b8008705bd82
 DIST serde-1.0.133.crate 75566 BLAKE2B c6f9334c6a3f722fc3f8b75a031f3c34acf81de1488953addce546ed1dbfeb2350a2a2b25b6088920f47172e2cc9e755c4ef682c19c579a2b70e7f4ae4a7ffb1 SHA512 53f6027a23688a5a303ad9ad169a333c02272ff9c0dc827705c75c162b70040ddf676428f38d04b9aaa49ddd4cee96b5ea5e1dc03f09b90d5f12d8ad22dced0a
 DIST serde-1.0.134.crate 75737 BLAKE2B 8aa9550eb48370cbd95fb6b92d8111861575494755fc5baf90f1b806379be92d68cb8d166c9eef3945d8e5917875932799e805f5dc268d2cb0a6a7527f19f70d SHA512 231983320869b8b135d716395b98000e5c34c0d6ada778d52f7b8bc5bcbd67eed2e5562733b91dbcc84364228c82bc4fa9679f40c38c40ca34851550ac05ee40
 DIST serde_derive-1.0.133.crate 54726 BLAKE2B c59d71b857513be8b7377b4b9182b7f60e441f7fa5428939ff8a25567ab645eab8ed54178dbb4b41967b7b9073b51cdae68f5a910c91a26cfc2baad0c0344b9a SHA512 d8c18ab50c1b500dc49eed1b5ea26bb46b9adf98b3b3c6c97f9c5d11324368342188ffbfef4c8a092c69577622ec85e672341a49853a957b10bf8dcbc6c0f441
@@ -234,13 +294,17 @@ DIST sha3-0.10.1.crate 521609 BLAKE2B b6fcc9519cdc6fb086b8e7bb713f3ff73c696dd9a3
 DIST sha3-0.6.0.crate 572150 BLAKE2B 44ad4953eaaf99754c96777095f8fd12f028d91637a803966a8d9ff5e254ee45f6407c56f0578755782aac84f96bd6afdd94021e87a667130866e8c540b0a017 SHA512 45854bcf8a5d830f087b876f2298be547e3dad7b18767c6e8d06197d80873b17c066fa057df49194e3abdf9085b72b695093ea308de3ba2b40ad8266b5d3213f
 DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
 DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
+DIST signal-hook-0.3.14.crate 49446 BLAKE2B 927363305748118e235fc4add923678cce406d6c5041cced17bf2a0602cf5a912d31143a4479672eb12ef86bcb682f54bef8489407aa1c1067542da295fc788f SHA512 32ecf012e46b94d3a87f2e56cd4c03a97886013309a4e52ef3e7769ed14b49ae2814bb6346cfc9766525dcf15db4182d260d3c9311134e3e6f5301c58729442a
 DIST signal-hook-mio-0.2.1.crate 8893 BLAKE2B d3dad6a9bdaa52c3a45b9839608fed8e79f44916a07ea36e342a7a29d2ff81c0c1928fbd8628130203f00d2562bdf7e191277d6ba2c3bc51f94edc15da455809 SHA512 ca95684574e2934e138fcc2bdd023960cb4207095916650710e76b6fa32f8bfbfc8c5119d3bc92e31a55a2edd6e63b47a2119ff31cef5ba63719b9bec0b438e8
+DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
+DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST siphasher-0.3.9.crate 10108 BLAKE2B 5babf4bd9edc4703205a56bcb87577c4456fc105b5b92ce992227293cf2ce515cc6181c629a766684280ac208578d8f46fd425f7e36ca1a97958f361cbc31a7e SHA512 2d5f25e9f3703718a8b8e5d790f336b70ac817605e52b893e37f154f07603f18a36c849c5ad06443c4661527d3092c984948c62ef83db4bfe2b2368c17425972
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
 DIST socket2-0.4.3.crate 44038 BLAKE2B 906212f81d9e4a1b19fd1a6b9f5f1c6615fd6198e35f58c5f66bcfb2e45a6e0bf10320fd9d8308fd35552d901c8e4e180062206573b9c5dfefef78ee7909bb70 SHA512 db9d9c021129ea7188cd57553cfbd784e90039c55019c3f97fa8379e6ed5af54471774bfe5d7be182ddf005d4cbe4e1faed7e740d2e2d32f5c49fd581bdd7a30
+DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
@@ -249,13 +313,16 @@ DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76
 DIST strum-0.24.0.crate 5524 BLAKE2B 6ad43c6588218d99ac05ba9cc20176264e8c88f7552c0527bfc81ce63488e755e9e2e6ff3b62e171ac7f50f83efdd16140a513cd19f6b9894e4eb7c1436d3713 SHA512 9136deb6bc6c4d48123b2df0f0bb4a46212622ed7bf92f6080a6520e7ce8610f7b55102357cd50d635977d7cde13581f80ce372d8473733b66070e4945166dd0
 DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea
 DIST strum_macros-0.23.1.crate 18203 BLAKE2B ecc220d436d4ae73adf1868a698cd1f98f40669c5a3e0b5667b521d3104830d7252a69525a6102ad41c0652414c5724aa4b9250a8cbebaa6daa14b75f21b1c3f SHA512 df06d2e6cc4999d643eab7bbcf8ffdf91b7c3c507b075928c07516d7f3abaf419d833513619ea083d6d05b80656b0828a6ac13fe48d9bb99f809058f5888d606
+DIST strum_macros-0.24.0.crate 18785 BLAKE2B c12f6a27db5e258eea99272661c88bfca3307b320aef3d4261f4a9178a847b4a6f0419f689fba73dcc9422384d8b6af8d59c13e9c8f3576d53c78384968fc2c8 SHA512 3a6a13d8c705b71dfa69857b04e821e63df21109d4469363e5eac51299a135f98865b6eaec5826949c4d8606d7b5242393ce57de16bb0318e40f73de284ba65a
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
 DIST syn-1.0.86.crate 235126 BLAKE2B 89973130279128cab73443ee36c8e0d7bc83364ef91d0f086a40c136e26e612428b867a54a1da8ee5b1778cedeafc7403180bd84df2c21017ad5bb76bc0c9138 SHA512 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
+DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
+DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
 DIST termsize-0.1.6.crate 5616 BLAKE2B ffb46966472bd1f21b316c1039163c233cf7c6d1f13b88ed575eb5cdfe7661f45c1bdcfb78c75f581c8c2f8f031ba656b227cb4256cdf1af0212d6ef81c33767 SHA512 993451c633b41bfd82abf168b553e443e3ba3bd14fc6e6a99565a1a75ef7c34b05aea955dfb0152c98ce01788f56da0fd252529568ff4b71478ab1709e342d02
@@ -263,13 +330,19 @@ DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff5
 DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
+DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
+DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
+DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
+DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
+DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
 DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
@@ -279,6 +352,7 @@ DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe63765
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
 DIST unindent-0.1.8.crate 8326 BLAKE2B 3123c6b540b152d89cc7a9a76ff1315549f973c6a26adc6ca1b40518973fcc95a9f8da94d1c52ee551f2870181a265aac7e4339a3d46ba5280021b49ad842df2 SHA512 7752f4a29306b3c43f768bc400d610d1537457b22cceae8a5ebba31c857e219dc433a10a676d3cf94316a7cd6c7013c8960c825c6f1f9db5a3c2edd0a60591a8
+DIST unindent-0.1.9.crate 8392 BLAKE2B 601f1779806037f48448ce03483779b731bafb003859f489b806b1b4fd5ca136d7a77b62f49926c0b4315e89830fc6382381aeb56da85b4acb4754ad4924b90f SHA512 bcf5a74ee92c034e975dabc83cbb1859100b3ac04439a360a109651d95eb4f29e4a0c113fbd67b9fef2a3b27d10f29dc84bfb648ea4c3dec64b7dab8d14e57ea
 DIST unix_socket-0.5.0.crate 12261 BLAKE2B 833c47f6359554cb76cbac50ed91380a2dbe406f75e6b366a29a807f6981973fc84560ce83f8483743ad31bc0c53d8be40f215f7cf0822b7405195bee474e79b SHA512 dcd3589f042491540a69176dde6944710deea7317ed0de6912725686473ca15b34dda0a67490252bc8ef5c1ffdf7aecd7b76aa81a27a34b3c4870305c89412e5
 DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST ureq-2.4.0.crate 91872 BLAKE2B 07a4fc5f4c285931ee31f869e1a0b96a82ac1bf61a779f156f8b0945ed96e6698a6c168498d3e2f0bbb648ccc3357fd17da73861b0b8a42550fc4f7f1f8c31fb SHA512 3d7093e6ac7cbc70f55a095590e9a92eba747421317fd7dbcb8096e36764925a3d1a02665567079f23ba765e63fc085d8b398283cd4941008286d8bf0d134050
@@ -286,13 +360,17 @@ DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0
 DIST users-0.10.0.crate 18531 BLAKE2B 18f1dba893d2d88b33785b997f6b2a3582fbd5c2c21f460fd7ab3c98572d524dc0e0fdc1ab3c5651d46f4219cdfaa4b60fafc045f01f6147d99dd3aad92c146e SHA512 21052adcd602ff6c30a4e9f4e14fdca896dce03969b1b03069f93f3e9d2b25c66b83ac2f40ed4e960dcfb5a0e67719ee45da475855f6e397f3618273ea52469b
 DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
 DIST utf8-width-0.1.5.crate 2941 BLAKE2B 3203d11eda41fc8f4eb4f7ccce6ff3cdc8fde5c36d04887b92f3569ce269cee44b3cd9dce0d5901c022dca26d6d021fce03f5f5c53f3e65c991506d8f47a8b08 SHA512 9491b21ae7d516afc6015ce06fba94ba2916c4811bdb58b91b1d531603e978985473651abd56777285c58b8b0c7ed650a68fdab20423b623e0140aeab1bf3f6e
+DIST utf8-width-0.1.6.crate 2935 BLAKE2B 819dffbf5203508fa3c30d8904295cc550cb7569d11346d8066061763982c7c78f3a0a7d6733c8e9ed38f943625b3c50f84da87b6f7a1d042db9a34cb57ebdd3 SHA512 2c51e38c7fa2a2c113ff74164067e49e2e615048144f3065c228a965804029447f7a1e65d926facccb8332a2ab2be02fffb7413d8eee6f883d941909b350844c
 DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
 DIST uutils-0.0.12.tar.gz 2185584 BLAKE2B 59344436c7462a7b43aabe1f2c9d6f6e74f2f6d1e17e79864677c65956e1749d76425385dcd1fbfbe2448ef6f508ffaaaabfb10c427a7cd09826a10f31bd0c7d SHA512 9c78c1ffe8495e95ddb07ce104f68e48dc7ed0d5c156f9095a579b4a27fafbded276314b2a3a239dac693aa0e9bde9bfda6513dcf30ddb17c1925cea27a4578f
 DIST uutils-0.0.13.tar.gz 2419205 BLAKE2B 0ed6cf42563407295dff69a1b68de2d3a6d255a180e5ffa5b33b77829146364105d21349e9a247e3762461b067da66a3a1b665b4cb68e5c29d7177ed81c9ff5c SHA512 80b76c13258945aa85925728141ee0b78de5ca385bd0a6f9d43f5b4008b30ac2ee52fca7f45df094e31f9231b45f2036a97143f9cefb46e8891268fc7e8e0c9b
+DIST uutils-0.0.14.tar.gz 2015517 BLAKE2B 2a1588d99dd39b77e4274468b83bf7a0361f833fec3c84f5b4f9d77c9b7d9dbc62cbf305f1ded1cdd0f84ecaac5699ae840d11234aa1ed7fe0676eb3c7e8f67d SHA512 99a023d192505bafc2cbd25bd1df63d35bb89ef6aca2d5a71404aef95f13d7cc42ceec5ad0cba8b2a63a6e5abefbb5be3e8c2375144b55e0cb47e1e2361d1577
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.79.crate 164276 BLAKE2B c3eeb98f9df18d52d7842886c187ea952923290725a0f90e1195152b54fa7859f0b05a618ee62c3f2eea36647c1299d4506f2cb5825cdddf823564882a93cd91 SHA512 30bbf75950c1f55560d88aa2ac37a00c55023974a73e59db575c16addad52c03eac401297be664f1f7bbd202dbba9f33c293ce063f4523082f5b2eec33ee2f85
 DIST wasm-bindgen-backend-0.2.79.crate 25776 BLAKE2B 4fe72230364c889e74134baff9c4d661e54da3b8612f6139baf0897deea218bce4b1ef47b13fb4314729bf37641f9a066cc94bf83c2c9ca9928ab05e4ee93280 SHA512 8463996051ff7af350d32a871ebca080c434ead1c47d6f4e7b39b406adfab249615cc84d775ab550ad2a23a9af6514ecf9538d0936c54a2e253109c962b198f8
@@ -303,6 +381,7 @@ DIST web-sys-0.3.56.crate 666465 BLAKE2B 903a54a43cdb7d990ac3e01b3ab7bd9ad33a787
 DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
 DIST webpki-roots-0.22.2.crate 237864 BLAKE2B e729f2a7f52b8dd20042e2a34e482593001885648f059c6621a311c6dd9b473016c105f59418aa3a0b21e19756f61109c58cece8bbabdefb9ff7120bcb2431d2 SHA512 b0556b4f6cc91a51dc0f8cf82a8b5e4199e40406f0aa14b2d2508c382c603b3bb112f3e05a518386b83deb21194b12db1076306b144b15303faf140b70509ef4
 DIST which-4.2.2.crate 8589 BLAKE2B 360ea38f7fcb357f558f8e80a2c951d016e4f5dd45f1294f1b85a6ab441cf89fb6f3192b63ca42491693f2eeb57c048d8d0f9ca9f1d857301288b098b138b07c SHA512 25fe54f3703d865bdda04a26720839d6cf52300558e1abdf339eec985cc085fc983ea44a3b36767ef56748c865d432b0105a9fbe677f4b4deee8ec0af9dda59c
+DIST which-4.2.5.crate 9326 BLAKE2B 8aea79157007f2326d21083e1eba387611233a19f39368904cf2b0e9b6f09b4fdf6dc469cff83373912bec6e2aeec191d217b0b1e720ee0db1848b6f64d37054 SHA512 2b2b44773b568946799035e5b90c1f0c304b399f4d330c1e063323f631f56ddc6c5d8a9d026d987cb39c801ccbfb614450064030fc19e1de34ab6a495f053395
 DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -310,9 +389,19 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
+DIST xattr-0.2.3.crate 11959 BLAKE2B e67cc186c3a86c3019cb5832aa515267671b8f11f88ba6253a3217eaf06d70b72a0367e9c8fb42a584b5b57113f8788c67f4e3d70db6427dd4e4a6efff59ac44 SHA512 55b99a9a9440463050b672dcacb7e1d1cc78f2b6f40ea7bff2134ee3a1c787d64972a1e00d2e06cf5a341bf76eff32f68e17a0c939a23f2c9a892715722afcac
 DIST z85-3.0.4.crate 9067 BLAKE2B 448e069d733316d6ad0705be11e8e2324611dc3b482a94237df06d444fef2eca4863f4161bf374f0ddfabbce01ea595617ea4539d26bb83e7216b69f92c515e3 SHA512 0fb3c73f196b65f7c7dad97a88195d4308726f64fdf10b09a12f071b32a622667c374f87b72a0ed70c556d55a859773f13913c019150e270d00d397ee4387768
+DIST z85-3.0.5.crate 9084 BLAKE2B fab4d13d859b02211cf1a80fbbe03af5d2eeb65c927ae4a75730be5567de496619e41f365a02c432af5526f262798af7f89056d72404d38157454dc2e405b7f9 SHA512 8b9c3d095ae51b7d0a9183373e8e47635ba1777d86466e160748bab67a45265b90308189efaf0a5a8eefa7c08ffd08a3ba0580be7ad7bafc7fdce463ec05d0dd
 DIST zip-0.5.13.crate 48237 BLAKE2B 0ffd9c41535f3e49d091b831925e8b639f3128702deafc75e0ea712b67df6f0900ec79628dd2640eb9b91fba7e828abd8b5c9edad87fbe7b22e042ef9909b07f SHA512 b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01
+DIST zip-0.6.2.crate 60077 BLAKE2B 3353cb0b8557ad1f16f3a3964a5c6d992bd044eebe3857e42ee235bd479875811619001ad54378fa7bcacce8acbe7dca30199eaf88ddc47a91e47f15e0396e22 SHA512 a044090643e22d792a83600631d2828b3fffdc25260bfd7de703d20871c23deb6cfb121dbee9cdd5540125c96d113a9516f26b9f07cbf6f260725627166f130f
 EBUILD uutils-0.0.12.ebuild 5139 BLAKE2B f32e400e7d05dd49af8252010950b38caebb3f16df347c0accb74b4aac4a807d514213c5c84a4c49f76b2827f4cb4fdb524d0832b56c909fe0e5176d8662f837 SHA512 bd9f5c48fd31292436f969f9ab4abacfac2c9b2b52877a2125faba9f2564d8967c735ea58181cec2c1f3b61d91bd604aa0c1a4c6d7d33083f5484b9d1cea9d9b
 EBUILD uutils-0.0.13.ebuild 5509 BLAKE2B 44e1dcb7c6b5b323052926fd369db0d96c549823f0ebc2723738af490dcd9cade5d01a18703eea806ebdc32a5927451f2a00dfea47870a7b0c4f6d75cd351202 SHA512 3bd9756af4c8a79cbc0c9aa35d3a9d18fd03445375e50816a6dc5a507a06bc08f97b8b46d893dacfe6fd348dd1adfa96f621513c2c494da491cf915137237d9c
+EBUILD uutils-0.0.14.ebuild 5135 BLAKE2B e47114e7adf350b02e5062092fc29832bd710fa48770f911c8f999cd28129ef916103303dec273bc5518cedb7cc59aecfb619fdd4dd1eeaa690419b7a6780d9e SHA512 56aeadb8415e7b730c6ee57cd7a890332fecb15efb201b17641f88a0b65836ad13b67cce3ef8921c2709df8907f4d75a84c2be688e171225297bcbb36dc7e5c4
 MISC metadata.xml 523 BLAKE2B 71fea6775cf5acf1f8601208185ef09ef2b4432020d7aa981260ae82e92dfc61385a7a385a5e003dc3f0002b85ed1f5a9c0c42745e55f5f95bd31574829d9981 SHA512 aac39be0b85200eac0762219840295319f1f6f3c0ec161b16d97b6b3bbb2891bfca3921d7c38bf0f94cf0ccefc48709a5406ff37be4b367c2b128414e6678d86
diff --git a/sys-apps/uutils/uutils-0.0.14.ebuild b/sys-apps/uutils/uutils-0.0.14.ebuild
new file mode 100644
index 000000000000..13b3ea88d8e8
--- /dev/null
+++ b/sys-apps/uutils/uutils-0.0.14.ebuild
@@ -0,0 +1,269 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.0
+
+EAPI=8
+
+CRATES="
+	Inflector-0.11.4
+	adler-1.0.2
+	ahash-0.4.7
+	aho-corasick-0.7.18
+	aliasable-0.1.3
+	ansi_term-0.12.1
+	arrayref-0.3.6
+	arrayvec-0.7.2
+	atty-0.2.14
+	autocfg-1.1.0
+	bigdecimal-0.3.0
+	binary-heap-plus-0.4.1
+	bindgen-0.59.2
+	bitflags-1.3.2
+	blake2b_simd-1.0.0
+	blake3-1.3.1
+	block-buffer-0.10.2
+	bstr-0.2.17
+	byte-unit-4.0.14
+	bytecount-0.6.2
+	byteorder-1.4.3
+	cc-1.0.73
+	cexpr-0.6.0
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clang-sys-1.3.2
+	clap-2.34.0
+	clap-3.1.18
+	clap_complete-3.1.4
+	clap_lex-0.2.0
+	compare-0.1.0
+	constant_time_eq-0.1.5
+	conv-0.3.3
+	coz-0.1.3
+	cpp-0.5.7
+	cpp_build-0.4.0
+	cpp_common-0.4.0
+	cpp_common-0.5.7
+	cpp_macros-0.5.7
+	cpp_syn-0.12.0
+	cpp_synmap-0.3.0
+	cpp_synom-0.12.0
+	cpufeatures-0.2.2
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crossterm-0.23.2
+	crossterm_winapi-0.9.0
+	crypto-common-0.1.3
+	ctor-0.1.22
+	ctrlc-3.2.2
+	custom_derive-0.1.7
+	data-encoding-2.3.2
+	data-encoding-macro-0.1.12
+	data-encoding-macro-internal-0.1.10
+	diff-0.1.12
+	digest-0.10.3
+	dlv-list-0.2.3
+	dns-lookup-1.0.8
+	dunce-1.0.2
+	either-1.6.1
+	env_logger-0.8.4
+	env_logger-0.9.0
+	exacl-0.8.0
+	fastrand-1.7.0
+	file_diff-1.0.0
+	filetime-0.2.16
+	flate2-1.0.23
+	fnv-1.0.7
+	fs_extra-1.2.0
+	fts-sys-0.2.1
+	gcd-2.1.0
+	generic-array-0.14.5
+	getrandom-0.2.6
+	glob-0.3.0
+	half-1.8.2
+	hashbrown-0.9.1
+	hashbrown-0.11.2
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hex-0.4.3
+	hex-literal-0.3.4
+	hostname-0.3.1
+	humantime-2.1.0
+	indexmap-1.8.1
+	instant-0.1.12
+	ioctl-sys-0.8.0
+	itertools-0.10.3
+	itoa-1.0.2
+	keccak-0.1.0
+	kernel32-sys-0.2.2
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.126
+	libloading-0.7.3
+	lock_api-0.4.7
+	log-0.4.17
+	lscolors-0.10.0
+	match_cfg-0.1.0
+	md-5-0.10.1
+	memchr-1.0.2
+	memchr-2.5.0
+	memmap2-0.5.3
+	memoffset-0.6.5
+	minimal-lexical-0.2.1
+	miniz_oxide-0.5.1
+	mio-0.8.3
+	nix-0.24.1
+	nom-7.1.1
+	num-bigint-0.4.3
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_threads-0.1.6
+	number_prefix-0.4.0
+	numtoa-0.1.0
+	once_cell-1.11.0
+	onig-6.3.1
+	onig_sys-69.7.1
+	ordered-multimap-0.3.1
+	os_display-0.1.3
+	os_str_bytes-6.0.1
+	ouroboros-0.15.0
+	ouroboros_macro-0.15.0
+	output_vt100-0.1.3
+	parking_lot-0.12.0
+	parking_lot_core-0.9.3
+	paste-1.0.7
+	peeking_take_while-0.1.2
+	phf-0.10.1
+	phf_codegen-0.10.0
+	phf_generator-0.10.0
+	phf_shared-0.10.0
+	pkg-config-0.3.25
+	platform-info-0.2.0
+	ppv-lite86-0.2.16
+	pretty_assertions-1.2.1
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.39
+	quick-error-2.0.1
+	quickcheck-1.0.3
+	quote-0.3.15
+	quote-1.0.18
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rayon-1.5.3
+	rayon-core-1.9.3
+	redox_syscall-0.2.13
+	redox_termios-0.1.2
+	reference-counted-singleton-0.1.1
+	regex-1.5.6
+	regex-automata-0.1.10
+	regex-syntax-0.6.26
+	remove_dir_all-0.5.3
+	remove_dir_all-0.7.0
+	retain_mut-0.1.7
+	rlimit-0.8.3
+	rust-ini-0.17.0
+	rustc-hash-1.1.0
+	rustversion-1.0.6
+	same-file-1.0.6
+	scopeguard-1.1.0
+	selinux-0.2.7
+	selinux-sys-0.5.2
+	sha1-0.10.1
+	sha2-0.10.2
+	sha3-0.10.1
+	shlex-1.1.0
+	signal-hook-0.3.14
+	signal-hook-mio-0.2.3
+	signal-hook-registry-1.4.0
+	siphasher-0.3.10
+	smallvec-1.8.0
+	smawk-0.3.1
+	socket2-0.4.4
+	stable_deref_trait-1.2.0
+	strsim-0.8.0
+	strsim-0.10.0
+	strum-0.24.0
+	strum_macros-0.24.0
+	subtle-2.4.1
+	syn-1.0.95
+	tempfile-3.3.0
+	term_grid-0.1.7
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	termion-1.5.6
+	termsize-0.1.6
+	textwrap-0.11.0
+	textwrap-0.15.0
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
+	time-0.1.44
+	time-0.3.9
+	time-macros-0.2.4
+	typenum-1.15.0
+	unicode-ident-1.0.0
+	unicode-linebreak-0.1.2
+	unicode-segmentation-1.9.0
+	unicode-width-0.1.9
+	unicode-xid-0.0.4
+	unindent-0.1.9
+	unix_socket-0.5.0
+	users-0.10.0
+	utf-8-0.7.6
+	utf8-width-0.1.6
+	uuid-0.8.2
+	vec_map-0.8.2
+	version_check-0.9.4
+	walkdir-2.3.2
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	which-4.2.5
+	wild-2.0.4
+	winapi-0.2.8
+	winapi-0.3.9
+	winapi-build-0.1.1
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+	xattr-0.2.3
+	z85-3.0.5
+	zip-0.6.2
+"
+
+inherit cargo
+
+DESCRIPTION="GNU coreutils rewritten in Rust"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/uutils/coreutils"
+SRC_URI="https://github.com/uutils/coreutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 ISC MIT Unlicense"
+
+BDEPEND=">=virtual/rust-1.56.0"
+
+SLOT="0"
+KEYWORDS="~amd64"
+S="${WORKDIR}/coreutils-${PV}"
+
+src_compile() {
+	emake V=1 PROFILE=release
+}
+
+src_install() {
+	emake V=1 PREFIX="/usr" PROG_PREFIX="uu-" DESTDIR="${D}" MANDIR="/share/man/man1" install
+}
diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest
index ccbc355e6742..496710ee5649 100644
--- a/sys-apps/vbetool/Manifest
+++ b/sys-apps/vbetool/Manifest
@@ -1,4 +1,4 @@
-AUX vbetool-1.0-build.patch 537 BLAKE2B e22826304e84fe21f577c3c7db754194103ca97a9b2647063469241f5c213182f4c80007823ef1caa6d79af1d313d560b1e06ebfaf757ec876a618117f2fbb3e SHA512 1b9b1b7471f09ec6dac8f535df1ea6bf09f8824f58c025b92e3e5d3e451a56e750e93836d03ee37e20f14868a9b75e97c548add36256412dfc154530c7a4be12
+AUX vbetool-1.0-build.patch 427 BLAKE2B c1145ae5ec65f79179360386610935db65195d9ae8f6f6642d48cdf4e473572781d536ba52b1729cc18d5569a67fc952a6f4863bfee0950cf3442686b751931c SHA512 b79b5c29ce8af7fdcdbd24e422e0f354e28db8ab3befb163b3a488b1a3a28b5d8fbbfeca654acc558e81487befdc19821482fd2212b31a97d384c440a5376902
 DIST vbetool-1.1.tar.gz 182826 BLAKE2B 6b30eb468e55bedd766161e373e042b5fdf38fd2926bfc8aeb94404350864e835d41642f19be155fcf9a8fbfdc8b4e237e742cabd00626db5e8d17e7c7c5cf6f SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96
-EBUILD vbetool-1.1.ebuild 668 BLAKE2B b13b2bb550daed41297ee4c806a1d5130e2e3e2a041c99fafd7980f7fcdb95638607b285bbb5a258d9ecd8a15b89aa63ceadac59f3c58b36af44e99d10bd8e10 SHA512 a598460e4af9587302d3dca73c14800403e7f434240eff658471b48c0617b6a03dff44b1b9dcc978168599cb22a164fefd3bfba6cc2a3e1e8a78433afba55571
+EBUILD vbetool-1.1-r1.ebuild 626 BLAKE2B 1b17878763988226bf825c6ac2018caa4ac9be78ccc25470ceecd4c0167544c3be4c09e151dd9356ea8a65102208747591e5e3aabd52131e5d18d1b7f6a57195 SHA512 2c83bf7fed2641e41080f240ea9004d80ed72cd194e0019c64f619f8f4493c3362bce9fe7531000095a509fe74702db664bbf7290b11e44d442263794622e380
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/sys-apps/vbetool/files/vbetool-1.0-build.patch b/sys-apps/vbetool/files/vbetool-1.0-build.patch
index 69d2f7b341ba..d0b239146184 100644
--- a/sys-apps/vbetool/files/vbetool-1.0-build.patch
+++ b/sys-apps/vbetool/files/vbetool-1.0-build.patch
@@ -1,8 +1,6 @@
-Index: vbetool-1.0/Makefile.am
-===================================================================
---- vbetool-1.0.orig/Makefile.am
-+++ vbetool-1.0/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@
  
  sbin_PROGRAMS = vbetool
  
@@ -11,8 +9,10 @@ Index: vbetool-1.0/Makefile.am
  
  man_MANS = vbetool.1
  vbetool_SOURCES = vbetool.c $(x86)
-@@ -14,4 +14,3 @@ maintainer-clean-local: 
+@@ -13,5 +13,4 @@
+ maintainer-clean-local: 
  	$(RM) Makefile.in aclocal.m4 config.h.in stamp-h.in configure
  
- AM_CFLAGS = -g -Wall -pedantic -std=gnu99
+-AM_CFLAGS = -g -Wall -pedantic -std=gnu99
 -AM_LDFLAGS = -lz -lx86
++AM_CFLAGS = -Wall -pedantic -std=gnu99
diff --git a/sys-apps/vbetool/vbetool-1.1.ebuild b/sys-apps/vbetool/vbetool-1.1-r1.ebuild
index 6001b998a371..e6dc1e224d99 100644
--- a/sys-apps/vbetool/vbetool-1.1.ebuild
+++ b/sys-apps/vbetool/vbetool-1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -12,7 +12,6 @@ SRC_URI="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	sys-libs/zlib
@@ -24,8 +23,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0-build.patch )
 
 src_prepare() {
 	default
-
-	eaclocal # temp fix for #439614
 	eautoreconf
 }
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 60cdd6e45240..cca49cc50e51 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ucx/Manifest b/sys-cluster/ucx/Manifest
index 869000b11dd7..b1c535cd4f42 100644
--- a/sys-cluster/ucx/Manifest
+++ b/sys-cluster/ucx/Manifest
@@ -1,12 +1,6 @@
 AUX ucx-1.10.0_rc5-drop-werror.patch 1822 BLAKE2B 4a0f9310f8cfd6691f0aac4d86570f60da05e5bc747445884b03618cf67fc583faa75f5789a2147dfa0ecf0c0bd651d87526bc3127a6b9eb092037a90927da22 SHA512 677f9c5a85e6971b7ed4dc9b9f71f69574797df048f6cde25a1c3e61700af71975c4ecbba73d6bcd8ccea582905701a4ea839cfa5b4b81312e09cd729317798e
 DIST ucx-1.10.0_rc5.tar.gz 2399950 BLAKE2B f6f78d2a3e0cd7f252354d59b9d667992c5f9f4d8ee4a41356decf4a1ed72382d8ce5213395bc6bacf1d8658f95808082cc0f825230857ddbbff19ed060efa5c SHA512 b772ad030e80bc5b0ab25d590117950d363f5f7ea1b7ed5ce0bba285d0a932205ee4d73705c094cef077c751b1cf8b6efdd4608c7df6b39d813771a0a31460ac
-DIST ucx-1.2.2.tar.gz 1513611 BLAKE2B 488b9b3cecc2c617b1209036e1342e4378459db6a5e93eab1d88dfe80cb0d9c8013c767413206f0fbd0105557ed89994ab510421068d709101336a7b3d2eac5e SHA512 515c382826310b9aa7179ab19ceb76a881a41e6786514219b7f703c6144fa57ca141bceb3b80523ae1b4e2a4b13e9abcb9df063612b376d894c5cd81cdc00571
-DIST ucx-1.3.0.tar.gz 1707317 BLAKE2B 740ab240663a26fde8abe631416dae6233febf3c587ba6bb7b27a9cb0aa041540ce71e106bb3c5618a719de66d479055961908b67125df61a4c7696999c0affb SHA512 0a2e32985e0225fc4ad15dbb1c422dba1d5552638e7329d67572924502e61e1a481ce30cde5ccc83c663fb4ec643df83efc08aed164dfbce6cf38d66a16b3e42
-DIST ucx-1.5.2.tar.gz 1844416 BLAKE2B 2e0296e34d8116a79c545fb3371dda1746517a18cc75f94da5d1f9420c7a74752839d5a3a07a61a2e91021baa87a26d02ab24554316351db9ba76721a18a5244 SHA512 7f11014eb26df342fc8f0914d323f08f4c19ea21e98e18f0a4ec18b7004299687f91daa8ee654ecee716ece6d4d6de5c9714c548768b1d44551b6be6195e2e9b
 DIST ucx-1.9.0.tar.gz 2467338 BLAKE2B 4d2d18c530f99a56baeb1dec88a7dba813970d3f501eb08f637dc7cefcfe5e564bc121e50c1842ea94e927a0fd657847c571241e3dd9601cdde207729d32d721 SHA512 2e8507e9cbba9ea445efdf8be5b5128dfc76cce30111805e9f7a5618bbbbb77d2bb449b6ad5e415f086b3156b63128306671d3a906583248cde720edb4241c67
 EBUILD ucx-1.10.0_rc5.ebuild 787 BLAKE2B e194162df091517e92d11ce58c2c0219eabed5b3e21fa0b4cd8db0abcdf94d1f64165a6b40991513bfb25c17437d84caf0eb823ef6dd05c58f563735b085cce5 SHA512 562b0ce8c4550ecfcb2cd289e4af9cd3c7acf7a91d5e577f7f814381254519bab1e3926aae0eca196450b4ad7fe3980904f7a74356cdf2c8e8f66367b21d7bf5
-EBUILD ucx-1.2.2-r1.ebuild 657 BLAKE2B 0296b5fb569ebe585f28ad21a93db38ae8f7e067485bd2bde52e59ef1c55550b4580bb5fb7e3d3749d834fb98deca7992fb27fde1935f7ee416512a6614711e5 SHA512 18f24525c15aeb5c58488577a1fa895d11bd37dca8d18508fa3db09f6be142f7afc147d8b0d6014abcfcc3f1651b23ffc2436a5db16021fcde0ae23277508e30
-EBUILD ucx-1.3.0.ebuild 521 BLAKE2B 424edb7396cd501bfebaace337b0ffdca591e784b020d1f59ac768c576bb45177ace636584ddee803112ebfaf34c3bff11316fde49aa12ba0e923cc266ab8b8e SHA512 505e9fd473b6011b65b32ef657f2dd328e00647409b5ad5e9f1b4aa10ceb734eeb25ee8eaf7b8d70b5b5cce199ce546bf60bb2978b574beec7987f8a2b497d88
-EBUILD ucx-1.5.2.ebuild 608 BLAKE2B d6cd8284f1ba783ea6ef3471d6779859c3af572834b387a123e1829fc01240ab6a476188d290cbc593a07c0af3129c8492594a0947db70e3dc50eb881d5da351 SHA512 03fae77ea4880763d65f7a5332800438c7dcf9a9c6345fa31f486c4770be249012c05791e39e2e8e8e96cc6d6abad967d539f9cc2f5e80950414e770294d543c
 EBUILD ucx-1.9.0.ebuild 608 BLAKE2B c6b01f62989d841ccc7be1dffb3ddf356d8f59bc5621bef514a300984d9f63317cb5c5b51cbf031689e292d262477082b7c4365fb899c0ddab91f6541abe8e5d SHA512 cbb8fe1196f36f2d68803c004ad6343378ff1a8eb693249c5bbe0c196fb9b72d5dddead0def92857c1afd771d440ccaed287b106d878e6424cc0f694b2a83d5e
 MISC metadata.xml 339 BLAKE2B 6b774e1fdabaf49cf42847ac8696ee898f4fab46e462515ea3e0fd4f35a759a6ccfab93bf2f0e36f4a394582d973210012ef8052c2600fb2ca288df11f79e115 SHA512 a72620d9bbe4657364a311e27479c497796a154a0ccdde5f226742df5e531edf2f16b8c91edaa7409758f03e986272b2a1f0030ab7e8b11c756d84ec0170289b
diff --git a/sys-cluster/ucx/ucx-1.2.2-r1.ebuild b/sys-cluster/ucx/ucx-1.2.2-r1.ebuild
deleted file mode 100644
index 392242a2f1c6..000000000000
--- a/sys-cluster/ucx/ucx-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Unified Communication X"
-HOMEPAGE="https://www.openucx.org"
-SRC_URI="https://github.com/openucx/ucx/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+numa +openmp"
-
-RDEPEND="
-	numa? ( sys-process/numactl )
-"
-
-src_prepare() {
-	default
-	sed \
-		-e '/BASE_CFLAGS=/s:=".*":=:g' \
-		-i config/m4/compiler.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	BASE_CFLAGS="" \
-	econf \
-		--disable-compiler-opt \
-		$(use_enable numa) \
-		$(use_enable openmp)
-}
diff --git a/sys-cluster/ucx/ucx-1.3.0.ebuild b/sys-cluster/ucx/ucx-1.3.0.ebuild
deleted file mode 100644
index 5baf8fac0e3a..000000000000
--- a/sys-cluster/ucx/ucx-1.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Unified Communication X"
-HOMEPAGE="https://www.openucx.org"
-SRC_URI="https://github.com/openucx/ucx/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+numa +openmp"
-
-RDEPEND="
-	numa? ( sys-process/numactl )
-"
-
-src_configure() {
-	BASE_CFLAGS="" \
-	econf \
-		--disable-compiler-opt \
-		$(use_enable numa) \
-		$(use_enable openmp)
-}
diff --git a/sys-cluster/ucx/ucx-1.5.2.ebuild b/sys-cluster/ucx/ucx-1.5.2.ebuild
deleted file mode 100644
index 780a1371ad80..000000000000
--- a/sys-cluster/ucx/ucx-1.5.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Unified Communication X"
-HOMEPAGE="https://www.openucx.org"
-SRC_URI="https://github.com/openucx/ucx/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+numa +openmp"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	numa? ( sys-process/numactl )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	BASE_CFLAGS="" \
-	econf \
-		--disable-compiler-opt \
-		$(use_enable numa) \
-		$(use_enable openmp)
-}
-
-src_compile() {
-	BASE_CFLAGS="" emake
-}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index f372d3173b87..618b24bc92f6 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 052f57d2848d..e99234babc10 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,5 +1,5 @@
 AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e280097f9d1e97aca8942cda80d0d574f24f71f25245714dc4bf99d5b53a9613cbbf4b33d5a50cfa9482be5a2dd601b9b9a03be3940 SHA512 51cfb62fce69afaf73659a2c4c819aa3554831b48d69bc35c1b299cd2e0b4d3be7f156a2cb57912cf10f21182e49fd5ce17aad0205a25d151f55ab3e0e58ddd7
 AUX libsmbios-2.4.3-avoid_bashisms.patch 2909 BLAKE2B 426ca128f142307ea89cc5003c298518115805a518b348345f154094e34be932721aa6c880612fa7fe3473bc1156bf7c2dc1ce085dd9511ddeaf58e54d2464e1 SHA512 d2199481d87527ce7e90ca355cdfaf48a859982e67090e248034139b19ce2d61717e9887d246c7bd6b1e46f3f97cf6ec6bbdf04e3091c513221cb42d0f1431b3
 DIST libsmbios-2.4.3.tar.gz 644140 BLAKE2B 684bff4f6cf755796f785e9a93d4ddbe2a1af52082cdebc27d203772a6a2a0259edb4b9d19921f90fc78b48d54700223fbc2628665b963ebcb601010ff4340ab SHA512 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad
-EBUILD libsmbios-2.4.3.ebuild 1817 BLAKE2B e6b2b599c84ac286a1cbcd6fa1005270546186a0670dea26439b6e1e8f94542a457e2135b24662aad89dbf9429f3209e8cd60b6b29c7f22efa7ef2a8d692f8a2 SHA512 afdb310068c7119cbca86bb7ebe87654bb560e3a03eb6ed44dbdadd33daf1a430062030c9d36ef979ba0351a15c13efebea30faf76e4d58c4f5de8d847373b8d
+EBUILD libsmbios-2.4.3.ebuild 1812 BLAKE2B 7c188ceea03940390372c4c8dbf572f0aab242dbce7833f264865b5d85c30b3ccef086f9a3cc0a6563e68eebc5b738b5fc24223cd1aa5390979c7e569c54c798 SHA512 82ed49378df01d8d8290719dc15a11a51ed2765d04c5f328226a96171b91e6bd424a88563bfe1932ca359998132a258f2dc09e0421a82a15a2457937c61b6947
 MISC metadata.xml 670 BLAKE2B 5289ced6533425323143e54359147085513eba236a8cbc5ba6e71c068143a032fb448a695ea7ac1733a6b0d9231932bc3a52dd0fa149c14d2fb1c41bd7ddb0d1 SHA512 00e4e9c65a2b499b935dd5e02b71338d70a76258ebe179c62eafc7a04b6211e1c331e6e57d6d656e0700137d1d15095bb6c4bb4dca0bca3d3e9c0ecf7dd3fa2a
diff --git a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
index 4ee63a217cb1..ce9ff13b731d 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools flag-o-matic python-single-r1
 
 DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="http://linux.dell.com/files/libsmbios/"
+HOMEPAGE="https://github.com/dell/libsmbios"
 SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2+ OSL-2.1 ) BSD Boost-1.0"
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index f5f9bbb4ca51..0d6f74d610ac 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,5 +1,4 @@
 AUX ldconfig.in-r3 3093 BLAKE2B 146374fe711c660a61e4a23f89ae066e78b8bca6884719c058981069ab92833d7f660b7bd78e7c8b86112944706823f0260d7c63f19d64960f27f44b4e95a6a3 SHA512 ba021cf7d52c001d6ef9a54a91de93240cd7eef9f7a6d7a48ae0c58f934aaea6796979ce80e1cfa9bdc6008023108f3c226440360f8e3134fc23f7fdac0e55b1
-AUX musl-1.2.2-gethostid.patch 1028 BLAKE2B fbe554e681c8f0e4bff6ec6fe97c88fd3c7f84ac07580b5f6cfef13b6b27c985f4f0e1d7722f397c59e655b8cd864fa845f9af2aa0eaa9287349f41e71f7a257 SHA512 d2959ef272e3a2742efec3983a41705cfa6424110dbc1eb53a912492cf067881cdbcb8cd864757e6450dda9b47e0cca7dbe3a86d3e6e74e7f33fb7d1723edfde
 AUX stack_chk_fail_local.c 1798 BLAKE2B 380bcbb920bd40a5185246621ba93716f27d61cd0077cd796ff267e10c534c9cc64982b2a66c89b61395dc93d67dae77e8c59908f65f2903f16016180cf94bbb SHA512 bb0bdd7f205d57771920c7ea898c1f84a55d6f90ddd1f8203bfeed98d13ccefa6f68d5fd1c0761321b2732ca928ca81b425e3fe8321c936d1316dea6f1930091
 DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
diff --git a/sys-libs/musl/files/musl-1.2.2-gethostid.patch b/sys-libs/musl/files/musl-1.2.2-gethostid.patch
deleted file mode 100644
index 96c799cfca29..000000000000
--- a/sys-libs/musl/files/musl-1.2.2-gethostid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Subject: [musl] [PATCH] extend gethostid beyond a stub
-Archived-At: <https://inbox.vuxu.org/musl/20210420191519.23822-3-ericonr@disroot.org/>
-List-Archive: <https://inbox.vuxu.org/musl/>
-List-Post: <mailto:musl@inbox.vuxu.org>
-
-From: Érico Rolim <erico.erc@gmail.com>
-
-Implement part of the glibc behavior, where the 32-bit identifier stored
-in /etc/hostid, if the file exists, is returned. If this file doesn't
-contain at least 32 bits or can't be opened for some reason, return 0.
----
- src/misc/gethostid.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/src/misc/gethostid.c b/src/misc/gethostid.c
-index 25bb35db..d529de9c 100644
---- a/src/misc/gethostid.c
-+++ b/src/misc/gethostid.c
-@@ -1,6 +1,19 @@
- #include <unistd.h>
-+#include <stdio.h>
-+#include <stdint.h>
- 
- long gethostid()
- {
--	return 0;
-+	FILE *f;
-+	int32_t rv = 0;
-+
-+	f = fopen("/etc/hostid", "reb");
-+	if (f) {
-+		if (fread(&rv, sizeof(rv), 1, f) == 0) {
-+			rv = 0;
-+		}
-+		fclose(f);
-+	}
-+
-+	return rv;
- }
--- 
-2.31.1
-
-
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 8774bd5654a3..e337f9dd2218 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index b449aae2d31d..2441698e8656 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -2,5 +2,5 @@ EBUILD rust-1.59.0.ebuild 405 BLAKE2B db0aaeb02412a231d1d966d35309298fb556c27fdf
 EBUILD rust-1.60.0.ebuild 411 BLAKE2B 650c3f3370d8d4bf42493d08371d5aa1dcdd415c9b417f2b8bfb6678b7f885a3f83a6f8046576ae38c36978933f1824e300969ac6f4caae2bd24a8d120d8b8d9 SHA512 ee4c0c50174ec71d97139ba74f45e35d5084373f98077926f910d1cafd7a57e820c919ffaf2a1e61fac655c4e21ca4f418d4f2446e31766c715f27ce7d4b8131
 EBUILD rust-1.61.0.ebuild 424 BLAKE2B d515a692188e1e986754522772ad7c5f131e74ad4ff00666279ce3c5b15b77e316c24078fb401952a73e09485c026fd2f82923e52f89b38746d5eed59672320e SHA512 dbaed1e5dc025f059a1b9c0870eb31b8030132376dba5ad082cdf3751f6f4404968a3e44dfab9411eaef98e8c0082e2393b4fdc1fe8836f2d1d57f25f5b83718
 EBUILD rust-1.62.0.ebuild 424 BLAKE2B d515a692188e1e986754522772ad7c5f131e74ad4ff00666279ce3c5b15b77e316c24078fb401952a73e09485c026fd2f82923e52f89b38746d5eed59672320e SHA512 dbaed1e5dc025f059a1b9c0870eb31b8030132376dba5ad082cdf3751f6f4404968a3e44dfab9411eaef98e8c0082e2393b4fdc1fe8836f2d1d57f25f5b83718
-EBUILD rust-1.62.1.ebuild 420 BLAKE2B fc513aca7c5c95ffe19ddb78deade59cc8f1255642338307d84c3408271a228219d78cfc52001233c56e7a0bf2fb9b08198e76ca15e596fea91ef23b87fd4504 SHA512 92823a5b3f4218b43ea6ad0141f71b34db2139bd28855521e6a7c6da6bf615daa8194818bca5ce63d66ad13c149afa9a5c6621afaba1ee8a5e400730d386128b
+EBUILD rust-1.62.1.ebuild 419 BLAKE2B 230f8d5e3a6a11efadb19cf20ae0eaa40f3fdc6e429427593931c5a5963292d779a053adfe56b132126afdc17217a28746d387ae87852ba3c15e701fb4d4f646 SHA512 92d1827df9500e59e05c0ed36194601f744da0671a50c2e68faddcb27829efc10704cd8a36242505aa88bd5d63d079b52d584af78a5c7b903b45597ef01fe270
 MISC metadata.xml 351 BLAKE2B cf3c7f2e804dbe6ddce9380d9c7b32e734df16a04ea867a474a4e6868edfaa72abb79dd6eb47f67128a1b60cb4872c999949e8237102bc2117e581309307f862 SHA512 d32137e0b4549baf85ffaff35d2c5fb058a44e3fbeb7f560db3ebbfc1d44d9ce3651e033cb8434f211994218a85d5bf89f42ea9e3ab76e361c1014dcc6f25997
diff --git a/virtual/rust/rust-1.62.1.ebuild b/virtual/rust/rust-1.62.1.ebuild
index 4766f33733de..aae34c5bd635 100644
--- a/virtual/rust/rust-1.62.1.ebuild
+++ b/virtual/rust/rust-1.62.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="rustfmt"
 
 BDEPEND=""
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0d2a660f4a11..8808e0377bd8 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 3223f9988920..4e1d8e74b8f2 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,4 +1,3 @@
-AUX varnish-6.5.1-autoconf-2.70.patch 1586 BLAKE2B d408e3d43a49a98bfd7c9e235548f30c042091d90ef943a38fc7d70b757764cb4579f8baefd31510229d8d926f1b2b6f9ca95b916592d463d6e9985b1fc2a727 SHA512 053383ad34d5f12ce47818101c2e9a7f82f6d480d51663bfba9e00bbaa40d7a159faede0d37d877e1c0fb15f57ab4a93447c88264250a7c7cd072250c5736372
 AUX varnishd.confd-r4 519 BLAKE2B 18d867add08324ad9ea8b829a747e21c450d6c1f724e18c4318d21ba1647250073d443ea63d721585dc2a274d490a9fb76f14d5e725cc62f483b45be45220463 SHA512 98c8901e53f3c6adb908b9eb01fd441ea53f3c54d4a79aecb1fb1eddfa2fc93de3d0de403a4464a9baff15873b3a20623837e3a37cb225e924a329e32b9e37d6
 AUX varnishd.initd-r4 1573 BLAKE2B 79a6583ea337857c58eafcf6dff5cd9646a871116adca6aa5a956bf25b8474394d850afb3c296cc5c920bad0176ca144a486b7202d3a94e7ab7e4688c552be5d SHA512 5ac7867e85cbd721f903c524ed4b524423d9dada4acfeefb0e543214a208828df5cc4efe2f012991bea6b38c2b223c24b17d3890ec4ed2c57d2b441b8e5a6900
 AUX varnishd.logrotate-r2 470 BLAKE2B c44ccd8198458031b977e3d0d1b6ef1a0c824554b7b1d9745e6bbbcddb7cf1c9ba23bd72472361bfda803f9691276433f3af422819aa3e6e8e5436f66cc47097 SHA512 51cc6d46ff7439de93977ab87dfb0af399458c1e446475696f73342ae7a0c1a8ca8fc6e79e593659f1af30716a5f8a1ee5e3b1f5e7b35df40b45d47e7b0f2ffd
diff --git a/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch b/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch
deleted file mode 100644
index beb400620fad..000000000000
--- a/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c6f70f8ca126b34a218248109b78a540d3a4989a Mon Sep 17 00:00:00 2001
-From: Simon Stridsberg <simon@devsn.se>
-Date: Tue, 12 Jan 2021 15:34:33 +0000
-Subject: [PATCH] Fix autoconf error in version 2.70
-
-Fixes #3491
----
- configure.ac | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e44b61fffe..3763b3f34d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,9 +40,9 @@ AC_PROG_INSTALL
- AC_ARG_WITH([rst2man],
-   AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
-   [RST2MAN="$withval"],
--  AC_CHECK_PROGS(RST2MAN,
-+  [AC_CHECK_PROGS(RST2MAN,
-     [rst2man-3.6 rst2man-3 rst2man rst2man.py],
--    [no]))
-+    [no])])
- if test "x$RST2MAN" = "xno"; then
-   AC_MSG_ERROR(
-     [rst2man is needed to build Varnish, please install python3-docutils.])
-@@ -51,9 +51,9 @@ fi
- AC_ARG_WITH([sphinx-build],
-   AS_HELP_STRING([--with-sphinx-build=PATH], [Location of sphinx-build (auto)]),
-   [SPHINX="$withval"],
--  AC_CHECK_PROGS(SPHINX,
-+  [AC_CHECK_PROGS(SPHINX,
-     [sphinx-build-3.6 sphinx-build-3 sphinx-build],
--    [no]))
-+    [no])])
- if test "x$SPHINX" = "xno"; then
-   AC_MSG_ERROR(
-     [sphinx-build is needed to build Varnish, please install python3-sphinx.])
-@@ -62,9 +62,9 @@ fi
- AC_ARG_WITH([rst2html],
-   AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]),
-   [RST2HTML="$withval"],
--  AC_CHECK_PROGS(RST2HTML,
-+  [AC_CHECK_PROGS(RST2HTML,
-      [rst2html-3.6 rst2html-3 rst2html rst2html.py],
--     "no"))
-+     "no")])
- 
- if test "x$RST2HTML" = "xno"; then
-    AC_MSG_ERROR(
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index a7d08ab32f35..296c10c17fa1 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-nv/Manifest b/x11-drivers/xf86-video-nv/Manifest
index 90d42fd80608..ab3a30d49715 100644
--- a/x11-drivers/xf86-video-nv/Manifest
+++ b/x11-drivers/xf86-video-nv/Manifest
@@ -1,3 +1,5 @@
 DIST xf86-video-nv-2.1.21.tar.bz2 424091 BLAKE2B 3ef69d23672c0d65d1117ec1c4906a47d34878ed20f7c07d044be3b9d74c848162d80fe9cc7a11797fd9f94dedcda3b5e76d8386f2b7208e432497ef50838422 SHA512 97cec43100b00609d43cf45937bafea387fd656cb5e321fcbed426973320097ba6601e4e548026618b3cf0c480f58956874a201791dc0cc39297b5fd54979ca7
+DIST xf86-video-nv-2.1.22.tar.xz 354708 BLAKE2B e2e54ea3f025a77f268d584345a12ad3547d60f8f23a393d5af0cf69c2a14c6851c8c074ecc4975f5dc2d94018ea51ac36241a86b2ad532672cd09ae2a5dba7d SHA512 a54767e9060404cafbb028ea36e582e8cfb7431a746cfc1d698c435fa73e41c4dfc12f84e50d002a582ac61e2d4c377f4defdf407250ee9e8656e5ff989b3cda
 EBUILD xf86-video-nv-2.1.21.ebuild 309 BLAKE2B 1a7413289d391ee02653a1650889ccf34f44bf542b37e5a09fbf1d43bda7bc73fbababa7e3aa1288c0b86b4f07ff42ff9be6e535967af228026fe90cfefaf019 SHA512 082e4052ea85f45a13faa38adcbf8a1c466d05e24359dbdcb39c83bdc3c97eae4fc0ba13b160064b0a5ce53a0296cdcdf53e9bf01325386a37682426cc2b1157
+EBUILD xf86-video-nv-2.1.22.ebuild 252 BLAKE2B 7b1c731907e284e534e2c50765ba89a0c9bb07bc366d7d915aec164bb6c099da9fb0ea046015cfb9e2518a6adb77934463e41c695242adced481fecc2a3e8aee SHA512 06219d5c6e82b5d01fd843eba313c88499a81d2cdfe067a057333e5c507be1b6501667c9289b2b777bdffd7b56cfa27ec7a84fec998175f2dbe005c8fccbdff3
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.22.ebuild b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.22.ebuild
new file mode 100644
index 000000000000..8e72d626549b
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.22.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="Nvidia 2D only video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~loong ~ppc ~ppc64 ~x86"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index f3c9947d273e..0c3064753d9a 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index 2215c4dd23ca..18a9840d1fd8 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,4 +1,3 @@
-AUX zutty-0.11-cxxflags.patch 784 BLAKE2B 06dcb5309326ff43337d32b52d9ea03dc2673020492640a37bf91a8d709bf19afa51850fabc5f6a08fedcf91dbff5fc28ffdf7719aaa98dd475e4527321d391f SHA512 7c8e425375d513c2591b3ef153054811a2c3f88134aa27f9bc3aa2b8328a5c10d1938a606d0ef11f168671537bc6d5773570c9947f7c99871f668540d76fc8c3
 AUX zutty-0.12-cxxflags.patch 750 BLAKE2B 24c3d67ba191bfb988a8ecb5ea7f1aeb1cf504adc230c1ed70c440b0dadd808d6f009c2da517587f59ea4f924aaea00b1072466187fe5e0705296b80b8c81d6e SHA512 0c32cece7edd62c476907f840c24391a68cda9dee1a21995858fe17de9e88e952bb9b9df1565c1ae73dc77a154130ab24ba4ab623a74fb7023448c0da63e84e7
 DIST zutty-0.12.tar.gz 348226 BLAKE2B 8d065928fe3e8049e63f1e679d4e8d2ef6643b01b098698594d536c6fa9494a2a934dce3e4fe60594be4f1b56691a83a8e7fab0dd1ec6c09e12eeb1e69354f5e SHA512 d10289a51469ec6352a5b1feefb732dce7cf507b02ce57e64f8f65443f4533b8d61f357dec92cb00b58386416470928d763290a6d4ff714f65f98f1f09d60083
 EBUILD zutty-0.12.ebuild 969 BLAKE2B 614c098e2ad812243b8413bf10a855f892efd341501fb11bbdfb59c267f7870095bebf4bc77a4feeb6ee7e8be966d6dadae7c6bffec816e5263d4aadc3bc000b SHA512 48a611c9de3f4014066604011df368e3d5c0bdc4a479b1010be6098ada36b12624791f42e98e5c4d52768eb7729671b42e52990a7147b53e4540b23de290881c
diff --git a/x11-terms/zutty/files/zutty-0.11-cxxflags.patch b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch
deleted file mode 100644
index 19b6649bb561..000000000000
--- a/x11-terms/zutty/files/zutty-0.11-cxxflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 06927a1f2f88bd9d5f4bb8056661ffbc4a0aeb77 Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-Date: Wed, 19 Jan 2022 18:07:55 +0000
-Subject: [PATCH] Remove default CXXFLAGS and LINKFLAGS
-
----
- wscript | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/wscript b/wscript
-index d2bfbc8..b38b50b 100644
---- a/wscript
-+++ b/wscript
-@@ -69,10 +69,6 @@ def configure(cfg):
-            ['-DDEBUG', '-Og', '-g', '-ggdb'])
-     else:
-         cfg.env.target = 'zutty'
--        cfg.env.append_value('CXXFLAGS',
--           ['-Werror', '-O3', '-march=native', '-mtune=native', '-flto'])
--        cfg.env.append_value('LINKFLAGS',
--           ['-flto'])
- 
-     cfg.check_cfg(package='freetype2', args=['--cflags', '--libs'],
-                   uselib_store='FT')
--- 
-2.34.1
-