gentoo resync : 06.04.2022

89 files changed, 2710 insertions, 677 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9fbaafc38f78..8f8a7e69673f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 4ce220d04cdf..609124866f00 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -2,4 +2,4 @@ DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 EBUILD apparmor-utils-3.0.1.ebuild 2270 BLAKE2B 2f634eb96254e823dd57e77b41b756dc330914e238876bc54586452d1b215b0b46f27092bd3677f4768c20765ad9132f8578da01f9055409149b6741757757af SHA512 1be4dd0bd8adf724cb48757c3005622c8a58a07655628b4c296dbfc7aa39c9941f30780903a27dbd4f5900d5702799dfc36371df7844cace317903938fdba28b
 EBUILD apparmor-utils-3.0.3.ebuild 2253 BLAKE2B 1c00f8270847616ce07d8244aa85cf1b25a2a27ab706581012b9716839241bdd2b9a2f5411ff5efeeab32cb34d3e60175ae083c52217d31eac5a2da448910191 SHA512 4dd7b39d928040f91aae80c3f87cdca2b20b6f28c2c696f5acca124d55b0742a6997ed554494355c8a8a9220cafbc287a5544d279730b5bfd67339fc22fac925
-MISC metadata.xml 410 BLAKE2B 220c545add2a0fb45a95c28e09ef0472ae92a0faebfb03effa69a8e202e137367756355c389c8d59e8d5d87a45e6df336a8424cf3c631d89595311d7095f049b SHA512 cff4f2dc12a85268da9fe6ce889a85d68669e7c940017f7617f7566c274394a8e145993c5e9d00c838acd0d41b2c82a7fee661bc31f9e5c54a2547f42ac7a98c
+MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-apps/apparmor-utils/metadata.xml b/sys-apps/apparmor-utils/metadata.xml
index f7b28ab4f352..22230f2666f5 100644
--- a/sys-apps/apparmor-utils/metadata.xml
+++ b/sys-apps/apparmor-utils/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>hardened@gentoo.org</email>
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index d181d07c9a3a..fc95927621db 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -8,4 +8,4 @@ DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 EBUILD apparmor-3.0.1.ebuild 1737 BLAKE2B 3fbdc0897be4dba7cde237622448ce7f3678a35dcce054854a9f13c734d5eb79214928b6a452f517e438174eeac165d84686befdad4a9a82261a53eacdb68247 SHA512 40e9a056910756f9c34cad803a69da2700589a095cc940c58c155ce7efeb7eca4189921e6d031755d4272727aa2c86aae9fc1c95e4ec92efb128dc0fa7fc5998
 EBUILD apparmor-3.0.3.ebuild 1738 BLAKE2B 2eb39b0a5c07f348013fffb0c10bc3d20f4dd70b6044467cb855938dc3df44a60249d023fef948eb349ce54eb8072b5bab3d7d090032b2166517aa95c88fd1bc SHA512 9a40e928011cde60ae1bc6e3512445f4edc612fa5d540d74abbb94b5a3e683b1663dc85d4890e4788398694c424a5012b4628ac93aa096e40dec24a9397b8905
-MISC metadata.xml 410 BLAKE2B 220c545add2a0fb45a95c28e09ef0472ae92a0faebfb03effa69a8e202e137367756355c389c8d59e8d5d87a45e6df336a8424cf3c631d89595311d7095f049b SHA512 cff4f2dc12a85268da9fe6ce889a85d68669e7c940017f7617f7566c274394a8e145993c5e9d00c838acd0d41b2c82a7fee661bc31f9e5c54a2547f42ac7a98c
+MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
index f7b28ab4f352..22230f2666f5 100644
--- a/sys-apps/apparmor/metadata.xml
+++ b/sys-apps/apparmor/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>hardened@gentoo.org</email>
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index be49111acac1..e7efe2d8ae5a 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,3 +1,5 @@
 DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
+DIST baobab-42.0.tar.xz 588392 BLAKE2B ec2525b6643a9ab2ecedcbb7b7a54419859116808d9287bfcc694cf22d314b5dc34e71483718353685f3a246c87b4b492e7c3fb69c7044dea605ae3e8737d0f1 SHA512 21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08
 EBUILD baobab-41.0.ebuild 854 BLAKE2B 6e723adedb979773babe606eb4ed3052d84219d787b770048811f2740219ed5404860ee7e91d4cd97a963168e3a313d3f9135c4190e43d44a6c141fbfb2bc005 SHA512 b38a58f149cd86dbf2b34a9c541cc5d1c0dc310895792a6f86e25cf651c15667f279610826e56d7289313b46a561061af102d2392d65946abd1065a6e4956f03
+EBUILD baobab-42.0.ebuild 837 BLAKE2B 9274209175ef80755f1c296be4e3ca25d2da8aba22a7c8bcd9008e7f8f01878bee534ed2c8fcf7f720877237f89938e374cf977c50b79e7ca29bbec029d43d42 SHA512 ccaed8b56697d3744720e457836781dbaf818df68090f53fc2fbaf07c65ca7286b93e6a2e899481cad8338c9a759c0d5d6c5f3e31cf75ba3aaa5f9ddf82c2fe3
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/baobab/baobab-42.0.ebuild b/sys-apps/baobab/baobab-42.0.ebuild
new file mode 100644
index 000000000000..8f6502db0c7c
--- /dev/null
+++ b/sys-apps/baobab/baobab-42.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=gui-libs/gtk-4.4.0:4
+	>=gui-libs/libadwaita-1.0.0:1=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	>=gui-libs/libadwaita-1.0.0:1=[vala]
+	dev-util/itstool
+	>=sys-devel/gettext-0.21
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/cinit/Manifest b/sys-apps/cinit/Manifest
index 709c9731217b..1e3de39e3af1 100644
--- a/sys-apps/cinit/Manifest
+++ b/sys-apps/cinit/Manifest
@@ -1,3 +1,3 @@
 DIST cinit-0.2.1.tar.bz2 63545 BLAKE2B ef45cc1a2622d4dbf36e47fab2d09a576ea726e3aa2ac928827dae63fd976daf3dee3d91de21bc1f66200fcb90aecd267b0e9fef9575e525b8e75d00a0f818a5 SHA512 fce6a0c06b11a252023f7f0159fdfe4f9f4dc3c1545708997c148ed2f0a451bb68a5b98518fc48083e3518959d28b32b1719a9b89d00af7a997854230fca09d7
-EBUILD cinit-0.2.1.ebuild 853 BLAKE2B 3b0eae06fb61d8537a9ad8561c867970d90c7ec7b80f5530a975edfa564a713c66ccb18fbdb5bd0b15ef4576b1b51a45d9ced7b067f8288bc9a513bfc6e8f838 SHA512 b9bb4f7366d746fab604428a4c8eeb4043a74857719e2f8b411e3386fb1c20135ce73287c2bae9e2a31591df28e6d95603a768faf53f0b9c4edf4496481cebd5
+EBUILD cinit-0.2.1.ebuild 855 BLAKE2B a509bcb0455f8b83af97fa2604e17fe7fbfe334e48781b407be5d1c466c819e9852a5cac18163aec5dd3ea8e81534e781f5c3e4a9f394e34052de6da5f015b08 SHA512 a5829fa70951104d1b0a9f326b4cb5706fd558af1fad96ca5143e28522169fda92ad7eb7da319407eea8c1739edc30b0fcc30b38f6ac37ee664b898f08e8df1f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/cinit/cinit-0.2.1.ebuild b/sys-apps/cinit/cinit-0.2.1.ebuild
index 252f62e217b9..1b16a694e944 100644
--- a/sys-apps/cinit/cinit-0.2.1.ebuild
+++ b/sys-apps/cinit/cinit-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	emake LD=$(tc-getCC) DESTDIR="${D}" install
+	emake LD="$(tc-getCC)" DESTDIR="${D}" install
 	rm -f "${D}"/sbin/{init,shutdown,reboot} || die
 	dodoc Changelog CHANGES CREDITS README TODO
 	use doc && dodoc -r doc
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 5399006dbf80..0762dc01f8f6 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,6 +1,4 @@
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
-DIST cpuid-20211210.src.tar.gz 129491 BLAKE2B 8aba8449207c39f2082363664b61b55163c8f43804552304d0f9070522dbae867a757019a51f4526f9b85fa541811a8156d517b8ae53ad956a25a56b0d774251 SHA512 42d01890c40f90e6500f643bb4a7f5a8e76c8c76720062add79662a789e0d460d39383ea49a765f206038d72d1db7074d547500998e265ad12fee88af2dc175a
 DIST cpuid-20220224.src.tar.gz 130706 BLAKE2B 78e0d8296ffafa6eb5a668561bb5c1834c8cffd020f0c052438381f72cddbfe8e85c3e4d662c6aff5224a0b147cd5e20cbce2240f791f2c857c4f584c87b4359 SHA512 7cf41d2429d442b4dfd5d369e394c11916352e16fc56852ea4af71945192903482bc45c38367ff5ae3f8d386ffc65cc61a9b0bec4594589a057557daf54d8562
-EBUILD cpuid-20211210.ebuild 597 BLAKE2B 5c1d26e0b9d3d37343a806a1b6e4f7ac65678f9286633888fbb21375e181fbcc19cd68c9975dad4a9d39d36555f542bfc55fa0a90af85575153301c8a53868ec SHA512 4d10ed0e3c8a96574b29227c07e45c95d3426ed170289fab097df4efb82a997227262f826ff29d0d7f2953728c1ee87345b57d764e02aca5223bd28c8973b7aa
-EBUILD cpuid-20220224.ebuild 599 BLAKE2B b7393dd1ea0314c0f5b44ca25662056e917f41562b285b369c0958908cdff71c698a50ef161ea149a6bd5217e784411408cc32f19d237c17d22f2cb5ceb95daf SHA512 3d70d2f4e545863487d0abd815e98fd54aab7a2929e09e71a1429479464194bc079210c5dd5e108180f7def04c8610650690ad4584f787314211ce2ebb0f4357
+EBUILD cpuid-20220224.ebuild 600 BLAKE2B 9aebdae2673da4c0d88f9178cac0366684a2ace93004c51d1868a48d0dd8c897acb4670a212df69a48b79de99d4536cbf6e488078573fe9a493a5af511e75a3f SHA512 1dde5b326b3f04775419cd24b970d0019baedd82ce2b2afa1a94afd52280ccb4233ecaf4b28a60f0810df66a113c63b1c7da08c324f583a00315c6eed4f7d9ea
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20211210.ebuild b/sys-apps/cpuid/cpuid-20211210.ebuild
deleted file mode 100644
index 687993325c30..000000000000
--- a/sys-apps/cpuid/cpuid-20211210.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	app-arch/gzip
-	dev-lang/perl
-"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20220224.ebuild b/sys-apps/cpuid/cpuid-20220224.ebuild
index 33d4a1c9a28b..d215e1baa0cf 100644
--- a/sys-apps/cpuid/cpuid-20220224.ebuild
+++ b/sys-apps/cpuid/cpuid-20220224.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest
index 83607927419c..841b1bc340e3 100644
--- a/sys-apps/daisydog/Manifest
+++ b/sys-apps/daisydog/Manifest
@@ -2,4 +2,4 @@ AUX daisydog.conf.d 115 BLAKE2B 55fa6089b54a2f5b4b56a5957020d6bab3dea492551bc841
 AUX daisydog.init.d 356 BLAKE2B 0b7c59435e39e17f1afe3678f84b25ff65276ebf93664d689f38a746c5c5b2945fa86e9f0d104a5b7577f7939214e4f4f15b04470af0c843468f7a732fcb082c SHA512 1ad3cdf515777e5ba8eedc40a82177ca7cfeaecb0ac82fe5d5757c81c298e43a8fcfc5f46f6d8d31c83534793d7acf798d8b16ce8d7a6bd2868820cebf898feb
 DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5
 EBUILD daisydog-2014.05.30.ebuild 880 BLAKE2B c9fbccaa8f7d1769019e9dd12de3f2c4d94d7a56d790667b4fb44522c4b4c228696cfd5378fa62d9f657caa5412f6410cac94f383b7e377fba6879cb10e297f2 SHA512 00e7357d2f3e0e19b3c39cd77fbb81c696423617ee6a8f85374c5e513c45449f64f34cc8bba48dd3308f2a3f918884a0057812cedd6ddfa5c838fb219c5241cc
-MISC metadata.xml 215 BLAKE2B 344b2d45a66df1c90f44ffca3343c1dec6f3fa2510ff1460d7652259f31f50bf80a8fef7a89ddd4fc86273290e98d04a1949ff881a9ca9464eaf81a422acfdb2 SHA512 059a722b5adb3ac6d86ab064c11bf5d472f7ad6156538798e7f61ee3b8c42d07ff7e2b951deac22472761526208214c3b7dd4950c09b894f419d0bbd00121f7d
+MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a
diff --git a/sys-apps/daisydog/metadata.xml b/sys-apps/daisydog/metadata.xml
index 8041df927597..7517f8d97dd7 100644
--- a/sys-apps/daisydog/metadata.xml
+++ b/sys-apps/daisydog/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<name>Mike Frysinger</name>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 9c1ec431da32..e5c6c9081bd8 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,9 +1,13 @@
 AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d884b2a8580aa88cff182d54ef75aaa747848f3dbcc0bd0bd5da124e4a259851878c73b00 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89
+AUX dbus-1.12.22-check-fd.patch 1055 BLAKE2B a4889677a778fe0698128b2399273adb5373a11927a5610e6a9757237226fa866ce33bb603a89c44b8c2d3e2fccd4131637821ba1bb14782276223d5fa5db337 SHA512 667e76237868c177b9299eb0259dee2a5f820fde15fed0a21823b435e34ad734ec9e850f1a1b5408a6b099a78f77564b2396c38b82d931f3b0b5b93c0e5b8c4e
+AUX dbus-1.14.0-x-autoconf-fixes.patch 5171 BLAKE2B 6b7453397e467da695b3efd70e53f6a50dad44c44130f973037a4cb4139d62c7adab758a495ddebb97a35d068333417051adb5eb17bae86df31c998137eb6052 SHA512 e74b09c7da445c02fe84148b43ca61b21a95b67edbde4dc9f1916a9a628182097630336010f15f366063dc1432da7b1ae52e73b04185493b48ce28bf79873e54
 AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
 DIST dbus-1.12.22.tar.gz 2108231 BLAKE2B 40c30ad9e48d8ac6b5f1c67726015eb17cb3501372ef2c8ffcd8ad73e4a2f186b80a7bbba094460d4093d1d0a3f1bbb8d83a27724397a8f5312bb8542237e6b7 SHA512 0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6
+DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf SHA512 9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f
 EBUILD dbus-1.12.20-r4.ebuild 7533 BLAKE2B 19b9f34046bea0cbef61a641255f56bf98005c96aa61de9212e9e6ddca1957b02a217f8ff28b23b51fee6337b3fa7b48d4aebe707589bf0452ec4f987af8081e SHA512 0369f3de41131f9ea8fa6577a5fc992f62c16f3a995017fe1becf65bdbe6c9676f02a99d11e706ae9afc63dc2202a850543d69fd3bc2cd4d4d9545c73432375b
-EBUILD dbus-1.12.22.ebuild 7542 BLAKE2B 8d7de8f0ef34cc158618fcd43f42bcb296b0ef2939ec5b39dadd2f79001e2ebe5a9b6169adb08fd66f6e1a128a86cc0c3e9e48726352e9bea4c36e0ca786ebc0 SHA512 17770a75450c4b9514657799a44d49f887982008945da2ceaab6c7efdb71ca583ecd24dbb1ddd776343491661e9aabcc4fcc0db6956218972c908b243235d689
+EBUILD dbus-1.12.22.ebuild 7654 BLAKE2B ac43f49c5079ed47a73c4447738b90ca9b5fa8f62a891e7724892ae195cfe24212fbe58949d747c9a7c28dfd0d2713ef08ec8eefb73eb8aa7c77c16820a2cdd0 SHA512 eeac6c8ad9a7e1da9c3603d4ea9a205b2fef70a8484258b349fa3a502e8f6f7a955149e0a251aa3486166d989ed8da7acf8e6e99d0e19113ed326256d92eb42e
+EBUILD dbus-1.14.0.ebuild 7862 BLAKE2B a2e4d2adc0b5d4a6d766091be9ce2bf8ccef55a689055b5c6187368fa0161674d813313f6c3ff35f36aa7f7917ddbf5dc20b66204844515cb7908b5244c01b20 SHA512 bbb4bd2d2844f60bb1492777c691b1010bd95e3401587faba07e18d004a282a818b70efd744fd86cf51a72035de402bc9d2be9f49deb1e93aa8f71ef08106c3c
 MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.12.22.ebuild b/sys-apps/dbus/dbus-1.12.22.ebuild
index 7427d268d82c..f4d09190728e 100644
--- a/sys-apps/dbus/dbus-1.12.22.ebuild
+++ b/sys-apps/dbus/dbus-1.12.22.ebuild
@@ -60,8 +60,10 @@ DOC_CONTENTS="
 TBD="${WORKDIR}/${P}-tests-build"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-enable-elogind.patch"
-	"${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
+	"${FILESDIR}/dbus-enable-elogind.patch"
+	"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
+
+	"${FILESDIR}/dbus-1.12.22-check-fd.patch"
 )
 
 pkg_setup() {
@@ -205,6 +207,9 @@ multilib_src_compile() {
 }
 
 src_test() {
+	# https://bugs.gentoo.org/836560
+	addwrite /proc/self/oom_score_adj
+
 	DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
 }
 
diff --git a/sys-apps/dbus/dbus-1.14.0.ebuild b/sys-apps/dbus/dbus-1.14.0.ebuild
new file mode 100644
index 000000000000..07da8e03b737
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.14.0.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+TMPFILES_OPTIONAL=1
+
+# At least at the moment, while a CMake port exists, it's not recommended
+# for distributions.
+# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+	acct-user/messagebus
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+	>=dev-libs/expat-2.1.0
+	elogind? ( sys-auth/elogind )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/expat
+	test? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.40:2
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-user/messagebus
+	selinux? ( sec-policy/selinux-dbus )
+	systemd? ( virtual/tmpfiles )
+"
+
+DOC_CONTENTS="
+	Some applications require a session bus in addition to the system
+	bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+	"${FILESDIR}/dbus-enable-elogind.patch"
+	"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
+
+	"${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
+	"${FILESDIR}/dbus-1.12.22-check-fd.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~EPOLL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# fix standards conflict, due to gcc being c99 by default nowadays
+		sed -i \
+			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+			configure.ac || die
+	fi
+
+	# required for bug #263909, cross-compile so don't remove eautoreconf
+	eautoreconf
+}
+
+src_configure() {
+	local rundir=$(usex kernel_linux /run /var/run)
+
+	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+		> "${T}"/dbus.initd || die
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local docconf myconf testconf
+
+	# so we can get backtraces from apps
+	case ${CHOST} in
+		*-mingw*)
+			# error: unrecognized command line option '-rdynamic', bug #488036
+			;;
+		*)
+			append-flags -rdynamic
+			;;
+	esac
+
+	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+	# not on an SELinux profile.
+	myconf=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_enable static-libs static)
+		$(use_enable debug verbose-mode)
+		--disable-asserts
+		--disable-checks
+		$(use_enable selinux)
+		$(use_enable selinux libaudit)
+		--disable-apparmor
+		$(use_enable kernel_linux inotify)
+		--disable-kqueue
+		$(use_enable elogind)
+		$(use_enable systemd)
+		$(use_enable systemd user-session)
+		--disable-embedded-tests
+		--disable-modular-tests
+		$(use_enable debug stats)
+		--with-session-socket-dir="${EPREFIX}"/tmp
+		--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		--with-dbus-user=messagebus
+		$(use_with X x)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=(
+			--enable-launchd
+			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		docconf=(
+			--enable-xml-docs
+			$(use_enable doc doxygen-docs)
+		)
+	else
+		docconf=(
+			--disable-xml-docs
+			--disable-doxygen-docs
+		)
+		myconf+=(
+			--disable-daemon
+			--disable-selinux
+			--disable-libaudit
+			--disable-elogind
+			--disable-systemd
+			--without-x
+		)
+	fi
+
+	einfo "Running configure in ${BUILD_DIR}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+	if multilib_is_native_abi && use test; then
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		testconf=(
+			$(use_enable test asserts)
+			$(use_enable test checks)
+			$(use_enable test embedded-tests)
+			$(use_enable test stats)
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+		)
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		# After the compile, it uses a selinuxfs interface to
+		# check if the SELinux policy has the right support
+		use selinux && addwrite /selinux/access
+
+		einfo "Running make in ${BUILD_DIR}"
+		emake
+
+		if use test; then
+			einfo "Running make in ${TBD}"
+			emake -C "${TBD}"
+		fi
+	else
+		emake -C dbus libdbus-1.la
+	fi
+}
+
+src_test() {
+	# https://bugs.gentoo.org/836560
+	addwrite /proc/self/oom_score_adj
+
+	# DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
+	# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
+	DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C dbus \
+			install-libLTLIBRARIES install-dbusincludeHEADERS \
+			install-nodist_dbusarchincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	newinitd "${T}"/dbus.initd dbus
+
+	if use X; then
+		# dbus X session script (bug #77504)
+		# turns out to only work for GDM (and startx). has been merged into
+		# other desktop (kdm and such scripts)
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/80-dbus
+	fi
+
+	# Needs to exist for dbus sessions to launch
+	keepdir /usr/share/dbus-1/services
+	keepdir /etc/dbus-1/{session,system}.d
+	# machine-id symlink from pkg_postinst()
+	keepdir /var/lib/dbus
+	# Let the init script create the /var/run/dbus directory
+	rm -rf "${ED}"/var/run
+
+	# bug #761763
+	rm -rf "${ED}"/usr/lib/sysusers.d
+
+	dodoc AUTHORS NEWS README doc/TODO
+	readme.gentoo_create_doc
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if use systemd; then
+		tmpfiles_process dbus.conf
+	fi
+
+	# Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
+	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+	# dependencies with hardcoded paths (although the known ones got fixed already)
+	# TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
+	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local plist="org.freedesktop.dbus-session.plist"
+		elog
+		elog
+		elog "For MacOS/Darwin we now ship launchd support for dbus."
+		elog "This enables autolaunch of dbus at session login and makes"
+		elog "dbus usable under MacOS/Darwin."
+		elog
+		elog "The launchd plist file ${plist} has been"
+		elog "installed in ${EPREFIX}/Library/LaunchAgents."
+		elog "For it to be used, you will have to do all of the following:"
+		elog " + cd ~/Library/LaunchAgents"
+		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+		elog " + logout and log back in"
+		elog
+		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+		elog "specified and refused to start otherwise, then export the"
+		elog "the following to your environment:"
+		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+	fi
+}
diff --git a/sys-apps/dbus/files/dbus-1.12.22-check-fd.patch b/sys-apps/dbus/files/dbus-1.12.22-check-fd.patch
new file mode 100644
index 000000000000..9038411bb13b
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.12.22-check-fd.patch
@@ -0,0 +1,33 @@
+From 769a0462befb9829594a76e675526aba8579317e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 27 Mar 2022 15:09:48 -0400
+Subject: [PATCH] sysdeps-unix: check fd before calling
+ _dbus_fd_set_close_on_exec()
+
+If /proc/self/oom_score_adj does not exist, fd will invalid (-1).
+Attempting to set the CLOEXEC flag will obviously fail, and we lose the
+original errno value from open().
+
+Bug: https://bugs.gentoo.org/834725
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ dbus/dbus-sysdeps-util-unix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
+index 314ce64b..8f079cbf 100644
+--- a/dbus/dbus-sysdeps-util-unix.c
++++ b/dbus/dbus-sysdeps-util-unix.c
+@@ -1633,7 +1633,8 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
+   if (fd < 0)
+     {
+       fd = open ("/proc/self/oom_score_adj", O_RDWR);
+-      _dbus_fd_set_close_on_exec (fd);
++      if (fd >= 0)
++        _dbus_fd_set_close_on_exec (fd);
+     }
+ 
+   if (fd >= 0)
+-- 
+GitLab
+
diff --git a/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch b/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch
new file mode 100644
index 000000000000..d9eb2a611bfd
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch
@@ -0,0 +1,147 @@
+https://gitlab.freedesktop.org/dbus/dbus/-/commit/7d462fe93844df711ff8433ad798b54e57f8609d.patch
+(dropped NEWS to avoid conflicts with more patches in future)
+
+From fdbb32bd1f3c972d3d5fd3998930749206a1095a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 15:56:30 +0100
+Subject: [PATCH 1/6] build: Treat --with-x[=yes] the same as --with-x=auto
+
+Previously, --with-x would disable the check for X11 libraries, which
+was not intended.
+
+(cherry picked from commit 99cc28e0eb1a37233c0f7d3595175d1f331550e7)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1115,7 +1115,7 @@ if test "x$dbus_win" = xyes; then
+ 
+     enable_x11_autolaunch=no
+     have_x11=no
+-else if test "x$with_x" = xauto; then
++else if test "x$with_x" != xno; then
+     PKG_CHECK_MODULES([X], [x11],
+             [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
+             [ have_x11=no ])
+GitLab
+From 5f2577aea3c5291dbb97e77c7384924851b30102 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 16:01:29 +0100
+Subject: [PATCH 2/6] Move DBUS_X_* definitions into PKG_CHECK_MODULES block
+
+(cherry picked from commit 51e468d828785cbc7060678f6f257723ba11cd10)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1117,15 +1117,15 @@ if test "x$dbus_win" = xyes; then
+     have_x11=no
+ else if test "x$with_x" != xno; then
+     PKG_CHECK_MODULES([X], [x11],
+-            [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
++            [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
++	     have_x11=yes
++	     DBUS_X_LIBS="$X_LIBS"
++	     DBUS_X_CFLAGS="$X_CFLAGS"
++            ],
+             [ have_x11=no ])
+ 
+     if test "x$have_x11" = xno; then
+         AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
+-    else
+-        have_x11=yes
+-        DBUS_X_LIBS="$X_LIBS"
+-        DBUS_X_CFLAGS="$X_CFLAGS"
+     fi
+ else
+     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
+GitLab
+From 5dad12f34c54e2359adfe8e7f122681df1d24bcb Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 16:05:52 +0100
+Subject: [PATCH 3/6] Emit an error when --with-x was given but no X11 libs
+ were found
+
+(cherry picked from commit 17c88a894499da64460a0ef76db1d8b88ceb9eeb)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1121,12 +1121,13 @@ else if test "x$with_x" != xno; then
+ 	     have_x11=yes
+ 	     DBUS_X_LIBS="$X_LIBS"
+ 	     DBUS_X_CFLAGS="$X_CFLAGS"
+-            ],
+-            [ have_x11=no ])
+-
+-    if test "x$have_x11" = xno; then
+-        AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
+-    fi
++            ], [
++             AS_IF([test "x$with_x" = xyes],
++                [AC_MSG_ERROR([Couldn't find X11, tried with pkg-config.])],
++                [AC_MSG_WARN([Couldn't find X11, tried with pkg-config.])]
++             )
++             have_x11=no
++            ])
+ else
+     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
+       AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
+GitLab
+From e03554eb0bf2731e39c06191403f7544df9bb307 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 16:08:06 +0100
+Subject: [PATCH 4/6] Add have_x11=no if --without-x was given to make later
+ checks happy
+
+(cherry picked from commit bf3cb42c6db1f4479467d66a111b08a98afef31b)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1129,6 +1129,7 @@ else if test "x$with_x" != xno; then
+              have_x11=no
+             ])
+ else
++    have_x11=no
+     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
+       AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
+     ])
+GitLab
+From 62361f47f9da2346a9ff9a8c4b4bd4a288dc44d5 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 16:11:05 +0100
+Subject: [PATCH 5/6] Convert "if" calls to AS_IF macro for the block that
+ handles X11
+
+(cherry picked from commit c71f013a64cd7f6de4c9cf3cf3b236239d713eb1)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1108,14 +1108,14 @@ AC_ARG_ENABLE([x11-autolaunch],
+   AS_HELP_STRING([--enable-x11-autolaunch], [build with X11 auto-launch support]),
+   [], [enable_x11_autolaunch=auto])
+ 
+-if test "x$dbus_win" = xyes; then
+-    if test "x$enable_x11_autolaunch" = xyes; then
++AS_IF([test "x$dbus_win" = xyes], [
++    AS_IF([test "x$enable_x11_autolaunch" = xyes], [
+         AC_MSG_ERROR([X11 auto-launch is not supported on Windows])
+-    fi
++    ])
+ 
+     enable_x11_autolaunch=no
+     have_x11=no
+-else if test "x$with_x" != xno; then
++], [test "x$with_x" != xno], [
+     PKG_CHECK_MODULES([X], [x11],
+             [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
+ 	     have_x11=yes
+@@ -1128,13 +1128,12 @@ else if test "x$with_x" != xno; then
+              )
+              have_x11=no
+             ])
+-else
++], [
+     have_x11=no
+     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
+       AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
+     ])
+-fi
+-fi
++])
+ 
+ if test "x$enable_x11_autolaunch,$have_x11" = xyes,no; then
+     AC_MSG_ERROR([X11 auto-launch requires X headers/libraries])
+GitLab
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index e2abc7fed8ae..ee8cbfced4a0 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,6 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
-DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
-DIST debianutils_5.4.orig.tar.xz 103640 BLAKE2B ac59ffcf7ef9523a67127e5565cb87eb694a0297eb81acba53a5ca00a2f16d024e21ba1ef6eff5079194c2cc751712fe9ad5814603deeeaa05d28343ff79a409 SHA512 a5501bdc46e203bd0cf357e5c83bb556ea7294ee603498399427dd49536848e006b21967f6239c3d808c8b9653d65f28536cf388dd18b749e54a235cc9326850
 DIST debianutils_5.5.orig.tar.xz 104448 BLAKE2B 707c9072ddf1fa0c61fc66f84aea26bac7bf6f31948880ad4711e89f8f4a665ae4104e998f27e53e288b3453a71876ef44038f8e954f19055ed1049eb9b9981c SHA512 230310428ee7c145c74bb666ae729754352295230f38ef4e22f7566970c5186d607cd827a5603a678815bd48d4a1eb2716f55c32494ec75eb665651da6a56e6a
-EBUILD debianutils-4.11.2.ebuild 935 BLAKE2B b02267258f6285fe997d10d55b0d66b7b57b9cf06fed5b569272cc9b43c4276867e637de35b94eb8887136182b360f5a9e87cd2e2fee40f670e7d9e102624a39 SHA512 062c35544f1c3dd8e876fba48a9afd234857e3494401cac2774f966a45d8ff61325f25d1a65ba4ee6d19cf455312c796ac8f3da1009d4d3877bcf7a41437dfdc
-EBUILD debianutils-5.4.ebuild 904 BLAKE2B 9b413759ceb25b6a3bf136e40016ab6dd42170b39649fe651ea514a7f4d1178d4bad352f6c63d467df168a040e878d9762b06e60d32415602f84966f12557a0b SHA512 3e2f9c50297b1741497ae0dfb98d22d4cbbff9171ccc5966088887193e4b7ef6a83a64e4a4797066e8e552616e7192b8abe35d0fa52746b5f63e06048443bda9
-EBUILD debianutils-5.5.ebuild 1037 BLAKE2B c132243f1754745659eacadd1689a8541d9df3ad311e0d4afd4593c597d8b980d944ada8ee922f4971ac05d263c014af591e0238b6731b2ae8ead124d06c3358 SHA512 2b34ffebabadc59ac75e514a136bfee02b7af49a0369bb26ee66b4a7bd671c409f302d17ddb28fa6b2b4bd2a43807d2efd178d03a0e09e9d3b99e8a6e897e192
+DIST debianutils_5.7.orig.tar.gz 257231 BLAKE2B 61d2e7abcd359c5dc87b7f91e510e91e1926183c15a572c7d87cf4a590dded2e2ee8c9b4e06f7f478353139870c808927575de233200ad69e084a6f971c4bd24 SHA512 79acd8885abca93842d696167171a359011c49a40f38deeb25bc94d62905f95afa3a7b2540d3bd4b0ffd363c5c48a439a1a68139a29d6c033980b019cea75d92
+EBUILD debianutils-5.5.ebuild 1163 BLAKE2B ed67f92b1f451f64691c5f844a21ede614b9b3e9d76db478f318a47725651a006f8b0234458e287cb9a2e5ffc38307b71ba48d466fae3a824af51b677a0797a0 SHA512 340ba67bc916cce705023e6b1ec9fdbb2be02a7b42e955fd7a83817d95f69dd505896cf0a8f5b9bb3a4b17d529feb0954ab43f26bfd3f581196ef94cedf725ec
+EBUILD debianutils-5.7.ebuild 1045 BLAKE2B 43d1ccd50787fd6287b901d749e87d381fbdfb0bf2fc43f9d9026061880ff7038b9f7d7abeeea187b9ee14296ece0374e5582f269b003f35aa42ed0a3142c21c SHA512 151ee45d276b52a9a0471a51f30766debf60fcc563671b2c11d30e253d7fdd246f5329b99f27adaa0a2882f823698222186c099d18d225f95afa32e32625475f
 MISC metadata.xml 446 BLAKE2B a681b76916f27a5d016fa34c6c6ce4abe887c1f46232cb6cd759ba699eca0cba865ff7b0d33900b1f9e858e016532815b18bf86cc211b97f57a1c0a56580d125 SHA512 c080d8ae5511a0870aa778f744518a2482e7d61ff9e653a808b3959571b8bb47dc90b1b1f2feaccc323df0521f4ae91efb43fa31bd6c8a72075c8b2e9dfeb829
diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild b/sys-apps/debianutils/debianutils-4.11.2.ebuild
deleted file mode 100644
index b2f49f05f042..000000000000
--- a/sys-apps/debianutils/debianutils-4.11.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+installkernel static"
-
-PDEPEND="
-	installkernel? (
-		|| (
-			sys-kernel/installkernel-gentoo
-			sys-kernel/installkernel-systemd-boot
-		)
-	)"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
-
-src_configure() {
-	use static && append-ldflags -static
-	default
-}
-
-src_install() {
-	into /
-	dobin tempfile run-parts
-
-	into /usr
-	dobin ischroot
-	dosbin savelog
-
-	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
-	cd debian || die
-	dodoc changelog control
-}
diff --git a/sys-apps/debianutils/debianutils-5.5.ebuild b/sys-apps/debianutils/debianutils-5.5.ebuild
index aae728d2f3d7..bbefd848de8e 100644
--- a/sys-apps/debianutils/debianutils-5.5.ebuild
+++ b/sys-apps/debianutils/debianutils-5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,9 @@ inherit autotools flag-o-matic
 
 DESCRIPTION="A selection of tools from Debian"
 HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${PN}_${PV}.orig.tar.xz"
+# Note: Tarball disappeared from Debian mirrors
+# SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
diff --git a/sys-apps/debianutils/debianutils-5.4.ebuild b/sys-apps/debianutils/debianutils-5.7.ebuild
index 0df682debe5a..484f32f6c429 100644
--- a/sys-apps/debianutils/debianutils-5.4.ebuild
+++ b/sys-apps/debianutils/debianutils-5.7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="A selection of tools from Debian"
 HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.xz"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
@@ -22,10 +22,16 @@ PDEPEND="
 		)
 	)"
 
-#S="${WORKDIR}/${PN}"
-
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
 
+src_prepare() {
+	# Avoid adding po4a dependency, upstream refreshes manpages.
+	sed -i -e '/SUBDIRS/s|po4a||' Makefile.am || die
+
+	default
+	eautoreconf
+}
+
 src_configure() {
 	use static && append-ldflags -static
 	default
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
deleted file mode 100644
index e0e99a0ec322..000000000000
--- a/sys-apps/dmapi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX dmapi-2.2.12-headers.patch 354 BLAKE2B 83a2e4de5882c30a1ead955768c8033099c461ee955fba2021808a288e552ab0c97f3b13198270e367cc7c2e035094a631c7bd1b1454b13c82b9d0b1737c15cd SHA512 b087227085d3e068323f2a01c1c7044e1885e47b04caa1050e8552ced50dddfab871608bdf67a027989c359f2852cbcedcffeb6708e182d6d5dc3bfc9609489e
-AUX dmapi-2.2.12-no-doc.patch 453 BLAKE2B 57e6a2b0bf043228564a515ac35aab09f3ebe85477f55c014292ab04bda8df4c61041f17a4d6c34e20f3dbe5e38f3c7abed49040426d0f812e23d3621bfdf393 SHA512 87dcac6577b992c22527a6c4a8c36a25c88af589f00d071815dc3c97f991512646a5be6ca898e1cecd258586f23ff175d768cf9a47db6c05b3e605d5bba4a247
-DIST dmapi-2.2.12.tar.gz 367318 BLAKE2B 7d74f3081f8430c43d3ea961bd4ad2743a3ab65a016b0653a68074353ed60fa0c1a01a77aa470326aa1b10e731a5058355ab887cae00d21196958563ae6c4ee8 SHA512 aa44c0c7857158fed198deb9d1e00abaab549e3c22a7ce0e24e6088146bde56ecf967405b1b61a589460981ddcfaffbb1e9a2e677088efec317e3a7cb44abe4f
-EBUILD dmapi-2.2.12-r2.ebuild 1056 BLAKE2B 4ad250ed4f1326641c42bfd505fd38641231c6aa85ccbd24d6b5f292d9ba2357400273fa9cd9751849282f56586b13e1a83f6ad1cbc23703836b4b0dc53428c1 SHA512 586d04a6e7183def00f7e334f9dc81b3c7231c46d85b41f038f31a489e9a5ea9d0f544f5affbd784ef586c9168cf703e8f9f2760d16ee757f2bd8ca5a7a75395
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r2.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r2.ebuild
deleted file mode 100644
index 09a877413747..000000000000
--- a/sys-apps/dmapi/dmapi-2.2.12-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="XFS data management API library"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="sys-fs/xfsprogs"
-DEPEND="${RDEPEND}"
-
-DOCS=( doc/{CHANGES,PORTING} README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-headers.patch
-	"${FILESDIR}"/${P}-no-doc.patch # bug 732042
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-dev
-	gen_usr_ldscript -a dm
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/dmapi/files/dmapi-2.2.12-headers.patch b/sys-apps/dmapi/files/dmapi-2.2.12-headers.patch
deleted file mode 100644
index 259e1aec3a09..000000000000
--- a/sys-apps/dmapi/files/dmapi-2.2.12-headers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/560212
-
-pull in headers for funcs that are used
-
---- a/libdm/dm_handle2path.c
-+++ b/libdm/dm_handle2path.c
-@@ -20,6 +20,9 @@
- #include <dmapi_kern.h>
- #include "dmapi_lib.h"
- 
-+#include <fcntl.h> /* open */
-+#include <unistd.h> /* close */
-+#include <string.h> /* strlen */
- #include <mntent.h>
- #include <dirent.h>
- #ifdef linux
diff --git a/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch b/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch
deleted file mode 100644
index 295bdb7c6572..000000000000
--- a/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@
- 	libtool include/builddefs
- 
- LIB_SUBDIRS = include libdm
--TOOL_SUBDIRS = m4 man doc debian build
-+TOOL_SUBDIRS = m4 man debian build
- 
- SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
- 
-@@ -66,7 +66,7 @@
- 	touch .census
- 
- install: default $(addsuffix -install,$(SUBDIRS))
--ifneq ($(PKG_DISTRIBUTION), debian)
-+ifdef false
- 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- 	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
- endif
diff --git a/sys-apps/dmapi/metadata.xml b/sys-apps/dmapi/metadata.xml
deleted file mode 100644
index 73dda144f9ac..000000000000
--- a/sys-apps/dmapi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 82b5104e33b0..dd7c8e803ece 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -4,5 +4,5 @@ AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8
 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
 DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
-EBUILD etckeeper-1.18.16-r1.ebuild 2111 BLAKE2B d5fa2ce326237338d288effd2943304a998e64b11f7dc3fcdeac0663d8813cd1180e72c13ff06acbae6ad7debc95fd0b5f1fa86ed15d3a41c5c891b4e770eb18 SHA512 ff8e2ea346df1f38ba1231e825f8fd07edf242fa4013931b347225632bc3799e31f6997860f72f1aebb4ee396e7691a84b262a509d076c2f24b34ba8ea82522c
+EBUILD etckeeper-1.18.16-r1.ebuild 2116 BLAKE2B 787cbd98c74dc9164b176e9c125e80b7b7bdeb7c6aa6ab3405eab323272ab256fcbcdf9c7885450a95838c083f8affa2bf47fe89e0b8d8d911cf687af2deb65d SHA512 41a4c4b697f4d45e0b35a65c5f137cbdf0e3b9eaff2fdc2c869bb9794e170f5468f8a97662ecd89677178a66f54ad4607d324edb3ca352fa3f3fa1f76f072696
 MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde
diff --git a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
index 96d6bc1125d4..7dc98bd98df4 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 SLOT="0"
 IUSE="cron test"
 
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index dcacecdef6a5..15c658b86bda 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -2,8 +2,10 @@ DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b24
 DIST ethtool-5.14.tar.xz 318536 BLAKE2B 09b5c9c8103635e33b22e55caff3b0f3751bf14d48de63e025587814c6b0d7e80962cd8ed27b6be7ae35a5a9d5decd0a9127a69a7cbbd52e2218bb3fc9e9b176 SHA512 880c4b6d5f83c25cabc6101222a5abf5f7e5e6501165ba5cdb420da242c351d7c32c1cffacfa1bcf0c4655434d89c64d39f0809af0d38f626a0a78f92ec68f87
 DIST ethtool-5.15.tar.xz 318864 BLAKE2B 855c07e388bfabf37637f20e2714c6ca27717f38d7f658be96e0e9ec9d4514e61f4ee29361fc0279510869606ad18126ccd2a47160f1097ab52b1e35216e9721 SHA512 28147468a92c179217b459907a3257ee4f2d2ed028cb87b074f1c7ca6eb91aca81c8a9f5c7fe74e81d16a516e6e7eb20137bf7a15b5479fd82a327c64954da12
 DIST ethtool-5.16.tar.xz 320308 BLAKE2B 198d76502510e533b7f51785fd9f0848e840a6b4237bfd0496d005978ce3e638be02bd7dee971501f57c83354a1ac2f34a7ef29f2255764e900d9299bad9254c SHA512 9f0c24323b3144cbc6e684dc8c545a7c5e4804a061f10e32c937ea7420cc25c0891137fd4be4f1b9cf44907d8a59970ead9db424051ec5b4a90c225038f04025
+DIST ethtool-5.17.tar.xz 321848 BLAKE2B 1695077d812b3ed8e287615d6a3aa15525a061110fa63563e4b2db3e5d4718b023415508db63e857c572fef248c6797564da596f17c80b833839899656840a5d SHA512 c9677829e3ed1f373bd993f72c710293a6e987bbd19829d437a436f42cf4e7995ee70a7db3590b1499ff6aa29c26815f4d0a3e4798ffb6992ae3f52b079cd3ff
 EBUILD ethtool-5.10.ebuild 583 BLAKE2B bbce36771a7b34b2b62b533a36df3d4039b913ac36e34cbd63fc5a28e7d717cb8449d65c1cc0cd80353f55ad3380eea3fa9d9f2cfacbc574b172bcff7f7e8910 SHA512 79631f2df71aa0c831e92578dac932d49f1fa9b946b9450d7f61d8fdf14dda1a218e79bb51ffc1ebe9534505c68ddaa9d547c7c8b6c2d271c1ddc34130e5fddc
 EBUILD ethtool-5.14.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
 EBUILD ethtool-5.15.ebuild 590 BLAKE2B 8850ed177a2ac5d814239e4eec4c72a216d562496cda15c1698aee52784a60ef82d245e65fa66f712c66310e2bf33967834e741c7add499ce5f1c69b9f7c0245 SHA512 919c114df09392c26db2c1ecfdc7cedb4ded632c00c4270b6f9405b51559ccb7928d55e65ef5f4cc06d177674016774ee440ea92dad88da86fdf7e3b461d3af1
 EBUILD ethtool-5.16.ebuild 598 BLAKE2B baf3417913dc24fbd8d9f3bdb2e2e95f1ef4ced1d49b9a8de5e30d7658e4a84e0b4f7ffc90ffc09a1274ebb2e932b1285040e777aa7b0339acfc345975276a8f SHA512 00dec7c445440facc0a9a8008b7bc02373b6043ac0255e020db9c6715f4895d3749ef443bf7d6123c5fd1d4aefdeb416b408dfc8117e374e36be8652a313a663
+EBUILD ethtool-5.17.ebuild 598 BLAKE2B f5b61f4816ca4828528099f776c5d39aeda01c306e86fd4fc1bb7f5be84e611fc98365bbd3e1a3fda3a98baeda106b36779c618a21afbea2f4b7066af394388d SHA512 0b3cdcd71fbfc619f3ef17e2b832c2e34529b48de5f65d333c3e70a98cea2bf78055463d935e23917f6aba1bdef4c215459ee2e06814ef91cd42c05a9808f8fb
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-5.17.ebuild b/sys-apps/ethtool/ethtool-5.17.ebuild
new file mode 100644
index 000000000000..66a327a8020b
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-5.17.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+netlink"
+
+RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
+
+src_configure() {
+	econf $(use_enable netlink)
+}
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index e65a77026766..4ac2214afe34 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -5,7 +5,7 @@ AUX profile_patch.local 198 BLAKE2B 6a84eca54c8fa5429b171707d6d2b7617c918798f40a
 AUX profile_pdftotext.local 132 BLAKE2B 2c98ecf386cdceae4cbaf4e3623187c66ff81540d86f978467a6a0106d57a0f41f7626f1049602fee8b7545fa413ed6ca8e21e1fb1448a374b8d80e6ae72451b SHA512 c0121f1ba4db0a737acdd250834ccd73fcd441b5d7f8d5740f75230edbb10bd6bb038dd09772ba21cb24cf4224a474749a2e0f3d0e9567b4e207f4adf67c19d0
 AUX profile_wget.local 128 BLAKE2B d2069517fce414faec2b23f8704fe15683a956af210e6e39321ca9f65bde939c71a7980506fdd3b01a6b15fb6733ebb013c684a63589839c60c53616a52ca5b6 SHA512 ef0b97b11fac742464b6520c6e6293017519b84c137c4aa60976b53b3d072bc9a69588267ac0a79c9647cee1e802fb0cd0d28e1647778e30473518415ce4d699
 DIST firejail-0.9.68.tar.xz 477332 BLAKE2B 4d995715caa81b69bb9a16f604a2463b2db48fad5ba869bb5f353973ce8ec273dbabe07ee340b40094d6fe15bcef7e356cd07e7e7dfd0491d2d1632f64878a0e SHA512 8c03c145bb91fe696407052968bd1069defc44d274bd74d33fccebb28324121d259973fccc1d1cdc38fb2902bb842e921adc9440596a92a4aa13c4e06963e354
-EBUILD firejail-0.9.68-r1.ebuild 3047 BLAKE2B e252a0c657c1e92a2420ed26bb67203a54ea08db7c1335cca477dbd745b04e627c7b8839f22b1c07e291fc0a369bdc660c9f4b9a079bb6224c713535a82e8d78 SHA512 736281c43fca7aa3ca757c2733e9062594b0c4994c569e28a4bbe56f0a0a072b9c146b0cb5d2b5bb8cb186f8d01b28f94b46e4660171fed09010fe0e4fa3aa0e
+EBUILD firejail-0.9.68-r1.ebuild 3046 BLAKE2B 4cff4e74660fb224440831490502763abeaa7fdefc0e350f1480abf38ad842bd77df525effd479af9f8371a3d4c9ea95a8d663bbc95fc3022c144816c2157727 SHA512 a9f79e7f93fc9cbc9b4cce5784aa51b99c994b1262532c75fe6340d787b56fc6c85866c803a537c59909b80c53f17977de47bb1f97298e56f656d405411bdd2f
 EBUILD firejail-0.9.68.ebuild 3044 BLAKE2B d7e26bce7d9cfffa594b6a72d121ce9efab1f384b25bcd1b00b0d1cccd58c9258756bdb983f2d44a9f02522c210662e7c646900f510dd4c5ce12c7973746cb6e SHA512 16ea37dd99bbfef8bdc6b5e82788a61bd0325615ccc7d5738dee24a0d6dc4c154aa14aebfd6786a75340ff199f695cfe12eb5a664d6111bc2102347996eec5b6
 EBUILD firejail-9999.ebuild 2618 BLAKE2B 4c9aaf9b58dd8983b9e6acd92ba33d44cb0b6cd41d034f3a22cf235c92b7b12bb53b1cbc73e83cf50571bf9e42e8da9ae86ed8da6739c49ac22222f3876b618b SHA512 dae3515ea76d029b93e4e0254ab8596a3eaaf6f745919fe8a81d0d84a27cc46d7001d26bed45a93c1c8fb0d0d6f5583a54d2e71d4039d1531df01e3de82a1135
 MISC metadata.xml 1814 BLAKE2B f8216f60d54df8ced109e016f0e5cc58a59dde8e8ff79b50964274607d829245db281d342274fcf82e20750988db2f5a8dfc0c2d914e83d61ae3193c1bb5aa7b SHA512 44221d68c026110e2e457adb851c1269cc3095f1f35ac3185213f2692b2a0758b5adf5d7d5b9929b9bc63bafb5e47b3b1d836c65732a7061dd729ca62c45b956
diff --git a/sys-apps/firejail/firejail-0.9.68-r1.ebuild b/sys-apps/firejail/firejail-0.9.68-r1.ebuild
index 5c5a610f1024..1946f9ec29dc 100644
--- a/sys-apps/firejail/firejail-0.9.68-r1.ebuild
+++ b/sys-apps/firejail/firejail-0.9.68-r1.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs python-single-r1 linux-info
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
diff --git a/sys-apps/gpet/Manifest b/sys-apps/gpet/Manifest
index 49f3e3881b66..a86133413586 100644
--- a/sys-apps/gpet/Manifest
+++ b/sys-apps/gpet/Manifest
@@ -1,3 +1,3 @@
 DIST gpet-0.4.tar.bz2 352653 BLAKE2B e9bee8cd62332101afea95f427646dfc51a0dcbb95a5807b8cbd0503594090ef2ff5428876bd7d017465d8708e7c3a282602cc48edeb6cafd2976a51568a911d SHA512 e373d57ab67d71fb750ee9af93893d036ff26f764f317328117745a4440c0559c2356866c09acfe579473e950e003744ae0a308df3b284d46097dcfe967c122e
 EBUILD gpet-0.4-r1.ebuild 609 BLAKE2B 6fbcf20b2165b2c7d50889763b465cb2f37bc7cd59f349298ca8939844b3ca464b0f7b4b7a6de65a4789bee1a599668041b031ab99c8c52931a50ab2941d2de7 SHA512 99f4f90bb345bee2cb683381eee49b2f84b1fbad42a8a241b922bd00361a8c4fef30256b9473222478001e4ca84117d89b0481b22f63369341cbf1c6b3739117
-MISC metadata.xml 302 BLAKE2B 7424fdf95d939a357153ced679c81cf6495dbe1ea07a81592265a4be83e78388f3d88ff24b424353c94c5eef3f1607c7a27834ba72b8511b5908a6038b65cb95 SHA512 54fae275193922e2c838c0a092c0a6ebd8b742b7d92e96b2a2e63defdaf094179eb7a7836d91aec24f1406140fdf86f24cf277ffb454e6ac48cd43b5848f5577
+MISC metadata.xml 332 BLAKE2B 4aee879af2627c6e72620756dde2130a9843a77c3c945f8e5d1ce34cff10e0407c7974b0045e0e6547a86ade7f22adec471918c296be7ab64c38097204f1c3c1 SHA512 5423050bf8f325c28c8e8a53c81e68d70758a9ea5a5c8687034fab630a38bcb3e0df8454ede43a0af2c7ee91ee74795c6208cfd567d59fd65d5bc77f8e30a636
diff --git a/sys-apps/gpet/metadata.xml b/sys-apps/gpet/metadata.xml
index 08e274017511..62c7cd16c9b4 100644
--- a/sys-apps/gpet/metadata.xml
+++ b/sys-apps/gpet/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>naota@gentoo.org</email>
+    <name>Naohiro Aota</name>
   </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">gpet</remote-id>
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index 0482f4c6c0e3..a8c815af6db3 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,3 +1,5 @@
 DIST gsmartcontrol-1.1.3.tar.bz2 677998 BLAKE2B f444dd29602f6934b440650e57d5d981a3b9823a905ce3c178109b230e6536edd4f38ed0762872b38186774127a164feb7363bb45cbd80e9c0b34398c1a06092 SHA512 7a8bb79875a53d742923fc8ff8336d7fbbdaf2e1b1f64296840557997125d4dcfea9a93a5e8a834003d592083a180ee85ca0e29d3aecf0eb475a3d4fed460456
+DIST gsmartcontrol-1.1.4.tar.bz2 691155 BLAKE2B 484452b85e848ca9d0539f9fb9e63fc60f837d5e5de1d85d6ef6340fba194ea52cb2026682b263b1391a59eee4ee846dad3863dc1f0bd00296015ddcf86dda9a SHA512 a59147f7adb76fa1cfc55198d175b38f7840c0ec07563bc020757d7609891c8f67953b87a867235821f90c52bc3c8e40a8d8a57a1429e4b75a3afb3a2ada42f1
 EBUILD gsmartcontrol-1.1.3.ebuild 1009 BLAKE2B 68fbd4e99795031f6d1124cd756f30f271746a7546ffdafb0d9c0d765292e3415e163edec83d6d692fd21ce29aab2d3fcc2db0e38817939d561458a28e21037b SHA512 a05864d911a09af9a435d3c132e5aae57eb8a458fcb818a18d4d4040af55467b620aa35a8b8a202acc3dd32fe9722a0c1afc474b223dae5a8f934a9daa83f97c
+EBUILD gsmartcontrol-1.1.4.ebuild 811 BLAKE2B 262fe0dee900cbb0436717bd8bd5804c34766e292c4d0003df07721e667b2ccfe1b98974530c3829598cdd4618db78b0d5b3012b423fe7b0b5ea6526b3ca605f SHA512 3f698126ff2a7b3739210b48723b94b325d92c8556283dc6155e5466851d87cd1a8c2214a788874beae5d9fc62085aabd735e6878625e95f41a6e005640f19f2
 MISC metadata.xml 341 BLAKE2B 0186090acb3718e9c11fd0acea1cbfcbb7222abda56ede52e5c40fd30b61572504a7905b86962c446a87b4ec0b5d7787d5e2beb8255130d97b40f8255f328843 SHA512 df6c99e8f920b1588d2ddea188ff4a9b4553e75a0c5d1a98d43c2ba1b46ef24a7a63a06865db71ab61cdf761b885a1017ca622966cd4ba5462c32a3822464a67
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.4.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.4.ebuild
new file mode 100644
index 000000000000..2dc9c0c0ebad
--- /dev/null
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic xdg
+
+DESCRIPTION="Hard disk drive health inspection tool"
+HOMEPAGE="https://gsmartcontrol.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-cpp/gtkmm:3.0
+	dev-libs/libpcre:3
+	sys-apps/smartmontools"
+RDEPEND="${DEPEND}
+	x11-apps/xmessage"
+BDEPEND="virtual/pkgconfig
+	test? ( dev-util/gtk-builder-convert )"
+
+DOCS=( TODO ) # See 'dist_doc_DATA' value in Makefile.am
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	econf $(use test tests)
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/doc/${PF}/LICENSE_* || die
+}
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 544b37f7916c..cbc88e54e23d 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
 DIST hw-probe-1.6.2.tar.gz 163183 BLAKE2B f9b8d405e59f7799dd665b62362fe8f2b9fe45491d43249ab61ef0fa5ea4d83671ac0dbeef622c68f7c581eef8cd3aa33e6c8bbd46d5488a9c1f4781c820453d SHA512 8a7bf5254f24cc3a1ca19039a00de312f1400f34eaa0459fbff665221940abf60396e5d9e95b4a021e7f5fb9c54254b8c50d0d0b125fc60a0a7f5c7a57edf68c
+DIST hw-probe-1.6.3.tar.gz 161938 BLAKE2B b4c43846411452a580ec4ea1743d3779fdfcf74636c62be5d66bbebe087a6355141f73b3da500cc36eba4dfba322ce19931cfd7023b395134b2fad940785cbff SHA512 b9898603b3bc15bc9d26be8511e64a776b51c8bfdfa6b62d5ca550d2663df8a7a2e3f423023ad8b221b0bc81ac413266ecd9e5fed618dc9967994523dcc7dd0a
 EBUILD hw-probe-1.6.2.ebuild 2308 BLAKE2B e1619f4d5de09a5d7d2d2b55623d2db2ea5cd3833ac62c49b65fc8e1bc4af837c5f13bb50570d4a402949203b88035874d87c725eb563552816ac3c2afc065e5 SHA512 03e09dc195acb9f079e8980e6a3cd74cfe4da63a846fd177e27888b047ea974345a6a6d5c50eec59e8ac20899857f143cd268065727c0fe631737f81e0839f07
+EBUILD hw-probe-1.6.3.ebuild 2310 BLAKE2B e0be3c494d1c55e417aa6cda7fb5dce20fbdfde3c7a6a8912dea50d689429d76f1070cc04fbe2d38818db82284d4b14a73ad11bfa3d91f0d07f5d8b999bdc63c SHA512 ff0384687c15d332a47e890f49efae9da2a153eebcd971510b7f47704c10a72b87a1e829cf1faa7a47584259b68aeb1b2742ca38ea46782cbeb7db33cb12061d
 MISC metadata.xml 647 BLAKE2B 522741fd8d5f7b64d686ce02dd5ccd7d9ba42df1e50a3e51921fa17c110c6db114ee22d5a903c8bb61a2a5f3884fad5e8b1a929a062af111fd52faf047638ab1 SHA512 ef6e4af1150d72b3cc26ba56267dae006ae8a19a8df2606a9f02df0dc6b091f0bd3dd9caee2171e896dd7b5e582b853f228e899dbd9281dd07b435a1da1f6b7b
diff --git a/sys-apps/hw-probe/hw-probe-1.6.3.ebuild b/sys-apps/hw-probe/hw-probe-1.6.3.ebuild
new file mode 100644
index 000000000000..89965032f4b0
--- /dev/null
+++ b/sys-apps/hw-probe/hw-probe-1.6.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature readme.gentoo-r1
+
+DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
+HOMEPAGE="https://github.com/linuxhw/hw-probe/"
+SRC_URI="https://github.com/linuxhw/hw-probe/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Digest-SHA1
+	net-misc/curl
+	sys-apps/dmidecode
+	sys-apps/edid-decode
+	sys-apps/hwinfo
+	sys-apps/pciutils
+	sys-apps/smartmontools
+	sys-apps/usbutils
+	virtual/perl-Data-Dumper
+"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "showing Machine Check Exceptions." app-admin/mcelog
+	optfeature "showing additional I/O statistics." app-admin/sysstat
+	optfeature "showing display data channel (ddc) information." app-misc/ddcutil
+	optfeature "showing smart card (reader) information." dev-libs/opensc
+	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
+	optfeature "showing information of attached scanners." media-gfx/sane-backends
+	optfeature "showing GPU information provided by MESA." media-libs/mesa
+	optfeature "showing zeroconf statistics." net-dns/avahi
+	optfeature "showing HP printer statistics." net-print/hplip
+	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
+	optfeature "showing additional CPU capabilities." sys-apps/cpuid
+	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
+	optfeature "showing available I2C sensors." sys-apps/i2c-tools
+	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
+	optfeature "showing information about tested memory for faults." sys-apps/memtester
+	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
+	optfeature "showing systemd boot process information." sys-apps/systemd
+	optfeature "showing ACPI statistics and tables." sys-power/iasl
+	optfeature "showing information about NUMA." sys-process/numactl
+	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
+	optfeature "showing available Xinput devices." x11-apps/xinput
+}
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index e8a2ef9bcc9c..b40fb33b1712 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -1,5 +1,7 @@
 DIST hwdata-0.354.tar.gz 2212834 BLAKE2B 5df04fd6069e131be7195b515f4f7273e28030d46823fa3054371f9afde4eb9976df2663bc7d31d056cb718a479630676f05459064decd59914f3a69bcfb03f1 SHA512 07bbe5137f35c0402029e066e90a29da1ca95faa6996a192b1f9ac00568e5020cc540b642ad2b22b25c2cfa0d7e4c2d7b80c9978ca0cd091691d8f1cf2933915
 DIST hwdata-0.357.tar.gz 2234392 BLAKE2B 54f26384664cc78d99db52cffa99bf74f57bf355908bd0a87bd01436596b8ed618567caa6f4486e32cbf11bd9313946db2f4d52ce7f2eae1d25b643e68714473 SHA512 7674e77887629e57cf1d6cb73ce7f4734f9dd5e5f8cee0016aa74f0ff6b962f9f0e501069f4cbaa0a5281fed179d2912a653071999b9f7d0eb4d81fff719cad1
+DIST hwdata-0.358.tar.gz 2240851 BLAKE2B b164c267a6779fec2a4018fb8bad98e564794e46cdec77b6f1234444f0fb20f49f44303a400d3301b40b07cebe0cc590553ae5e01702032b53180826273eb416 SHA512 52c765786aa41551e47bad2358bbe50f8f6a60cd820696c6c341f08cbde695f86746660a3fdadd8fad5614b99a98616111011a17d115c25bbcaf03c891cc3e69
 EBUILD hwdata-0.354.ebuild 698 BLAKE2B 136ac0f6d57825812547ca50d3abe718286ad2446205f0a155b5579761d1de1505075082bd2bceb8a7ab537ea36d1e8ea5f00fd4e02d9c4bd26d20353cba6b7b SHA512 31fe8fb5e5ac591a9df1c6817677b9a7acf604e20a1ab20dccd7bb884093456f024d6765bef3fececc8bc160ec9bd5828063ac0435c923da759fd9443a99996d
 EBUILD hwdata-0.357.ebuild 701 BLAKE2B 2dfc5adafff54a5860818f63314931b5f2344ace66f45fb8b0d57d4272128b121964ed5ccc37d6a90d95720fb492c2309db19518c8fc6d9edeac17ebb2610112 SHA512 30344157fb62cf2ccba7a17e1713b51cd840548339e2c9400b20eecd3926c322c2d8e62516daa35a6961c202e6a7cf5ad316e414a9112d73b674f80d841179d6
+EBUILD hwdata-0.358.ebuild 701 BLAKE2B 2dfc5adafff54a5860818f63314931b5f2344ace66f45fb8b0d57d4272128b121964ed5ccc37d6a90d95720fb492c2309db19518c8fc6d9edeac17ebb2610112 SHA512 30344157fb62cf2ccba7a17e1713b51cd840548339e2c9400b20eecd3926c322c2d8e62516daa35a6961c202e6a7cf5ad316e414a9112d73b674f80d841179d6
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sys-apps/hwdata/hwdata-0.358.ebuild b/sys-apps/hwdata/hwdata-0.358.ebuild
new file mode 100644
index 000000000000..6ad75332f251
--- /dev/null
+++ b/sys-apps/hwdata/hwdata-0.358.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Hardware identification and configuration data"
+HOMEPAGE="https://github.com/vcrhonek/hwdata"
+SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="test"
+
+src_configure() {
+	# configure is not compatible with econf
+	local conf=(
+		./configure
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/lib"
+		--datadir="${EPREFIX}/usr/share"
+	)
+	echo "${conf[@]}" >&2
+	"${conf[@]}" || die
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 1150689380d1..217dd6f94f2a 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,7 +2,9 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
-EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B 0518fb6472ee433835781125b914e68c788e5d219c5a120ddf99df6d3770de279c769a0c4fdfa6638a0b747190adf9f32e090cf1f4ecfc5d678a8f09dcb22058 SHA512 cad8bbd45d68521c0e5aa1fbdbdb763eeafdcb7b406aed1fd1d61dde9285d523da2e031c907f9dc5729d921298dafff126a1b493b66b21f0c7bd00e67f50d03a
-EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B d31578704690fd2ff24293a7a0ce316c1e04aee68f6e86646b90af3985f0719207ceb5273074e023d078cfe7e6ab43f1b353aea369eac06cc8d7465aacb300ee SHA512 ac6f807ea342db2a296c352b98b92185dc4f8133271814984329afc2b86de88936d4c27b51fda98ddd91c0877f02225d023f6c75ded8f99bc51ac6665c0107d0
-EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B abf59e91fdbceb69f173417ebde9008a2e0db5d71a97dd722715c3a06afcef851664b4878d9e1b82e1ebe30c88eaf889b1d6b28d4768470e946ce6c76e375ffa SHA512 7be8ba3134564367ac352c0c3f17ec45f93a7d57b8a122f55310e3e0e293a7b8fbaab15a3ede77147db4cfe01aa0b2f973da25e34a092e0d8eccb23f4004a004
+DIST hwloc-2.7.1.tar.bz2 6810477 BLAKE2B 26706b8835954b8baa9028eaf2da0f8ae6e57d1841d68daaa04d58a7b24a67e4e171eb439b8dbfb589a70eb1b5cced51f12a99bb7132591919c902374f89025f SHA512 35de85de3f5e75de30b5ac72d2c118dcb990a2427c9812910a03772857181fd7259a27352b34a968186d02ffc811644c3411d84ee37f2d0ff9b83628951b4863
+EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B e055e5b7624f56f54352a39649a51dba5dfe2e6cfddcdf83ef6496f9e88a8ed7b417c47d0e6a6cb5ebbd18619514b8497ceae74ca7df7fa236b86f4cb108e170 SHA512 6684246ba36711860baee3429c7976c6a719b63b2999cacbe7135450d8954082ed282485bb2f68a82c0fc67f78231c6f1c63626adc09f38a50197be8ef142e05
+EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 10a2be87fa805d97886e1e9261506af1e027314a68bac3656babfaadbe7273cb91a01ca9706ea9f284b015b8ec0b776f648a6c3461d3ce05147086a6b0fdd75c SHA512 5d0aab779a86fdd409bdaa98fff362824b301675db065859022fbff2a55f4f1a88263cadb85af9470e4915c5cc5c8a34e7e5f2d1376480fbd0b9ed46363ca7e2
+EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B 79a488a0e115c7f26a80b007088f8c14fc44d894b47637b0f2f9315082496361926165319e2e71ca21383406ea482f09c7dd6054ab4a198bc6c1e13605fbec1c SHA512 bf4432b8a655a23ae2faee3f1139d2beba90389f98df232a3999f4b86c73f01fa22c33e6350bd70817bc14e23f93115aba02cb9a9d5dae78ae1e023021b91707
+EBUILD hwloc-2.7.1-r1.ebuild 3213 BLAKE2B a89a29b783826055bbd57bcf191405c39bb9ad2ca049a4157d284abf176cac1cc8f3a3593ea9e0cae67cba1e70effdbeefb8196d35bab73b608dec4f3b5dc123 SHA512 2e5891623a4fe6ad9d66669aeceb70bdbeac36123854dcb0332229c7b8921c4bfcb38638acb4e9942c11139242181217b609439e8929ebb753092f1bcf7a0b93
 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index e6046bb1b546..435ec3acffa0 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools cuda flag-o-matic multilib-minimal toolchain-funcs
 
 MY_PV=v$(ver_cut 1-2)
 
-DESCRIPTION="displays the hardware topology in convenient formats"
+DESCRIPTION="Displays the hardware topology in convenient formats"
 HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
 SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index a62d172fdecd..763685d9bf37 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs m
 
 MY_PV="v$(ver_cut 1-2)"
 
-DESCRIPTION="displays the hardware topology in convenient formats"
+DESCRIPTION="Displays the hardware topology in convenient formats"
 HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
 SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index b35442059218..8e0985a990dc 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs m
 
 MY_PV="v$(ver_cut 1-2)"
 
-DESCRIPTION="displays the hardware topology in convenient formats"
+DESCRIPTION="Displays the hardware topology in convenient formats"
 HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
 SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
diff --git a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..cbdf2d374fb6
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
+
+MY_PV="v$(ver_cut 1-2)"
+DESCRIPTION="Displays the hardware topology in convenient formats"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia"
+
+# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
+#         anyone with hardware is welcome to step up and help test to get it re-added.
+# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4
+RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
+	pci? (
+		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+	)
+	udev? ( virtual/libudev:= )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? (
+		x11-drivers/nvidia-drivers[static-libs]
+		x11-libs/libXext
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}"
+# 2.69-r5 for --runstatedir
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #393467
+	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+	if use video_cards_nvidia ; then
+		addpredict /dev/nvidiactl
+	fi
+
+	if use cuda ; then
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
+
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
+	fi
+
+	local myconf=(
+		--disable-opencl
+
+		# netloc is deprecated upstream, about to be removed
+		# bug #796797
+		--disable-netloc
+
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--runstatedir="${EPREFIX}/run"
+		$(multilib_native_use_enable cuda)
+		$(multilib_native_use_enable video_cards_nvidia gl)
+		$(use_enable cairo)
+		$(use_enable cpuid)
+		$(use_enable debug)
+		$(use_enable udev libudev)
+		$(use_enable nvml)
+		$(use_enable pci)
+		$(use_enable static-libs static)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	case ${ARCH} in
+		# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
+		amd64|x86)
+			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
+		;;
+	esac
+
+	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
+	bashcomp_alias hwloc-annotate \
+		hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
+	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index 055b54343572..8793fcf97073 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1,3 +1,3 @@
-DIST IPMICFG_1.33.0_build.210528.zip 1975282 BLAKE2B e1397beffa3a2da1a224eb6c94a4107df23b5cf8066b63833fe28f40ced33a753114d685365724f43e314ce82a20ea41954401ca8808c3a7279412ef82ed463e SHA512 985395ce3604f33f6ad90aab07bb2cbad34c444e08f53c093acf9566c9083962286c2ab2cb2137352adf643cd9abe102b2f017c656b0da27e2dfbe025cf55e18
-EBUILD ipmicfg-1.33.0.210528-r1.ebuild 885 BLAKE2B abdcf24c296754cc28de9579e60e53fd91f341bb82889e6b1fb66f5a3b61f276b8a726efbed16b61283cdcd29cdcb362692d7f77ce13aaa7ba6fe0241006d799 SHA512 c489690c6de42fa5a899247d2396ef2711d682838261b1c52ee552e7d23280f8c92dc3c8a5bc1f99b1507d1d55b0d959c74c8e581ff603b046d47966a3594251
+DIST IPMICFG_1.33.2_build.220126.zip 2001713 BLAKE2B 12535eb2f0564a7f019e11267b19340daefa279e6f2005cc9360fe06130e30b9fee8cc03b79d2de25e1429e9eedb995026400cec6a8d3b0b66693fb35daa6c6e SHA512 352db617d772c28d77056b4571dd28eefb58795a79ed8032e34306dcb34a72177e22c70984c75e708fcb286b7377757a3d7400270a04dcf70c1e27534bbd38ce
+EBUILD ipmicfg-1.33.2.220126.ebuild 885 BLAKE2B abdcf24c296754cc28de9579e60e53fd91f341bb82889e6b1fb66f5a3b61f276b8a726efbed16b61283cdcd29cdcb362692d7f77ce13aaa7ba6fe0241006d799 SHA512 c489690c6de42fa5a899247d2396ef2711d682838261b1c52ee552e7d23280f8c92dc3c8a5bc1f99b1507d1d55b0d959c74c8e581ff603b046d47966a3594251
 MISC metadata.xml 332 BLAKE2B 3f1d44e0b3e8484018b21a018fe456ca61e41ba35b6e711b97485366a0746cf7db62aa0a1a3fd54e6f181628d6f8b3568e33949007a2c3d6489dbe9e339b80ad SHA512 3aa24d00e48e85075234d9ef1b7e925f71e5c9eaccb73dfb11be9777780ea0bdfc1b681ba5f7742c9cf4d0de0b18bcf7d0905c7551744cba8e20aee47e68b812
diff --git a/sys-apps/ipmicfg/ipmicfg-1.33.0.210528-r1.ebuild b/sys-apps/ipmicfg/ipmicfg-1.33.2.220126.ebuild
index 24e4375c565c..24e4375c565c 100644
--- a/sys-apps/ipmicfg/ipmicfg-1.33.0.210528-r1.ebuild
+++ b/sys-apps/ipmicfg/ipmicfg-1.33.2.220126.ebuild
diff --git a/sys-apps/msr-tools/Manifest b/sys-apps/msr-tools/Manifest
index 4ffee35f8edb..3518242f1e17 100644
--- a/sys-apps/msr-tools/Manifest
+++ b/sys-apps/msr-tools/Manifest
@@ -1,3 +1,3 @@
 DIST msr-tools-1.3.zip 7693 BLAKE2B 9ba92a6b3d71bf89e1b4a62226fa1eb2c53a588900fe52f1fa3a84443a471aab547e46e73826874c251ec32dcbb40ef9b787eef80fd93b65f3bb2c5d0312e310 SHA512 9605eed0b6211d0ecbe48a14d66b5d61965770f249c5c1b15416d4f2e9a37a68ecfde171077c3acc74bb6b951749bcff186acbb4d6d8a3051695d2d97c0e332b
 EBUILD msr-tools-1.3.ebuild 607 BLAKE2B e17fb11b64318693060f25b4747bc0771dfded5eecb0f2241e94dac6b837f387907290fc70fab7d342a008f8388e8a55d234d32217aec2cfa0fc7d4ddaa748bb SHA512 38bcd61294017e77be18e1bd4dc3bf9f113f44e6b112df1b1bfa51d208f1a09d395049bcac66c522d919cec1897ea4017316450b04f670a7025871f040712340
-MISC metadata.xml 222 BLAKE2B b5daf033ea46a708411a54d1b465effb557d4f48cef8f0f4b6872917da7e8efbc9b69db6e04f6331c7a27b473d1ea83e2bdf54247e7c6b427c94c492e62ef21d SHA512 52f592a4e8342cae9f7a982302b75c68af50523b23b4d8a13b5434b150d3c0e812ba66a13b8d5d093e59b64ccbb550640064aabd9748a200e63d170d0b6f327d
+MISC metadata.xml 254 BLAKE2B 27bfad9e03763fd082b0adc7a602dbf9f51b6c6ede654b4fa61e434e9c9452a301259197291dd45bb6d5486e1797fd8c15383c4bf88f3a0a08c116dd9227b5d6 SHA512 a08ace91187b9c474aea7738fedcbb2a65e52a19f004a781376f04f7fa6c4b867e43645764854108ab21410b6675246b00514c4754e8f22732790e6fc6dbc2d6
diff --git a/sys-apps/msr-tools/metadata.xml b/sys-apps/msr-tools/metadata.xml
index 0563834f5561..4c0df79c2637 100644
--- a/sys-apps/msr-tools/metadata.xml
+++ b/sys-apps/msr-tools/metadata.xml
@@ -3,5 +3,6 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/nosig/Manifest b/sys-apps/nosig/Manifest
index f7fa57a81160..8a17a89c82ac 100644
--- a/sys-apps/nosig/Manifest
+++ b/sys-apps/nosig/Manifest
@@ -1,3 +1,3 @@
 DIST nosig-2.tar.gz 15586 BLAKE2B d49bf9f9d4b443e8bcbee11e59beac4593e1429c414d7b0e2b7e31cdea9dd68c53b3604fdc8c8a0eabf2753aed64ee60f5e70f92aec807fb2030b83df0ed191b SHA512 9cc00a0250def091e5df070506128d260300909cc8664d9cee4d9fe459b1b8362a5671ad5b537675fb7e15665750a158e19193171aefa973d932756ea15b3430
 EBUILD nosig-2.ebuild 475 BLAKE2B 3093563282c421f6225dee21ab55e78a722e1805055f841ea6928f8d24d13a232ee7a88284a797d0515434b7acfc335bdfe9543e12e7d2fbc9fb2f1ca746e143 SHA512 e7b5f52806c8840a1d40659bf188bb449a19861b88663d5f68e68c2d178436af1eea7325435c295d3d98726aabb293af19bc3c971b1ec261da62a5da74ef1721
-MISC metadata.xml 262 BLAKE2B 5973d3538ee6391a3b3a50a29f43ea31fd19f017460e7b67fc43f506c7be278c0d9122d09417842a996bbbab954c3459f36bb7d456d53f790e6141e79c33ed36 SHA512 62b1c0df2a49888fe19b27010ab1dc81bf356572eb1a268ea65dc6761544f9be04be5d4b32b496098ebad2997341190c888a40a4332ad2433098ec5fb5251bcf
+MISC metadata.xml 296 BLAKE2B 8730075a71482e6863724cb45219e404dd14251f1be3d4591f1f0df0e54b12da404dbab24c10d06d9cc1f4c74d0e60b666e9613f0a90024e92f48f8edb84b736 SHA512 3635b8c677af028c2b701ce3298d3e0f965f4d2d73a73b348ebf9bcdfc776e25702884fd72049523cb63532751be5a87ad1a22648ee514d9c41795183a71ec4a
diff --git a/sys-apps/nosig/metadata.xml b/sys-apps/nosig/metadata.xml
index 1775a9430d01..11c18486599d 100644
--- a/sys-apps/nosig/metadata.xml
+++ b/sys-apps/nosig/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-	<description>Primary maintainer</description>
-</maintainer>
+	<maintainer type="person">
+		<name>Mike Frysinger</name>
+		<email>vapier@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 7f5e3ad6461b..1acfa5a97d9a 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,9 +1,6 @@
-AUX openrc-0.44.6-fix-checkpath.patch 862 BLAKE2B 35aac37270c8ee779d2e3f0291e2f2e659cbebd6ab8e9cb4a7a0295a1a99331b94c86e411ddac98f415839781d2415771c7cc81d12749a6efed5396f54933581 SHA512 187f318b652d779252371812ae2b154e79e109fc1d4eadb8e86c9c83d639c1b03a106e2e982c4365b2204321abfb561421e8a239f1fd71281ee6dbad4e775e80
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
-DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
 DIST openrc-0.44.10.tar.gz 254298 BLAKE2B 3cfecc27b560b8bb60d2104ab3dcf176b98677b65b829fa403ad2eb0e2e8bb0d586d374c336328a07c2f35e3abcb3f897cf5df142540a60fc09883aabd0ac79d SHA512 0e41f5268c6b8c325a6773511ca58c38ba52a1987aa47165794df8a99359bd1bfcb99d30e0d129b9242a2661663234f6f85c92c55c891dbb6c5b8a11d93edea4
-EBUILD openrc-0.43.5-r1.ebuild 5066 BLAKE2B b3e56275bd07558fa1b3a67e76c343d4368803ff8c806872e1fe7351667848640b722de86c5cac410d76e02d69a5adb764a942aafa180e22c4d79d7c90533e6e SHA512 8214a366eeb208c3f05302ec0f35a0bc9fb500951d102faa3010c0b8dc005d2d4a04609efd89351c76984ed18b0013e16367a0d257d809b667f69f981164dd46
 EBUILD openrc-0.44.10.ebuild 4387 BLAKE2B bc963720189c83f651237c52a55d907b2039c7447f9835b50e5f8decf4f3003aedfb5ac0bac5040bbafbe2ab739e41e267503b3d674031d7a32d8f5cd2dbba32 SHA512 1240620cbc33f7d6313278abe7aa6fda7ae99f8a74c882fccf1f7c4ca07311442952867c9f2e30e89830413daa54f606f4508fe0c494ccaf617ef4e17e20d81e
 EBUILD openrc-9999.ebuild 4396 BLAKE2B 78a8697930e9ec5b4792cb8ad738a0b69426fd0979d15da3378fd0a1008a21b0df67d0ed43603fa4ad4a6fed03e8fd6aa04a629f41025582cb14f89b85e011f5 SHA512 2773b661bca4a7279cbffed1606c622c8d73561dbae40c1fe6ad67bebc71c75f0fc90e0ecdcc4136c313d12269319d825118a81f6dee2393e83dbd2d2c3c14a1
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch b/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch
deleted file mode 100644
index e1ef97d981dc..000000000000
--- a/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cc45b55f895d0c21b5ac3e5a65b0bf00f76adeb7 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 8 Oct 2021 04:52:55 +0100
-Subject: [PATCH 1/2] checkpath: fix allocation size of path buffer
-
-strlen's return value isn't enough to be used
-directly for (x)malloc; it doesn't include
-the null byte at the end of the string.
-
-X-Gentoo-Bug: 816900
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/816900
-Fixes: #459
-Fixes: #462
----
- src/rc/checkpath.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
-index bab22692..c4dd7d9d 100644
---- a/src/rc/checkpath.c
-+++ b/src/rc/checkpath.c
-@@ -151,7 +151,7 @@ static char *clean_path(char *path)
- 	char *ch;
- 	char *ch2;
- 	char *str;
--	str = xmalloc(strlen(path));
-+	str = xmalloc(strlen(path) + 1);
- 	ch = path;
- 	ch2 = str;
- 	while (true) {
--- 
-2.32.0
-
diff --git a/sys-apps/openrc/openrc-0.43.5-r1.ebuild b/sys-apps/openrc/openrc-0.43.5-r1.ebuild
deleted file mode 100644
index 98648ccc0246..000000000000
--- a/sys-apps/openrc/openrc-0.43.5-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	!<sys-process/procps-3.3.9-r2
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.44.6-fix-checkpath.patch
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBDIR=${EPREFIX}/$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKSYSVINIT=$(usex sysv-utils)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=no
-		MKZSHCOMP=yes
-		OS=Linux
-		SH=$(usex bash /bin/bash /bin/sh)"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-export BRANDING="Gentoo Linux"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
-		fi
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 7a50d9e552a6..0722da006fef 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,6 +1,6 @@
 AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e
 DIST pcsc-tools-1.5.6.tar.bz2 289691 BLAKE2B 35dd50a3a8babff89f9e5d769ef70a573e58b2780d680c82dfa07177a3daaf527b5ccca665c901f9667ca4a81719916bd5aebb2e9b1b4d0301001498fe587832 SHA512 94076ed5af698afcec05da9645d7108c02c110fd0ee5efecbd8e0c7eb5ed9a55ee857d23b79ab2ccb93847f8a36f996fa9d521d999395f63274d4bf1d9cf3d26
 DIST pcsc-tools-1.5.7.tar.bz2 292637 BLAKE2B f0bfa9f680a2f2b348d2baef4b4b4567008163f47d7d7e6cec694cdc424626c5c6f18c475f0e8d4c5cd49111315b3c8a934fecf30afe90bbebc0a15f8d6f4a1d SHA512 58d70f41c5815297def7d8b64807e960db85719996771ecb43a4320d3f3fc82e2deb133d9ca97b3a4e8e76267294b3339d8883ba4770bdd0071566e1ce457501
-EBUILD pcsc-tools-1.5.6.ebuild 1332 BLAKE2B 501081f01c52942be7cb2bf59f944dce21d3a1dbdbe0ed66bfb1dd24699344e9dcbc6fe5e6d72ab76ba52a213835d4552f51731183709284d43ecc5344b39d7c SHA512 b04fac13c8113d3214b978592c89d21ada84300e626515ac8b2364218fb5cb2e38ab6c0a8f68446c44f736be09e9046e9f217b9ec406240055c9470543797fbf
-EBUILD pcsc-tools-1.5.7.ebuild 1382 BLAKE2B 3211dd397c7d103f75652f6807f4efa702ea75d5ef450461a4f0a206797d64f3dadfc2d1b1e14bd1f654433c4125c48fbaa1430e4e1c42ea7a0ee8921641b206 SHA512 e152bc516c62bb9bd924796f36d99aa37f17956ec6cae9744e237251a91ab6fd23514b223c0af7c071dfef514b60f407444c2259ded074403e3e4a1b10ce35bd
+EBUILD pcsc-tools-1.5.6.ebuild 1334 BLAKE2B 8f671f22c23efe48c28f9af575d596dd2573e97894f80f85f5727da4d62eded2779158b9f4d8d2190cda6ddce10ca26d89dbec3972870311d479127a7829096d SHA512 4692b478bfa5add8df4784e3a291bd6d782fb4c012f012d50cc964d3d726e09435a1f2257a4c9ad664fe7285a1fa33c185e1503633e43d7b35d8fe5ae25df22f
+EBUILD pcsc-tools-1.5.7.ebuild 1384 BLAKE2B f564d094b220ae5f527e749439bf158d80ed630934ed2c67476a4e3082751be8c8db5db1686f00be9fa28f02d5e4d1219f231831b8a77178b7128516f84f3304 SHA512 8404504fabb1d89fcc85f122090ab672054efe137924faebfe496bf8eac5a30d3b1084a56b06e4b4d4d2503e9534b46a3187c092279b7263bcddf86622c8b448
 MISC metadata.xml 357 BLAKE2B 42de2e205846206e147c56d469fd99d34e0e0ae207337223f93089c4d6ff86dfdeeeb65a4d0fb81398afc8d847be8f4e7559dc34ee50b899e8f20bcbea79b606 SHA512 241d96ef35852c80c581c527a9e469043c218cd81a4fa835c36d097e0b128961482d081e879cb99d74694121e35a99fb75ec7b9eba4f30970897c4e2fc3839db
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
index add6360afa55..951db2412435 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ DOCS=(
 src_compile() {
 	# explicitly only build the pcsc_scan application, or the man
 	# pages will be gzipped first, and then unpacked.
-	emake pcsc_scan CC=$(tc-getCC)
+	emake pcsc_scan CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild
index d3b2711916dc..18bbcf455751 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ DOCS=(
 src_compile() {
 	# explicitly only build the pcsc_scan application, or the man
 	# pages will be gzipped first, and then unpacked.
-	emake pcsc_scan CC=$(tc-getCC)
+	emake pcsc_scan CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 8444d7eebbec..796391b07ec4 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,6 @@
 DIST pkgcore-0.12.10.tar.gz 625285 BLAKE2B e6d8aeec37e9f5379cc12ca9ff502bbfd8ab355087be63160b9a03feddb5c792cc0ef01d338926e3217ee01859fca5a84aa710db8e224dde8e2befc59e3fafad SHA512 8b5159a06e8291be1663de077ac089b0cfc0da1334111ee66cb6c3b627bb29ecbc7fa6b4727fef1d4c9ac93889a7de787114d07071157a1fc1ed0b5143ebe12f
 DIST pkgcore-0.12.9.tar.gz 624918 BLAKE2B 190ccae01862b7e498dabcab5e8716ab0f3ed732eeb0469a0ca39f5e201c75ea19575f49be29a6d36b3acad8d5252528dc5e76444cd21fec25681a9350b93875 SHA512 2e391f9ae2baacaaec025c4b6cd7fd7c7757d7815d8bc62aec0f09e4fdbf7fc99ce832bc2c3ce15013fda860465ca19f27377935dc535a286446e548e08be6cd
-EBUILD pkgcore-0.12.10.ebuild 1123 BLAKE2B ee9387c1773b2fc590cef6a7773a3f4d3c7e7842e146fb8536db2c168f10726690dfbcd15fb664131f00461ac353e71c89d19df2f2463363db40d12ed8749163 SHA512 e0c56d9af4891c33ada9db8b279273fcd79d503d0db8856de9ff3e456f48ab233253d06c18a965f245eecb6b5618088c2cab3ac589379c06a70a5806c415ec4c
+EBUILD pkgcore-0.12.10.ebuild 1121 BLAKE2B 88697991a0fceb3feb3a933cccdc8363b121855e73d7bac3c5a402b79bf77b514184248144bcdf777761424ecfb545bb3f00afc3c88cc68d76a36690f7dccd7d SHA512 7dd5d3beadb0a4e884aee7599942bc356dff161a737bd56742cdfeec5e7c3dd3f52480595c428a68ad7d18f73edc49390d4bad26f94dc6c9871516ace6bbf059
 EBUILD pkgcore-0.12.9.ebuild 1119 BLAKE2B a5b776d54396ecd6491bf3db798c1131caa37402331c3968096673d0efabc172469734a04312fc0f8ead1b2a37018d8b03bc69ec05fd9ec792c73dba0db5c9ee SHA512 97aa6863c986cfdbf0a04af429ca774c6e4230c1010aebbc487156d92db4e23e082f5939e05dec83de2eefe83fab4192a7c5293779bcad260e878ba4f038a36d
 EBUILD pkgcore-9999.ebuild 1128 BLAKE2B 8a1e4b3be381366d63c74e02d3f4daa2a4c9613b07b7837579da10763aff9029e41e390c4b8e2f9754b0d6e621feb559328128e681da9ea00f6a49e5638cb698 SHA512 44ceade535f78821029b3a4d26e0b3b1c1510530499daf2989c66b9e5f99d72eeb873c09351bc3e8648d7a6521638a80bb48c1f6e7ee742a8a88ba56591bc819
 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da
diff --git a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
index baa75c6b7014..1db71e75e4f3 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/restartd/Manifest b/sys-apps/restartd/Manifest
index 2f1dacb3c5b6..40672d48101f 100644
--- a/sys-apps/restartd/Manifest
+++ b/sys-apps/restartd/Manifest
@@ -1,4 +1,4 @@
 AUX restartd-0.2.2-fno-common.patch 1433 BLAKE2B 0e63b4ca36108331c249891c6fc45ae2d3605e6779973900135143e2307438fb78d64976a9a8be74fd387da5112297fc1ff1b3584d9a7139cbcd507c85327a1e SHA512 a1b5b60311e4e7a8a840a052b916a1af6cdcb20fde298886d42c313812049bda5e7c8ebd8e931c8e873441ea7dc2a41ad4de9fbf031e31043f167ed84a55f297
 DIST restartd_0.2.2.tar.gz 13777 BLAKE2B ccefeb3b6b8e7a288d52793a708a1158804530c3ac8351c9b40b33ce2ff725511c8ce19558f3100dc5f01a4d9f6b17252362d97979c2a7d54dbe71392593b070 SHA512 731d33e6ade389708801e6cb024c355062745d049ab389fc78fcc1918720c93601dc8fb3a56a8bbb626bffc0a240b16e33ff5a8614d27b2701eb6ca68018cc93
-EBUILD restartd-0.2.2-r1.ebuild 721 BLAKE2B bd1894497e2b5544ea8020559567081f28fd5ecb9743514add72f5d7c98288ec3c17dc186055a4cb34c4d0b353c2e12b4c830bbeb94328ce654756f9052c177e SHA512 77a4c94964c7a6e63709526087ac382e065e33a0e10ba004de97d32b0be1f64cfd07fd80574918385da73cf7323c786df82220539392c2e77c825ca6467a1d06
+EBUILD restartd-0.2.2-r1.ebuild 723 BLAKE2B 2366af99547fe23e2fc86716a68f97d63e78fb7b595f7923902bf28c9ea8fdb34a8dd594e858d17eb94bfe1f5bc9d96bc15432212781eb256c45faa31948797c SHA512 f24a1dd92971e6d3c55515f844daf487c192a54c207cab17ccefb1e9bdadceacd2645ab1744b823d8587e4224f6017e461edcf02ac4d69d1151539c2e66e10af
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/restartd/restartd-0.2.2-r1.ebuild b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
index 6f78d10eb3a3..63a0de4222ca 100644
--- a/sys-apps/restartd/restartd-0.2.2-r1.ebuild
+++ b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) C_ARGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" C_ARGS="${CFLAGS}"
 }
 
 src_install() {
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 45e816b08ecb..2772d8566da5 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,19 +1,14 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
-AUX sandbox-3.1-label-decl.patch 1331 BLAKE2B f8472f3a69663a4fb6c9502694fe3aa96a069cb81c3b5f2c54cc3a17f2d59e809a953ed697ba2ebafc35e0e8c45fa48137243096e2fbe15b7c2d96b28c502aca SHA512 451960db208520b356e744aa90cdbfa4f599ad8aeacd835a7536a2bc202a0056a9411f068cb0b8ecaf9f0950ed1c638466c1923891078500306f6e9c9e0ecb51
 DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f50163db1c3bbddbf4fd07dbd5b7d92ef2f1b2c01eb77ff6cf531c5cc6a05e60b028f585310ac56eef96240882843 SHA512 8df5414e334a15f367acfd218ba1b74ba618b93d7bdeca8a039b69cbd81ab048ec5a6cecb24df09fa9a5f4fe214d647acf5138004defd45e6396eec5ae7c93d0
 DIST sandbox-2.25.tar.xz 436004 BLAKE2B c9c7d351cdefbb2b1a585904c38742a5a3bde50d3d690c57cff9cdc71ffb822e78a2b56c47afd03fbc70834de5dda13c5a300d9d6b35e09ec400a050d4f8e82c SHA512 4e998c4d9ba6eb69369cc49849060a2e90535eae91fbb64c4d46371fe0ed5182413b14674f10c773fd997b6895bc870ccb23586351f5bb06b69dc11a0cddbe1d
 DIST sandbox-2.26.tar.xz 444412 BLAKE2B 3bc88d86ba4e2522895c4448dff6da2cffceb912e5ff9610fe4c3aea255ffd9b9ca9bbe8e45d94508f45e9c141aa6945a9a8d82cba0f3ca102ff6a1624c84161 SHA512 f20766daf2ce43753772a184c86a7b6847f96ab7b60b202616e15d791bc1f770162035a9b1ffe38765dff8d2567ad971a9a2bdeba9a8769845a758fcd95206fa
 DIST sandbox-2.27.tar.xz 448948 BLAKE2B 03a311c8c7c8719bac398e39ce49e7149bdaa1d5b2811f395eb2251a32aabba995f97c3d5d27461aadb64bf43adf2b0cbaa7c2f141dd86f64f8dd326422ac104 SHA512 2a53e6fc87cec975962737b1fadc447d86985d27b18ad2caed711116da2ba435f54db0f7dadb02664b2638b9dc77752831cd4820390f5c3e61a42429e13462a7
 DIST sandbox-2.28.tar.xz 450840 BLAKE2B 1a144db1dcd140ce393f47b224c4389693bd3db6d056749968a9e78730b1075192148aa63fdfd5ab93893dfb96a87bcc36bee8b4540abefca0590a8def8365f2 SHA512 eaac54fbc35f51da3c94bfa10e0556f0fd39c20660fea2aa7d3cbf76dd3e4c9fb4a16cc198425988b79313f9331af030e1dca431c3f057ee4a04927c96897895
 DIST sandbox-2.29.tar.xz 452784 BLAKE2B 388f5d9c49134696bafbc6b882581396a9fa2e7caa6ccfb4376706d653f836ce18e0d77527c4c4f2ff753c0b920ab5ab60e151dd8a4e399e13dbc3fe7c0533d6 SHA512 15c0e6b71e8b8547b8188f857568c99b1925d5a837a289b21c4f842341361bf7119b96083697dc83546caf530daab700fb8c2704974e7cfb804d64bb5257a4b4
-DIST sandbox-3.0.tar.xz 454384 BLAKE2B b4f38b7c5ed2dc52e558f1b7e36d2308e6017c9d14861c60eace0f240a909f11184e259b2359ea96cad81d21234cc9a6bcd9f313ce56bd2f3bb1ce836f006a50 SHA512 3a35ee0b19a356b1986468ef5d2ecd553b88cbdaf287ce31a211b4072097a9844fca413ffa0f2858b9a4e75ead822fe9d9834f17c241ba32c2f14e02619a70b3
-DIST sandbox-3.1.tar.xz 454404 BLAKE2B f8cc2960f1c7b3367d375952f0a7ca978c1a2cc27b63137046152d1080a1a7b6b99d356af0776d3b57a5c260b2d89f0b7bfb127967407b537642be04e92b8603 SHA512 e57c0fc1ddb5a63012abd02080770d49deaa1d0168508a794df2eaa25b2b7a4fa6c505e8b93572a3745912819202c264cdf980f10dc7101c487a9b03e7f65815
 EBUILD sandbox-2.24.ebuild 1617 BLAKE2B 5bb22638ea5e5735242e538cb8e0e2598a38237001162fa0cd4d4c3dba6ddb7b9d4607b04ab20b00cb2e7b17c7a759808117d6c0c521a7ba6843fb42e29d1ab2 SHA512 845b5ae83d2c12dc7101d01b76af6693ae888237eda43d2207ef4a1fd3c121d79c554cbb1e7395365867cb96b6a27bbae1c26ff79c301ed00e536acef396dae9
 EBUILD sandbox-2.25.ebuild 1615 BLAKE2B b42f819adc73df7f3c7b0f2654eeaa41f23840763c3fe5abe64ba147b20cf74f1df7411a1309d2581b4264a9a5152eda6386551acadfc04125d31251557c10b6 SHA512 df4789dff85f482c7e9750d8581d2b74686bef82a5b4dd15d1a4b7923f7a2541f68afa5e5b5c091ccdab8234eba2708110401bad527c99e25e236dd8921e8abd
 EBUILD sandbox-2.26.ebuild 1455 BLAKE2B d1d05a952f34ec697b26176ba6183006d636d546af197277d30a1811b7200a45d1327db669ac411174e74989024f4c87d69ffbd68834e7a76fdf5a8ce8bd0446 SHA512 8fb95b39aad62153208436bb73c84fd6d891333cb251958ac2ee71913cdc59b98002f53dbb471fbbb2e76ae954b34c3cedc8c94b4f5d6e4fb65ffd40e4c8b3d7
 EBUILD sandbox-2.27.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 EBUILD sandbox-2.28.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
-EBUILD sandbox-2.29.ebuild 1557 BLAKE2B 3ed52c1ef3a9ed537582c1f4b714d11607fc79c01694bf746620a44afaaa17f36e1d7a6cd906302781db0602d6b6e72d48bc94ebf8be6a96013ce2cd61121675 SHA512 ff6c9179e992e828e93396da4ca17bc3fad99e70634c524ec05a9af59fd6c94480d56616f1e25a4095400355179991cd0dbba9d678ab3e1fed2980f901c26ff7
-EBUILD sandbox-3.0.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
-EBUILD sandbox-3.1.ebuild 1618 BLAKE2B 10cfbee355236fc67f56acec39539a708984aeddff9781ecdf72a00c05c4b38b31079324f41615a8cacd78f94c72da8fee1ca73e7d020b5b853812917a6f42cc SHA512 837fdd8538a28f67b1cde4795c57ef115a4637c94ae3723fca9be6936d354d156bf1b10492fc88f0ac7620cbc7edb952dc10ff92b19b6145b34f0a626f3ce3a2
+EBUILD sandbox-2.29.ebuild 1553 BLAKE2B 15711468cb189af759ad500d66626484dc435764002252b65ab49138afc66206a506f1fa462280833527358e21fbf82650a67b03404612c6cc042889f77577a3 SHA512 8bbf9fb39ea1312ee514a5ca745150f18ec796d6e7470d722d6748810c58d9fddc855aab7ade14960b97cf411f1e165054e90317512e3e832d08d5848a6f2130
 MISC metadata.xml 377 BLAKE2B fcbc91501a4a61bfa3c3cc01b0746f5f638093933cf8a9ba1e6206071cb0482c9ba18c5c10541d934327cf805ee0e40c010b3f25a221ab63fefa2fd9f39da0d7 SHA512 92aa26a3200dd1508fb86da0e0bc70be66ccbcf66593ee6833102c9961ac17c8a99c5b070a2cd2e79dba8e5daa0316cdb6744baa3fbd9342953fcc00b1277d35
diff --git a/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch b/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch
deleted file mode 100644
index b17f4b866f5a..000000000000
--- a/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 82f6d876660ba1132d75ccfef5c4301d123ea505 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 3 Nov 2021 12:25:10 -0400
-Subject: [PATCH] libsandbox: tweak label/decl code for some compiler settings
-
-Looks like gcc is inconsistent in when it chokes on this code:
-> a label can only be part of a statement and a declaration is not a statement
-
-Hoist the decl up to the top of scope to avoid the issue.
-
-Bug: https://bugs.gentoo.org/821433
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/trace.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libsandbox/trace.c b/libsandbox/trace.c
-index f3390d99822e..d2899b743048 100644
---- a/libsandbox/trace.c
-+++ b/libsandbox/trace.c
-@@ -704,6 +704,8 @@ static char *flatten_args(char *const argv[])
- 
- bool trace_possible(const char *filename, char *const argv[], const void *data)
- {
-+	char *args;
-+
- 	/* If YAMA ptrace_scope is very high, then we can't trace at all.  #771360 */
- 	int yama = trace_yama_level();
- 	if (yama >= 2) {
-@@ -721,7 +723,7 @@ bool trace_possible(const char *filename, char *const argv[], const void *data)
- 	}
- 
-  fail:
--	char *args = flatten_args(argv);
-+	args = flatten_args(argv);
- 	sb_eqawarn("Unable to trace static ELF: %s: %s\n", filename, args);
- 	free(args);
- 	return false;
--- 
-2.33.0
-
diff --git a/sys-apps/sandbox/sandbox-2.29.ebuild b/sys-apps/sandbox/sandbox-2.29.ebuild
index 902f38f6d5d4..ce5ca66d6320 100644
--- a/sys-apps/sandbox/sandbox-2.29.ebuild
+++ b/sys-apps/sandbox/sandbox-2.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+nnp"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-3.0.ebuild b/sys-apps/sandbox/sandbox-3.0.ebuild
deleted file mode 100644
index 83e908988817..000000000000
--- a/sys-apps/sandbox/sandbox-3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic multilib-minimal multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+nnp"
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-src_prepare() {
-	default
-
-	if ! use nnp ; then
-		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
-	fi
-
-	# sandbox uses `__asm__ (".symver "...` which does
-	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
-	append-flags -fno-lto
-	append-ldflags -fno-lto
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	dodoc AUTHORS ChangeLog* README.md
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/var/log/sandbox
-	chown root:portage "${EROOT}"/var/log/sandbox
-	chmod 0770 "${EROOT}"/var/log/sandbox
-}
diff --git a/sys-apps/sandbox/sandbox-3.1.ebuild b/sys-apps/sandbox/sandbox-3.1.ebuild
deleted file mode 100644
index 1c11a7faf157..000000000000
--- a/sys-apps/sandbox/sandbox-3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic multilib-minimal multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+nnp"
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-label-decl.patch #821433
-)
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-src_prepare() {
-	default
-
-	if ! use nnp ; then
-		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
-	fi
-
-	# sandbox uses `__asm__ (".symver "...` which does
-	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
-	append-flags -fno-lto
-	append-ldflags -fno-lto
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	dodoc AUTHORS ChangeLog* README.md
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/var/log/sandbox
-	chown root:portage "${EROOT}"/var/log/sandbox
-	chmod 0770 "${EROOT}"/var/log/sandbox
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index ba3a899a8321..96b31eaf1c8f 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,6 @@
 AUX 00-hostnamed-network-user.conf 227 BLAKE2B 0cc780a2ea9f31f08be01184704e4fa8b4b95e4c82b7e2dd4127f82c594a5cd7c8f865a83ae5f1284e58a7fd120ee9a9f4f586b7e479d21f1e8adf26e8e61238 SHA512 97e8decd802de8581fb546e3a714376fbd065108f3edfed54a1036d93df02f9947c358aec9aa4841a766c9120fa20c69eb7867bb4d2bd7339d8bd89c43235b2b
 AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194
+AUX 250.4-random-seed-hash.patch 3300 BLAKE2B 3a952e18ebc8075853943e57730b2f9cf0ac31e2161fce992d11df483a57fc777b74b212c243260ddb6255b2bfe6ac64ba4abfedd236d2cae5e18150e2e3d859 SHA512 4ade52e055d6ccd252221354125e3155c9398452a470b45dc15967fd354d94f4ef94437626c6063762c1c83243d65ec57b0b8d326b769514dbd76f2644925b39
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
@@ -11,10 +12,11 @@ DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efe
 DIST systemd-stable-250.2.tar.gz 11121031 BLAKE2B ddbb33648dbf0442e4258bf23ace04eac6d5ab6a2434537395b900b7bd4113a86199d6d559f8d76dcbede88484240a6593439acdcc7b1801857d13840c389c6c SHA512 2f734c1d1ea98ee3f1beb00689a0d56603cd981aa938bee1655445ddd4af3b2bb6472249fa158741edcb2259ee302b625e124c38b7d2ec00c53760d6b362d5bb
 DIST systemd-stable-250.3.tar.gz 11125151 BLAKE2B 659c39994e76f94407dd9079e28fc644981d3475a0ed440b9895e8f201c3ce1fc47aa8c4d599ad85ed89ddfb6ca8e514aee2a739e93640745cf46647f99efe56 SHA512 81847fb088ff271138b1ea318995a2ca2ee5d4c5d839c9dd81f0210d366198049199d59c49b25ef8783df2c6b8dd9fcdf2d916777788b1a6d42deec9da8e9da5
 DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
-EBUILD systemd-249.11.ebuild 14750 BLAKE2B c68d4145202cd0bf616f2e0f6a066e7f2000f10705bcfc27f38cd8a0b0a3dc7bb8386df6473ccd821469606fb27a910e785447fd9748b8544bc157a92e6c00a6 SHA512 3c0478e0d2d5e4cf140d0657405f79645f423a6c7da76f9c62e5af56e8eb200cc2f5b4dfad27aaafeb40ed5172ac9a5b53c26952f56ddb31ebf1d4797485cb22
+EBUILD systemd-249.11.ebuild 14749 BLAKE2B 3b6ccb1617acceb9ebd90805aa7e2124be674e235094641013a665b76bf2417f250cb290e96caca6cdfa6704ee179a07057dfb820ce3a57daaecd754427a88d2 SHA512 6aa8d8428824cc8961692075a4ec34d1d5b179fef6b499c381370645259250b8c340dbb4523f4ac1c61241e844ed17c7800fc34ceb51c43fcde62562ddc350d8
 EBUILD systemd-249.9.ebuild 14784 BLAKE2B ca86d60cc9890d368c269baa814c55345c05da6781dab850dc11d1ea81304e1d25319af0e3a81690df4fa178a796a54af5789dff4756c65b2bcb326f5f4bd511 SHA512 2c3166d0e8ce969b0117cd4454f7d8f71dcf6f079e7a8890cbe77c56e92e3d28d54e98ca07ed5dc0a391cd9acb0b58ce4869ee98b7d91f36fbdbfac54d01ee7f
 EBUILD systemd-250.2.ebuild 15249 BLAKE2B e9a1484fa9c39b55f47c680c7a4a53fdd722e4d56d3a496a06875c3782a2ab97d04b7a1475ac0b08ace87dc8d9ba939034e7b22874da110d3a5b8e6dd064265d SHA512 8e820f53362c9c2379196ae8c3bd7bd8801856331ede8ad3877e5a04c9cc2e5145ada108d8d48db09358e2335791550c49a663ae75c900eac9a5b9fe201152cc
 EBUILD systemd-250.3.ebuild 15249 BLAKE2B e9a1484fa9c39b55f47c680c7a4a53fdd722e4d56d3a496a06875c3782a2ab97d04b7a1475ac0b08ace87dc8d9ba939034e7b22874da110d3a5b8e6dd064265d SHA512 8e820f53362c9c2379196ae8c3bd7bd8801856331ede8ad3877e5a04c9cc2e5145ada108d8d48db09358e2335791550c49a663ae75c900eac9a5b9fe201152cc
+EBUILD systemd-250.4-r1.ebuild 15294 BLAKE2B c709485d1ae97d77f58a971984e7f3258a0f624b59e11958e1cadfe1991f704ee10d8bc836770f4c98f3dc3714e2c8d9ca65d89015b575bb21b877afa44ddeae SHA512 90468976a753b773f1748821128b034c342da5dcb2646203d51b07ccf726aa0937bfe7c87166e5feee5417ed6b40e81abc534953dbbb1d359fe80b9beb6c85b7
 EBUILD systemd-250.4.ebuild 15249 BLAKE2B e9a1484fa9c39b55f47c680c7a4a53fdd722e4d56d3a496a06875c3782a2ab97d04b7a1475ac0b08ace87dc8d9ba939034e7b22874da110d3a5b8e6dd064265d SHA512 8e820f53362c9c2379196ae8c3bd7bd8801856331ede8ad3877e5a04c9cc2e5145ada108d8d48db09358e2335791550c49a663ae75c900eac9a5b9fe201152cc
 EBUILD systemd-9999.ebuild 15249 BLAKE2B e9a1484fa9c39b55f47c680c7a4a53fdd722e4d56d3a496a06875c3782a2ab97d04b7a1475ac0b08ace87dc8d9ba939034e7b22874da110d3a5b8e6dd064265d SHA512 8e820f53362c9c2379196ae8c3bd7bd8801856331ede8ad3877e5a04c9cc2e5145ada108d8d48db09358e2335791550c49a663ae75c900eac9a5b9fe201152cc
 MISC metadata.xml 2627 BLAKE2B b785769f4d2d029a935d8aa4da18d2366d283565a70db63b36eccbab4213edd3c0063a61fe58b313a37cd72fa4a848f4ba12dd3761f82b862a84a3b09ce06258 SHA512 ecbc947ffc3ad23afb6c07c60907d5cbb91053c4153c6661fa26f358710e3d7ca44ae4c3b0d229b428fbe5abb63f83175448e6fae8ec11c1cbe01c1a692c873b
diff --git a/sys-apps/systemd/files/250.4-random-seed-hash.patch b/sys-apps/systemd/files/250.4-random-seed-hash.patch
new file mode 100644
index 000000000000..efaa8cdfcaac
--- /dev/null
+++ b/sys-apps/systemd/files/250.4-random-seed-hash.patch
@@ -0,0 +1,74 @@
+https://github.com/systemd/systemd-stable/commit/ed46ff2bd6ca21d83cae4a94c3ed752ad1b64cce
+
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Mon, 3 Jan 2022 18:11:32 +0100
+Subject: [PATCH] random-seed: hash together old seed and new seed before
+ writing out file
+
+If we're consuming an on-disk seed, we usually write out a new one after
+consuming it. In that case, we might be at early boot and the randomness
+could be rather poor, and the kernel doesn't guarantee that it'll use
+the new randomness right away for us. In order to prevent the new
+entropy from getting any worse, hash together the old seed and the new
+seed, and replace the final bytes of the new seed with the hash output.
+This way, entropy strictly increases and never regresses.
+
+(cherry picked from commit da2862ef06f22fc8d31dafced6d2d6dc14f2ee0b)
+--- a/src/random-seed/random-seed.c
++++ b/src/random-seed/random-seed.c
+@@ -26,6 +26,7 @@
+ #include "random-util.h"
+ #include "string-util.h"
+ #include "sync-util.h"
++#include "sha256.h"
+ #include "util.h"
+ #include "xattr-util.h"
+ 
+@@ -106,9 +107,11 @@ static int run(int argc, char *argv[]) {
+         _cleanup_close_ int seed_fd = -1, random_fd = -1;
+         bool read_seed_file, write_seed_file, synchronous;
+         _cleanup_free_ void* buf = NULL;
++        struct sha256_ctx hash_state;
++        uint8_t hash[32];
+         size_t buf_size;
+         struct stat st;
+-        ssize_t k;
++        ssize_t k, l;
+         int r;
+ 
+         log_setup();
+@@ -242,6 +245,16 @@ static int run(int argc, char *argv[]) {
+                         if (r < 0)
+                                 log_error_errno(r, "Failed to write seed to /dev/urandom: %m");
+                 }
++                /* If we're going to later write out a seed file, initialize a hash state with
++                 * the contents of the seed file we just read, so that the new one can't regress
++                 * in entropy. */
++                if (write_seed_file) {
++                        sha256_init_ctx(&hash_state);
++                        if (k < 0)
++                                k = 0;
++                        sha256_process_bytes(&k, sizeof(k), &hash_state);
++                        sha256_process_bytes(buf, k, &hash_state);
++                }
+         }
+ 
+         if (write_seed_file) {
+@@ -277,6 +290,17 @@ static int run(int argc, char *argv[]) {
+                                                        "Got EOF while reading from /dev/urandom.");
+                 }
+ 
++                /* If we previously read in a seed file, then hash the new seed into the old one,
++                 * and replace the last 32 bytes of the seed with the hash output, so that the
++                 * new seed file can't regress in entropy. */
++                if (read_seed_file) {
++                        sha256_process_bytes(&k, sizeof(k), &hash_state);
++                        sha256_process_bytes(buf, k, &hash_state);
++                        sha256_finish_ctx(&hash_state, hash);
++                        l = MIN(k, 32);
++                        memcpy((uint8_t *)buf + k - l, hash, l);
++                }
++
+                 r = loop_write(seed_fd, buf, (size_t) k, false);
+                 if (r < 0)
+                         return log_error_errno(r, "Failed to write new random seed file: %m");
diff --git a/sys-apps/systemd/systemd-249.11.ebuild b/sys-apps/systemd/systemd-249.11.ebuild
index 58ec6237eb87..79c41b24c83c 100644
--- a/sys-apps/systemd/systemd-249.11.ebuild
+++ b/sys-apps/systemd/systemd-249.11.ebuild
@@ -20,7 +20,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-apps/systemd/systemd-250.4-r1.ebuild b/sys-apps/systemd/systemd-250.4-r1.ebuild
new file mode 100644
index 000000000000..444d748cfd2b
--- /dev/null
+++ b/sys-apps/systemd/systemd-250.4-r1.ebuild
@@ -0,0 +1,521 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
+	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	policykit? ( !hostnamed-fallback )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	hostnamed-fallback? (
+		acct-group/systemd-hostname
+		sys-apps/dbus-broker
+	)
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if kernel_is -lt 5 10 20; then
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		else
+			CONFIG_CHECK+=" ~KCMP"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+		"${FILESDIR}/250.4-random-seed-hash.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	# workaround for https://github.com/systemd/systemd/issues/13501
+	if use hostnamed-fallback; then
+		# this file requires dbus-broker
+		insinto /usr/share/dbus-1/system.d/
+		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
+
+		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
+		doins "${FILESDIR}/00-hostnamed-network-user.conf"
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index b06c5cb8d3e5..ceabf294d03e 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -8,7 +8,10 @@ AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa
 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
 DIST sysvinit-3.00.tar.xz 127072 BLAKE2B d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 SHA512 ba834ac6c48528304373018bfb05dcdd3573d8081dd7dc95a44808804404d77ee4832fedb3f34e67d87f22f201f9526c54910a51c6ed2a42ac55b756843cd825
 DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf
+DIST sysvinit-3.02.tar.xz 219560 BLAKE2B c68505aab9e257fa3fb4153b4d2a51a7a8ac0137f0ee21174c168b1a1e4f12ea6be53679c484e2ea31904a37cd94fb5d913a9885da6c618acdae566b70bb7fae SHA512 44a43e2faff3a0d3410447ffc9b8b7c66eae1a5cba54c2c4d8518d3b2e5accecc68a280c87dbf6d18f943ae466c3c1e09bc633009207cbd777d371effda30831
+DIST sysvinit-3.02.tar.xz.sig 833 BLAKE2B 07f86211d2ded8afea22df246140cb44ec4a949c2450b1cc9d996b4b582da7767726648595c5f1cf584c31c0c59c4b0915a22cc254fed56bd42ac155b544cbfc SHA512 9b8a2b3e480041ead8bd2b16551fb00e387d823ad196cf60f6938eda5accf33e944b7b530d47bc0bdd90de6766cf8d44050c0c3d95b18c8b76d412d0a6c3121a
 EBUILD sysvinit-2.99-r1.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
 EBUILD sysvinit-3.00-r1.ebuild 3857 BLAKE2B 791e9a2c798e5194338bfa2b7339d8badfcbeaa1548fd9beffcd968cf36ba68b29d6a9087818d3fdfa90c725567d71757ff50029d460c8862e8487fbd4e0cb3c SHA512 ea6f4fd2491b49b9351b767feb14aeb696452277b80ab0244e6c2831f7ae7f29dd5164825a378e251d640ef6798f547865dd359eda032757531ce92359a352af
-EBUILD sysvinit-3.01.ebuild 3857 BLAKE2B 791e9a2c798e5194338bfa2b7339d8badfcbeaa1548fd9beffcd968cf36ba68b29d6a9087818d3fdfa90c725567d71757ff50029d460c8862e8487fbd4e0cb3c SHA512 ea6f4fd2491b49b9351b767feb14aeb696452277b80ab0244e6c2831f7ae7f29dd5164825a378e251d640ef6798f547865dd359eda032757531ce92359a352af
-MISC metadata.xml 359 BLAKE2B c5bd566a590dd04ca51751f4985840a143515fb8f7d3d21e1ad7f35b042ce578dae87e8d86a6338f7346cb50012991ccc77abfe73cbf2a4195f8d3dda04708d5 SHA512 9eec819463d81e55845eb293c5bc822748dc28bb420cfe498077d2dec6947e4762a743ddaadba34576f10275e9176347ba98711b059c429b4125258718e8290b
+EBUILD sysvinit-3.01.ebuild 3851 BLAKE2B 336d2d2c0f6842348e77245e45520f81cd8a47c800c2b67f78bc022e2ddf19ca773ba4607328c341457898ac637799925fd2fae0f01781c95f97bd31b18568b6 SHA512 db6ae417491bbc015efd56f9413b15768ebe7df077f1c44d8169775bbf80d22c83088bc8c7d279b68406dfaa4dafb6aa1d13b8a80c8c1baccd5ba9b6df98a55f
+EBUILD sysvinit-3.02-r3.ebuild 4899 BLAKE2B 0be96f4b4648501f7d2a9b401a897bf12decb39309719d46e1647f80f7a60b2722ca962eb17978c6ee26a70b8dbc2a0325c2a4ec93a0968b02ae2714f8aa4f6d SHA512 93810f84e111c18fd1a7fcbe097d13f5049c373b6595ce698d7e3e6e1a3cbb62f3042a32e71ec70ea700aa4a8bbd3acacb56ed24d2cf8147652ea7a6a60847a4
+MISC metadata.xml 449 BLAKE2B e8c38e3a241f77fb4de63d170e24bcc8d1f8a9ada912fb5870d150874412c2a60a5c3a59ef662bc81f929fb4c36db393667c49c8c75346c3212b81b129edd5d5 SHA512 d5ae5c9606c89a9b73982983d68353bf0605a9c98e7272e762c5a62188b75a071675b61bac5894761a33babcb874949acb76292cda6a6b1fb4abdf725e2e847b
diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
index 244cfb040246..f085bc59b51f 100644
--- a/sys-apps/sysvinit/metadata.xml
+++ b/sys-apps/sysvinit/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>williamh@gentoo.org</email>
-	<name>William Hubbs</name>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">slicer69/sysvinit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild
index 2b6267d776db..bb9bb332d574 100644
--- a/sys-apps/sysvinit/sysvinit-3.01.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="selinux ibm static"
 
 CDEPEND="
diff --git a/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild b/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
new file mode 100644
index 000000000000..a1c99e551867
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="de es fr pl"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
+inherit toolchain-funcs flag-o-matic plocale verify-sig
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
+SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
+SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
+S="${WORKDIR}/${P/_*}"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} != *beta* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="selinux ibm nls static"
+
+COMMON_DEPEND="
+	selinux? (
+		>=sys-libs/libselinux-1.28
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers"
+# Old OpenRC blocker is for bug #587424
+# Keep for longer than usual given it's cheap and avoid user inconvenience
+RDEPEND="${COMMON_DEPEND}
+	!<app-i18n/man-pages-l10n-4.12.1-r2
+	!<sys-apps/openrc-0.13
+	selinux? ( sec-policy/selinux-shutdown )"
+# po4a is for man page translations
+BDEPEND="nls? ( app-text/po4a )
+	verify-sig? ( sec-keys/openpgp-keys-sysvinit )"
+
+PATCHES=(
+	# bug #80220
+	"${FILESDIR}/${PN}-2.86-kexec.patch"
+	# bug #158615
+	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CPPFLAGS =$/d' \
+		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
+		src/Makefile || die
+
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# logsave is already in e2fsprogs
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+		-e '/^MAN8/s:\<logsave.8\>::g' \
+		src/Makefile || die
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}" || die
+	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
+	local insert=()
+	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
+	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
+	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
+	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
+	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
+	if use ibm ; then
+		insert+=(
+			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
+			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
+		)
+	fi
+	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
+	if use x86 || use amd64 ; then
+		sed -i \
+			-e '/ttyS[01]/s:9600:115200:' \
+			inittab
+	fi
+
+	if [[ ${#insert[@]} -gt 0 ]] ; then
+		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
+	fi
+
+	delete_unused_locale() {
+		local locale=${1}
+
+		einfo "Deleting non-requested man page translations for locale=${locale}"
+		rm "${S}"/man/po/${locale}.po || die
+
+		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
+	}
+
+	plocale_for_each_disabled_locale delete_unused_locale
+}
+
+src_compile() {
+	tc-export CC
+
+	append-lfs-flags
+
+	# bug #381311
+	export DISTRO=
+	export VERSION="${PV}"
+
+	use static && append-ldflags -static
+	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+
+	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+		cd man/po || die
+		po4a po4a.cfg || die
+	fi
+}
+
+src_install() {
+	emake -C src install ROOT="${D}"
+	dodoc README doc/*
+
+	insinto /etc
+	doins "${WORKDIR}"/inittab
+
+	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
+
+	into /
+	dosbin "${FILESDIR}"/halt.sh
+
+	keepdir /etc/inittab.d
+
+	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+		install_locale_man_pages() {
+			doman -i18n=${1} man/po/${1}/*
+		}
+
+		plocale_for_each_locale install_locale_man_pages
+	fi
+
+	# Dead symlink
+	find "${ED}" -xtype l -delete || die
+
+	find "${ED}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ -z ${ROOT} ]] ; then
+		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
+			ln -s /dev/initctl /run/initctl \
+				|| ewarn "Failed to set /run/initctl symlink!"
+		fi
+		# Do not return an error if this fails
+		/sbin/telinit U &>/dev/null
+	fi
+
+	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+
+	# Required for new bootlogd service
+	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
+		touch "${EROOT}/var/log/boot"
+	fi
+}
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index 5a0a30566f89..cbaac18e0378 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tomoyo-tools-2.5.0_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10
 DIST tomoyo-tools-2.5.0-20130214.tar.gz 210892 BLAKE2B fc9435c5b4c97a58d6e3b00cfa5b82e08732c0f6804a819e99872fbcf64e3e831f33766c23e0ab7d8767e0c806d8e2f7c18280ebedb198684c386e8c7c8bb637 SHA512 1ba6f6b3a3d4e644e6ee742beb64b09c6d527f130b1fe6d09a2e19760ced26f540ac8cc1e6f83fddacc3ef8844c3c23425191e4e0098c8b72b5ba3086adc9dc4
 EBUILD tomoyo-tools-2.5.0_p20130214-r1.ebuild 1374 BLAKE2B ac08fe95a322b0108ab270b7338e51fdc9758e0fe37fc57436f2f5c83f771378563cadc40d916bd6ebcf104cc17f1f70569759b8d443a9007284b6b5a0d47e39 SHA512 a97f68573f73256eb10f5749832c1c8888a176669cde4cb8c1d9d7b06403df74ec5aa0cf8d4fb3831dc3e85e965af9728a52ee76ff0dad508f4f2087a14ba8e7
-MISC metadata.xml 296 BLAKE2B 73fba5aacaabc3b7fdd5815352cfff6ea1fd2a39f28b0ea29392148893dcfd681a38296a9ee146048d54879e2e84919001bfb62468dde8c7b5db651b4b44ae0a SHA512 f277a3cc3482960a897d170d9669e39e415e50c3ad20437e139ebb04626de0735d9cca513ed6f48ccda2eed810cfb7fc0a3cde829fd2ee1a2ba6573c9ab8c945
+MISC metadata.xml 324 BLAKE2B 24fda3589fe0df36f6b5bdb3899bf4099ffdd2d949db77d803d2f93760b6b3a449e4d6af7d5843a0db5c6d2c6741c7014351620caab59f9b2591c07c5183d8b5 SHA512 fc3021d80213dd4423096c243d8a281a379c60f20f8d6816d16fc7e8e24aa594e72de1d70798c3213f7bd80ab4c1c562750c9cc3861d4b8ce378a5f74244fe75
diff --git a/sys-apps/tomoyo-tools/metadata.xml b/sys-apps/tomoyo-tools/metadata.xml
index cbaa2ffac653..aac55a5dd45c 100644
--- a/sys-apps/tomoyo-tools/metadata.xml
+++ b/sys-apps/tomoyo-tools/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>naota@gentoo.org</email>
+		<name>Naohiro Aota</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">tomoyo</remote-id>
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index 7583a6ae275a..b13f180badb4 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1,5 +1,6 @@
 AUX utempter-0.5.5.6-fix-build-system.patch 1168 BLAKE2B c513d18115a7a78e2c4d381f7ae650aa56de4d0833fa7c610948da072c4a1e85ae6832517012dd0c04ca91f4c3cb51d8b3b332c58b66b0716c63e3576917fe77 SHA512 a2febc07a01e0f9f95c8c846616d8f46e74e3db2ea66af720539f6825019dd05ab5472507210945c5caf84566584ab01824ebf0f16e51e7012f1334fc5a920b4
 AUX utempter-0.5.5.6-no_utmpx.patch 666 BLAKE2B 9ee0c3634b87ddd50d50f81811f749f615e4fad8dc27b9fc97cc1b61ffdd64eb5045910457547b2cbc245c593490ab354e3a7f5a5965a8aeebf330c6b32d4889 SHA512 4cdc7616f1b886b74fa39272f502fb9eb303047c93be57122ba32517f49a0274e4f7e02b25ead9dd9b60584610a576cb2d78c6350350b3d8364ccd903c3dafcf
 DIST utempter-0.5.5-6.src.rpm 21099 BLAKE2B a4a8c53ab31d53ec56d60a16e5c1d3a0a2ec6c73c3c3025c15dfc389da75f969545392b46976017cfcde1d9f9ca974b14786bbf39709aebdda890df13a7866ed SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655
+EBUILD utempter-0.5.5.6-r1.ebuild 956 BLAKE2B 4eb2d3be6732ee1eb07b62f0bbf711e141a1894f21db30d1279a8f3d7fad2470924a0c1944a4e45d9481e4c3b867ac258d0ac512428dc9a2e6324a8dd3f60186 SHA512 736a438f352cf84381a1de34355013dde0ca6052f16146fa8539c5fc4cc11266bc6f4c15a63b64a877818acd0095ef5be835c76e6faecafedc3ed7b824f95a1b
 EBUILD utempter-0.5.5.6.ebuild 1176 BLAKE2B f69291ee2133e60d389d9ee368920042f1dba52ec13c37eabd59925a7243a2eb0b6bc3ae2881406b9a9982287bc895400859002c65c83190370fc2f0053deb6c SHA512 9f03b9180d919d9f4f0782fa852f9398f38e307dff7edf0f865d37992ecbd2166c1c1262871e062d196cd127f01dfadb5b4ef186b632c3a66b714e0a0658bd12
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/utempter/utempter-0.5.5.6-r1.ebuild b/sys-apps/utempter/utempter-0.5.5.6-r1.ebuild
new file mode 100644
index 000000000000..f52de8c53368
--- /dev/null
+++ b/sys-apps/utempter/utempter-0.5.5.6-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${P%.*}"
+MY_P="${MY_PN}-${PV##*.}"
+
+inherit flag-o-matic rpm toolchain-funcs
+
+DESCRIPTION="App that allows non-privileged apps to write utmp (login) info"
+HOMEPAGE="https://www.redhat.com/"
+SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="|| ( MIT LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+BDEPEND="acct-group/utmp"
+RDEPEND="
+	${BDEPEND}
+	!sys-libs/libutempter
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.5.6-no_utmpx.patch
+	"${FILESDIR}"/${PN}-0.5.5.6-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+	append-cflags -Wall
+}
+
+src_install() {
+	local myemakeargs=(
+		LIBDIR="/usr/$(get_libdir)"
+		RPM_BUILD_ROOT="${ED}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	dobin utmp
+
+	fowners root:utmp /usr/sbin/utempter
+	fperms 2755 /usr/sbin/utempter
+}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index b3ece45e35e2..02a26c12a268 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,8 +6,11 @@ AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c756098
 DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d
 DIST util-linux-2.37.3.tar.xz 6126260 BLAKE2B 6a541dd1f243f0fc303cd813b50be3e0edd8dc7377734aed90fe0af03321bf03fd727285e406b95a1db176572742245220f2e6e7f4d35e508e948816ec4b6345 SHA512 2303b5c55b1fd932c73b0a079d37e56e10b6a20270b72d0b7e81ec7a6b715b42ebaa336714c3e1722d05e5aa4499f8be17ceaf61bb1341532bf9697c9a2174e9
 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7
+DIST util-linux-2.38.tar.sign 833 BLAKE2B bddde8cf392155eabe1e5f3c77d4f61cc9cb235c6d668cb289bf78650775d309dbe633e8a272ca52ff208e18bc8eaa4f8664ac239e285feb1eea5e3def1b8c2f SHA512 8909576d64c74e43496d45fcf87a761d9960cd8867534923bb280f2e4abaf4df871723aed10ac4e514e14dcbce147bdc9590de3c84994b11227923264313ac2c
+DIST util-linux-2.38.tar.xz 7349140 BLAKE2B dd3b2abb3fedd91e35cc5665b49f1913aa93927cbb6eb5c9715a9f2ce06269d43c28fe96f6c67be88c210ca20e574177b06780ab4798cbbb0d7c76df07f3eeab SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c
 EBUILD util-linux-2.37.2-r1.ebuild 8770 BLAKE2B a5662ed7720f636f06896b98662d94267ca0b6719614ddabbeb27600bc29232577c96b1af13a2574a16216a0f401635554753c42f815174e933522c7cd4aa0bb SHA512 d4834e6e9c585e150a6ace0c29063cbc895e61346d554da8c1e5606c2338ef7c4ff343d338913fbccb38886b9c1b83c9a3917a764ff368a10d3dd4f74077a343
 EBUILD util-linux-2.37.3-r1.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a
 EBUILD util-linux-2.37.4.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a
-EBUILD util-linux-9999.ebuild 9287 BLAKE2B f718a394674d8c3dd3c12a90524c2c7fa188559707becc3667c703cd1cca130fdc67cbf2b82ec4ada2c05a8ce4319618c12f3f4f7cd9e9a2e106d7d42006bedc SHA512 f5c69c551a033fe5de6242947b64d1856488ff7699c1209211afb5f485915e0d3a8fa34772378322c551de1614b9de6a1966db1da1c173d75474d009c5a5d6e0
+EBUILD util-linux-2.38.ebuild 10595 BLAKE2B 25dcd9797b789de23789e5f48a671f675e33ca7066e3d7fa807ca2c28cb18d3bb37eee16f0fe0f8057a50253bd17a0aa02722f7fd1d9815a65ed4e6b3fc17ce8 SHA512 6073ce8f64433a53e3cd65c5bb93ee0c60be9c799c17cd103182b743e8c85eff63bdf747348f77216e7b5234318cb969da1fec9b64deb5bda111600e455f8736
+EBUILD util-linux-9999.ebuild 10595 BLAKE2B 25dcd9797b789de23789e5f48a671f675e33ca7066e3d7fa807ca2c28cb18d3bb37eee16f0fe0f8057a50253bd17a0aa02722f7fd1d9815a65ed4e6b3fc17ce8 SHA512 6073ce8f64433a53e3cd65c5bb93ee0c60be9c799c17cd103182b743e8c85eff63bdf747348f77216e7b5234318cb969da1fec9b64deb5bda111600e455f8736
 MISC metadata.xml 1527 BLAKE2B 66d5b1f7f5fd85b467ec66f69c1ae71e61e41cd221ef8a52b39b09984dbabe63b26243183dbc86e8d1e5c6b0fa6866cccc18e454f741d40b6e146d9f8f1f8f80 SHA512 a6428edad3baa98b177d3363162fdffc6258305b956b9fef504341da43697935f5ff41bc9adc5d6327571f0f0bfd3148356f01f17e287b675c8c3a42e7dcea5a
diff --git a/sys-apps/util-linux/util-linux-2.38.ebuild b/sys-apps/util-linux/util-linux-2.38.ebuild
new file mode 100644
index 000000000000..68bb10664cf1
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.38.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
+	inherit verify-sig
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	fi
+
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
+	hardlink? ( dev-libs/libpcre2:= )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		magic? ( sys-apps/file:0= )
+	)
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	rtas? ( sys-libs/librtas )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	!net-wireless/rfkill
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	# Required for man-page generation
+	BDEPEND+=" dev-ruby/asciidoctor"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	if use su && ! use suid ; then
+		elog "su will be installed as suid despite USE=-suid (bug #832092)"
+		elog "To use su without suid, see e.g. Portage's suidctl feature."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
+
+	if use verify-sig ; then
+		mkdir "${T}"/verify-sig || die
+		pushd "${T}"/verify-sig &>/dev/null || die
+
+		# Upstream sign the decompressed .tar
+		# Let's do it separately in ${T} then cleanup to avoid external
+		# effects on normal unpack.
+		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
+		xz -d ${MY_P}.tar.xz || die
+		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+		popd &>/dev/null || die
+		rm -r "${T}"/verify-sig || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	if use test ; then
+		# Prevent uuidd test failure due to socket path limit, bug #593304
+		sed -i \
+			-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+			tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+		# Known-failing tests
+		# TODO: investigate these
+		local known_failing_tests=(
+			# Subtest 'options-maximum-size-8192' fails
+			hardlink/options
+
+			lsfd/mkfds-symlink
+			lsfd/mkfds-rw-character-device
+		)
+
+		local known_failing_test
+		for known_failing_test in "${known_failing_tests[@]}" ; do
+			einfo "Removing known-failing test: ${known_failing_test}"
+			rm tests/ts/${known_failing_test} || die
+		done
+
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS, bug #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+
+	append-lfs-flags
+
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
+	)
+
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. bug #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+
+	# bug #485486
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
+	# bug #545042
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
+	# bug #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# Avoid automagic dependency on ppc*
+	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+
+	if multilib_is_native_abi ; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-newgrp
+			--disable-nologin
+			--disable-pylibmount
+			--disable-raw
+			--disable-vipw
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable ncurses pg)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+		if [[ ${PV} == *9999 ]] ; then
+			myeconfargs+=( --enable-asciidoc )
+		else
+			# Upstream is shipping pre-generated man-pages for releases
+			myeconfargs+=( --disable-asciidoc )
+		fi
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-asciidoc
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+			--enable-libmount
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call, bug #689190
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		# Need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if use pam ; then
+		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+
+		newpamd "${FILESDIR}/su-l.pamd" su-l
+	fi
+
+	if use su && ! use suid ; then
+		# Always force suid su, even when USE=-suid, as su is useless
+		# for the overwhelming-majority case without suid.
+		# Users who wish to truly have a no-suid su can strip it out
+		# via e.g. Portage's suidctl or some other hook.
+		# See bug #832092
+		fperms u+s /bin/su
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers ; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 658e0639ff89..68bb10664cf1 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -15,11 +15,19 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
+	inherit verify-sig
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	fi
+
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
 
@@ -72,18 +80,16 @@ RDEPEND+="
 	!net-wireless/rfkill
 "
 
-# Required for man-page generation
-if [[ "${PV}" == 9999 ]] ; then
-	BDEPEND+="
-		dev-ruby/asciidoctor
-	"
+if [[ ${PV} == 9999 ]] ; then
+	# Required for man-page generation
+	BDEPEND+=" dev-ruby/asciidoctor"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
 fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_pretend() {
 	if use su && ! use suid ; then
 		elog "su will be installed as suid despite USE=-suid (bug #832092)"
@@ -91,30 +97,75 @@ pkg_pretend() {
 	fi
 }
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
+
+	if use verify-sig ; then
+		mkdir "${T}"/verify-sig || die
+		pushd "${T}"/verify-sig &>/dev/null || die
+
+		# Upstream sign the decompressed .tar
+		# Let's do it separately in ${T} then cleanup to avoid external
+		# effects on normal unpack.
+		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
+		xz -d ${MY_P}.tar.xz || die
+		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+		popd &>/dev/null || die
+		rm -r "${T}"/verify-sig || die
+	fi
+
+	default
+}
+
 src_prepare() {
 	default
 
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+	if use test ; then
+		# Prevent uuidd test failure due to socket path limit, bug #593304
+		sed -i \
+			-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+			tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+		# Known-failing tests
+		# TODO: investigate these
+		local known_failing_tests=(
+			# Subtest 'options-maximum-size-8192' fails
+			hardlink/options
+
+			lsfd/mkfds-symlink
+			lsfd/mkfds-rw-character-device
+		)
+
+		local known_failing_test
+		for known_failing_test in "${known_failing_tests[@]}" ; do
+			einfo "Removing known-failing test: ${known_failing_test}"
+			rm tests/ts/${known_failing_test} || die
+		done
+
+	fi
 
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
+	else
+		elibtoolize
 	fi
-
-	elibtoolize
 }
 
 lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
+	# Make sure we can use fallocate with LFS, bug #300307
 	cat <<-EOF > "${T}"/fallocate.${ABI}.c
 		#define _GNU_SOURCE
 		#include <fcntl.h>
 		main() { return fallocate(0, 0, 0, 0); }
 	EOF
+
 	append-lfs-flags
+
 	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
 		|| export ac_cv_func_fallocate=no
 	rm -f "${T}"/fallocate.${ABI}.c
@@ -131,6 +182,7 @@ python_configure() {
 		--enable-libmount
 		--enable-pylibmount
 	)
+
 	mkdir "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -139,14 +191,19 @@ python_configure() {
 
 multilib_src_configure() {
 	lfs_fallocate_test
+
 	# The scanf test in a run-time test which fails while cross-compiling.
 	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
+	# itself fails when the scanf test fails. bug #531856
 	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
 
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
+	# bug #485486
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
+	# bug #545042
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
+	# bug #601530
 	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
 	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
 
@@ -179,6 +236,7 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 	)
+
 	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
@@ -221,6 +279,7 @@ multilib_src_configure() {
 			--disable-asciidoc
 			--disable-bash-completion
 			--without-systemdsystemunitdir
+
 			# build libraries
 			--enable-libuuid
 			--enable-libblkid
@@ -229,6 +288,7 @@ multilib_src_configure() {
 			--enable-libmount
 		)
 	fi
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
 	if multilib_is_native_abi && use python ; then
@@ -275,11 +335,11 @@ multilib_src_install() {
 		python_foreach_impl python_install
 	fi
 
-	# This needs to be called AFTER python_install call (#689190)
+	# This needs to be called AFTER python_install call, bug #689190
 	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi ; then
-		# need the libs in /
+		# Need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
 }
diff --git a/sys-apps/uutils/Manifest b/sys-apps/uutils/Manifest
index a4bc656c23b4..5cb43baba56f 100644
--- a/sys-apps/uutils/Manifest
+++ b/sys-apps/uutils/Manifest
@@ -1,12 +1,15 @@
 DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST aliasable-0.1.3.crate 6169 BLAKE2B c23840c7f1df86109e004aa1929d7355bd815c69ce8c5a316c9e2810851b7faf91c7480924d67cf83520e94b86dc0cc1b90b0dcc84b446a15ba5cccc1bae95ca SHA512 a60e4280335638b36a72e51514843229fdd0cc89cb670fcf159f882a687c04ecbddcc52a1dcc3cbe8647e5308af3939037934a157facdddcc4834dcd3cb16dc8
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
+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 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
 DIST bindgen-0.59.2.crate 206267 BLAKE2B de66347fcf2d538879e49c85d2db80e86a70e27d3c84464b52a840476a31edae0cfa3e1afaba33ef0b7abadcb1e23a2fe1420e3254e0de1f6848b575a9c96620 SHA512 14c49879c7443191b877957a4fd405c7f10a1e8b70016d91bf5fe33861fc5d71982a1c685c190e4f7922cedb6c8aefadac3b0b68cbe5578da791a8da6bfedf44
@@ -14,8 +17,12 @@ DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
+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.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 bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa6cd77696a57bb94c25650f02b2f0e1e476fe9cb024a17d910442b940ea21bac3a99588146b8d89ab4adab0eca SHA512 990460eedfd41b6b52278c9dfcac81872e755d40cb839d162bddf44a30eec3a9fd76369847f10edf6c2b2d95cbec562e9a2a6c6dce37f2ee59ca9edfe972a279
@@ -25,8 +32,11 @@ DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17
 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 clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
+DIST clap-3.1.6.crate 202211 BLAKE2B 9fbd6d5ad8442118716e01c10ec9388644ef6e5621019a1245ae937324265b96d50aa70777d149daeea6f812ee05414623f938a056c38a201d9f6ee0b98bded5 SHA512 397c277eeb9acafc1098f6b6aa7e428cf7c7016356a99139dbff66dd6c6e12434b14a457679fd99ea50c1fb0b54b9b96bad65f1198025986835810484e542824
+DIST clap_complete-3.1.1.crate 22432 BLAKE2B 8eb0696e76f3e82a8e4efa644e35d97276bd60c49d8d38b2844b4f47abf4346911bfa11bb54681eb07cc552f97b0959ab6857b2f6dba279e81eebd10fd2c10cd SHA512 73ccd96b2116e756b6d4e00b28720e1e66984cd0efde5f2ec80a8a4c00737a9a096472f96ac6430c7ab586de57e38639ab15484ea6b088ddafc9f021b4680c8f
 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
@@ -40,12 +50,15 @@ DIST cpp_macros-0.5.6.crate 6346 BLAKE2B f52cb8e92e46f1fd595709b3eb3299dac06dbc1
 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 crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
 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-utils-0.8.6.crate 38841 BLAKE2B 90729cb53f5bdabaea522ac72e06e411a9737398c7970b1805a40bfc3e4d8717eb04c3afac8cf31a1c29c5ef4f137713bfb56320aa5c0e2cdaa6d49e3426b29b SHA512 ee47913da20440fc5b276d68913ab86f12e05d962daa2bfa9c1dc11a0ae775ecd4029584730fa09812d691b64dcb25ec9ad2dab5284fc83962a8e219924119e9
 DIST crossterm-0.22.1.crate 105450 BLAKE2B 4e90dddf5da88dd94c4ae82d0a6d989126b063fae56e5e0963414f196d779f4fdd265d528ecfda387a604866efb41943db8ceee124c2e97dfdcb1f092678f76b SHA512 2a8534a12bb119be583d491b3595259d164de6922ce2a17bbe6f19fcff93339a6d0d8c08398958a7592d6aa765eb2ebc6e61b54211080785357c711b2c454d91
 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 ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
 DIST custom_derive-0.1.7.crate 10700 BLAKE2B 205c46bd4f052873ff9790974052f8d81ca1fb16815b591d20db96fb330ef5b782a54eca9c07615edc5e55ba93eb38fcd37c1225f49251e83ea6059ed2cc3910 SHA512 593a98f7c9adfbd07eeacbc6915d3de053ffb33076099f425f5a72c089ee0dfabab8ea31f525cd3eb5da5c19782925ddd14a3672bd9999c6866fd9f14150518c
@@ -53,55 +66,73 @@ DIST data-encoding-2.3.2.crate 19159 BLAKE2B 43208abc26b243537e9a2556bc3ec5db53f
 DIST data-encoding-macro-0.1.12.crate 3730 BLAKE2B 5a56bc42b5b1b228e3153a4c344c014475b820f6a9df51e6b503885769ff8cca08d78231fb0feec535afe583b20dbacd2d6db524884f26e994eff2e13855b98b SHA512 2b3aa08f98f413c3c0f8a67cbf7907c913a358a0875b7e231c2cfb956d2e8fdf745c65aeb01d54bf2be0b4206233b08cb606666dc1c109816b18ecbff7aa5d59
 DIST data-encoding-macro-internal-0.1.10.crate 3149 BLAKE2B 50d5132e0b53569a74b8a946870c582489512f92c48c6578db82b05865a59f2883ae947cbf55d70d0d248c05afaa2c3396f71a3b102a677eb80326506b92b2c7 SHA512 fd98100d95644c081cde3cd9f6c86206dc0e0ea369266b198a8b63ac20e146802ff019da8e19b632418c619fbfc29ac662a95285051072e508b71b7c9c2019c0
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
+DIST digest-0.10.3.crate 18990 BLAKE2B 871a9939e5a4352781dfcb1bef82aba66ddc32e77a2db5e43488302ac3836adfc87869921e95a2af63e46699419e20d526453ee31f3d7b2171198dc23922dec2 SHA512 bfc9b24e4a6e3df91669a36f8ddcdcfb643e22b3102a200d56bbe88d94e8f1f1e52f5ac29f06253913fbd977b149a3e775c95175b93950340946152f6525803e
 DIST digest-0.6.1.crate 6953 BLAKE2B a640151f656ce6454480541c85a797dabb2d0d85bf739adbf72ae959abefdcd8381fd8b47eb51374d5290e7fd9bf4af17614ae34760105e438d62728668abcfe SHA512 6effe42ec7c6968d502e5eefb2984ccd31970d0f2e9a03e9c0721378be7b0936b93eeebb19a0ad2e3596510721ad0a287792838416421e5f8d6c5d52f7b06d6d
 DIST dlv-list-0.2.3.crate 12311 BLAKE2B c74bc2b7e8fa65443c8c8c8c44d5ccfa831ce63e3603797f193a12f78f249e5ed0fb57983469355bf3549ce335fdfac43eb4644e648296a1cd3f48f1e59b35e6 SHA512 ac464c8d1ccbb43b48618cf8912067f28e2d4f53d648cd8b6b8f1b2e2688d2e39ffb8d53faa0f665d23487fa7927258e60ff01e10df584a9e274583d8dc279ae
 DIST dns-lookup-1.0.8.crate 13153 BLAKE2B d1a23c188dd879760fd3038c72368ed15ee39378314f91c92c4073fa762bfe6c8c2a2a2d5317fcb2342dcf4f2fde9fb1548aa20b473c52b8d871733000f103c6 SHA512 88889f6dbc7e027753e6daa487f77b0db070ab67c3d4925ee463b30e7a37ab75f22c7aa88f3eca6b100e58c560bdc163dfbd1e36baf4773495ea5ce7607bf787
 DIST dunce-1.0.2.crate 7953 BLAKE2B 5572521dd8b85419561ad0af2abc47f3b60b1142c1966b89f678bcce500a38b88b3986523bb6c29b38205440ed110ad5dda3ec7170c476c5614054b36b691acf SHA512 9d1a5d449985913d1cecf2249f3c14001361faf98a0ffa2cb682b4ee4dbde906302355632033484640373587c78c0345c1c7e267c354018cb070cbc46517ba86
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+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 fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
 DIST fastrand-1.6.0.crate 11338 BLAKE2B 2862c5d40364b3412c7a6fbceab0f883a012412f22a24b960008b7951f3d6f0d5410fb28f75913d0bf3ac6254fde72b591343425e4e1016d77b9e53c8f5a934f SHA512 85f0c5e01b9e549b6a170561600138caea9604f18eccafcc4c37c2bd70f992e77e852bec20302028ffeee40d85fe8e8dcb812c0d996010a0427fb68a0ed7b029
 DIST file_diff-1.0.0.crate 282318 BLAKE2B 628bbbd75e7a8f192e54f75e3898b2c128f23c0111299fe54676f00ebfe532794f4b7fa28b27df3f94d96c8e4405fb9d2dd73e3459dbb888a38a4e99c6383389 SHA512 260313bcf0860e63d9f78523d81416fbc360a33c7c1740306d9d5b8aa1640e509b7330313c38105cd662881a47c46f89193e473f0b7da12d3848ed59d84e9905
 DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
+DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 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
 DIST fts-sys-0.2.1.crate 3731 BLAKE2B 51cbafc8f70022d30564c71cb2eeea42acfa0571ff9ce1804178a1b6551a1e655e246a382935dd138a0c5f02aed7ebbd0fe2672fde65574bf99dfdc09eb589c2 SHA512 c45db4f32783a83940a96ddf53b0b5db1a8a118ba85c81a11e8f034b7291979f54dd629c7db2a8dab21fb94743f1fbd76916d09da981d1e1aeecd391e019ca95
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST gcd-2.1.0.crate 8470 BLAKE2B 285985256a2cbea486ebf355214b525517d80db93a3d298b205fb82b539cfa6654d38e563c393b70ffa384f0f5fd722ef7c3c24bb2a5da4928d7fe4a2c2f9449 SHA512 f7b2389ac51730329c5a34ce116d4dc506e9b1edd609a3e85795e419d5942f0fc80f2298905098d5e5a4272c2638661bb4b5b34fec4ed8dbeaeccf539a606755
+DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST generic-array-0.8.4.crate 9820 BLAKE2B cbb5eaddafcb58b9f2ed5b02196dc3ebdf217bc4de9aae513bfbf61351ea78b028e1b19d5829615887fe66a244bfdcbb8fa6365d04c2dfb2a3fab5bb8a37d963 SHA512 410b136fb535bf9373623bb4025cd0adf7189165c32ced8d74ba91a8a3e7847a2fe9367f1b6357a201b035217e60b49e2d735184a3989492ae1961d1ce6de059
 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 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 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
+DIST hex-literal-0.3.4.crate 9933 BLAKE2B 65072b283fa7e7572a1ba8b65281054f2dfe1c3ebe830f6c02c6e97bd0a96a2db17f531aed0e2d39bcda1b99a648ae41e3ac82f208918cfaa2f04d925e5f08f4 SHA512 b064b9b66e36890d29f414ed5cb9c066000752c218867fcf96918e089d28a851dec8c790850e5a65e4105fa66c8e954cc0a950ad77c11fbfeed490e896301966
 DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
+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 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 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
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 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 libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 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
+DIST md-5-0.10.1.crate 14184 BLAKE2B c9eb7b25ec8f0d334555e52ca8febfbd08850aa6d87d37a8ba9d287b544d34693b79f26d645e22f06a96d1bb5c02920ad85c56b3dd6c665ee89555298e005930 SHA512 51e75f65363b3a7f4f12c7d8b563bd17cb717cdfec11fbc9dd267dc97bc933fb197c26c6e823dbe4f5e2af6261ec1b9cc003182b027be4c0ceef2d6e07bcb9df
 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 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 mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST nix-0.21.0.crate 220596 BLAKE2B 9a9c8bc8c1161b4a642eaae2dca8dee7635168249ea724d59e425253895236a1edebdc82828ccebc577edad2c7920cd918ffab1725c89068c9ef21386208714f SHA512 a3f96ba6eb976867017bf372d8e804b8048a29d32cce962d75199f10621719fe9ed3019bc40f4c8e7a683b6dc82cf818476ec9481c927a5e14b09a738cfe74a7
@@ -117,13 +148,19 @@ DIST num_enum-0.5.6.crate 13721 BLAKE2B 8257cb2a8ba51e5936fc998d3af39b2bbff9631a
 DIST num_enum_derive-0.5.6.crate 11672 BLAKE2B 81535facdcb2059831f09112519683b21e2bff19e7f611dbe022501f95a57a230ce2d9c48b64b1da53963e9207e4d1b6c572b0cf0995ca2fbaa8692f1660e183 SHA512 28cedf7a7f1d00d8e9ef89ec9df1b0bfe5133108661729f1108a1c1f724f21f6c868b0f29e29cb9dd46845893bd201d9f2ea3c51168dc2d8ab80174ea707ecc9
 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.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
 DIST onig_sys-69.1.0.crate 544763 BLAKE2B 29e614a2c2eb191e0f132348f841613d85e9877d27397a04e2e20d4e724fe730d6c467140fc02921fa75669110f303fa5182780789cdda2e05208de050b8fc32 SHA512 676884bf338fe2d9726956eec5d26297f3eba03642766ee3e64d7e2f5a945d6da93521c19c2c11881b5bb2785f24e5e91febfc08f12729fe58d74e4494f08ae6
+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_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 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 parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
@@ -131,6 +168,11 @@ DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c
 DIST paste-1.0.6.crate 17808 BLAKE2B 8659076678f659ab0bc5d9c626d405f1f545742c79222348ad6d974beeef4541663e166247433c617829e5e65fb7a5b4d00656d95d37bad214bcfb2182d45677 SHA512 cf7795c64ded12c16ed7bc90a29bb36156abc8c424066c62d3eff8831a86b4133965d87b8b76b17ed5487ec286fc80e05fff1180833dee4b48f0429016bea25e
 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
+DIST phf-0.10.1.crate 5406 BLAKE2B 70532bb97a0089ef2a57a1bd43b4dd30f0289ffc1a15357ffd8a372d82374bd505f4e39d3bfd6bc2d3c2afca39703c89e3ed37ac41c364cee3759bf0cb609f82 SHA512 84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073
+DIST phf_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0d5690d3aa331ba252351b59c478e42212cd66f167a2a88c2b9111ae7aca2c9fff3740dcba1b77d2beedc1d44483 SHA512 dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1
+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 platform-info-0.2.0.crate 11571 BLAKE2B 4cb4f50d878175e080144f6d96b3ee3f53a49c1c889e96a9fc45595518db45c46e4f24d491dec20ea27b336942023118ed0a8bf01a17e1d2d6cb5218825c86db SHA512 9420f1fdde9e3b47720c312eea5056970c38422829a5768cb280dcb876f12c631e5a64b73a0f4120732a823fa75abcb3a45c117777e453b48b2e47659d378f62
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
@@ -143,6 +185,7 @@ DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e
 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 rand-0.5.6.crate 137236 BLAKE2B 26ce5ac8fa86492fed467b68047a6a47f17af3720099410a3498c95531efe9d8329998df0ce693190c63d371c2efc67f07df9c1bed624ada18b5365f555b6c5c SHA512 0e2a643eadf6cd9f035eb720b540b838a00d6c790b1a99b36cec349c2e24dcaadcae6607f99fe86957e77b244d356dfba436a03c1d4d0756d6f8362c19087b64
@@ -160,6 +203,7 @@ DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 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_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
@@ -167,30 +211,47 @@ DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST retain_mut-0.1.2.crate 2723 BLAKE2B c899036528da0047e8c833bb9c7e0710cf56eee1088bc2a3f5df497cbdf3687b00fae032ba9fd807ba2995438e4d0734405e100db658194a235685709b1340ac SHA512 2e45b0091c97d92894731b17726c99cddbc7866d92af3bbc7b83f5721ade4bd8bb2e44570e100229ed33fd6e96de48045da025a15e37ec17e46561c47a5d1189
+DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rlimit-0.4.0.crate 5294 BLAKE2B ec55f0f9aeabe8fd030a41570885dfcd84e8d5ca0fbfc81fa43e4088bb59be4c5572db32b4d6dd9bd8c4774fb468933070083b4b7cec7ef1570d3c9e436b5571 SHA512 2687e303c4ddceadaf21ff23b1b95f572186aab2592332d8f5d542497bdeb5235d5ff22dfc37e4244511c27acc9e03cc6439542276d362ed398bca7d4ac9c08a
 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
+DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 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-sys-0.5.1.crate 8263 BLAKE2B 33aef6eea96c3b13d65be4f8397cf1f526cb90eab70c588e95011f0641d29f06a02c979e86478f4043602063914e3ab9780871e7393bd38fe79fde870339912b SHA512 59885ef9af1d547a1deb980620ebf044c96c5d959d7811a22373e3faf86e384dd3268274794ce9b34f6171591876f8a167db0e649d85986e9627634cdfe916cd
 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
+DIST serde_derive-1.0.134.crate 54728 BLAKE2B ba700f6db24bc1f807516d4948c10b3164e1d043545718ecb3464c3551d65e974b8a9ddcb7924317f8a3ddcaa1b196498b39476ce81695666d238ada1cedeed2 SHA512 ef9b2ec0e293b9cff7165fed64b80197ae63add9868c9f550bbf4a9ca92d2aa118ba901d9ae6aab06420064e81edfca489a7aac6a7e53c12af9fcd6bbb1c0d4c
+DIST sha1-0.10.1.crate 11785 BLAKE2B faef32bb5503f712d0eacd65b07cf793010a462f5fb7beb23e3768097ae5cff3537709b500e822d67bd95d70fe33163aa74fd791dfcc8ffb5bea0d4b39a1b9c7 SHA512 5f32cfff707d08dfcf0c826ddd723fbdb7e1e29614f6b303c2707dd75ef3b599a5e2b48ebdd570e2e731b02dbcbe2557e91f2d1c5cb44d0afb3d8a46c38c89a4
 DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
+DIST sha2-0.10.2.crate 20213 BLAKE2B 9e8942b4f4a4a86f5fdb0e1c237d6bfac8f3f29622c98f7203e36f736ef7e6574ce067c5ede96a3773874a8b06ff45b587dc7acd80bc1fde02344ae9f70a5e80 SHA512 20b8217ce9b56fb5f2c1d71d3555889bcfcf5e40fb7fe0eec23479d384dfcd504f1046d6a12dcbb5072813792992b45261e664e9e8e14eb90a641e94336eb4d2
 DIST sha2-0.6.0.crate 17463 BLAKE2B 22b6fd6330ca4b8c540b98d2d1d0761093c1392b7a0fa6f376223e5c692dc4aed0ff7e48e4804838054fc98bf15fd0d507dfa12d10ea204128bf6214c635845c SHA512 74f7fec02721e474aac5cb39b67af35fc4863ab9b041305cfcd1da0296bbc2e69dba255b9705778db0f7cf85c5dd584254b1399ef5a4ad30fb282d8233dcd6c9
+DIST sha3-0.10.1.crate 521609 BLAKE2B b6fcc9519cdc6fb086b8e7bb713f3ff73c696dd9a371e30c3918b183f29643b4fc03b4e77952bd1ce885aaeb8fb2b84523b73044ec37fd8bf1cf0e543b6c885f SHA512 1aafd9075a96a2fc5855dc70d48516b4beb15fe15c16c75d32c8dbeb09a3c931700a3cc650045524d7434ba5b7c28a36c659b71fc1abc581c3cd31486cb1f66b
 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-mio-0.2.1.crate 8893 BLAKE2B d3dad6a9bdaa52c3a45b9839608fed8e79f44916a07ea36e342a7a29d2ff81c0c1928fbd8628130203f00d2562bdf7e191277d6ba2c3bc51f94edc15da455809 SHA512 ca95684574e2934e138fcc2bdd023960cb4207095916650710e76b6fa32f8bfbfc8c5119d3bc92e31a55a2edd6e63b47a2119ff31cef5ba63719b9bec0b438e8
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
+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 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
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76ff6a89dcfcb28b05353a860fc1b59412933b9c54b9ad424a1366e0b81773e38b04e9a5f9a038b2d1bf082 SHA512 687a99aa93616e16510213b66f53be35561d19cd19f9776084e9d6d33f8576f5eec7a806a0e48997da2b41e6f563a05424c1d5cb5ab2b4a2310cfe1d3b10a5a6
+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 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 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
@@ -200,28 +261,47 @@ DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042
 DIST termsize-0.1.6.crate 5616 BLAKE2B ffb46966472bd1f21b316c1039163c233cf7c6d1f13b88ed575eb5cdfe7661f45c1bdcfb78c75f581c8c2f8f031ba656b227cb4256cdf1af0212d6ef81c33767 SHA512 993451c633b41bfd82abf168b553e443e3ba3bd14fc6e6a99565a1a75ef7c34b05aea955dfb0152c98ce01788f56da0fd252529568ff4b71478ab1709e342d02
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 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-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+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-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
+DIST unicode-segmentation-1.9.0.crate 93241 BLAKE2B 359904bcaadfd161128d40a896a2d10e5dfdb4098de245c949ae3fffecce9b4b6b999bbc2c6ca522944733ab0074e50fe829690183639c312bba8f8d0ad24456 SHA512 7d0ea37bfb24a1a803b1cd40b7b0c0e6e44ebf9a474fdedf0dcca1ead25662e19f44af29b87de1b000c3cc75fec93320938bb3ab9d9e82298eda324bb97e7294
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
 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 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
+DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 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 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 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.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 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
+DIST wasm-bindgen-macro-0.2.79.crate 11806 BLAKE2B 8b06ecd90701e37810644d9a28cae3e9d18abe7aea7178dee92b373991a02e2d718b0546f8f90bef1e4c7ec2c0e00221dd6f8f4f796225197184f407b585dce4 SHA512 b4d6b7b70ad6b1b2017726032923965f1bd0431a1badac1d050ef2539815cf9b705f7668da57c1bee2b7ecdf403c7d1c753217d25b8acbd32cbdca110c69c99b
+DIST wasm-bindgen-macro-support-0.2.79.crate 17861 BLAKE2B 0368ed79c618949580a3aeee03853f0174399de2ca8e0f0aeae88c8b9d3cc61f86bd38481937ca3d7a1424d17586625ab581d2662045ffea4d9af0062d8404dd SHA512 a8b83cc222889b8d90801787c99a92c93383a8313f16d96949598e137e47cbd5690cedbe97cc610e7d72042462beb6562124a0fca6e2e777d4133ede376a9b99
+DIST wasm-bindgen-shared-0.2.79.crate 7204 BLAKE2B 726e4df99b50052a9eed71b94e3887f75bf611d08e50d22724863a2cb95a9ddab59c67c88cfed21fb1b09ff9f7f154cb3acd27cae71aafc0850d4ff19f61ba2b SHA512 f81088018534c91b542d5a9085509544ea47c3a1ac13291e9dc291c23bf1a912bc61cc64d94469ae5de3b98010270956f222a08e462332ccd0b450c8f198af74
+DIST web-sys-0.3.56.crate 666465 BLAKE2B 903a54a43cdb7d990ac3e01b3ab7bd9ad33a7877fca2873296d3df3d7e1fc47d2eac52296d37579cfa1055746a0d07d3aa3d909cd86f1524e7c1ba60af16a3b2 SHA512 00db771aff344a7c05ff0c6e3c7648646913ebf16a38eb83cdb4b9afaae3ea90215ba802fe8586e50e20ccb96af11b8dcf2f81b6a11f44e26a2b0f9978b7e641
+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 wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
@@ -232,5 +312,7 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST z85-3.0.4.crate 9067 BLAKE2B 448e069d733316d6ad0705be11e8e2324611dc3b482a94237df06d444fef2eca4863f4161bf374f0ddfabbce01ea595617ea4539d26bb83e7216b69f92c515e3 SHA512 0fb3c73f196b65f7c7dad97a88195d4308726f64fdf10b09a12f071b32a622667c374f87b72a0ed70c556d55a859773f13913c019150e270d00d397ee4387768
+DIST zip-0.5.13.crate 48237 BLAKE2B 0ffd9c41535f3e49d091b831925e8b639f3128702deafc75e0ea712b67df6f0900ec79628dd2640eb9b91fba7e828abd8b5c9edad87fbe7b22e042ef9909b07f SHA512 b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01
 EBUILD uutils-0.0.12.ebuild 5139 BLAKE2B f32e400e7d05dd49af8252010950b38caebb3f16df347c0accb74b4aac4a807d514213c5c84a4c49f76b2827f4cb4fdb524d0832b56c909fe0e5176d8662f837 SHA512 bd9f5c48fd31292436f969f9ab4abacfac2c9b2b52877a2125faba9f2564d8967c735ea58181cec2c1f3b61d91bd604aa0c1a4c6d7d33083f5484b9d1cea9d9b
+EBUILD uutils-0.0.13.ebuild 5509 BLAKE2B 44e1dcb7c6b5b323052926fd369db0d96c549823f0ebc2723738af490dcd9cade5d01a18703eea806ebdc32a5927451f2a00dfea47870a7b0c4f6d75cd351202 SHA512 3bd9756af4c8a79cbc0c9aa35d3a9d18fd03445375e50816a6dc5a507a06bc08f97b8b46d893dacfe6fd348dd1adfa96f621513c2c494da491cf915137237d9c
 MISC metadata.xml 523 BLAKE2B 71fea6775cf5acf1f8601208185ef09ef2b4432020d7aa981260ae82e92dfc61385a7a385a5e003dc3f0002b85ed1f5a9c0c42745e55f5f95bd31574829d9981 SHA512 aac39be0b85200eac0762219840295319f1f6f3c0ec161b16d97b6b3bbb2891bfca3921d7c38bf0f94cf0ccefc48709a5406ff37be4b367c2b128414e6678d86
diff --git a/sys-apps/uutils/uutils-0.0.13.ebuild b/sys-apps/uutils/uutils-0.0.13.ebuild
new file mode 100644
index 000000000000..6fc62f500074
--- /dev/null
+++ b/sys-apps/uutils/uutils-0.0.13.ebuild
@@ -0,0 +1,292 @@
+# 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.0.1
+	base64-0.13.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.0
+	bstr-0.2.17
+	bumpalo-3.9.1
+	byte-unit-4.0.13
+	bytecount-0.6.2
+	byteorder-1.4.3
+	cc-1.0.72
+	cexpr-0.6.0
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	chunked_transfer-1.4.0
+	clang-sys-1.3.0
+	clap-2.34.0
+	clap-3.1.6
+	clap_complete-3.1.1
+	compare-0.1.0
+	constant_time_eq-0.1.5
+	conv-0.3.3
+	coz-0.1.3
+	cpp-0.5.6
+	cpp_build-0.4.0
+	cpp_common-0.4.0
+	cpp_common-0.5.6
+	cpp_macros-0.5.6
+	cpp_syn-0.12.0
+	cpp_synmap-0.3.0
+	cpp_synom-0.12.0
+	cpufeatures-0.2.1
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.2
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.6
+	crossbeam-utils-0.8.6
+	crossterm-0.22.1
+	crossterm_winapi-0.9.0
+	crypto-common-0.1.3
+	ctor-0.1.21
+	ctrlc-3.2.1
+	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.6.0
+	fastrand-1.6.0
+	file_diff-1.0.0
+	filetime-0.2.15
+	flate2-1.0.22
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	fs_extra-1.2.0
+	fts-sys-0.2.1
+	gcd-2.1.0
+	generic-array-0.14.5
+	getrandom-0.2.4
+	glob-0.3.0
+	half-1.8.2
+	hashbrown-0.9.1
+	hashbrown-0.11.2
+	heck-0.3.3
+	hermit-abi-0.1.19
+	hex-0.4.3
+	hex-literal-0.3.4
+	hostname-0.3.1
+	humantime-2.1.0
+	idna-0.2.3
+	if_rust_version-1.0.0
+	indexmap-1.8.0
+	instant-0.1.12
+	ioctl-sys-0.8.0
+	itertools-0.10.3
+	js-sys-0.3.56
+	keccak-0.1.0
+	kernel32-sys-0.2.2
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.121
+	libloading-0.7.3
+	lock_api-0.4.5
+	log-0.4.14
+	lscolors-0.7.1
+	match_cfg-0.1.0
+	matches-0.1.9
+	md-5-0.10.1
+	memchr-1.0.2
+	memchr-2.4.1
+	memmap2-0.5.3
+	memoffset-0.6.5
+	minimal-lexical-0.2.1
+	miniz_oxide-0.4.4
+	mio-0.7.14
+	miow-0.3.7
+	nix-0.21.0
+	nix-0.23.1
+	nom-7.1.0
+	ntapi-0.3.6
+	num-bigint-0.4.3
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.1
+	num_enum-0.5.6
+	num_enum_derive-0.5.6
+	number_prefix-0.4.0
+	numtoa-0.1.0
+	once_cell-1.10.0
+	onig-6.3.1
+	onig_sys-69.7.1
+	ordered-multimap-0.3.1
+	os_display-0.1.2
+	os_str_bytes-6.0.0
+	ouroboros-0.15.0
+	ouroboros_macro-0.15.0
+	output_vt100-0.1.2
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	paste-1.0.6
+	peeking_take_while-0.1.2
+	percent-encoding-2.1.0
+	phf-0.10.1
+	phf_codegen-0.10.0
+	phf_generator-0.10.0
+	phf_shared-0.10.0
+	pkg-config-0.3.24
+	platform-info-0.2.0
+	ppv-lite86-0.2.16
+	pretty_assertions-1.0.0
+	proc-macro-crate-1.1.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.36
+	quick-error-2.0.1
+	quickcheck-1.0.3
+	quote-0.3.15
+	quote-1.0.14
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	rayon-1.5.1
+	rayon-core-1.9.1
+	redox_syscall-0.2.12
+	redox_termios-0.1.2
+	reference-counted-singleton-0.1.1
+	regex-1.5.4
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	retain_mut-0.1.2
+	ring-0.16.20
+	rlimit-0.4.0
+	rust-ini-0.17.0
+	rustc-hash-1.1.0
+	rustls-0.20.3
+	rustversion-1.0.6
+	same-file-1.0.6
+	scopeguard-1.1.0
+	sct-0.7.0
+	selinux-0.2.5
+	selinux-sys-0.5.1
+	serde-1.0.134
+	serde_derive-1.0.134
+	sha1-0.10.1
+	sha2-0.10.2
+	sha3-0.10.1
+	shlex-1.1.0
+	signal-hook-0.3.13
+	signal-hook-mio-0.2.1
+	signal-hook-registry-1.4.0
+	siphasher-0.3.9
+	smallvec-1.8.0
+	smawk-0.3.1
+	socket2-0.4.3
+	spin-0.5.2
+	stable_deref_trait-1.2.0
+	strsim-0.8.0
+	strsim-0.10.0
+	strum-0.24.0
+	strum_macros-0.23.1
+	subtle-2.4.1
+	syn-1.0.86
+	tempfile-3.3.0
+	term_grid-0.1.7
+	termcolor-1.1.2
+	terminal_size-0.1.17
+	termion-1.5.6
+	termsize-0.1.6
+	textwrap-0.11.0
+	textwrap-0.15.0
+	thiserror-1.0.30
+	thiserror-impl-1.0.30
+	time-0.1.43
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	typenum-1.15.0
+	unicode-bidi-0.3.7
+	unicode-linebreak-0.1.2
+	unicode-normalization-0.1.19
+	unicode-segmentation-1.9.0
+	unicode-width-0.1.9
+	unicode-xid-0.0.4
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	unix_socket-0.5.0
+	untrusted-0.7.1
+	ureq-2.4.0
+	url-2.2.2
+	users-0.10.0
+	utf-8-0.7.6
+	utf8-width-0.1.5
+	uuid-0.8.2
+	vec_map-0.8.2
+	version_check-0.9.4
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.79
+	wasm-bindgen-backend-0.2.79
+	wasm-bindgen-macro-0.2.79
+	wasm-bindgen-macro-support-0.2.79
+	wasm-bindgen-shared-0.2.79
+	web-sys-0.3.56
+	webpki-0.22.0
+	webpki-roots-0.22.2
+	which-4.2.2
+	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
+	xattr-0.2.2
+	z85-3.0.4
+	zip-0.5.13
+"
+
+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"
+
+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/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index a9e563c7ec74..c21b50e13bdf 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-desktop-portal-1.12.1.tar.xz 484352 BLAKE2B afa14ab78f35cb1c0e66514f313f5dc297ceef88af1ca7b3028305faa8398bdae1b9e897289b18a93b1cda1a8290c0e51bf73e66c9dce231f57a58652fb9e120 SHA512 62df427e2d8d54acd9a34a02a77c26ae3911fbb4c5844eff4a253dc839775c929c6945401b93549ba200ba637d315146767e41f18a831d7627b35de880de0da1
+DIST xdg-desktop-portal-1.14.2.tar.xz 504088 BLAKE2B e0a378c1f1d80afda7d73fd8e545f7304eeab349cf3298ebb616021c7e16e8a088360681e31eedca9ac90978eb04167a7e857ddaa5e023a2a8c24c9f959f9b2c SHA512 7164d6c0d89843d117e03bc46963d72f24dae2b9fc8e173f06a78bbc80655ccf192d86f951d3c404c88bf5da88d9d2053ea52cf3e541b833ee937b6931d803d7
 EBUILD xdg-desktop-portal-1.12.1.ebuild 987 BLAKE2B 94bb8e58df78606aca537d7d824fa28624d1363ecbb851da6cf26c1c9c9df001c374700ce1927d9c8e21c4f9ba57f8f0401b67384b402955884b22e34f498323 SHA512 8364ffd4409b01f374b3e192bfb7e955f00e9c8fe056439b34ec5cc2b2ca750fb69ddef02469d5b542f6bee51f4de8885802acabccd6f112184920c9dcb814e4
+EBUILD xdg-desktop-portal-1.14.2.ebuild 1057 BLAKE2B 96717ed1de8af640d5a2e9ba776e04b9901c2980654d4bac60146201abe0ba5a9e13251ad49d25d89bd027fb3dd7619b5551d33075443babeb0c0c0a5ad5816f SHA512 e9e4de40e97bd48e80a88246c307a470c14a62cd76c1e1a0292958569a6f42e9ae0ac1f42b8ad0f23f3ca041339ee6fccde010b46cb032114cdea1622c26725e
 MISC metadata.xml 361 BLAKE2B 29f050b1cf9380b76d4a779066ae0db5704da11ba9d97e1b2ed7c8d15003d534ecb83c4cd186e7f47e0e89b10e51299ee7bdd9acff9a02f9dc721647bca283da SHA512 872fc2c477635667b5593856f3fef346b96add82b754f9978c36c3c4e56a00516196faab14bac0adff40636c481ba436889b13549b2fc29412f3a21d1166fa25
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.2.ebuild
new file mode 100644
index 000000000000..32e526740664
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="geolocation screencast systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	dev-libs/json-glib
+	>=sys-fs/fuse-3.10.0:3
+	x11-libs/gdk-pixbuf
+	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-docbook-docs # requires flatpak
+		--disable-libportal # not packaged
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		$(use_enable geolocation geoclue)
+		$(use_enable screencast pipewire)
+		$(use_with systemd)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/zram-generator/Manifest b/sys-apps/zram-generator/Manifest
index a608dfb539d4..6b79d728a6a7 100644
--- a/sys-apps/zram-generator/Manifest
+++ b/sys-apps/zram-generator/Manifest
@@ -1,9 +1,12 @@
 DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
+DIST anyhow-1.0.45.crate 35468 BLAKE2B 0a6e6bb7a04315e6aab21ad1da743b4087ed95e7bfb7f143b4c5b1cb9527c1e1f9c334bf94c8aaf7bb98f3fc6b0b0cb87244d13808cb86fb76d07555304db90f SHA512 a2ea3a764024dc5d5c176890e22aa9e91e18c4252e04548baeb6ed8cbc11ba8e3b0220758e7b1a670e934da0f40e747ce02520788c0e557cf9ed05b19806fd50
 DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
 DIST dlv-list-0.2.3.crate 12311 BLAKE2B c74bc2b7e8fa65443c8c8c8c44d5ccfa831ce63e3603797f193a12f78f249e5ed0fb57983469355bf3549ce335fdfac43eb4644e648296a1cd3f48f1e59b35e6 SHA512 ac464c8d1ccbb43b48618cf8912067f28e2d4f53d648cd8b6b8f1b2e2688d2e39ffb8d53faa0f665d23487fa7927258e60ff01e10df584a9e274583d8dc279ae
@@ -11,10 +14,13 @@ DIST fasteval-0.2.4.crate 267521 BLAKE2B 2abd639d65e45fb31aada3d776a47eed7cc16f0
 DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
+DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
 DIST libc-0.2.109.crate 570506 BLAKE2B 629146033110c42a380a8e87f09af04773bfe9609b8430fa5ec8d85b3d8431e430b60b072e436c479aa8f0037410f1a642bfdb92e4a932ed2c875241bfd63eff SHA512 ecc5cff60ef7ef4febae95cb3ea4fc130b1844ee20d046332ea0738c85ce1c0afe9239d9ad5b1a50236918aa1166eed04b5a91ece76e49099e4a5415bde881a4
 DIST liboverdrop-0.0.2.crate 8714 BLAKE2B a60988a848d21390b46538f02a97cec247184eea7e72a4d77bb243a2476d8ac1d88f964c91ffc0ebefd1215c4c7538fb0a835c4cb41bc153ab89e0b2d98b3c6a SHA512 084c2c2e4c1ee787d5af53ce20f7118f9deb4f1f34b242ca1dd928a71515660b388eed94d1eedca108b3f23c4a8dc4e4b778b6b8a8704850989af63a8be20bdc
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
+DIST nix-0.22.2.crate 227371 BLAKE2B 614f863ba54c57e247d26df2c0673270fb2ee19dc729f8b2340139556fae943cf3b0499532d3f42a02dc26f98b62558921568c46a99f2ebc348b37dce0f14b30 SHA512 860c6cfe77117c28ea54fc5587a125e8ab14acec2dcf77f70d3e43ea574f5272ebb05999b266142616bd92aa613f8c2f60b026b95e758975601df9345a2dbf71
 DIST nix-0.23.0.crate 185348 BLAKE2B 3b5acd0972755d7e3f724d2429b801d5952f2410d91240f9410a8fcc724421beb8c85c9df35b7b877036bf7bb83977e579293ca473efbf9a34cfaa07ad174fe6 SHA512 0aa28f348b67eb79f6f36410e0be4a888294312350b67717ef462905fddb7cba4d81fc0748515629cfd617535c2244e651b05cb0600a054fdc40ec60346a8c8c
 DIST ordered-multimap-0.3.1.crate 20631 BLAKE2B 2d874bb9b37ea109cb7840209c4811c872bddb96f4fec4c936400c57e9a16c04fe801eb72a5b4877762dc9afb7d778c15f2c1efdc34a05b9405212cbf14e6c51 SHA512 37b827165659529e02e303a15ae51c1291e521510a11703ee4245f899d45a2a33237a85bc5e10aeb229f16647f544b37f45a35721c6ef6d6c3c75874a373fdc3
 DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
@@ -27,6 +33,7 @@ DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-ini-0.17.0.crate 15155 BLAKE2B 654c74c69dbef6ccea8a31070683b9008160340c0768b2e2d169554032cf5ff58533a824c42af83924eb10c2273bd0599bd397ae8322e7179c978015b31249c7 SHA512 2e89d4a60ba33115d3de5b7da551fd47f2350b3e77cc1148c5141134c7ac2bb87de152c67d4c782ae69d3dc04b4159c28eebab1810ce8b9b11bccc3f1a804410
+DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
 DIST syn-1.0.82.crate 234316 BLAKE2B 1d115a4fd61cfebf62657f8faf7fe8786b3715ecf0413a5d117289853b4ecad399611d92d7bed26e590236a4689bff5599787c04f83de1db7f6c771eaa032853 SHA512 9406f62404f1dec3ea37a5e583a8dd7daf646fd5a1b11359aea3004010b3b416a44e4457695ba5beb12b3cbb9fe437de6f73018faa364c4e48060f6aab8ada1d
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
@@ -37,5 +44,7 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST zram-generator-1.1.1.tar.gz 26091 BLAKE2B 439f550920c1d1a5ba834f3a7e399b8e4451d3fc70ba29788810e08e89f4009972fa9e2e068ce99484f282c82da19044c8498b4f59083a7df1baeceea8c75ab9 SHA512 3aedcd5fb5588b6b011948569785dbf970a3a574094f020e2e1f5a448db41deaa3c955962a8ade5b178df8749163a6282eb4f24e7256c3a185163aad3eee0d66
+DIST zram-generator-1.1.2.tar.gz 26483 BLAKE2B 20a3519c21f543626efb4bf507f0f59dc6dd2ec208eccbcbdbb07a96e7f03ca5539cda17e4a96187267f71f3d771921f7a83fbdab26051c312640c1118a3b186 SHA512 334864dade2c5e0ca5519c0d1d3448e115440538dd04d29857f71cdb6383c65afebd022903f7fa768824becd90072a6a15ed9e1709bbe2676fb71d9f6b9b5f42
 EBUILD zram-generator-1.1.1.ebuild 2080 BLAKE2B d6a78fbe61c718a85f906fc729e333d1b548a308a2031c0ea4de765ccef157def5f156ba7884ddef7bea017f1096ef0d913c35da71cfa36b8e3452bc81f9e6e7 SHA512 98edc49eade47b49b5010924bb647f0d6cf41e979e9e49892be6ec59fc36544bf41f9c0e5e4c09d5a321b829f8c86de5e17c760936bb48fd9737f68a3c1ec37d
+EBUILD zram-generator-1.1.2.ebuild 2080 BLAKE2B fd4654039d9d64a582a6e59e55a469bf047927a65065980ff28202f76be8e6432f4253cb7ecbeb9465dcda02b87f292438d30c3ffe5939c00c658114b705c6f0 SHA512 12f87ccb84935b6a0a5b24599c6a4a7b01632fcd063cc3015ef5843614fd941853325a9d5cbb8a4a57ef0fdc669310bec3ecc08394366fa38acf04dc25017bb9
 MISC metadata.xml 215 BLAKE2B d2ce9b6179c543801bfe26069c65df723eaac4c8bab2d6ea1bb78f41a6ea032fb4491adee16a11e38342158c312ea625113cb362f5da840efc2b432ba3117fe6 SHA512 375665b8997b26eaec5c9237b5ccdf8628af5fd54548e85ba80c12e34e6afe8304fbcf7dfb30f69c6081e9d45e372ae2603efc778421586a13ddfcbec695cf87
diff --git a/sys-apps/zram-generator/zram-generator-1.1.2.ebuild b/sys-apps/zram-generator/zram-generator-1.1.2.ebuild
new file mode 100644
index 000000000000..dd3664998c2b
--- /dev/null
+++ b/sys-apps/zram-generator/zram-generator-1.1.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ahash-0.4.7
+	anyhow-1.0.45
+	autocfg-1.0.1
+	bitflags-1.2.1
+	cc-1.0.72
+	cfg-if-1.0.0
+	clap-2.33.3
+	ctor-0.1.21
+	dlv-list-0.2.3
+	fasteval-0.2.4
+	fs_extra-1.2.0
+	getrandom-0.2.3
+	hashbrown-0.9.1
+	libc-0.2.107
+	liboverdrop-0.0.2
+	log-0.4.14
+	memoffset-0.6.4
+	nix-0.22.2
+	ordered-multimap-0.3.1
+	ppv-lite86-0.2.15
+	proc-macro2-1.0.32
+	quote-1.0.10
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	redox_syscall-0.2.10
+	remove_dir_all-0.5.3
+	rust-ini-0.17.0
+	syn-1.0.81
+	tempfile-3.2.0
+	textwrap-0.11.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo systemd toolchain-funcs
+
+DESCRIPTION="Systemd unit generator for zram swap devices"
+HOMEPAGE="https://github.com/systemd/zram-generator"
+SRC_URI="https://github.com/systemd/zram-generator/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	  $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+man"
+
+BDEPEND="virtual/rust
+	virtual/pkgconfig
+	man? ( app-text/ronn-ng )"
+
+QA_FLAGS_IGNORED="lib/systemd/system-generators/zram-generator"
+
+src_configure() {
+	cargo_src_configure
+
+	sed -e "s,@SYSTEMD_SYSTEM_GENERATOR_DIR@,$(systemd_get_systemgeneratordir)," \
+		< units/systemd-zram-setup@.service.in \
+		> units/systemd-zram-setup@.service || de
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	export SYSTEMD_UTIL_DIR="$(systemd_get_utildir)"
+	cargo_src_compile
+
+	use man && emake man
+}
+
+src_install() {
+	# https://bugs.gentoo.org/715890
+	mv man man.bkp || die
+	cargo_src_install
+	mv man.bkp man || die
+
+	mkdir -p "${D}/$(systemd_get_systemgeneratordir)" || die
+	mv "${D}"/usr/bin/zram-generator "${D}/$(systemd_get_systemgeneratordir)" || die
+
+	systemd_dounit units/systemd-zram-setup@.service
+	if use man ; then
+		dodoc zram-generator.conf.example
+		doman man/zram-generator.8 man/zram-generator.conf.5
+	fi
+}