gentoo resync : 16.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-16 13:07:24 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-16 13:07:24 +0100
commit: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch)
tree: 464c922e949c7e4d5d891fb2cdda5daee5612537 /dev-util
parent: e68d405c5d712af4387159df07e226217bdda049 (diff)
124 files changed, 2585 insertions, 246 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8e04d7e4a043..ae71f4f05521 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index 91c659ea91eb..cdd8874c453d 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -1,4 +1,4 @@
 DIST ROPgadget-6.6.tar.gz 9349424 BLAKE2B b1f1e5fbc76329f64122e65161ab188e9f7260c4e43d5e92e0e43cd4ebbf27ae281c32bd49790a363ff1d10360a1cda1846310054c249ab40279063a735654e6 SHA512 bf636a264975c95676e5bb6223d0cf04885699eeaf691c6c93a1ac8c1bc44f95323207660a57a58f44163f8c07156567daa73755b35a13cff5d27aee01ec4fb6
 EBUILD ROPgadget-6.6.ebuild 772 BLAKE2B 104cb7f8723d5c23bc873d4666646120bc46ab54eab63cdb8774754e4d45ab3700f00d0560adb313dd011fb7c988eced926f7d2c05d67d51d6f902d214add9e9 SHA512 7e798006553e0b0b26fa276c51486d329ffc0a05802f6adb477429e506d3f660479a4f0d1ded69096d6480e9e9db1932842f2ffbc0c39d8046454e8e87e13973
 EBUILD ROPgadget-9999.ebuild 772 BLAKE2B 104cb7f8723d5c23bc873d4666646120bc46ab54eab63cdb8774754e4d45ab3700f00d0560adb313dd011fb7c988eced926f7d2c05d67d51d6f902d214add9e9 SHA512 7e798006553e0b0b26fa276c51486d329ffc0a05802f6adb477429e506d3f660479a4f0d1ded69096d6480e9e9db1932842f2ffbc0c39d8046454e8e87e13973
-MISC metadata.xml 714 BLAKE2B f6d32594235874aa2c8149ea44e067bcb4fddd211152c60e243178b71ebb831be5937f140aa4f322a21fc7c01baab44b78e38b656d5db6bbbe350862749c203f SHA512 d3a78623f7402452be13196a5dcac925ee34a3a4b62400a7c7ec26eb0b0a177f594e1e4d5d93678066fa6b2204707881705684dc11d8f8b93d7fa36f96a729bd
+MISC metadata.xml 761 BLAKE2B 4945ceb179f08902671a650504bc6671a51223aaed0f676349bbe6aaf0cf3622a7df096810181099a8488f35a687cd682005f11839219eb7b5a63074a634cb78 SHA512 afd23e85344db0600b9ac51767af44ba57e653e47b47746109c52dfe7c69e85d07a999a2bb5e51dc7fa3e8f1738f04dbafe8f46c214fa7e8679a44f2e078d77e
diff --git a/dev-util/ROPgadget/metadata.xml b/dev-util/ROPgadget/metadata.xml
index 29280c8d8dbc..abb0bc50b189 100644
--- a/dev-util/ROPgadget/metadata.xml
+++ b/dev-util/ROPgadget/metadata.xml
@@ -16,5 +16,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">JonathanSalwan/ROPgadget</remote-id>
+		<remote-id type="pypi">ROPGadget</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 58508b24490d..620f8dc3377b 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -2,7 +2,7 @@ AUX 3.0.17-gcc11.patch 1934 BLAKE2B a51dcf079322144ee84ae41dddfccc08dd878a0b04f0
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.16.tar.gz 122948 BLAKE2B bb720170488968e79d26b7022859a3a55f191661a65d8c5c1ce6120911919ffcd74a32035eebb419e4fe9a616f6dec1c66804445d9e8b243c7d26a87284f7776 SHA512 3906011aa01f42c7841046614e9f1972a39288749cbdeab4b55e517d48a05cb02a48be2b055b4ce65300ffa0a940609e713f55bd1a47ce4fc9a8cb2702487f07
 DIST bear-3.0.17.tar.gz 123861 BLAKE2B 9dea85c7c0ec5ec4954d08147cdac31e0b28c9780281a544687340e6e226e5403ad82f74db0fb9edd3f65c9a982531afb612e1c744430735e6de97d8d29a2189 SHA512 08e50b04c87745ae60623c32de07e710ffb4e78d9978f13cca9d51929b45477c780f1fe47178569310dca20dab5fef49dbffdf17a087c388f111eb11ffadf5b1
-EBUILD bear-2.4.4-r1.ebuild 1826 BLAKE2B 533fc59fcd4c43c10bf5d5c35d0ca8014e5538f90a8ea53eb57c01a2638153ba5a09561ac88adf02797c0e7bb52bfb3146318447bd3666becfa670923e257a24 SHA512 9716eb3dad6a82708b74b622112762981a18d0c8ecaf0a0d103fd8563597643212555326481c81ade52ba355f109db754a56e402766a4a3396a3d525fd056bfb
+EBUILD bear-2.4.4-r1.ebuild 1829 BLAKE2B 0f87691b8ee68c1176236f4cf1608892941195893b4a1ebdf5872333b05196f81f1b98469bd90534f7de062bb613dbc649ccc2e99ccc739501d4d57b57d48a61 SHA512 be4c5dee00262ac6681cc2486965732ba5f196e70e7cbf21424e96d3154f3171d1db68b7493f802ba359699999664f92bc64488f3922cbf9ac34d785dc61dd8e
 EBUILD bear-3.0.16-r2.ebuild 2095 BLAKE2B 515d7147414212b1edba08ef6a63c58f2e85de1908103b4308d6eaa13ca23c4e058025181f3a5ee0fa0c25712950f6130513d47bd073abbfd03343903eac8985 SHA512 480fa8af0fde9f09bb70a14021fad6d0766c9831590c2c46db6e6a1331f3d24dc0b3a6202051fe9975567047c86dddc2f89e3324113586c6c84042659d69b81e
 EBUILD bear-3.0.17.ebuild 2160 BLAKE2B 9fac64f316be4108616bce784e2efa4c32fdd379f06ba21de0f3c378611244088ac99d7358593a6a7d75871dea5b846e1774e5268ddef6e68a39da7492d15fcf SHA512 21f420ed9cf827bbee97d8d587228374594ebc467996e96aa5e6a4d0ef169444e01dc9111bacbb66ad033ed7bcb3adfd1c990da5ecb3146107ae8a0931bacf94
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-2.4.4-r1.ebuild b/dev-util/bear/bear-2.4.4-r1.ebuild
index af4cedd7fc4f..08fbed8fe87a 100644
--- a/dev-util/bear/bear-2.4.4-r1.ebuild
+++ b/dev-util/bear/bear-2.4.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit bash-completion-r1 cmake python-single-r1
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index a59fbe0b143a..605b4c725a5c 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -10,6 +10,8 @@ AUX boost-build-1.78.0-no-implicit-march-flags.patch 17236 BLAKE2B c8c068f48de2d
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
+DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 EBUILD boost-build-1.77.0.ebuild 2114 BLAKE2B 28bfad497b939cb453f6010fbeea0e46fd7ffff6009ab65f7404b842399e2941065e33477d293d5983fa4269d90b2d8cec017537d010d11c40e8d9c94e3d2f30 SHA512 677e523abbb7f97475a91b87bb592c6fbf8674d6baec28bfc24bbec32636476430266b5cab2f1c6b357cd84ce7fc99294896ea9431ac2e0987270a8012470384
 EBUILD boost-build-1.78.0-r1.ebuild 2166 BLAKE2B e65979c0a57bc8d4c30514f51be2051ed73b33221d69fccc429dacf699c8ce9fb2e65c39cd6c04a511ab1c33ccbcc73bdeac9e3de8a1de3a8994678e3e6fa561 SHA512 7f3c708126c863f3cc052f16442bc360dcdff51be044b1f820820a5d70a7404e4e104d75556cd7e487e31f6c16cd095ffa05b495b60cdc04cd0332d3183c3fbe
+EBUILD boost-build-1.79.0.ebuild 2122 BLAKE2B 6336069e4e4439a46bc2790ae7377189763ff26628b06b54d64671241c4ed1be392691e62978b024b004cc9f6087e3b6ffb31e9b570990791b10dac87846c61d SHA512 124e4ebf118b7967dc72220c13d4665ef203533ed7a9c8e0f0073e7a91de5bd3d2e2a98e11b45d0c6f6895b4154d892867aead3eb46773f86dda250e1a019012
 MISC metadata.xml 320 BLAKE2B b8916adb7b84ead3feef70414578019e07de58086e6954cf2a26a77368a99bc75bf99ca18f111a67531d318863fab700083ebcd7612e7d40ece89086d9d4974c SHA512 7c2c8fa591a6c3d05b5d4808077b890d5757bbb4c12a9fe7ed7b4ebc738244266196baba07da434ac3609c0d00aed4ef9c2346524f141e679b94376f804c508b
diff --git a/dev-util/boost-build/boost-build-1.79.0.ebuild b/dev-util/boost-build/boost-build-1.79.0.ebuild
new file mode 100644
index 000000000000..5efc205f8f68
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.79.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://www.boost.org/build/"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-1.78.0-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch
+	"${FILESDIR}"/${PN}-1.78.0-no-implicit-march-flags.patch
+)
+
+src_unpack() {
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	default
+
+	pushd .. >/dev/null || die
+	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
+	popd >/dev/null || die
+}
+
+src_configure() {
+	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+	append-lfs-flags
+}
+
+src_compile() {
+	cd engine || die
+	${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed"
+}
+
+src_test() {
+	# Forget tests, bjam is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/{bjam,b2}
+
+	insinto /usr/share/boost-build/src
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-util/cargo-ebuild/Manifest b/dev-util/cargo-ebuild/Manifest
index e75539745295..519225961247 100644
--- a/dev-util/cargo-ebuild/Manifest
+++ b/dev-util/cargo-ebuild/Manifest
@@ -1,9 +1,12 @@
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3
 DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
+DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base-x-0.2.8.crate 10614 BLAKE2B de50c274295b12234d9c4b8a551058b3345f3f3801cda0141f18b6df9e0f92d2a1fe09dca185e475fb95a1b2bee7935549d1ca1bf882d77e64afad5bb0b55955 SHA512 ad140fc44bdf0342875b7087ee242e70ebedf591075cf80d2362f74e544882971bd9b1cc21dc5b4ac13e38710ec0e087474b54b238d6ea6748d3ca4755b25929
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
@@ -14,18 +17,24 @@ DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST camino-1.0.5.crate 29642 BLAKE2B c345be490622b50f3a744f9c42392d12e02e286d75e09f4eaa8a1c6f86cc849c5a752aa7cb5fb1f697ed8beb741c7d9cea951f4f5ce7049dcaf6de5ec69a60d7 SHA512 1131997ca090426a25daf3be2fcd6e559d980078dd71fbf3f16b4d593531a24c0f030aa6c9652080fdc02b5420da98991b9c93115ce1c0cad8c0fad4437b1d59
+DIST camino-1.0.7.crate 26602 BLAKE2B d0ab5d5da9036acfe8ee4f68c015c123773529b9c84f0dd365169f33ca7e23eafcb5353bb2f6db02fbced9c075a0dc356c96d02711af1c4a506ce4d1c9f2fe05 SHA512 0c22c9de3740d39d058de25b2c9b221928f11cf9340562412a15948ddfeaddcb6da38ed3f18321c322d2811847d7cb5cc1c78304f67e9702a2056e59da64bf33
 DIST cargo-ebuild-0.4.0.tar.bz2 19977 BLAKE2B 11c39c65a076393806800daef8b24b25ff8c616e07deec69682adb6bff934e5419629a8295fdfee6119207577ec21e62586566187fcc4b92eed2a5ec936ce15d SHA512 04db68e8518e0955bde0336186f60c865a18b2fc1b9d069f7fe3e24c5b708fab0e3e4fd4cf142bce451fe7033b1c863ee83997b04ee60d85b3aa2bb7dc66d32b
 DIST cargo-ebuild-0.5.0.tar.bz2 19107 BLAKE2B 3f264823838e159169d7b8311aa68912862f6b41ddaf281fc806dc2e81b573539854099113acd47fe6f7e7a5f26f6c3fffbfeebdf9960aa15aa2f312c8014511 SHA512 ae7c460f7c7e084daa5b68f99d2b55351a82a616762c2d4713db89e05ad5179dbe8fb4342ce52c1b7c23e70e2e60287d21b342e0aaa3f5808e042690dccbc2f2
+DIST cargo-ebuild-0.5.1.tar.bz2 19304 BLAKE2B 12cc6fabac8113e2d1e9eefcc609869bff45250e0a1dc4c328478260f839605d0ce05056012f142e49665f9f264f5942a635f0fb842f18f464ac7537d309d91b SHA512 4e8af80c1aed288591596c065b480ea94c44a752d5daf248e9c66e3ba6dbcce7c028b94f34316a3ee88dd4657b2a53c2dd57c050610d59f89889f3ff2337809a
 DIST cargo-lock-7.0.1.crate 60137 BLAKE2B 43b5fbb04471f4b639a99ad87a9b97316478ce53a804b3600fb2601708572476c361b2108b7545b88f23b0854ba01e2a81a2530fb073fe86ac8a309d65572cb9 SHA512 7ea98c9ab1b769ed8a801d18958be70ab17a3bfa07c974661b3ab064c754ee7da5a064fe1a1732d9b44b305ea89206c8497772deb215ee433b15ffab31ebb65e
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo_metadata-0.14.0.crate 17008 BLAKE2B 00fd6841170d5dae463a60daf442eb3033d616ab171dfb7efc201596196571b06df83f6ab23e88397c77baf3135745bc3ac6051557ebad2c3ea96440f00e1d2b SHA512 d33f691d56df56bdea260363cd29864b17f0326b90b4b9688781c37d3eba4437b93b48e6448dc1d012a8542d7d2495f0acb73322340269db9cc4a4aa955f9605
+DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
 DIST cc-1.0.69.crate 56044 BLAKE2B adcd10bf4faf6835ae8feb79ce5e7a4895700d9714fc4322dd52e37bdd8db66b849d5e59aceba6ef0edcf9a5c7c0e2bc616de4acd98b71999bd63592c1c69dda SHA512 ba2b84fb61b4097a96f9013f9925b1985263ccd75274186f5d37589444e390ae8d5d1f88c210822a9e9dac2db551c24aee2b12bb61801aef8b31a72b2ac77437
 DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
+DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 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 const_fn-0.4.8.crate 12662 BLAKE2B ee8d12d8bd01e64c308b27fe4f55e665fe6ccbba6e911745061e816265b096d17c708fc4ff9d28ebe7101a6523edc65e8c54d189a4a9815b2d4341c69f20d741 SHA512 e7bd5c50a10f55bc9578e55f9bca80c8ca1cebcd49206ce1feeeeaaac3dfbefdaa89f3c197a992d8ef52efc8327b3b34935e253a41ae9ac20b0b08b73f19df8b
 DIST crates-index-0.17.0.crate 16270 BLAKE2B d5c073bb227c94d7a7ba73432bd5a4132999b019f5e61b07a57a60e0bff206f4b0eef727396e7a607de174ca4282d89d80d3c25f9cda1a7de91570cdebdbd22c SHA512 9bd23a12400e01211537f3f7d80c83c08b566a3471d76c2a8242b8553661b9f5e84497d97c5ca0c39e01cdcce6e52fb2bd9998463fff8912027749f528ccad85
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
+DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST cvss-1.0.2.crate 19222 BLAKE2B cfe53ae9e6e2f7748f9b4f1e464615e6c1f0a43ae818107a5ad291e37676d91407af62fa0e8800fe7f51324399b883981e3a6c679e911a51dbe7c0a5579f0716 SHA512 9c0d079396a0fb826dc84d67c600477c480a25de07260c09e398cd970c433651a9e6ed8d0e817cf603aed2e2eaaa7317631ebdec0a9e0a071a1b77e7cdd8d922
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST discard-1.0.4.crate 4700 BLAKE2B 423cb655d6d58b4ac68269a63332f4828a3f6a4823f6f98f83d748bd16afb7ae68d2bfe5852fbd86c10b79713576d6e16425bd2541451f715a7e9e3a9f2d2927 SHA512 51e0335509a16c73d2620ff83de4b73506a45b36e306dd0eedefcfe89c6054eb5abcfed0ff5b3868c3b17a1c6d82d958d7899f25aba50709c5dd486fdfd0dd6e
@@ -34,10 +43,13 @@ DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b6
 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-err-2.6.0.crate 14311 BLAKE2B a637cab75430655a1bec0145a0a8ca30413daec111ab7f11a78424dd147f098060c510ea6b9dc82fe4c72969c1635291f1de18f7d6de54194af6cad388f96042 SHA512 ce8234b9b12990bf5d322c537f1bc1dfe2927dc9cd6797eb009a42ffde1379e8194a0320e75ef032deefcbafbea79510982c5ae4c668ad8f8d5a87caba5d16e0
+DIST fs-err-2.7.0.crate 13981 BLAKE2B a86fcfb126bf1a48f81ec98f544510f46e329c0c62b697f8ede62afcbb41115fe71fb5b46e785b5304884219d81fe03d74f0735ec72eeba0a7f0b8108f1ce1cf SHA512 19477563b4a316b8ce528c637c1ab9e17e6d06d15230e83468019cefeb5e66bc4d86a24738f6e10063b1c27ed65ddba6992195be4467ae7f14aa53a0ad6632c0
 DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
+DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST git2-0.13.21.crate 191193 BLAKE2B 430a2d43d2ee544c6cfd014f979dad42cf5e28215fda02998e967d9f98e91d77c7383fdc3935977657c20f1222c55df1229d796c9bb18372cf2726c21bc0ed4d SHA512 836c976c86eb8b818c90b9b3d498183ede97934ed7cf84828760c9a4e1c08ab4cf65fccbb200b0d14c129eee811a4c2c405613e1d3f27baae5e9972c7b0e6a9a
 DIST git2-0.13.23.crate 192186 BLAKE2B d3bd3c54abc7b04c2948edaf35adac671a391c03ecc80c53e6ad0c9f14798d0d9fcd308a9a30424ffe5b1f6da1e6e20751d98eb47c62e123e3bbb16cb11ca32a SHA512 e60f21affcef26aac16181d48ecaa67b6a9578ce5fe9e62b6c460b21bc02feb858fe25f07f7d7443b8eeae88974f1ad76a998972e002a6c5da5aec4c1172c401
+DIST git2-0.13.25.crate 194192 BLAKE2B 7286ce8f37421e5cb626c3b3d4f0005d4ddbf4f893fa4885a9bad28ba3f0e24d4b2161df8788430d909394ceff77eae586b26ffe343d6b0ca287ea0b63087068 SHA512 666f11464f34d82abd994f00a0b81e960551c4c524b4f00d28e5c728172dfa894fec65050767cc96d18d1d5de57f1e901154fe8d70e2e31b93b93790bce021ab
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
 DIST globwalk-0.8.1.crate 13705 BLAKE2B 4d0fcc805cfddb47af24f5d8f2c4f9bcbba48a8a523e565f7ce7bea767b6d108ae5e3f5cccf6647b497b3690f862e1652812b9d83ffd02c634119d5e03d1a7e6 SHA512 3235fdd9c24ffc54994a0b37862c44e16a4c9ef6a7e1a008c5d83dc62a9683ade97e451e4da7f6db710be2532339a55038fa3bb85dbe6685d1c807cf42f6d955
@@ -47,33 +59,46 @@ DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc
 DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST humantime-serde-1.0.1.crate 7727 BLAKE2B f1c0fc0fdc53c9b93b082ad511a90f50f173faf0f1c4005fda95394720a1a4a56e3bad0ed2dc9da133663f0f6cb03c7f8fd4a100e779344110f7cf4a18459388 SHA512 1e6b3e391d8943979a08f60766bf5eeefadaf3bbefeb64a72f8823c88c824174025253e30c8a913e954e02b04989352c840454fb45f7d3d5f4b8c1a52e2e904b
+DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
 DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
+DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
+DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.101.crate 530003 BLAKE2B 55be777a0ab91df07e06f8c5045fa49dcb356eddcda2feb3a16949afbfb395abb3a50a97fdc6b6f1b8974c07af13c9b286f8222fe8557b668247065515063d8a SHA512 876a5739c1ba29d4a4d5c9407b013afabebc6f5644dc57864104e99f0303e7e7ef1d5ee81a665f1029433b9251917b1e1571624a123dfc15586d6bc49ecfb3e2
 DIST libc-0.2.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
+DIST libc-0.2.122.crate 577366 BLAKE2B 042727ae8bc7f768852baf42fe46404f2bed4b8d9cf5c99e2d76ec9866ac38d4afba9d3084db3ecab2015f9e612324dee74bf64a64b9d66906bd404d2ca38c6c SHA512 dabd14a1344174fa83e34dc0fb0c2b6bc00b9871063fa1ce7c6ffcd236e74262f453cbfdb04cd7625bb3b8e5e08e6591d51213246eea695b0ee78d480277da89
 DIST libgit2-sys-0.12.22+1.1.0.crate 1443875 BLAKE2B 58168804f8947bd854d3b5326a8956c3ee0a4dda6b45ecaeaefa470aa1038eec0023668dc363dbe6d10bc3018246436bcc27b8cce005b222d38889590656079f SHA512 20fe79a676c7fa5ca0f5096da166a8302ffea3b63e39021e31a34d8831a6b163683384a4e2e42ece19c19a80d5c8b7158ec580dc62952260cfebae58e2aad8ca
 DIST libgit2-sys-0.12.24+1.3.0.crate 1476766 BLAKE2B d1164bd49ac122692141ae6f2a38fde941582668169960e9af98bee7a4a26e57b34522057c8503146fc5b7fb1ab646fbf2548c7a3994299fd078e5b835041ff9 SHA512 9d738c318a15b70c749aeef777aebaf59a40912da5e4f23fade1e84a6425acdac6e6a59030811f5cd974edddd965c0c9514f7b5a0286d32d4d7f6ebb6e6ae21d
+DIST libgit2-sys-0.12.26+1.3.0.crate 1476836 BLAKE2B 953756b4ed1e6f90d9eabf03dd9f3db50a085ecee4018c6f5e598b2b030e3332a6281f5e033810134356a48b92a4b910fd534813f2111cefc6de3bbf2954e1c8 SHA512 de30865b3d4ab0288e090381e5646e3e8028c341fac93014168fcfa5f166f7fbad9fc4ebd285919247cc6bac178658eb936ea1fdf168068248be07ad34ecc54d
 DIST libssh2-sys-0.2.21.crate 482836 BLAKE2B d92ef8081bd1ffceabf1be840b20722de647b50a0b95832d544afd7f1930dd51620622a9bf3031b37db9b0a1da4a925050bde16c916a8a71b3e79c73f125ea1a SHA512 654dc947e32070cd03fc8e9bc6046e28c9cc401bbc4c914319102a2c7ace7f319dbf0414a51d9812a09c9a88f7fba6b9203286fdc383d0e75f86b6a87fc78faf
+DIST libssh2-sys-0.2.23.crate 493516 BLAKE2B 00c0c1396f3d6723ad750112e7af8c8ac098af7b3d11e3fafbb4dc3b90c0defeb8184e007de3c740bf1111e12a53b71c355d697c4567deb3a30ebe3fee2e0caa SHA512 9617fb1d5826dacce23658b42e3eb3f8427b33db1b5a4424081e148bd90a3f776aa50ef66183c93ae19086d64321fc10b19b1a496c3feb12a669c7313cdf39cf
 DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
+DIST libz-sys-1.1.5.crate 1494933 BLAKE2B b53e39d2a1f0db29edde3f03cab97e1970f9903222777e2a5c55b265a5873a0fae3927724d592fe754e04861aa999e0b9b22122ee09f836ece8d7a0fcfe20e3f SHA512 51ac64c26df57d91f4b7e089600e283354ebf636d8a50ff530ddb031ad0eb74601aca687a087f9e7f51f2b00187d8daa03ca2999ea48ea274c87ad8c7ba8d9ac
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST num_threads-0.1.5.crate 7109 BLAKE2B b5a1055937a87c3f3b758ad527fce0a14c812b40c3bbda530bfc0e03f43dd3155c17e1eaa210c512a98919da802d9d48fec4e3c8464072fe4d309b9a402d9b61 SHA512 3ad2234945ea20f47efdd8381de2f0f05790163bb1e4b28d9e630a2da4d86c99e596558ed231e2e9d62d84ae85f8f5422dc11c323ba899e37ad1e654e3c4fdd1
+DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
 DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
+DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-sys-0.9.66.crate 54599 BLAKE2B 5c03c5e4a524a518885a68a7d7c9fefc0d6cb97e35368bfa49898cf5a97fdce0ce34047bc7e7ba5aff3430b51b3b546bac1bbdddb743bea1bab877df684fc1e4 SHA512 ab2d39a766df694f3985d67495d4e820bd196987571fbc229c003f441fe61bdc1aab9cd35a83ec3be9518d2b4e463f33f19bb109e9297a2d4114fe2d1d932a59
 DIST openssl-sys-0.9.67.crate 54600 BLAKE2B 8371057756351f2e77e953e2a827e812477fd404a66053047f6a1dd891d5374ff6f6666e3c8af5f858201814d351e72a4473f95ca439c2c0b02e08c89a1ed336 SHA512 cca7edceac5a11f3e3ca0c4c09aada27f94664eb9c7ada4784dc147fdd1c9cbb5eb1ad1ec145957155aff006a21e7c954363c0f72691bcd241cb43dee98b42d1
+DIST openssl-sys-0.9.72.crate 56510 BLAKE2B 32a346a5c98fa6de7dda0c592ebbe5144de777ed5fe63b96e5ba1891831c73099e7d01ec2c1a6890150d01a77d909fc18bc961b3fd8ea7c4b85317a79d988e98 SHA512 c1a6a50c4ea30b2bd7da520bc98bbd22a22ebc327d71c12f807f518cdeb10d81117b65df9294ba9391513a60577709723b93e75fc75423e970e9fa552edad32d
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
 DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
 DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
 DIST phf-0.10.0.crate 4675 BLAKE2B 72f3436754215f51ed2041ccf61d67ff9139d9223a0615fba6252bcb3b72f86397f91aa97fb8a439b2f5b357610c0c14979e92e718d0da29e40292b94f931f89 SHA512 4784c4acd49fb4de47aaa2484d6c018ff154094fe97199ce5fd3e6a67ab53efa454fc41b549a7addd2a02f32a096e4c541e4134f71d7bd78f77da23ab9502017
+DIST phf-0.10.1.crate 5406 BLAKE2B 70532bb97a0089ef2a57a1bd43b4dd30f0289ffc1a15357ffd8a372d82374bd505f4e39d3bfd6bc2d3c2afca39703c89e3ed37ac41c364cee3759bf0cb609f82 SHA512 84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073
 DIST phf-0.9.0.crate 4712 BLAKE2B 1ecba00b75d980ac6f7d0a2065233c1b388bf54dfb8efda7f7deb5221ccc7975b94dc9731481043a94ec06d2d54206c77891351701fe8fb7e5e01e017586f6e3 SHA512 0a10c9afbff6e40146cf32f8a279368ef0f73ce32d1ca7f7e527e03f3432635ae2b993531b3d9ae3624c2feb875b302cdd0c3588047287dbbc201e8485260ee6
 DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7
 DIST phf_generator-0.9.1.crate 7527 BLAKE2B d20eafec1e6c5878820436254ba77d59f3bcbcb265c25bcb432250e34705a93dd5ea3ef23d9f16f935a5783daa3ec3e346742f7ceba8899a883cbd288d069365 SHA512 0243d80b67b1a43d00f17b3b723daa5b90086a9b804fb678895543db39dcf819da8236cf85a5b9370bc5c66bd49f0d96685c327ac62db85a94246e7acf53e16a
@@ -83,39 +108,54 @@ DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b1
 DIST phf_shared-0.9.0.crate 4111 BLAKE2B 04d4344d7f07a8116ff7ac2497d64e60eb527d1387107d7bb8f7dafe14802434e8e8e3f4587580a673760a7332fab90fe6307905d571ada432b6541cc29af2b6 SHA512 9c15d6d0af7809c036c510b964a6f9e2c07b7c866333b30e71c3e302035821ad1c21993b3c56522c0f2641028dce42aaa8532a04a50f0706c6501f5c2c739f26
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST pkg-config-0.3.20.crate 15395 BLAKE2B d2727edcd04135783de0c1f27fe1cb052bd9255be88c935bdc2ca04f09694b7986cf66325761f2742a34c4b851ae3c48d3e01030c8ea1c19642de064d78ad574 SHA512 6c69010f122d0f7dcbeb6301aee9175617294fe7eea384201ef0dfcf83124b00d0727fc0460da797882e91153b677cc5b16eba98d19484c3a3ce4dbb06c7dd6d
+DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST platforms-1.1.0.crate 21540 BLAKE2B b80739e8b7a59028553283ac044643e5efd094ef316067b053d97bde4d725fb9ac1a969589fffd43741fe433b5629bebcbc67769a09729dc2e0f28423f38e0cb SHA512 cdb44f70d373abd6c1516179b2ff10fb6eba5474d9bb5666be7e01056aa98476155f4561c489102da9ba4e45a40a2ba1fd8d30d475e951c2c0ba5c8015630378
+DIST platforms-2.0.0.crate 23349 BLAKE2B dc8f270963fb0282655148f97b12a98882c3023994022f2c58d2bf60cefc19a67d05fe6c68f8d96f0811369bde113ec2e2ba53f8482b6b6b4f9cc4953ad8b6ca SHA512 e85e3d423a0f4a4cee8f6bcd5bad00bbdf7000639fbe27924e5e6afd9387ee76b6fd71fbd7e83217986b78760fc774efb1215b7aba2071d976cd78c7d726f932
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
+DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
+DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
 DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST quote-1.0.17.crate 28629 BLAKE2B f4c586b9869e9fa24e0b5a2eb9b4dda7aa55924c6a7f6349825c5c9a55ce170397af975d9c6b319009791cf48f51fdc0aa38530ea31efb45fc0659f07c30ca32 SHA512 d34fa0c864e3b9007449269ad5ea8736bbaa359e61eeb454e9c1cc30f9739a96778a04421e2a014879aeee417d8b51e20c6c41ebdab6878567af027096ff9ebd
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustsec-0.24.2.crate 52899 BLAKE2B 5387c115014e03288e1a2c60e640fe4934dccc1bb079ddb7183305f7beb7442ebd8daa0e87371b2ae2032446b8ad6098cf18e029b84dad4005ae4397870a8be5 SHA512 0603b5aef3a7bd120d8c88d8bc86f44e7777d1e9f5c472b066b1dcbcb3ef093ae7e8713d546eff6ff16382302ee2fb8aed27307f206f2c8cee30d446bbdf3e6d
 DIST rustsec-0.24.3.crate 51869 BLAKE2B 08b2ede08f4b538d204d3a5376f3e3e9b9ad54143def5ed36e21943375caeb95bc1db1f6712bdba0fc520f82bc80e9ba548feeabc407458e0f44ca61f8c50d5b SHA512 c329e0e4da46d25659a1bc8ea25d04b65412f616034a8df0fb57566a4926b3896e4bc6071b6e20c4b5b17bc83fa10949e09917692830c428c2913538cf9b5966
+DIST rustsec-0.25.1.crate 52022 BLAKE2B 64215daccbf967bd86bc37f30dd43116498522ebf4633451f92b24c0a13f33b568ead8223d3d953a837b199831ec52c6401fe1c3c3bf0a5a20beb3ea8be693a7 SHA512 8a31eb28e23b8699b729ec4e10f0c20efb4d52d4244e56fccb0c58af24cd2330c5363757cb05b426444debba058dd2bac47f9e2965a3069eeb19e1a11dd4c443
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
+DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.129.crate 75300 BLAKE2B a6f1a7df810f3232da585bcff86a7905785f82b2c434a87e2ae7e5cc0dfa8aee2dde47b301fdea17ee885fed54698c607a1334a9faef1a83840b9b111668ba6c SHA512 7c520bd5d9d5ba05c4b696413ab843ba36b22b0a4d8bdb2883eecadd2f69153fa90f57689f861ee5c9ac36536698b7694837cff45c615ec4892fc6b035c25482
 DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
+DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST serde_derive-1.0.129.crate 54697 BLAKE2B a5921822dbc1761ccf5e5951f60f27e4d2d263491cdddc870acd8cb069bf3194be9099911edc161bc1b037bb4c0551bf8918214d13b52cbb94ab98675dd5b672 SHA512 f4a418a5431a4d9b47f5555e485a81485bc7fa050fe137f8145ac02615cb21ea6d06ffa88e8f2c404341885e51f45750c273382adec1eea20bff9ea7a18b85f7
 DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
+DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
 DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
 DIST serde_json-1.0.68.crate 114986 BLAKE2B a588a87ac9fe2b3635d7bf72c185801e3866101020a0afb8f714d37939c2dc7b5b32e2177910df7221df197e4e8a92d92187968efdb5e9f1f1616647c10d81d3 SHA512 54a0345029016873883dbdcd2094615f509759f61b04d9a496dfdbc1e27ee5361dfb3d129f209a9ad66984cc1f4c82751adfe1a564198649ecc939e8c3dd1ac5
+DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
 DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
+DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST siphasher-0.3.6.crate 9708 BLAKE2B 652b226927c1a2020a1d407bf53582d10d9e2cf1e0a71ff07c6b30edb31d3def77b9e9e1f9bd3c5cc6206b2158cbd5753d6c05ea0010a2ada3a26ebf64c425d6 SHA512 2b2295b4807ae418ae03ad5b1d1a9adb8c29706179e1e77a483b0d1786736385e0681384e8f5879d21c1b009958659f2efa8c553a2a93618e66dd0660aa1e169
 DIST siphasher-0.3.7.crate 10097 BLAKE2B 455b5ca81418aee667b4fe16092435e025353267e14cf4f911f5d48a18d9a46be04452ce1451a272f8b2073ecf606c6834b6d06b49687474bb7ac226383aa7e7 SHA512 4a8ef56085742de7ad638194b21ff3e315aef6de9b7590e736071859ffa2aa4a28cdea7e05ecfa781fa35a40505086a36d84bdb3ec40d679f9b83c2edffc4d3d
+DIST smartstring-0.2.10.crate 28977 BLAKE2B 31967c963c8c757408c867b2d83993047f406a89417f9adc6dbee15aa1e42d5745e9de39aa9aaa6183e3b968b6aa5839eca91c6e2153cbf11bd94145261eb4d5 SHA512 236504b6485cda2cafe690535736b5147f1e073919313deee3c3364032c930521ff53da68f6658c76b5c53f1464aac0afb4e34c8fcffe251628e07708d83a727
 DIST smartstring-0.2.9.crate 28634 BLAKE2B 4a57c947d850964f2617f48c5e41fdaaabcc95be3c43303dbbcdb287d1fefef6c10b25d418d7113ce4a8b873df9fdb455ae3ff90e5fcd45173b6be07875221fe SHA512 c780f4c46db385576833e423ba4a9621f6a8e9fd4b09c9872188398d893da0e111cf5be4494eceeb8b0845bef963430a4153304334e4d4d42cc8712c6752f0db
 DIST smol_str-0.1.17.crate 11896 BLAKE2B e741251fce444968f82b6c18e9f0a8443dbf2beeabf24215702d3823a5ed2165274f663beec6b271e46437268ce69d1633d3dafae6feb44a8b0c0c729cc58448 SHA512 2e1f816d8d4ac5588dfd3002327f935a9dfbe743eefdd51638c7b2d1af93a12e37dd19fe1cb66fb6b1602acdc4e46d4ebba57b55c1728412f25b5b9029dcd06f
 DIST standback-0.2.17.crate 29011 BLAKE2B 96081a4036d2e17d96f24be446f5179880f7089cce5dd9acb5140277526bb8395384225055b9f60749e29d48283f2251ad514618f460b44a6850cb75eee9845a SHA512 cd953c942afeacea01b2114eaae2d80e754da7df2f399fcd2cd5c6ff31a15b0644bce4ef1bcc019bbfe60c6521ee15f370b83d77b0a1efc75dcc35a81faea662
@@ -127,27 +167,37 @@ DIST stdweb-internal-runtime-0.1.5.crate 5445 BLAKE2B 6684fb69a8add47cdfebf7d85c
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
 DIST structopt-0.3.23.crate 52029 BLAKE2B ad87f3d2da5a4a972b2ed0dbd49830038ab6b46243561cabcbc06013d7088e7a44acf1a29137af11a53ee8720aa8cd69cd7200a388b0ec626a0c513b6390ce2f SHA512 6f6cb5e2ecb7bc2e1e7c58d98e3e9f54dd4ff4698d22aa32e2fe7ab6c51a8e9e8c418260321a3f4aaae1808a68eebcc40f619de28433949aa846c27f06ff5cef
+DIST structopt-0.3.26.crate 53798 BLAKE2B 04be64637d18bcc87d261320668023459a42c167bb5a4c52216df556a7dd19be28032e7bf759cbcf710a3729a9dfaeb20c29f37f35fcf33533db583ac4fa049a SHA512 dec27090b57107473c9d398db68bde3b1b5191e7c7980d7d2c20fc723f92c64a6cf1d391d5122a103222c4262253d8073fd0fdfb11c74f235af79b2ae0caf069
 DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
 DIST structopt-derive-0.4.16.crate 20996 BLAKE2B 3410095fd88bafba6d08d0aacdca295cf86f4d8f028103934c03cb16da334955c1334039d000ef7eed471eb8020046c56cafb00dbc7713ecc1f76585cdc6f22f SHA512 11c5fa7a0fdc35a02fba22c940260a4a5bb26ec431d92e032789731afd97576cfe63c988ca614747ac477433cad640c972b48f5c90cb9893be28ffc9774c247c
+DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623ee0d5acf45afdc3844114e02975b855fd1a9f7df404a24044cf33a3a4cc4142eccc34d1e97925646d54d460a89baa28275 SHA512 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
 DIST syn-1.0.75.crate 233068 BLAKE2B 8d4b5ddf1a18c59989f7664f0893265dbb6c833235afa430bf1fd224f3f542ff7385c5068a0da8841c9771ba9e93ce8974c6ae8dd0033235447d6a44488652bf SHA512 9ecda1f0cb91b4472309ad00f10eae80fdfce3c60990ec5f6510cb2ae8adb6f49e8b1d092426c5d1f0a7e9d669929330ac26a78fed227046dd1eb09a81d2e53f
 DIST syn-1.0.80.crate 234102 BLAKE2B 97e13bdf99f9d50b352eaf87ceb1cf27f74e59df7e40ef28508cc387f78c8472111aaeb5902e1e577e157cd16c7f431c2faf461cdf2554876a3d0ad7662d34f9 SHA512 3eb437757f25c1a10db8f9b10f21cc4de77be1aabd910f1618edd43ad309ef9142ef08def4cf6b2d7470165a7dd0783b28da54847678e22f2b2dcb2b4dad3c2d
+DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST tera-1.12.1.crate 95193 BLAKE2B 290c4215033b236b62b469242ec5fcca8b36cac333f687820c2e3c867a3afcd176d77edec6e0ca2639a31faf0eb5491b9d2bbff189603bd83183b7e269def821 SHA512 ba57cc78f426fa02b4f21eef0b4a7c674fd3609867e35025a3656f120b7ccb5bcb2560fbfc134ba54cc4200577d4812f27912f371b8e27f8b04a32fa97f79380
+DIST tera-1.15.0.crate 96195 BLAKE2B ef3dc79403f7dac93493890b3c540d6905dd15b0c2ed5ae000638e64d839588f39e108e7e293c8938308229f64b492fe852b0bbfe293bc909762f56972674977 SHA512 d303b41dfb66125397c045695c468b777c5371b1b34efc9dbc028e4480a5653ef84ed199f9b12825352a564c5fc83624f1352c5d6154373639aa779b0ba0ab9c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
 DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
+DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
 DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
+DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
+DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST time-0.2.27.crate 65167 BLAKE2B 358463967b7f17af5d2d80f8bb967a85ce096927b6b656545744d446d2f0ebf55250178cb345354ca64f8a46ba12ed280621ca16a786674cac103914e6dc02a6 SHA512 a54421ebb3b4b833fe5122bfbdb8d7e1fe2d605afcc252a1106183d148e5fc298e29d86284827a4545beee0810b8b756aff66eba03bc9a27e8686d5683e0f13b
 DIST time-0.3.3.crate 68698 BLAKE2B 65c8db84d5bb7d2ac4eb096c64ceb411c88afc8d3eb42f04b7ae88121359c47bad1480684c6177515904e053d400779a337d8a7a0c40c1f4c657d9d996e2c7f6 SHA512 51dd24f29b6a51d165c660411b24da9106281986adab7569416b68988e4b76a4ffa9479b0400eb5b16e583b6503b950e56f0ff24ddb2574c73cba5f3562d5d4c
+DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
 DIST time-macros-0.1.1.crate 5447 BLAKE2B 4b9dbc879711804f4af172e46e10421d35177242a10c6dcc32bbfe9cad7ed865c7c3d18cd9b8ffee79bc47f0ce5622bc9609ba511d7750a358b6e5cab8426934 SHA512 c6792be54dab0847d621684b4afe2e9803f2004bc3d4f01d84802af7f557799cf4d2b5ff6fe58e0b4018d92ab3868feb9b5df5691b2c8ee188e6e7b39deb8c8c
 DIST time-macros-impl-0.1.2.crate 10096 BLAKE2B 6a1208bdd9a687f682a3310b0720648f7bc9e6afb020e65800decf1f6447d971b360b94030dfd433397ce4c8d0921852de41f611fffceca39ba2173cf28d66ef SHA512 7f783390b4cdcaed2b9c8d8083f42d5708ad25605d3c17c3a484ebd1bb93531627d563d4506281a856bc4a23ff2a4d3d4b42eb8be15da0dca2712bf47c3dcf66
 DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
 DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82
+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.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
+DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unic-char-property-0.9.0.crate 6809 BLAKE2B d2bb66259b66e59e831ad74d89528882336a7cf6dfac7a9f49308a70a3d61d5ab88f3ade9df2c086f27ff4a6eae0d2d2b8e63bd154ce3e700cc525769f34542a SHA512 ef969968c61eae6a7d68e6ccb0b40f6618a69bfc4714b51bf4ee8c5ec4532d10b9c6675a4cd5121c904a578ceec7c6471d1496fedbf121059f076ad1c5ccb70d
 DIST unic-char-range-0.9.0.crate 7020 BLAKE2B ab79b4298b999a9fbb769bf191f83e259b40b8d06cc5cb82abac48434162216a283fa82c1bc9af8b40656c2d06e5b6a919ff7888852eabb9001a92db12fa48d7 SHA512 bb0ede1695f4f016bdf9ec83bb49639527248c175c71d24993b8651ea6be0a411251ed8518893101dd5e96fd2913cf15ec27799c677ddb08b8e408da06ae0ceb
@@ -156,8 +206,10 @@ DIST unic-segment-0.9.0.crate 34848 BLAKE2B cf04b1d875ebc835758b17f8fa0937da8e47
 DIST unic-ucd-segment-0.9.0.crate 39262 BLAKE2B 73a2f0bfeb17ee731c17e7eb4b7188a800fcd3745c5c6480916240d087df5a856e4f51556e1aaee1e6668b216377acdaf4879beee6b285da040f6871f0c04e6b SHA512 04aab71f97785453dce7f561acfb2382a23d60a68735f3664577015a256191463dd6b1f90694e4440c4889eb9b6380c16c7a0ec2dfc2d49fc44a284eeca43c09
 DIST unic-ucd-version-0.9.0.crate 2246 BLAKE2B c546ee182387db997e6cd699a25bc201fc943306d8e87f96edc1a3dc1cd5ab8ad96f34e8275721a5604765aa6fb6f81e3d8d9eae690d04e5ba71325a769b065b SHA512 153219ff18be02e23ff3dc90bba11fa8c7cda11b972e0d84500d9a0742fb7d84466f2cc63ee278a24098c39634e50742af3317cd942f4ea882ef5a2a8e003d7b
 DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
+DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
 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.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
@@ -165,6 +217,7 @@ DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+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 wasm-bindgen-0.2.76.crate 160285 BLAKE2B f57e3463db92d0a57239028f4e92ac6767b7cf2e8e4c2637688fcd6478c6c4559462a69586bc9c24e9df2559c28dbe2db59e24092dbdac8fb18165b0981fc08a SHA512 8fa02f42c55a91d9a4c4a8c8752a09360c86993405cb8de2d0309f4bfd09c99c6353af753d1927a12467f489b660ef9f293dc32b362ce0226fe65b642de0c98e
@@ -178,4 +231,5 @@ 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
 EBUILD cargo-ebuild-0.4.0.ebuild 3587 BLAKE2B 7b726cf68902a9204cd498faac21d7bad274bbf3136ee5b504c7acae55eead181f52546eb0d538c5c670601c6978a1f8916339fceb6e833df5edc74b3c6059bc SHA512 4b3825ba2482144c14da920cacdcfdf585020fdd8340bb3152c92a14af414d2a13c48a8304f3136d53d7e9e97b9604bb106a6aeef82d6c572cd2ae29ca37ca2e
 EBUILD cargo-ebuild-0.5.0.ebuild 3125 BLAKE2B 34fcada8d0a5a689dd2039d22057c17a1fd0a93e5b62f0160d59fd3e3f050906a31fffc737a87d021f79041747d80f4e9fb00da8fd33ee04cd9a2860824c4017 SHA512 b4f7a4f7ed4e199bfad1aa7f1d94398f13dfb1a6bae11dfc7c4cac1a90337e7df5a872dbbee9801f7b2d544139a332540885f884621b5ba598def67c4843634c
+EBUILD cargo-ebuild-0.5.1.ebuild 3373 BLAKE2B 20d90c952bf976dbf6e72afa5bf174458b07fa2f73e8c1c373ad66be72130d784793eea0fe407af2503cf2984c4db3e7c0d35a5c2530917ab48f45bb5d0c740e SHA512 fc597a2cd9c05effedfbd6eb26351c3957401b36aa419f934887b27cb261a957bfe41b01da2d7b9c03a639d8ca5fcabd7f3d82a308e68a9c0d9c91df64b468f7
 MISC metadata.xml 413 BLAKE2B 5ba143992e2d8ff2b1732a98fac5f495c09ec66e9c89e3b681540a5ed76c333e0bd720668a409e0fb8694465f901345401200426b64970cc82768c65ed4107d4 SHA512 a813c0fecb8993e3cb522ae07bff0f73416d0146f0c881a9c8967f9618b700399e9c0955fa7b2d25cff1d2ddbe834c7d4935499e471a44c97987cf6f314d441f
diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.5.1.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.5.1.ebuild
new file mode 100644
index 000000000000..42e6ee7465e1
--- /dev/null
+++ b/dev-util/cargo-ebuild/cargo-ebuild-0.5.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.1
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.18
+	ansi_term-0.12.1
+	anyhow-1.0.56
+	atty-0.2.14
+	autocfg-1.1.0
+	bitflags-1.3.2
+	block-buffer-0.7.3
+	block-padding-0.1.5
+	bstr-0.2.17
+	byte-tools-0.3.1
+	byteorder-1.4.3
+	camino-1.0.7
+	cargo-lock-7.0.1
+	cargo-platform-0.1.2
+	cargo_metadata-0.14.2
+	cc-1.0.73
+	cfg-if-1.0.0
+	clap-2.34.0
+	crates-index-0.17.0
+	crossbeam-utils-0.8.8
+	cvss-1.0.2
+	digest-0.8.1
+	either-1.6.1
+	fake-simd-0.1.2
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	fs-err-2.7.0
+	generic-array-0.12.4
+	getrandom-0.2.6
+	git2-0.13.25
+	glob-0.3.0
+	globset-0.4.8
+	globwalk-0.8.1
+	heck-0.3.3
+	hermit-abi-0.1.19
+	hex-0.4.3
+	home-0.5.3
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	idna-0.2.3
+	ignore-0.4.18
+	itertools-0.10.3
+	itoa-1.0.1
+	jobserver-0.1.24
+	lazy_static-1.4.0
+	libc-0.2.122
+	libgit2-sys-0.12.26+1.3.0
+	libssh2-sys-0.2.23
+	libz-sys-1.1.5
+	log-0.4.16
+	maplit-1.0.2
+	matches-0.1.9
+	memchr-2.4.1
+	num_threads-0.1.5
+	once_cell-1.10.0
+	opaque-debug-0.2.3
+	openssl-probe-0.1.5
+	openssl-sys-0.9.72
+	percent-encoding-2.1.0
+	pest-2.1.3
+	pest_derive-2.1.0
+	pest_generator-2.1.3
+	pest_meta-2.1.3
+	phf-0.10.1
+	phf_generator-0.10.0
+	phf_macros-0.10.0
+	phf_shared-0.10.0
+	pkg-config-0.3.25
+	platforms-2.0.0
+	ppv-lite86-0.2.16
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.37
+	quote-1.0.17
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	regex-1.5.5
+	regex-syntax-0.6.25
+	rustsec-0.25.1
+	ryu-1.0.9
+	same-file-1.0.6
+	semver-1.0.7
+	serde-1.0.136
+	serde_derive-1.0.136
+	serde_json-1.0.79
+	sha-1-0.8.2
+	siphasher-0.3.10
+	smartstring-0.2.10
+	static_assertions-1.1.0
+	strsim-0.8.0
+	structopt-0.3.26
+	structopt-derive-0.4.18
+	syn-1.0.91
+	tera-1.15.0
+	textwrap-0.11.0
+	thiserror-1.0.30
+	thiserror-impl-1.0.30
+	thread_local-1.1.4
+	time-0.3.9
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	typenum-1.15.0
+	ucd-trie-0.1.3
+	unic-char-property-0.9.0
+	unic-char-range-0.9.0
+	unic-common-0.9.0
+	unic-segment-0.9.0
+	unic-ucd-segment-0.9.0
+	unic-ucd-version-0.9.0
+	unicode-bidi-0.3.7
+	unicode-normalization-0.1.19
+	unicode-segmentation-1.9.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	url-2.2.2
+	vcpkg-0.2.15
+	vec_map-0.8.2
+	version_check-0.9.4
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses."
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/gentoo/cargo-ebuild"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2
+	$(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 Boost-1.0 MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	dev-libs/openssl:0=
+	net-libs/libssh2:=
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/rust
+"
+
+QA_FLAGS_IGNORED="usr/bin/cargo-ebuild"
+
+src_configure() {
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1 LIBSSH2_SYS_USE_PKG_CONFIG=1 PKG_CONFIG_ALLOW_CROSS=1
+	cargo_src_configure
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 33b2140d781d..9d64e1cb2209 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,12 +1,16 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
-AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b395549067272beea095e93686cf553d534c94d76c1c032ef3423f851907367006e1e7bc7b4afe1494bef1eb293e5aca2e3625c29c10 SHA512 bbdd370e478839980423777053baa42ce37cd18ebf8cd36d3f5b13d9252c38b17840ab6e71aefda20a9903bd4a85e4cdb4582728a9db9d1e847b0ee9569bba9e
+AUX ccache-4.1-avoid-run-user.patch 823 BLAKE2B de70e7b3f687f099e8b6eafb069d725350bb32c1ca39e42223113a5cbd79d6be7edb0560d6f199b0d43d20f4c99a5a5d888d96b8ec74d678e9793011e2463613 SHA512 2f3351af3ee755ff44802239cddd16e5990edd067d44228707ba2cb96f44faf26ce220b2e9e9994a45baac11a54bf778ba48c27fdd526e59a889638a84cfd5c7
 AUX ccache-4.3-PWD.patch 2677 BLAKE2B 4a21c496fc2e2249490246d9595935afe13244a4ba39181ac7193445299870a00f8168d6d1602d1ef17881ed32acae27ccb68a1cbc3b386e6c88a2bf5e8ee341 SHA512 2c71fccb53f6205e99995e66b2666834d5c3fd106933b715bc4325bafc27121e8cf6b7925ce1c9d524aac6941f444137c249bda837cfc7be4c08cf6cb5a49f8f
+AUX ccache-4.6-avoid-run-user.patch 940 BLAKE2B 2d8e6f4ddef3ca407b9b2054c52ea5b2b2fa19d0ea8de3c88b632b2f3014d2764c8f36270589d8a2b26917be5a59e22107b2bbd75af7938d9d181f303ab1a1fc SHA512 b2c4643f94c6da34641b92b523879d05d0b1d07b2d01d49d3c8f13a8cd208b253eb91b6f1d916ab959c347e67101a3a18a0ef343c754614893999f6781b60ef5
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
 DIST ccache-4.4.2.tar.xz 510260 BLAKE2B f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1 SHA512 afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
+DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
+DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c
 EBUILD ccache-4.3-r3.ebuild 2117 BLAKE2B 89b501e9327a050b60413b4fbeb87416ca9337aefc2b27b0e6baef9747505ce42a4a6c54f3e6bfa01ce60069bf69bc212e0eeecd047fe5c413de9228cd0edeaf SHA512 7a46c9d7ffd461044335a0133859256eec7ff0d315aaad507563edf84b670256a6a3470bef430abfdafca35e4f0df58e836204a6ee6fd6f4fd3ae2a94a976412
 EBUILD ccache-4.4.2.ebuild 2295 BLAKE2B 92d785f5da6638d32093cad6dd26f451029407affe753b5ea315f422e05bab01bd84cf93cfc2f4f51e8bb4bd582706197808c23b16aed9a344e7971d8caf1677 SHA512 09fac1b415387ea5c8dadfe5dd044d5eab2d6b546fa7a04b159837df7d606f4fce2c69c8daba7a388919383c4c8843ae3960781c111c60d2ca4638c7bf944da0
 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
+EBUILD ccache-4.6-r1.ebuild 2574 BLAKE2B a026e2ee397cdade55f377346ddefca9523b50a0a6f6ee8af5bc575fa073b40fdc8a74ed33cc84d3f01377ad2720342294a12f9e1fc5187ac4611217169e5a4c SHA512 adb38a463d5081606e25e21d1370b4ac5f6ff87dd0da051aa49be283d65109cc9253887fd3386271f6b984a9f3d2e8748c1a8d34e6021e0ac820e75851fac8b4
 MISC metadata.xml 632 BLAKE2B 54a81f78ca7731afb01f2ca1d377d9aa722a368d4177c8cd34a505c1ceaec28539718da6665ffcb5a06af544d518d7806c8db4338b0ab473d56cfff39fbac9bb SHA512 bc9037810d55b532289cad47b2249efb9cb81a9acd48466461efba65487ffade1269ff00f271a4cf1ee8625906c1b3abca6e5244224c55a527aea75cc6eb5922
diff --git a/dev-util/ccache/ccache-4.6-r1.ebuild b/dev-util/ccache/ccache-4.6-r1.ebuild
new file mode 100644
index 000000000000..d3c7ceee833f
--- /dev/null
+++ b/dev-util/ccache/ccache-4.6-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+	redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.6-avoid-run-user.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+	# Mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+	use static-c++ && append-ldflags -static-libstdc++
+
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DZSTD_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
index be7db76ecbf0..b1d0837ef3e0 100644
--- a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
+++ b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
@@ -1,6 +1,12 @@
 Gentoo's sandbox does not whitelist this path by default yet.
 TODO: bug link.
 
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68)
+
 Until we have a sandbox whitelisting the path let's rely on ccache's default.
 --- a/src/Config.cpp
 +++ b/src/Config.cpp
diff --git a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
new file mode 100644
index 000000000000..cfdd09f79e66
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
@@ -0,0 +1,28 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+-  static const std::string run_user_tmp_dir = [] {
+-#ifdef HAVE_GETEUID
+-    auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
+-    if (Util::create_dir(dir)) {
+-      return dir;
+-    }
+-#endif
+-    return std::string();
+-  }();
+-  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
++  return cache_dir + "/tmp";
+ }
diff --git a/dev-util/cflow/Manifest b/dev-util/cflow/Manifest
index bf55d0c16ee2..f6434d5fb796 100644
--- a/dev-util/cflow/Manifest
+++ b/dev-util/cflow/Manifest
@@ -1,7 +1,7 @@
 AUX 50cflow-gentoo.el 177 BLAKE2B d43229ed9ebeea653f91ceadd84f641eff4bf1168cf6e94524c228c943ff973e2cf99216bf7be10dc766014d607f9edf1ab74230e963fbe62561c66914665b15 SHA512 1edbe2c330206fdb9ad3844a2278dc71d13a0ce7c46c73030192de3f05634fe08012c04e7c94883b1f6fde21483aba29e16f7a1466719c975e9c60d59507c5e3
 AUX cflow-1.4-info-direntry.patch 356 BLAKE2B 5edd13456dc90461927c0b2ecbb7c66987ef935e54d7d89010bdddac6193a9eee852fde601543149a3aeef1fc5e3447d43d2e076673e9ebd3b6e5bb978477008 SHA512 6bcfd0ec801b3c487d817d2fd1a0f030a1e3fccffb03f5343eb335c807fd763a8c00d8f98654ce3f8574e756a9c1d5769da71b9fb70acee0ecdace6395a3a624
-DIST cflow-1.6.tar.bz2 836405 BLAKE2B 6cfbfa9f4bb503616cb0bf465e70d9951eb52e65addff16ef2a1ee79b1a115e46ac4747510dd1edf5ec1d96c29540152a6fb2227715cef9e19acbb895f5cda2e SHA512 eb26695b479205ea391623d78ee537cac084a168a52c2bf4f2e4206d7a3f813e6e3f92684903673af905172c3b1df3f8ab1ccb7986bd61ed53feee34fb3fd7c6
-DIST cflow-1.7.tar.bz2 916685 BLAKE2B 0ab6e17e67765335587b9adbbb074b4461b5082fa68095fdcd0b8c96f597f86c4bde35980efc91e5f187f1eef3f7d656eba53d6420533904a51e5c1f4830cd46 SHA512 ec7361b12099e8024f8420469eeddfa068014e8c7bc892ff5780396ce0baa1f915cc57d304f7e228f010379e08b9bd1ce31c9b50b619bb469081a5ea3d2bd9f4
-EBUILD cflow-1.6.ebuild 1057 BLAKE2B 38ed1704a06d5a638f3e91993ab0e8582065f2a5c1239f30c00bf5d11b65d2bab1ff118cc8b7a85ad1244bfe840e1d59fcf147259d6b227bfa85d2902213675a SHA512 19a38d33c9ad43d90c61ebe006767cbf5a51bd7513000883893ab3d28fb7db8163c35dac4a15452fd5dbc56175e101d62564b37964de18a87bc39af40b7ba03a
-EBUILD cflow-1.7.ebuild 1077 BLAKE2B fd7f0a776010c4d8e7c0e1d15f60869baaddfb1a0ff3161ecf7a0d3c0d39ca64b34dd481212b529d4dc48204efeb1953c484efdd444959f42002eec86830b8dc SHA512 edf4e320e7fb4a015e35edf9519c2913691f218291ccfe72fb9e37d015578de3e6dc4d0faf2dfb24be2aa66b107463cea9eaf1d95c5d999d0e518351cd37acd4
+DIST cflow-1.6.tar.xz 679760 BLAKE2B f4947bf31db1c9dce00682bc7645df5f110d6bc7cb1d2d0b8cff0c57e47aca91916a3cfa4635feb4ae2a880c3ff966b128a61db30935c88a5509739062e9a6c4 SHA512 8f15503b0f94385641039bd05d65aa3c9a91bc032be26963279022d32136e12a583d15fdcb8e9d5ef0d31662334f994fd50b014baf7d8b221a1877172576e305
+DIST cflow-1.7.tar.xz 727604 BLAKE2B 0d015f66a1cdeb5119d09c6a81231414362bb5a130d744a4532f3eac7de54f05472716afdcf244d413f510f2f955655654192ef467c56588a09a69b064bd43b7 SHA512 e92a559c5a7141b6c94b700b91e5737b22ddd8236771ebef420a71f2d3a979a64339f56163a16b00e11125f5730927dad29f39ab1c154ceefe3ac4d622c82b02
+EBUILD cflow-1.6.ebuild 1046 BLAKE2B 791105cee277369913247c349e0bab33a0143a3346ea666c02fcf5b734d533b0a26ef7aefdc3491863130d14e19948f571762b16e40c6712d1ac980c41167d29 SHA512 ede872520e22e7ddf25fb3fb983f12ef40c38908b2f7d69518d77b34ea24897f7c1baabe53957933e4c1e5cc4afa678c3a30e3210143b80f4d413e0930446bd0
+EBUILD cflow-1.7.ebuild 1066 BLAKE2B f9bace29bdad9b9bd5f1f29dbf1dc625615b416a1f8893957591a33cb3aa5fce4cd847e4d7209a55e0eb6028770c20b8e9097f54ded19588636ecbfcb02f28c8 SHA512 16fa9db42abec33f5c41bd2328db4c61a04188085462b7156ea1b8ba95e219869074959ddfbbd4da5072903a52334a8d0560eb95f2cffbd3230bbd1da7f8ff40
 MISC metadata.xml 537 BLAKE2B 28d8ac6a6b52ec06d826dd74958b941c4255fafd09ba59b1f88f6d820e639576230a4b5894c4bf46f357884e1e81cf3249ea28732d9c869c586f6ba412f82ca8 SHA512 8afc2cb05d0ad512ec8f4a8de9b160a68448eb4c6fbdbc05b5e07f11a7658cf0cbe18cc25bcb70de796303ac220c287b99b377a60a9245e2ee66d0b572b8683a
diff --git a/dev-util/cflow/cflow-1.6.ebuild b/dev-util/cflow/cflow-1.6.ebuild
index 3aa848e9a2d6..228103418dce 100644
--- a/dev-util/cflow/cflow-1.6.ebuild
+++ b/dev-util/cflow/cflow-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 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 elisp-common
 
 DESCRIPTION="C function call hierarchy analyzer"
 HOMEPAGE="https://www.gnu.org/software/cflow/"
-SRC_URI="http://ftp.gnu.org/gnu/cflow/${P}.tar.bz2"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/cflow/cflow-1.7.ebuild b/dev-util/cflow/cflow-1.7.ebuild
index 505e9785fbf2..11de52ba090c 100644
--- a/dev-util/cflow/cflow-1.7.ebuild
+++ b/dev-util/cflow/cflow-1.7.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=8
@@ -7,7 +7,7 @@ inherit elisp-common
 
 DESCRIPTION="C function call hierarchy analyzer"
 HOMEPAGE="https://www.gnu.org/software/cflow/"
-SRC_URI="http://ftp.gnu.org/gnu/cflow/${P}.tar.bz2"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/cmake-fedora/Manifest b/dev-util/cmake-fedora/Manifest
index 2ba26e99d098..3f3dd8a0657b 100644
--- a/dev-util/cmake-fedora/Manifest
+++ b/dev-util/cmake-fedora/Manifest
@@ -1,3 +1,5 @@
 DIST cmake-fedora-2.7.1-Source.tar.gz 127053 BLAKE2B cc5578104d63b4d1e445897c4fe73fe464c3bb294209bb3fd6a58c9274f0f802626ee467d0ec5493ef76f64ffad130858ba8302ab1cfdc7a38a7c3d0a993ceb2 SHA512 1f264a3527c4938916de91d2b8ce10c58fa222c992820d6ea5c5e850a190476900a4cdb18f7efc0680222d220efb5e56c8102a9f034385e15b5f88f9a25601cf
+DIST cmake-fedora-2.9.3.tar.gz 128800 BLAKE2B b73aba476f5d05088e34c896f8ebb2f10d2f847df96c21e233c5290218c4f9f2647e7ffb610ae8a8cc9dd83ba3f2747d869015e4f7d930d9e3d97c7762abd2a0 SHA512 459aa902b1e9e43bab392cf685d38a332e1a2e81ce94665fe5ab09ee79594d9de5c74e8cbbc6c342e2266f98cb4a4ef07a36da8489f06fd892f899ac6f907782
 EBUILD cmake-fedora-2.7.1.ebuild 523 BLAKE2B ae0994bee1b18ec02e4cf2e6f8edb981402ef09323b921a71ce1a4e3635a999c77953621ea1aaaa25e9690c83bfc04073dc646da1872d3790387f61a6563e5d2 SHA512 b1ba08106f3b19b95cde395d55b4901a7fdb96d23f266ecd748224b2658302188065cbaed0603105589d0bc8986f6546bb64869b735a5d6edfa677d4695a7961
+EBUILD cmake-fedora-2.9.3.ebuild 587 BLAKE2B 7af40f2ca5e396eab63cc851eee68c6d66aec3c1b26402a61795fa35716f767ec76398c42436683fa2ae86257cd27261e71670a6f567a7d9912f2f1b64e51913 SHA512 a1ec1e14ed44df2dfda0354700898bce1c8577ed78f636d7b3609e9d7807271afc67d647c77bbf2540dc1d430efc32c35925f34e36f34f7f3fff150377365d4a
 MISC metadata.xml 245 BLAKE2B 679c2c8c096017f4eefa915d06fde493784875e685ee5078252f57a24df6fba8f9829261929f1fee146c10b30485fb81c2fa93614b8348548844658774193f61 SHA512 0d85fefe9769a0241748160f3e73644a81f68d578d392f1c443c2f56d5f05faef7458c8d1380804bbac9280626e95207de32f493be5910a9f7f678bc0fbf5cb9
diff --git a/dev-util/cmake-fedora/cmake-fedora-2.9.3.ebuild b/dev-util/cmake-fedora/cmake-fedora-2.9.3.ebuild
new file mode 100644
index 000000000000..f3f7853a9493
--- /dev/null
+++ b/dev-util/cmake-fedora/cmake-fedora-2.9.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Provides cmake helper macros and targets for linux, especially fedora developers"
+HOMEPAGE="https://pagure.io/cmake-fedora"
+SRC_URI="https://pagure.io/cmake-fedora/archive/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# fails 1 of 7
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e '/GITIGNORE/d' \
+		-e '/INSTALL.*COPYING$/,/)$/d' \
+		"${S}"/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 51ceb526dca2..cbccacbb6bde 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -10,9 +10,17 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.22.2.tar.gz 9779456 BLAKE2B 5f1c76344fe2d6fba012b0d745dc990ec1ed4bf32c99beac1e538f4b83c1d695aee757d2780e635b67c0a185935a6a70b344a733259e3a91d01c4b83e94e2730 SHA512 86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f
 DIST cmake-3.22.3.tar.gz 9779118 BLAKE2B 917b722701481cb87cc282a19083ec3299d845eeb633369bf29a961d1eef8a0f1157d0000866d983c4720a9b0524b81d647b5947a06281089a0a106146df2936 SHA512 a35003468153b99770ac6bbdeaa611a231a1104560da36aca0f393b8b71dbb44d854378504d2ec6b4af615f78efe18d91453fe15a1b7ec58129aa0289a5a1507
+DIST cmake-3.22.4.tar.gz 9781548 BLAKE2B d07172091c8ff695f9af398321e4bf7b64643e9186c4e882c5fb15ae1026a306bce61b6f410a858ab580c5d8ea7b9d03c901e2c3ac1e6cf841b6ad969261b96f SHA512 4fc04ec3077b261fe252d26d18e81271975db0bb237686c0e0e774d180e6c7fdfb0275092c21569674ad0ca53218a8c6c5638a5fe5c46a988362b0083e3d40c4
+DIST cmake-3.23.0-SHA-256.txt 1452 BLAKE2B 5b57c57389ba203222297ae1fa9868062cea839707d8e14c020543e1997acd804e34d29f98848f3ef2a4c5a7fb8516f34d8544d7cfab8f90839611c62823902a SHA512 77866404fb5ab0206bc527c74599c43e465e6d32cde3149ae2a82eadddc4bf3572f4b5ed06b38abd27162890ee47e9a2dac6e649b131dd0dd29047e1a300211a
+DIST cmake-3.23.0-SHA-256.txt.asc 833 BLAKE2B 003db47ac8f5df3eabf06cb9a8d26c809fb43b2a1aca0510ae82a2d5db5514458cf578f42cc3885dbcb1fb68e1c5b679ea01af2a3111cf5280b588ea5640145b SHA512 a42ff36ee4d93f005205fd105b999b6fbd3b8644eec7b0aa25d043b18bd4f0a249b48574f1114a532e4c43c5041e473209836a29364bee7e78e0a6dd3373dedb
 DIST cmake-3.23.0.tar.gz 9981221 BLAKE2B 280b82af7bc345926f0e8cf47bfb5d6128b3807bed5f331e6a488c00ab72940b723d83638662f5a07367d4f651d7250a8f78abfadcc8c7c66bc2195171b9879b SHA512 bcde8f2bf2fff6c4ab37a28c115b4b53d5fef0d4e38305420966cbd9f0026a4ffdcd4137f917a83458c1f380a137f7a7bd78f6fbd4d92fdcc5cf1dfbe4c02003
+DIST cmake-3.23.1-SHA-256.txt 1452 BLAKE2B 8cce350435aeffdb7b903d87be611ed0362f601f7cfcff96f444859e40227b46e03baac6427587cafec79e9e1c8ab7ac4ee3dc915131c13badf2bcac99e1e8b7 SHA512 fd2dec42f51344a15d1a8e6afd35e96399765c5283925c4708aed5fa84117d0415ef014652cc740600bf75265baadac0559b6b8b1a0e60342a6e88eb61cbb4e5
+DIST cmake-3.23.1-SHA-256.txt.asc 833 BLAKE2B 28ce9f5c99b263895ad19f9df43050156ad399846daf03be96b9c4439c41d57e9c26244ab872692e98db321ba919639881d68b81237a9f443316cfa0aea1b8af SHA512 55b1808668b17a3bee0055e3736b6312e3260297ee02137e6bd90ba7a75d2a3e094e06fbe16cd299325f0c191a5f5924fadd075e5edbe3275933356df7b11b12
+DIST cmake-3.23.1.tar.gz 9982020 BLAKE2B a51eedeb78657caf86409ea8bdf4e61b09c66c6a0f3102c9b9ed42976a239f9c4561d7168b4bb24152b80cd773505166ca87e241dad3b36919b5e26573fb149e SHA512 94893f888c0cbfc58e54a0bd65d6c0697fe4a0e95c678b7cb35e7dc8854d57eb360bfc952750f97983348817f847f6df85903f21a5857b1a3880b2a7eb6cc029
 EBUILD cmake-3.22.2.ebuild 7034 BLAKE2B 4234d8e5807dc998c74da5201c79212880c510aa91cf7b968be3d68eadfd628276af97316fdfe84ece9021981fee655bf2ccdb73b5216d82ec3c4b7cf8a3b48f SHA512 2cec9ab2e18169a6bc6e73e2eb63b2c8b8d09d1cc114e5304c393a92223466fc57d2cb4c06088eb3232b3aad59bd0597a2b842c74f7693be683bf368e93cf9f4
 EBUILD cmake-3.22.3.ebuild 6827 BLAKE2B c219b7191f3562325b33d75c3958cdf291ada8a892212e6b132ecd43fb77437465462dd4a6adc3958faff0b01a5ead7c0edf6011a0f232cc37d69045d8b6f60a SHA512 d3e5f98312456305149800f784362c37f69b1d50ff09088b474edd450046def404d6fedc02220674caf78bfc118fc5c710c9e85a98d5e13ef81801183fccba8d
-EBUILD cmake-3.23.0.ebuild 6948 BLAKE2B 884c55fcc6b02654d97915ac12843607632d7877492309aa7dcafeda761339b533dad885053c0f096e27b82351ab46dc6bedd923a27b87da18e78a5226e8b0a7 SHA512 26e267dd03a69af6ff731631e2327ae7e1f4906423ba7906854de736019b27db7569b9461d648271031d94761c8ee6111fac01f72e0e38b1ebaba85f848f18d9
-EBUILD cmake-9999.ebuild 6948 BLAKE2B 884c55fcc6b02654d97915ac12843607632d7877492309aa7dcafeda761339b533dad885053c0f096e27b82351ab46dc6bedd923a27b87da18e78a5226e8b0a7 SHA512 26e267dd03a69af6ff731631e2327ae7e1f4906423ba7906854de736019b27db7569b9461d648271031d94761c8ee6111fac01f72e0e38b1ebaba85f848f18d9
+EBUILD cmake-3.22.4.ebuild 6827 BLAKE2B c219b7191f3562325b33d75c3958cdf291ada8a892212e6b132ecd43fb77437465462dd4a6adc3958faff0b01a5ead7c0edf6011a0f232cc37d69045d8b6f60a SHA512 d3e5f98312456305149800f784362c37f69b1d50ff09088b474edd450046def404d6fedc02220674caf78bfc118fc5c710c9e85a98d5e13ef81801183fccba8d
+EBUILD cmake-3.23.0.ebuild 7787 BLAKE2B 4537277a0e9bc99cfe95700922f4d0a3b7fddfd70eee7a45cabdb95902ff41b53b494c5c131c661f84a19618cd0dfca747e0ee551a8b004745a20a67cf3651de SHA512 61d04f9e2cbccdf4a8a1c4a9eda5b72fedfc6f7e8e6e15ed598f1db8d17e6be65ed41010eae21a6c40a573fc6794bc0e007a62c90fa6de0cf5d70bdd0d4ab3fa
+EBUILD cmake-3.23.1.ebuild 7787 BLAKE2B 4537277a0e9bc99cfe95700922f4d0a3b7fddfd70eee7a45cabdb95902ff41b53b494c5c131c661f84a19618cd0dfca747e0ee551a8b004745a20a67cf3651de SHA512 61d04f9e2cbccdf4a8a1c4a9eda5b72fedfc6f7e8e6e15ed598f1db8d17e6be65ed41010eae21a6c40a573fc6794bc0e007a62c90fa6de0cf5d70bdd0d4ab3fa
+EBUILD cmake-9999.ebuild 7787 BLAKE2B 4537277a0e9bc99cfe95700922f4d0a3b7fddfd70eee7a45cabdb95902ff41b53b494c5c131c661f84a19618cd0dfca747e0ee551a8b004745a20a67cf3651de SHA512 61d04f9e2cbccdf4a8a1c4a9eda5b72fedfc6f7e8e6e15ed598f1db8d17e6be65ed41010eae21a6c40a573fc6794bc0e007a62c90fa6de0cf5d70bdd0d4ab3fa
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.22.4.ebuild b/dev-util/cmake/cmake-3.22.4.ebuild
new file mode 100644
index 000000000000..0d8e28da59fd
--- /dev/null
+++ b/dev-util/cmake/cmake-3.22.4.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+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="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cmake/cmake-3.23.0.ebuild b/dev-util/cmake/cmake-3.23.0.ebuild
index 402d531d597d..2380055102e9 100644
--- a/dev-util/cmake/cmake-3.23.0.ebuild
+++ b/dev-util/cmake/cmake-3.23.0.ebuild
@@ -21,7 +21,17 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
 		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"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
 fi
 
@@ -48,7 +58,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
+BDEPEND+="
 	doc? (
 		dev-python/requests
 		dev-python/sphinx
@@ -100,6 +110,24 @@ cmake_src_bootstrap() {
 		|| die "Bootstrap failed"
 }
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/dev-util/cmake/cmake-3.23.1.ebuild b/dev-util/cmake/cmake-3.23.1.ebuild
new file mode 100644
index 000000000000..2380055102e9
--- /dev/null
+++ b/dev-util/cmake/cmake-3.23.1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		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"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
+	fi
+fi
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index 402d531d597d..2380055102e9 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -21,7 +21,17 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
 		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"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
 fi
 
@@ -48,7 +58,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
+BDEPEND+="
 	doc? (
 		dev-python/requests
 		dev-python/sphinx
@@ -100,6 +110,24 @@ cmake_src_bootstrap() {
 		|| die "Bootstrap failed"
 }
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 24babee2cfde..3044909eba07 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,3 @@
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.5.ebuild 1086 BLAKE2B d0925dfa0fd07c56a9ee6e1f2a0eb8eddf63208ece29f18532b2b99ba6cff8472e774e8c26341aa179f623da3a93ed453bd33affa7404a00c5c381555c233520 SHA512 58553d202eb790ff5b70601cbcf17485fe4a4864f923b2df5caa4a3a79b4d52f4c1f426ab62461c2bd7af5d0b62146e016994bf136bf52505fbcb0dd9b9a610f
+EBUILD cmocka-1.1.5.ebuild 1097 BLAKE2B 375b6d1b1c1db1dad70c813556480af0ccf34098de9f4f24446d1f98d974f907ffe5d811d5128395edbc74b5b7b490831d211a7bab3a40186803d23362fdf159 SHA512 f7e6b7423040001412b1958338969cf5f79208b5106cf7d81df8fe47abc839568b55e57d06c5ff5a43ab6929439e961f0312278d9c08099acac67bc529e9ef7e
 MISC metadata.xml 260 BLAKE2B f2a46bd04167517ee453a39cc2dcc848d4fb0760026483acd86fa86829779666837e81f8a9012c69c0eb89d5fbd9fb22002a2c786877ddd5c81ca1d80a0eead9 SHA512 a44f57da0d8fa3e4c8df9d9052e53ba139603c7312d4b13fc3c311455e41488c0bb855712817929c4f551747ee6651ac0c3428f28129e4a889a56622281b58b6
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 23ce594bd892..e16ab06ed23c 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.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
@@ -8,7 +8,7 @@ inherit cmake-multilib
 
 DESCRIPTION="Unit testing framework for C"
 HOMEPAGE="https://cmocka.org/"
-SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
+SRC_URI="https://cmocka.org/files/$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index 04aef1c73d1e..fb8e67b0931d 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,4 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
 EBUILD cram-0.7-r1.ebuild 561 BLAKE2B 8e526c8987ce8fd81d88e8dc8b5ec02d4f35a4bda141cc823ac8479e15a0b25cd4aba71311d1e7eeeafead87aa0b29afba30380024b8b3d7ae356e424be81129 SHA512 926a0ddb18c75ee18f829de724d6d96685ce7f871f5ebb97fe249c8b89a7c05556a618220905acff20b361dccc8b2087145366ac8f9a38a6f1d36911c1ca7015
+EBUILD cram-0.7-r2.ebuild 591 BLAKE2B 40204a07b0349f588ca013e052ed7493539d20ef6618ae841e7ad935081d10e3d0691c4e9c4f591b347adfb7817e80be573609fdf6df552d3eb9a4e300859a92 SHA512 58b15cd4d5318b5171dbcdef3d065a3f50238961b9ab1c0fb995dccbd729388520013b5483d4c400283bcfa53bc6e00cc02c7b46f609e1a4e9d1190d69a3fa81
 MISC metadata.xml 599 BLAKE2B ca01dfd4f46ef9d885eb2b98a4df59e5372f4f0acd859b27d8906f03ab2f025e367b9ef306fb4685c9001c120a9fd32026d88bd07acd8975846f52956b361e2f SHA512 f46da675a684cfcdfb9426fa3e69a0a80a29269de96e10966514ef5b226c19c1d7f6639bd935a3bce0881307e34dcc0c4c8ec7a81806ad55993695a145cda7be
diff --git a/dev-util/cram/cram-0.7-r2.ebuild b/dev-util/cram/cram-0.7-r2.ebuild
new file mode 100644
index 000000000000..56867074f7fe
--- /dev/null
+++ b/dev-util/cram/cram-0.7-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Functional testing framework for command line applications"
+HOMEPAGE="https://bitheap.org/cram/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" "${TEST_DIR}"/scripts/cram tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index 4a7e6cd886fe..7f4f9fa7fdad 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -2,9 +2,10 @@ DIST crash-7.3.1.tar.gz 1329499 BLAKE2B 9c9fd88d7f8874557b99a173b4bd615bb5d41d35
 DIST crash-8.0.0-patches-1.tar.xz 38880 BLAKE2B b1b22a55f07e7c23c90d13769cdf0db92d3015d5aa5af20bef85394013635bb393c4bbc36fb0af2a925b59b98289e33b3c092ca39c9c90c7213ba5e4b9af8b74 SHA512 17f638c4a5d2cff472a75f58d82d3b7325e6cf9444641c85ec6a3be5b4980aae90ec19dae66ae4b5022f938faae6876b4b50c0b791087fbd20629745b9909ac6
 DIST crash-8.0.0.tar.gz 1281026 BLAKE2B bb86bc64d04ce136295bf57097674e96d29e5c934b2fc55f2bd5fa331f2d0086929e1fc7ce60b75b4df1ded128e71048e555bffc3321f6f860d00a8fae8bc09e SHA512 c52afab6c8187dc0c44a13b2a5b33bd7df33d9ee12bcecc6b7e94e8bc98d9470c134cb0fbe941b750f36a66028aad718bfd6f1a00524ad38ce43d1f278048a3b
 DIST gdb-10.2.tar.gz 40267550 BLAKE2B cee3ab45a52ed378fc718e49c4d153393200fd1b85306888e4085919ab27277bb85d66f9297e6d0aaa1fb47d65fc31d4b97a2fc476e2ccedd4dba0fbec778ab4 SHA512 aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41
+DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872391b618fd7b14c5cf251b78e55d28c12e81382fd600f67e2f618ff5dbe3a7b737a5d5161ceb3542afbb90b SHA512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa
 DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368
-EBUILD crash-7.3.1.ebuild 1021 BLAKE2B 2051802e5a602a5fb9918224072f27398bb0bf1855285ec1cb0d46130c761fc4e4a23f76f87d8f869035678059533029cdd616b3cdaab14cce4009aff4f4d3f3 SHA512 cee1a11b79b6e4c5f448eb5c606d2d119b71282de91f3d113c06a5fa4f9ff0c3adc636bb3919c417523d890d4eb51e72786a0420f73e52d4720b2b04b1b523d2
-EBUILD crash-8.0.0-r1.ebuild 1151 BLAKE2B 6af44841747f7446b438b60b01cd8b5aaa31218cfc05f67ea9110ad961cd3bb42f9563470bbe6f9071eb3efbe4f6ac983d29bcb4417234248cfc4814bf29af81 SHA512 8c9e1d88cb85492aaccdf7e2f902a1d97de5b450f7d3e22e0aec20ff835c5a5627cc4e09096730da26afe3dcdde1b052fd52857312837ac4aba5ce685290b1dc
-EBUILD crash-8.0.0.ebuild 1023 BLAKE2B 748676b6f761082229bdbc1d0eef105db0eb8b745505f0f7bea2414b54803e9e6b6277afcecff993fb9ff2213a5d53deabb77a569036bfaaa6c040c5120b4b30 SHA512 9ebcf5ab9b003a8cd1065c08bba6d2a8630e69357634c79a805ee244594384ef42508a6bb34225d399ecd2b41aedb9e2d2ae354c83a7f0aa4ad5437a85a7b13a
-EBUILD crash-9999.ebuild 1023 BLAKE2B c9a565d025a2548eaf3a07a75750a458c732b22d1dca03bbc8a72ca728017299949e916096421a800564f73762b62479dc3bef79b8d17841e993df53a019b42c SHA512 9302ae319acb25bc045dcfe1d6faea4c1a0381615010d786836aef115b1e9b110dfbe1c747bce74dc74218ca65267c3e74e3bc3d7f2ca967972ef0d6373cf406
+EBUILD crash-7.3.1.ebuild 1049 BLAKE2B 87fac2ac007629723f10c252808eb104bb3b90695cb9c847c35b169103fcc8b652619eb789a58c5232142fb56350404c0b3d2f3ff9f893ef148cdd4ba6c745f7 SHA512 6d705509862b013b9882194520691958abf108a45ff4828f98c1392b54ff1a33f51e45dd69e3aa2fb71a156d1ec9fa371186a760c1773df5e4521f403b3161da
+EBUILD crash-8.0.0-r1.ebuild 1179 BLAKE2B 50d3e7be37ea782f0c02e64d6ab2274f3b1348eeeb93d72e9e8c8c2e44383038fd5b196a3478cbc5400cdea72a05b35f5da1596492949ec7e5b7ec0a03173cda SHA512 689bda50c66921eb02b0abf0788e4befe92e3b98fe527d5881ee4f8a479df9d4c67055be714d8df7b12fcb2e842f1376b33aacaf6574efc6da0c96a665c5a10b
+EBUILD crash-8.0.0.ebuild 1051 BLAKE2B def995f877f449c3ff152a2ac2eb5f017613d37a2a48e91cfa8733eb21585685f4a6da71f6fc99e56f978794ca118ea8e281a99d7df843756e3179ffe4383785 SHA512 4ad172055031888c5aa0ca12071b8aca097c340a0844743928c9ce7760a250b9b912a465eabe8a81b6271602e6a6228bc663062a1457aaccd7d5abf59cb599f9
+EBUILD crash-9999.ebuild 1051 BLAKE2B b5ac7621569cfcfe48fba7d84a247a96a74f30b7f3bdd26fbe970b92865098c5a078c7a9cfb3b17c8165426c018b090097d795819bae568851ee569be49b859a SHA512 df17854f2d7fdda5a39a36f4ecfed8876eca82a74a8f139f2d63d0a33e44b7ccc09320995d11f01395f4d9d877327981029f1012a4343d7e92a33ec9143e7d96
 MISC metadata.xml 641 BLAKE2B 48301b1c1db0805eb7514f7c41f40f31535652ef57e09c227b939470259c891333bb96a288b1eee725f9b93c3640efd28df94eccf2f8996e3e85412c7b015181 SHA512 2aefb1422f38b6532a11bfb508c1c13c1ca85931ebbe47d93f2f193df5f7a4e622283425b68d898ce7921c301d8d5937c2c5c848917e5a0e3f2f13de03ab310d
diff --git a/dev-util/crash/crash-7.3.1.ebuild b/dev-util/crash/crash-7.3.1.ebuild
index 24b0d3f6115c..70eac2d36095 100644
--- a/dev-util/crash/crash-7.3.1.ebuild
+++ b/dev-util/crash/crash-7.3.1.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit toolchain-funcs
 
+GDB_VERSION=7.6
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz"
+	SRC_URI="mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror://gnu/gdb/gdb-7.6.tar.gz"
+		mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
 	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
 fi
 
diff --git a/dev-util/crash/crash-8.0.0-r1.ebuild b/dev-util/crash/crash-8.0.0-r1.ebuild
index 13cee473e98b..863cd9a9b6d8 100644
--- a/dev-util/crash/crash-8.0.0-r1.ebuild
+++ b/dev-util/crash/crash-8.0.0-r1.ebuild
@@ -5,15 +5,16 @@ EAPI=8
 
 inherit toolchain-funcs
 
+GDB_VERSION=10.2
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz"
+	SRC_URI="mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-8.0.0-patches-1.tar.xz
-		mirror://gnu/gdb/gdb-10.2.tar.gz"
+		mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
 	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
 fi
 
diff --git a/dev-util/crash/crash-8.0.0.ebuild b/dev-util/crash/crash-8.0.0.ebuild
index 3f40679fc254..e37d6d2d621a 100644
--- a/dev-util/crash/crash-8.0.0.ebuild
+++ b/dev-util/crash/crash-8.0.0.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit toolchain-funcs
 
+GDB_VERSION=10.2
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz"
+	SRC_URI="mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror://gnu/gdb/gdb-10.2.tar.gz"
+		mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
 	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
 fi
 
diff --git a/dev-util/crash/crash-9999.ebuild b/dev-util/crash/crash-9999.ebuild
index f55b7b3c70b8..525199322751 100644
--- a/dev-util/crash/crash-9999.ebuild
+++ b/dev-util/crash/crash-9999.ebuild
@@ -5,14 +5,15 @@ EAPI=8
 
 inherit toolchain-funcs
 
+GDB_VERSION=10.2
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz"
+	SRC_URI="mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.xz"
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror://gnu/gdb/gdb-10.2.tar.gz"
+		mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.xz"
 	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
 fi
 
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index e80e46f15766..ac29d991d254 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,11 +1,9 @@
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
-DIST cucumber-rails-2.2.0.gem 136704 BLAKE2B 660037bb5938ad01aa0b1188e5e48522f9932662d6578f1c0a107cdacbd5cf8527e48b6ddb2c91d975577a71db0259a7250d762004ef0a49ebc063f45103aab0 SHA512 ca8a0ce9c9cdb1306b6a5f8e3d9ba68a2beb3d0a35a58fd6c51ba3ce76e2104045b2768054d27bb4bfcd437534aeb6d39fa2be87396f3a4084c0044201e96252
-DIST cucumber-rails-2.3.0.tar.gz 39492 BLAKE2B 73c45db7b3b445804b29814fa7add1ee5d66ea75bf3bd7b19456cef38340adc37f6129911a49d7e9996bf20299e31511e51758e18d9f8ffdb53fa9ea320aad42 SHA512 fee78784bd21084271c611073bce8b399783a2ce1900bf12a27cd8b70edbedc525b501d5d71856ad42f19174664d95d97bd4adf75b1791af60bc237a9f16e00d
 DIST cucumber-rails-2.4.0.tar.gz 41130 BLAKE2B abe10f72aad684691f863a7aeb952a7e45c945d22e1998dbd860ff47808c253607d6502fdb9dbcb1d573a0e3d615859ab56b9e34eabc5de33ff3c47483f8314d SHA512 b57134227e807da4f64d5d8d1435e597f28adab27f2f4d7148b8e997cedf721916dfa73de5a226953827053db2dbc3f3300a88f71d72327514585ae9fada9e0c
 DIST cucumber-rails-2.5.0.tar.gz 42030 BLAKE2B 96279b72c597bcb40eebb2270ee996c08fd599f257b91beea50f84cb0cf221258bb5fec4f91ce6a2400d865763072bdd47c1b4c4a03b35b5e35e6384ab3f31fa SHA512 cb689beac565d0b193ebcfb0ce4d673cad2d50fe8db5718fda6779d08d5458e2234ccb5a1ff13eaf22b3048c9a10b4dd6148cfdedf841dd0b41366059acb0b67
+DIST cucumber-rails-2.5.1.tar.gz 42456 BLAKE2B 91448ce88fdfed2e219a6c46b7915deeccb5678ceaaf57db06fc1348facff756b0c1dd67f6d8bcbc1b36ba555ca2d31167fa20c8b5f48138c018ef5d2f65bafc SHA512 2bb1748d9710998f974fc253ae03595d8e972593423d027840d2b437a0f13a60ec0df3cc2fb7d6e30c0003d414d093e4fd3c398e0fa27441ccb431f308f89405
 EBUILD cucumber-rails-1.8.0.ebuild 1162 BLAKE2B e331bb87a4aae973e0f25ce575ac117512d52287509bb63c0e2e9a8ecf89d019ae78c2545ceb9a0ba0926ed81ae06ac200442ba04dda4990436f6bf984e552a2 SHA512 b4b3d19e60f972ade1730d87982121eb7fd3ef0514a7242f1a6909faa87ef7f24528c06ba798b4b73e9c1f875f2af0d0791d38b3f457d54f8321d78a248afaa6
-EBUILD cucumber-rails-2.2.0.ebuild 1174 BLAKE2B 2f2d04492f77ee142583095bddb987dd72213f34429908e0a240308b4178db57df3b5116b85ee68844c755cd09f820a3cd2fecc45cd9027d4d24c4b3bc49c166 SHA512 c3d5a3e0407ee0122d0e44667f9fb9dc14fb47cdcd25615b86a0c8685715cb1e3dc0d0c2428637bdfbb82fa70ba54ea85773dee789ba337dad9c9f14940a4798
-EBUILD cucumber-rails-2.3.0.ebuild 1284 BLAKE2B 221dad655a92b65bcf3d6dfcdd31454ee1b0e0b8b2a41161bcda2cc4df520ff1dd5810493453020b4b93a23cf885123c329fdf622f803a8a27c5782ab67f7b58 SHA512 7a89333dde47f099520adaf4397032b954b7d6215d65fcf44851e724ca910794cd44cf7296dabbdb7d3fb75190d5e287e2dcba1ac87e206176611502d3723ea1
 EBUILD cucumber-rails-2.4.0.ebuild 1302 BLAKE2B 76f406cdf9b9dfa5986e2241b46bfa434b2a29fde25431c3b158b994a92de7cfddffe45daa024d7b2ad768f4966f50ac3dc0578bdad2ff571e43ddcebfb2d69c SHA512 924ed76623a44c61cca3d9fb29298f9a050dc47b6474b5821db3eb8a0f12b9dc073103dbab5b9bfa8b7997e8617e3d9761036e5159906743fce96a380ed7fe67
 EBUILD cucumber-rails-2.5.0-r1.ebuild 1300 BLAKE2B 69ccd976c5906d56de8bbe3965354a7cd03d5d7764659c9a20918856773f9174b9db4d3963ab5dcde657efc5901e54595feea2e96be851086e8d1762f6a003ab SHA512 507aea58a6a2bf74018755a683dd2bc02bc505500ab9cbdfcbfdcbc57f13548deaa77d882ce48038a712e9fb0be82fe4b6a162ed5e010cd8aeaa4ac6eb7bc4cd
+EBUILD cucumber-rails-2.5.1.ebuild 1307 BLAKE2B dfdd93177aca8772a7627c5843bae145c9c81edad359bfbbe99a7d31cdc433f6e2c16eea7cfa82ad805378c41b62191f2a0f61e06488c6e8c38bee5c5c87fb82 SHA512 b3a55f93a54b7fc1e7f899eac7039a88c70930d820b3f0a894368bfd7fb35668ed746eb32d0fbcd7269893387be669e51f8e73af0eca8d3a3b4e0a23fe96fcff
 MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
deleted file mode 100644
index 26409e65e60c..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-6
-	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
-	>=dev-ruby/rails-5.0:* <dev-ruby/rails-7:*
-	>=dev-ruby/mime-types-3.2:3
-"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.5.1.ebuild
index d770fc2499c3..6bd4d98c8b7e 100644
--- a/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-2.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # There are also cucumber features. They require a Rails project with
 # factory girl which we don't have packaged yet.
@@ -36,14 +36,16 @@ RESTRICT="test"
 
 ruby_add_rdepend "
 	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
-	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-7
-	>=dev-ruby/mime-types-3.2:3
-	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/rails-5.0:* <dev-ruby/rails-7:*
+	>=dev-util/cucumber-3.2 <dev-util/cucumber-8
+	>=dev-ruby/mime-types-3.3:3
+	>=dev-ruby/nokogiri-1.10
+	>=dev-ruby/rails-5.0:* <dev-ruby/rails-8:*
+	dev-ruby/rexml:3
+	>=dev-ruby/webrick-1.7:0
 "
 
 all_ruby_prepare() {
 	rm Gemfile || die
 	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/files/ s:^:#:' -e '/cucumber/ s/< 6/< 7/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/2.4.0/2.5.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index d1579491ef30..32218fcbc2cc 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20211107.tgz 566509 BLAKE2B f2c045f60185c34eec18b878219fae10a5acca2dc8bec5d379de069c939a0079e1a95925f860944108c97c8ef4e32041966c423d8b294b2102311c9aa085301e SHA512 a6626092692ca61209f67caa7c5dec91f637e3ff002488a0e117ec80ce8fdf0ef50d3b11f67d84d8abb06145347a100de76223fb4b1f971a755c28de1be860ac
 DIST dialog-1.3-20211214.tgz 565608 BLAKE2B f069968abe258942f27e010f8d14eafd270c45ae467d5131b41b57c0cc5a145a410fdaeab5f7fa221aa7dbea440f8e268d130e0f1f7389a224374b0047228156 SHA512 b76e7e1fc333550a9cc351e37e7121e98f48b2a1f78e8c0c528e2126db16ae14c4c5da088bc611cb12020836e75dd2a1d875561fe5eec6589c104252d4aa7626
 DIST dialog-1.3-20220117.tgz 565530 BLAKE2B 6c77be870962151e37f87870e62d4a1e04adacf01ad4076fc38b3dc35c97ea03169f253d2672edbb9d4cf54aa6ae0ba3def199b84c866c6a0bd7299915abbd0c SHA512 c785dadb0bf7feeee6ac767a6752fb85e9d07ff3991c2f948deae05893ba3104590eda37e88adc0032ce89ede036f6215bb4acd1d85699f5cb9f5b4fc153e2ef
-EBUILD dialog-1.3.20211107.ebuild 1280 BLAKE2B f3a52a7bb5ebfaa1b18be1d85c8d1f6dc970afed683cfa54c4c468e6c3abb9e741c97da1765d30a18c3a99537e3e3f1d05b263a7fc2a20c2870dd48418a1e616 SHA512 599039faed3b0a25e2c23382e4c837dc3a8c3ee5bd86921bc0be7046e0aa991d13cdbfbdcfb866784f583062447dd5a27a896af93255b42f5c11ca35bc5c1493
-EBUILD dialog-1.3.20211214.ebuild 1280 BLAKE2B b067faa3baa6076867af866f9ab314064c7e2ddd868143a51850c3d5e4b7bcf7bfa9109f6564fc878fa61a2cdba2a44533535124d0a37bd215b2e43ef77d5930 SHA512 61ee7f66ddeb6e523e3f0930302d64a0872cf90d8976cac5f2d2d6eac3507ff355930436ef1c8201e236ba6decbc29d481ce188809671c374d5c3fa7477c18ad
-EBUILD dialog-1.3.20220117.ebuild 1288 BLAKE2B 08c69a4d51c9a90d9725b16738861b62fd355716b09c36d6fe80fa00c187281695b5e3d2748d0a6cb5c53f440ff35850d611686a77c3fb41204d83ede0bcaa74 SHA512 c1308aaa4f27fbe9d03d316fd4f65b557aaa557898bcb959859c89ad8932b8b8c0b6e2986370fc2f56bd372212a1b9744a20e3ed44a5d282f708c064db8bd40a
+EBUILD dialog-1.3.20211107.ebuild 1283 BLAKE2B 64250ab768c4bbbae8906615fd597c3faeeed16756a1e56adba1aa17fbab4cc0ab23e32d5591c1215d02ca47a7d70724f537172882ad6b56f63fa44487da2124 SHA512 04a617333f28a61ccac8b3d64299c3c91cb239f68974ce23dbf138bddb16f3b70cfc6f359c0694a597d02e2bf64ade18dac0a176630e33d2add14f729ee2d719
+EBUILD dialog-1.3.20211214.ebuild 1283 BLAKE2B 64250ab768c4bbbae8906615fd597c3faeeed16756a1e56adba1aa17fbab4cc0ab23e32d5591c1215d02ca47a7d70724f537172882ad6b56f63fa44487da2124 SHA512 04a617333f28a61ccac8b3d64299c3c91cb239f68974ce23dbf138bddb16f3b70cfc6f359c0694a597d02e2bf64ade18dac0a176630e33d2add14f729ee2d719
+EBUILD dialog-1.3.20220117.ebuild 1291 BLAKE2B af93c7739580719115efa9df36c8ca42dfb39b79c56519f26e49c053b6f7454a9857bc55247709f115d8d13f3de9f89c8c3f4a6a57d9fae8a4ee5a899e0cb207 SHA512 a5d90aef252fd8a5999a37b90b1697d491308587e47a74c51f002a3535b4bf14a2395b2f2798e7743f367939ed8ec0eea640c2aee68aa6c12edc6dee65dc4909
 MISC metadata.xml 461 BLAKE2B 82507f66df52f2e9c4f51c52fc346a517e4244b4902dac4d557b52c01fbcdc9547ec8b0b572870a2860f995932973fd2b97698fcf748fe4762f210e4b12b655c SHA512 b07779508297ef58d1fd0349700cb7c609a1d503ce99c4fc3bda84c5441dd52064116680459510adbc6e1b6d9173d53fccbd3d6c2130caeb1d822dca5082a334
diff --git a/dev-util/dialog/dialog-1.3.20211107.ebuild b/dev-util/dialog/dialog-1.3.20211107.ebuild
index 0c54076343ab..5e7375f8cdbc 100644
--- a/dev-util/dialog/dialog-1.3.20211107.ebuild
+++ b/dev-util/dialog/dialog-1.3.20211107.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,10 +7,10 @@ MY_P=${PN}-$(ver_rs 2 -)
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
 HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
 S="${WORKDIR}"/${MY_P}
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0/15"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples minimal nls unicode"
diff --git a/dev-util/dialog/dialog-1.3.20211214.ebuild b/dev-util/dialog/dialog-1.3.20211214.ebuild
index 0cf983360452..5e7375f8cdbc 100644
--- a/dev-util/dialog/dialog-1.3.20211214.ebuild
+++ b/dev-util/dialog/dialog-1.3.20211214.ebuild
@@ -7,10 +7,10 @@ MY_P=${PN}-$(ver_rs 2 -)
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
 HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
 S="${WORKDIR}"/${MY_P}
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0/15"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples minimal nls unicode"
diff --git a/dev-util/dialog/dialog-1.3.20220117.ebuild b/dev-util/dialog/dialog-1.3.20220117.ebuild
index 2d0b6c41e870..ddddecae1353 100644
--- a/dev-util/dialog/dialog-1.3.20220117.ebuild
+++ b/dev-util/dialog/dialog-1.3.20220117.ebuild
@@ -7,10 +7,10 @@ MY_P=${PN}-$(ver_rs 2 -)
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
 HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
 S="${WORKDIR}"/${MY_P}
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples minimal nls unicode"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 23a33d7ce8b8..35dc464412c8 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -3,7 +3,7 @@ DIST diffoscope-207.tar.gz 2707223 BLAKE2B e20f21c9e0acc78cadfce082f874b3e3cbbbd
 DIST diffoscope-208.tar.gz 2709374 BLAKE2B cd5bf11f8686fe9afc97285bad335ac3a20a214b83a9a6746326e8b455fd1b32ee2e17ae8a2a5ce36fffcb67dc694c2f17b93f372eec5c4237e62120902c9ebd SHA512 c2583693b0b38f663c5674b60f988657c12a6de3919c407031d1e090eb1c8d25a34f441f328488be03137fbe6573e0cfa9cc32a43863ea476877f0aa03aa20db
 DIST diffoscope-209.tar.gz 2709412 BLAKE2B 70648067d3397a3a9237d70dc49695133fca474a1b14d51259642bd4ffeb3870c4ad5641e14096d460ac82c49bb7f2439f2071e8f439e7966a3ebff3928d5562 SHA512 7ffe1479c935576d040f2ac960d8d55f6d533b30d1a04efb4bfc371e6aa54b27790f910a2abd59cf5349e089d73a283bd432908cfbc1e93b482f190c11d86bb7
 EBUILD diffoscope-205.ebuild 3297 BLAKE2B 38b17dc44cf8feccd717f69ae028dbada341c4b0dae653cc00fa4032da7c26a9d9026b5d8d29f6dc6f4cda42ee66ffb0d25f63c6dc253dbd0320e1848d01dfc7 SHA512 b97eb645cf2fcd16d472c265913373247d1b923586955860008ce2325369d10b6616704b88001e6260dc39bf409f2d4b5645ee4efec9c9e81f59731cce67ed74
-EBUILD diffoscope-207.ebuild 3299 BLAKE2B 65d0650ccf6601d3e6afa823e0ada14e446aaab408ada39c34acf153c13ee02cfe9045ce3fea0e134e651a972fb16f5b06ac6a235dbad73295caf31bf7c25a70 SHA512 0cead8b86fd50c651a6c1df897fa57482f5eb70a4371a38d84977fb86db5770e80f2b901a1fc762dfc48537bc0bd6492f62debc5434a802d698a860592f4a30f
+EBUILD diffoscope-207.ebuild 3297 BLAKE2B 38b17dc44cf8feccd717f69ae028dbada341c4b0dae653cc00fa4032da7c26a9d9026b5d8d29f6dc6f4cda42ee66ffb0d25f63c6dc253dbd0320e1848d01dfc7 SHA512 b97eb645cf2fcd16d472c265913373247d1b923586955860008ce2325369d10b6616704b88001e6260dc39bf409f2d4b5645ee4efec9c9e81f59731cce67ed74
 EBUILD diffoscope-208.ebuild 3299 BLAKE2B 65d0650ccf6601d3e6afa823e0ada14e446aaab408ada39c34acf153c13ee02cfe9045ce3fea0e134e651a972fb16f5b06ac6a235dbad73295caf31bf7c25a70 SHA512 0cead8b86fd50c651a6c1df897fa57482f5eb70a4371a38d84977fb86db5770e80f2b901a1fc762dfc48537bc0bd6492f62debc5434a802d698a860592f4a30f
 EBUILD diffoscope-209.ebuild 3299 BLAKE2B 65d0650ccf6601d3e6afa823e0ada14e446aaab408ada39c34acf153c13ee02cfe9045ce3fea0e134e651a972fb16f5b06ac6a235dbad73295caf31bf7c25a70 SHA512 0cead8b86fd50c651a6c1df897fa57482f5eb70a4371a38d84977fb86db5770e80f2b901a1fc762dfc48537bc0bd6492f62debc5434a802d698a860592f4a30f
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-207.ebuild b/dev-util/diffoscope/diffoscope-207.ebuild
index 46f6608598b5..304d6efd1313 100644
--- a/dev-util/diffoscope/diffoscope-207.ebuild
+++ b/dev-util/diffoscope/diffoscope-207.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index 7b10870abd2b..90af7a9260e6 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -1,4 +1,4 @@
-AUX difftastic-0.24.0-regex-dep.patch 483 BLAKE2B ecc1d6a712c285192abfc63d80fa44cec7e318f2aeb7618b1eff60b5c09b68b60844be68d072c6d21542583be5c89504ded95befed0ddca0897f1545f8371d4d SHA512 55ddeb8b9ebd6d2067ad189821e3ea31fbd9f99a68bc20de85f8ba4aa848e840487c3baeb72811efd43e538a14e04d2dfd1d75aabf3f2386380d737b285779ef
+AUX difftastic-0.26.3-regex-dep.patch 771 BLAKE2B ca4d4b2d360491f4f2b7277aff19788a3702798198fa7ae1034eae8fa4473b20f7a54c96668dc7185b1f4dc824b0cfd5f54c7ea525d9bb6aa6b82247d98819e3 SHA512 474ee6e7674b3280d45e989e78e7195cf72491ea9f6fd26f79cd00579ae738b2c325df51fd185230ba439d82f8fbd758182c8212b06fd902bf534cb04f26f050
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST archery-0.4.0.crate 21265 BLAKE2B d5e98cd65b7ae426affc3cd905d7cc4b4296c059a305ae5bb3cfcb206f0bffb6dc4aaf24c820d855ca8acd1be1bd80e2bd8c2e172af5824bcd9b300224d8159b SHA512 4726598957f2fda480fe4fb28b518307030dc032b1b79a9ce83a5e58872e57517a632e205cb83870f48937c3090956045faa066171248d615cb6b029127ee693
@@ -16,7 +16,7 @@ DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ce
 DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST difftastic-0.25.0.tar.gz 8645342 BLAKE2B 2e7b72881849c655b838e20a64c477f0c2763e345b54979a052b14ff35c1adee0edd9b9ee03a6109416397c3eed9bbd1d49f9a2ad4b32b8c05f9066b68a15032 SHA512 b421a591cbd896cacff832ce0e39cb9fc952690f2e334969bdd2722ff17b43f5c6fd81a4223490e38e0a9c5b639a558c6c3682123d5280ba5f29950072626473
+DIST difftastic-0.26.3.tar.gz 10100584 BLAKE2B 9121a9747f761f13830028d8ae01655d6d15ceb846f966b92d905224f54280a354873afb19419fb3a496e67ebca12df1cf15369e69588a1066d7682bea0fee93 SHA512 91ef6c359e709f0f63d3627621ed6a03627248cb31ef90ce1a617294425d5ca8803f3f7608d1b2c1326fd1247ee89a8fc200f1188c659028d9af43bc69fa9467
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
@@ -64,5 +64,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wu-diff-0.1.2.crate 33439 BLAKE2B 78b90ed8a42b3a7a1697f92227edb9f0cb8e74583edf8079b8f85110f6fc049eb68370e93ead3940ae222d108c2f18b7f301e9285968e046d362669a79bbb3ca SHA512 6d93c8854dba66f48f736db3f9e997d11d07a0fef3e13219716e553c0f5936f1d00468b88d9164329cfd195271aa242ec7dfd58560074f1a41e8558719ba5af0
-EBUILD difftastic-0.25.0.ebuild 2158 BLAKE2B 50f13dae2d74fe6235d617c24b41c8f6ce9503d9d38f716c5e3742b9dd36661455acf61d124b533f44a70fde95b5b100692a62837beb9fed81d675283d3b37d2 SHA512 91a7071317ef0314bfaf2ec1909854789d2e4de70b7237a70fa6f09ed104411ba0b77f739dadeab03347ced6c2838fbcc2a24bb76db2fc3d37e263e14cd8e774
+EBUILD difftastic-0.26.3.ebuild 2145 BLAKE2B 34dcf62c98c13b89a971a0e1a33ce2e8bdfc0363dfed90bef5dc1e392cf1bdaeaecf6f2cbff7e1f8963ec48239b77093df342c6f3d626eaa0b03a7b4b1f14b43 SHA512 a02890feab24a41b10f2acc9a79775f3a80bfb1b764991ef7e3984a336ddf13210531a7ac05f0b9f91d5f40e0c8c4ae95ea57ef1999aa43d29d5dc26979f741d
 MISC metadata.xml 333 BLAKE2B 3ba43124273c8969651c7ff68c86718cf0484850e98b2e5de2b4aaacea67e95609b286c6156dc74cb1fa1201e198f0cb685b9cb1f80a6c81cfb8b712dec96a05 SHA512 0726b7ca030ff47d0a304f30f97671e7274905c9c5187edd61eba9224207430ad1cd98d76ecb4120f8b9d722e628834f7bc3d0a3734ef22f0df48fcb44c6c2b3
diff --git a/dev-util/difftastic/difftastic-0.25.0.ebuild b/dev-util/difftastic/difftastic-0.26.3.ebuild
index e1b4ece14a37..cfca879d4a2f 100644
--- a/dev-util/difftastic/difftastic-0.25.0.ebuild
+++ b/dev-util/difftastic/difftastic-0.26.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2017-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Auto-Generated by cargo-ebuild 0.3.2-alpha.0
+# Auto-Generated by cargo-ebuild 0.5.1
 
 EAPI=8
 
@@ -93,7 +93,7 @@ RESTRICT="mirror"
 QA_FLAGS_IGNORED="usr/bin/difft"
 
 PATCHES=(
-	"${FILESDIR}/difftastic-0.24.0-regex-dep.patch"
+	"${FILESDIR}/difftastic-0.26.3-regex-dep.patch"
 )
 
 DOCS=(
diff --git a/dev-util/difftastic/files/difftastic-0.24.0-regex-dep.patch b/dev-util/difftastic/files/difftastic-0.26.3-regex-dep.patch
index 20a8c60e273c..e5f25935074b 100644
--- a/dev-util/difftastic/files/difftastic-0.24.0-regex-dep.patch
+++ b/dev-util/difftastic/files/difftastic-0.26.3-regex-dep.patch
@@ -1,5 +1,5 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index d1c2f2d11..7a80ce5f8 100644
+index b31dab30f..a3e7795aa 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
 @@ -418,9 +418,9 @@ dependencies = [
@@ -14,3 +14,16 @@ index d1c2f2d11..7a80ce5f8 100644
  dependencies = [
   "aho-corasick",
   "memchr",
+diff --git a/Cargo.toml b/Cargo.toml
+index f5916fa44..8d7cf3ea2 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -21,7 +21,7 @@ include = [
+ ]
+ 
+ [dependencies]
+-regex = "1.5.4"
++regex = "1.5.5"
+ clap = { version = "3.0.13", features = ["cargo"] }
+ itertools = "0.10.1"
+ typed-arena = "2.0.1"
diff --git a/dev-util/flatpak-builder/Manifest b/dev-util/flatpak-builder/Manifest
index de6fbc23628c..4dac70541742 100644
--- a/dev-util/flatpak-builder/Manifest
+++ b/dev-util/flatpak-builder/Manifest
@@ -1,3 +1,7 @@
+AUX flatpak-builder-1.0.11-musl.patch 626 BLAKE2B 83899e982e24f4045af7c494b92373eb712e9e34415bb4cf6a8f00edf8d08dc999e0f10e52fea03bf56d200b2a7503d2c8a85a54e5c9af76ea58739b8baaf339 SHA512 32595a1e9ef8e5693c69882849e89d66438f3bb36d9e2c2a4db2b1d84835636ed2db49703b18ead616df68aee8509cc5a1d4074ff49616134294d4a9f77b2a2a
+AUX flatpak-builder-1.2.2-musl.patch 1977 BLAKE2B d6e9374fcd7249c206714beb1f14f856d41576ea04cf4e27779dfc95dbef7def2f27e5183518d930ef34bf111ba4264188bef6e78169227e0f8a59d479ffc842 SHA512 a63f6df29d0045e13796a7c7b033bad1941411f84018b05479e3ffa14bada0826e891fd8e83b9e3df741c27d8954893bb85070be69e92ff3de48904746886100
 DIST flatpak-builder-1.0.11.tar.xz 459500 BLAKE2B aa5edebaa6a52a7dbf5cd68bfc356617e13556036979575369ee65e919b267f0ec6838524668793c394b9024f97309d71ceb094c26e3893dedc8884ea8d18d1f SHA512 27c15ecccee79c6a7545f11d7c8cd7b80d4e99dc9c48818dd722934dfbe61e02b258b3db59946badfe5e1e189b39b509a2dbff1404a31a42c29ed4993fb5ec26
-EBUILD flatpak-builder-1.0.11.ebuild 848 BLAKE2B cc0a9f7a81a13c5e0c5f5f07df5b13571edfae7026c3025d2f2ff285c91c6ca7e54eb960452820887231e33d5fd9cbaca3c00b7814e3fd3a58840b97bfb6ad1c SHA512 9f7751f07dce91715778bf31cabc4fb1a715e4ad4b2b143ac2361f5cb0b90d8251d117849f90f5fc5fa455f8be1570099bfcb1224f94d91cf6f0d69006c9354a
+DIST flatpak-builder-1.2.2.tar.xz 503444 BLAKE2B f499d5a5bb313530b2a5c69c2aef897aead40e959495ee368f375e03b9bca3c224b377607d1ca213f8640b0f926d7b862b0a7502e1773661a8e5ee983340f53c SHA512 28ab004f5c4fdb7f43b7d3f0823d54dad0aa4f660d5bbe9969e0ce011a1e338e2442e676d1d4c197af60d61a0911b8715ba34244b547116887bbcdef589e1b47
+EBUILD flatpak-builder-1.0.11.ebuild 907 BLAKE2B 2f134f02ecf3371956c756d63920be5ddca46f4de07cdca25aff2b5fb48bad7215d99a015788067529cc67a8130752a49aa83d6a62f3d62cb8c73e580348a07f SHA512 f545a6ba6bf0f689761a4ef2d670213939be7eaf20bd93f27127dd0bccdd8712d4a2b482037bcdd26e87e690a8daac4f96c02a178e3af94c36414bca75f7255e
+EBUILD flatpak-builder-1.2.2.ebuild 906 BLAKE2B cfbe124731f52e2a00564a25c0df26c01fd56c0cc1d080177f741c3acc4725ef40f6575768df4182e0ebd6fdc206c70a5a2e2ef771daf2eeeb356515cbac0b28 SHA512 ee5d845726d7c0b7e57105c38ba8d8e462fdc76811f758f55f50fde84b84f1ec0cc533722c9e19ef7321c5b074cd89169e7eb784857ef0d698eaf0afb3c4067c
 MISC metadata.xml 404 BLAKE2B 6dbef666c9bbd3347d28811890ab5b9ab1ebdf60895dc2d8146a88374a0c348706656e9758a92eaeb47bfa86f833313d669530460a1ee6ca7f81da1db542fb95 SHA512 bfb8bc1b79690c44e7e8171035e326bccc96e1df26d7fe12515e26290ef68b64f6eef1e86ab24530ea6b2c9cfc3240f1587b0d7c21686fdecf9ee8e53144b42b
diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch
new file mode 100644
index 000000000000..b5ef0ec15504
--- /dev/null
+++ b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch
@@ -0,0 +1,18 @@
+--- a/libglnx/glnx-macros.h
++++ b/libglnx/glnx-macros.h
+@@ -28,6 +28,16 @@
+
+ G_BEGIN_DECLS
+
++/* taken from glibc unistd.h and fixes musl */
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
+ /* All of these are for C only. */
+ #ifndef __GI_SCANNER__
diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
new file mode 100644
index 000000000000..626fbddd0352
--- /dev/null
+++ b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
@@ -0,0 +1,69 @@
+diff --git a/subprojects/debugedit/tools/debugedit.c b/subprojects/debugedit/tools/debugedit.c
+index 668777a..b3ba5cb 100644
+--- a/subprojects/debugedit/tools/debugedit.c
++++ b/subprojects/debugedit/tools/debugedit.c
+@@ -25,7 +25,11 @@
+ #include <byteswap.h>
+ #include <endian.h>
+ #include <errno.h>
++#ifdef __GLIBC__
+ #include <error.h>
++#else
++#include "error.h"
++#endif
+ #include <limits.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --git a/subprojects/debugedit/tools/error.h b/subprojects/debugedit/tools/error.h
+new file mode 100644
+index 0000000..c330dc3
+--- /dev/null
++++ b/subprojects/debugedit/tools/error.h
+@@ -0,0 +1,26 @@
++#ifndef _ERROR_H
++#define _ERROR_H
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++
++static unsigned int error_message_count = 0;
++
++static inline void error(int status, int errnum, const char* format, ...)
++{
++  va_list ap;
++  fprintf(stderr, "%s: ", program_invocation_name);
++  va_start(ap, format);
++  vfprintf(stderr, format, ap);
++  va_end(ap);
++  if (errnum)
++    fprintf(stderr, ": %s", strerror(errnum));
++  fprintf(stderr, "\n");
++  error_message_count++;
++  if (status)
++    exit(status);
++}
++
++#endif
+diff --git a/subprojects/libglnx/glnx-macros.h b/subprojects/libglnx/glnx-macros.h
+index 6d8aca9..e3e4e33 100644
+--- a/subprojects/libglnx/glnx-macros.h
++++ b/subprojects/libglnx/glnx-macros.h
+@@ -28,6 +28,16 @@
+ 
+ G_BEGIN_DECLS
+ 
++/* taken from glibc unistd.h and fixes musl */
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
+ /* All of these are for C only. */
+ #ifndef __GI_SCANNER__
+ 
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
index a8017f003f1d..20d616e0056d 100644
--- a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
+++ b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
@@ -33,6 +33,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=("${FILESDIR}/flatpak-builder-1.0.11-musl.patch")
+
 src_configure() {
 	econf \
 		$(use_enable doc documentation) \
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild
new file mode 100644
index 000000000000..f135df85fc71
--- /dev/null
+++ b/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Tool to build flatpaks from source"
+HOMEPAGE="http://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc +yaml"
+
+RDEPEND="
+	>=sys-apps/flatpak-0.99.1
+	>=dev-util/ostree-2019.5:=
+	>=net-libs/libsoup-2.4:=
+	>=dev-libs/elfutils-0.8.12:=
+	>=dev-libs/glib-2.44:2=
+	>=dev-libs/libxml2-2.4:=
+	dev-libs/json-glib:=
+	net-misc/curl:=
+	yaml? ( dev-libs/libyaml:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt
+	)
+"
+
+PATCHES=("${FILESDIR}/flatpak-builder-1.2.2-musl.patch")
+
+src_configure() {
+	econf \
+		$(use_enable doc documentation) \
+		$(use_enable doc docbook-docs) \
+		$(use_with yaml)
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 75552f16472f..b53907b4237a 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -2,6 +2,8 @@ AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f19
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
+DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
 EBUILD gdbus-codegen-2.70.4.ebuild 2183 BLAKE2B 5a25fb25dde1b297bd4c3413070dee2e7a3c51c763372d62c1c92e4aeb022e513c03dae4505a39d011fe10a0e254b90ecb17e56894d4936f0e9ae0aa36f2507f SHA512 fe3d58113918cf0d3d6665d0c243ac900fa54d411a12c8ea1b74e6af49b3055f92ab6142dab8aebeeb3f61aa20fdc176bf0f3b931ec7ac0aa8b9e37acfa1eb6e
 EBUILD gdbus-codegen-2.72.0.ebuild 2191 BLAKE2B 0064d0f01a14f641c9f63239512603d27e9b250724518830c3075e8c05f951e3d14a4f402a6555e3713646722c5e447939d0feab3787aa852753894aff631b96 SHA512 5b0df36169361fa447fd48510ce9a157b562889c8fce22b507203f8b8599b815ae2e4a2aa9bfb7a41cd554ac95fcd22baba8c0afcae9021f447cb4f78440f7cd
+EBUILD gdbus-codegen-2.72.1.ebuild 2191 BLAKE2B 0064d0f01a14f641c9f63239512603d27e9b250724518830c3075e8c05f951e3d14a4f402a6555e3713646722c5e447939d0feab3787aa852753894aff631b96 SHA512 5b0df36169361fa447fd48510ce9a157b562889c8fce22b507203f8b8599b815ae2e4a2aa9bfb7a41cd554ac95fcd22baba8c0afcae9021f447cb4f78440f7cd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
new file mode 100644
index 000000000000..672168a9fcce
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index db6a05616997..911e72744184 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,7 @@
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
+DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
 EBUILD glib-utils-2.70.4.ebuild 2325 BLAKE2B 767c5fd70775f5a8d8222d802316d474f6b4038556a1c932e35374bc36dcb572d95dabb1fb3a5e60a6e74c0f0d9977821b258cb17c818bf9fda2895c1deb4155 SHA512 5a20a3c359f296ed6df07cbda7222eeaf0fc7891f72124b15accdf2daf8380abbcf707bf332ba692be992296c259b4e5f1588265435d51b6e7b7dbb79fc6f497
 EBUILD glib-utils-2.72.0.ebuild 2333 BLAKE2B 5861c4e70129e259905bb90638338af32383a1ca39b55c4ef4e3a490ef367969b8c929fa83c0cfe7fa497890357aff620997c3f6aa94c7cce94fe70cdfb0a98d SHA512 b8c391ae1762732adbae47742b09f71fd0364f58551592f64b7a63fc62b14257f61a78e0d76809a794d4de8fc2021ab60b39078aca268cce7dc4ed442e9a8ea0
+EBUILD glib-utils-2.72.1.ebuild 2333 BLAKE2B 5861c4e70129e259905bb90638338af32383a1ca39b55c4ef4e3a490ef367969b8c929fa83c0cfe7fa497890357aff620997c3f6aa94c7cce94fe70cdfb0a98d SHA512 b8c391ae1762732adbae47742b09f71fd0364f58551592f64b7a63fc62b14257f61a78e0d76809a794d4de8fc2021ab60b39078aca268cce7dc4ed442e9a8ea0
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.72.1.ebuild b/dev-util/glib-utils/glib-utils-2.72.1.ebuild
new file mode 100644
index 000000000000..3196415b47e4
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.72.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/gob/Manifest b/dev-util/gob/Manifest
index 39ae4a4a2fb2..2f60b265446d 100644
--- a/dev-util/gob/Manifest
+++ b/dev-util/gob/Manifest
@@ -1,3 +1,3 @@
 DIST gob2-2.0.20.tar.xz 202540 BLAKE2B 942fdaa77e660d3c8ea49e9b326ae8201893e01f335b2cb5c518597f4638058c7cb51e89061a6f707f39044a40c71cd1ec91b5fd514aa36904e91401abd9c9b1 SHA512 9d09692ef208f8d6422fd573aa1955ca5dcfc3feaf9e0fb64c27e52f4638fe19a5e08a7282f682ed5241a8fafce3852e4168ba4f3865890df972dad4ee342b7a
-EBUILD gob-2.0.20.ebuild 538 BLAKE2B e32970f36f2593851a72a40eb741738c2cfa9cd00839a729b8b054ab902ff5ed108109849962771077916a7c574e9064eb5ab0e6616926b69e97b6f89b3c4ed1 SHA512 caee6c7894858c8a6175105103a2d31fef217a2493655d87aa92fba192914928f1c9c36ebf1e58192efd17ef5c38902a238ef04cc355edae16eb52bb1598a664
+EBUILD gob-2.0.20-r1.ebuild 522 BLAKE2B 1b713583faf4f530d1692a79775b9b8ada717540811ba0b12106a20c2f107c1683ef31cf82a9d5fdd4a0b429c93975216fd2efbe092ee4b9bae0ba99ee6e9686 SHA512 bd283bf9ef1da1de4104c83955e7e4836d233d0052f90248e2cc93fb4d18e7cac6323e1ac0f92077ab7257410fa91bd9d679fa0a3dd118e5f335df4d833f8300
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20-r1.ebuild
index cbb2cea1b114..977fd1b27142 100644
--- a/dev-util/gob/gob-2.0.20.ebuild
+++ b/dev-util/gob/gob-2.0.20-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
+
 GNOME_ORG_MODULE="gob2"
 
 inherit gnome2
@@ -13,11 +13,10 @@ HOMEPAGE="https://www.jirka.org/gob.html"
 LICENSE="GPL-2+"
 SLOT="2"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
-	virtual/yacc
-"
+	virtual/yacc"
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index d7554fee89e8..24c9d0196268 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1,5 +1,5 @@
 DIST hfstospell-0.5.2.tar.gz 152115 BLAKE2B 667c01672fd6fd6ee743a6542677ffe74e3900c27ab2754f8fa7dcc57081074bd98e8d82827fe176b2a6c9abc4565efcb3204df43110906f5a333405ec8a6bf2 SHA512 307aff3aec91ac6ffed3ebabdc2baa1a6e913431f57a80a0d0254be57fbd72e28d7592c35e0d72e5979f7e0b4c585f11b8eb91183b0877f9670a9cd5206c0140
 DIST hfstospell-0.5.3.tar.gz 152654 BLAKE2B f77c86e18b9dcb098460bdaec2f6a148b4bf515670aad3d17002b3027026483658d0df924a5d71b12251128ba89bee3a9d7c1d03a5983830accf0340445a1331 SHA512 f25bae6c083894139ba1e3dbd24f010e1c4695bdfe4c2499d31f2f0bd2f5688b662ea15666b46f174fc75f0aa6f5cd114456f735b1d49bcf33322221b6f57ff5
 EBUILD hfstospell-0.5.2-r1.ebuild 957 BLAKE2B ecb8813098753b38185bdc36a19a0d96659b1edc7461853b32c8f415ad464eeca8ba8f063e218a0a80cab347a0097a24f7f70c0d6986b7e8455931783c6b17d8 SHA512 dcc7a336da1abedc4f11e0d70363e7965009ab1fe5af36d7be39f3dc25a71a44786883aa8e282b1ed8e8f4a5f9f5a6ba6d9f7dd2b8a81cea5be6fbd491924f52
-EBUILD hfstospell-0.5.3.ebuild 1020 BLAKE2B bb13991ca30013b37a953d815efbe467e6db98bb66187a33fdd6b8c83e6131f7699a8728022b8c6b55484ee9de32d020c13d31ab70b797251a9171abae1a57ee SHA512 16b8cc8f9db74552e6511b9f70dbfd0f3fe572583d07e0f4a4a04ee3f3d0103935de01d69b36c74b8f75e07da581490ee1dc79a45c01d69b9bc175425f7dc65b
+EBUILD hfstospell-0.5.3.ebuild 1018 BLAKE2B 73fe117faca691ad9558b4563feb2fcbb9efefec2dd5426c1b12b6e81c8bc22c85126038d953385006eb04c7e71651533bf580aa22a09cc4fef9753a1e460930 SHA512 51b2d0db29a9b2bd5f0ddad714aeeba9fea094369d0e8ba5665473f575d26bf209adff627dd940776a48b9147cac1c6a145adf8b94f2cbef5d2f0c3abef69020
 MISC metadata.xml 351 BLAKE2B 9cdc83b2e5d95339cda3177ecc3e365a30a1ebc43aadd34b455150adbb47103ea1bc5d45e05cbc6a6274f6bcbfd6cf81a4b7d46c8d144d4afc37d4d15f5c4a18 SHA512 678b8c4ded8d14c4a044ed866880e0bd3794a8456925e7e66ee610263ec347a0e28ce8f2f27be7f3f6b2217467b6e30218c4b2c29d9f133bca7cd8c730c48b8e
diff --git a/dev-util/hfstospell/hfstospell-0.5.3.ebuild b/dev-util/hfstospell/hfstospell-0.5.3.ebuild
index fb0ae63f8f3a..f1d817be298e 100644
--- a/dev-util/hfstospell/hfstospell-0.5.3.ebuild
+++ b/dev-util/hfstospell/hfstospell-0.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="clang"
 
 DEPEND="app-arch/libarchive:=
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 192493869b3e..5dc05073c045 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,5 +1,5 @@
 AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4
-DIST ideaIC-3.3.213.7172.25.tar.gz 636020953 BLAKE2B fca05b0576f02922425f1fbbd2ca1b79812e96fb4d02727cfec29a4f4e1961465d405eab15a2caf778570387d67f15e44703a9f8cf37d6b811709137948dd2b3 SHA512 8ab649a869b12019ae4061d45fb8909150ea978cf325602e19ccafa8cfe40293e41fd788510acf3b06e41c310ea0d9bab0f7e1b12e7e86c72c2dccebbb6da89b
+DIST ideaIC-1.221.5080.210.tar.gz 671907781 BLAKE2B a85830d8b6690b8c65a3e0d8e949042b6dba388017ff77591e47f0afae6d5f13ca96499e22478cdf2eb4b236e27956b5d43e26d7ae6ebc0256b12386a6d7e296 SHA512 34170dfd9f95d864adf98bca4ef789ad1dc8d959d83bc3068e76f969db28583965bbb70b3c1a772b42a3360278eaeff8b2817273a76a7a7f0b88bf618afc0efc
 DIST jbr-11_0_13-linux-x64-b1751.21.tar.gz 295860296 BLAKE2B cd6edd69fa34896a388ec929d5f53ebc1f078ceebbed8d4e414a19eb91e004e8f53cbae95c2e3b191c39aa89b307bc8a1854b8a86ca2129eb3997c62705563bf SHA512 7d97e520b67197718951609370e90a1e08ef1daca1433373ff6e34fc9c6f4f005478b142190ef5dab46f14e85440f9daca5c662348bbca5207fc2f8d7892361f
-EBUILD idea-community-2021.3.3.213.7172.25.ebuild 4249 BLAKE2B bff5c155fcee3affa624798b3e3e0b88fcc68b259b10df834153ebb3f71ce3daeeaa68ee245f8feb8824059fadb5082646e755abd24957f5b4230edabc5f0561 SHA512 f0e7a3a65fa2dbeddf1e134b510c52c068f0773bb6b9b5b5609b1359588dbcdd3107bbd19100d90c1cacbc447ef43c4985aa72436305ab3988fb896e72aac01a
+EBUILD idea-community-2022.1.221.5080.210.ebuild 4235 BLAKE2B cfeee188c4afc4e9531e76cc6a48739bb05c80a343457a3760abad5461ffe035826ebd531a9bedfce4f4ad39914d221ec0845d75e445169424a054d3efab08df SHA512 cf732f359b21b75bf103bd384f030b75d9059ede432b92e53e75cb7516ea7e770f91890a68d42d1e40e329c6606b039065c6c2ff3a69a76d247e722c09c6c3f6
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2021.3.3.213.7172.25.ebuild b/dev-util/idea-community/idea-community-2022.1.221.5080.210.ebuild
index 2ae2388b0368..9afe37cf1586 100644
--- a/dev-util/idea-community/idea-community-2021.3.3.213.7172.25.ebuild
+++ b/dev-util/idea-community/idea-community-2022.1.221.5080.210.ebuild
@@ -6,14 +6,14 @@ inherit desktop wrapper
 
 SLOT="0"
 PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
+MY_PV="$(ver_cut 1-2)"
 
 MY_PN="idea"
 # Using the most recent Jetbrains Runtime binaries available at the time of writing
 # ( jre 11.0.10 build 1304.4  )
 JRE11_BASE="11_0_13"
 JRE11_VER="1751.21"
-IDEA_VER="2.226147930.1137651295.1647540233-983510988.1643395105"
+IDEA_VER="2.33828453.558307708.1649857043-998802185.1649857043"
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
@@ -49,7 +49,7 @@ RDEPEND="${DEPEND}
 
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 3-6)"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
@@ -114,7 +114,7 @@ src_install() {
 
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier}
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,restart.py,fsnotifier}
 	if use amd64; then
 		JRE_DIR=jre64
 	else
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 5ccc4b5f9a94..7d87f64c98af 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,5 +1,5 @@
-DIST include-what-you-use-0.16.tar.gz 742573 BLAKE2B b8cd90db490d13f140126df8955d0968a9248480da09ca29b82fe1178c779ca75e6f29239bc6fb1556200c7d7c498f2340839e8500455ecaed9e6199fd3d55f7 SHA512 2923e18c40ddc5c03458b896d991adde03d489c6645ecc3cc4f69a508e323534afdef3233943e99533ffc21c64a10a8a5c635dc4797a61edf09d0a7a918a3cd5
 DIST include-what-you-use-0.17.tar.gz 747385 BLAKE2B 0f584521b070eec6448d65d6dc4c4fe09110e85099d2696da82be800ee82522185f378c849559d899424a85864878d5b7b4790b900c438ef1f008262d6de6e28 SHA512 2439e3dd37163d3953fc1e45614fb4325be093a162f25d0f45fa8126b2313942a7c8d45ed12454dfbfeb4cb4fcf2f4e3eebdc0ec5da14dad23533f7a0bf58290
-EBUILD include-what-you-use-0.16.ebuild 1172 BLAKE2B 60808543d4b660f87bd498de00f3e80a71921c5e3ed0726bf3a7d0588be7240d66d2456d4f03f2b143ff20ae67e7d743262beaf17dc6efdd77e46936e9d01585 SHA512 118f9e92561d531c13ba576e1f27ec929fa6432c416be34a6fba6585b23ad5e0e812c134b9d8d90273a33b83b03266995dd5d6eb8be14bc75d4269ffaa2be548
+DIST include-what-you-use-0.18.tar.gz 750341 BLAKE2B 6da65c3613abe36d09a07eb56cbc40054f9176771fea61fe9ad1b662abdb8b6d7e052f6c364d618856a5dbc54655157b2d023fa42cf7e7ddf9db8dc3e736cb67 SHA512 bfce2ff00b572961dcba83519959cbedaf1c2ec4bd4e0a2b8b6d12f440887ee64a1c9970fa1a80c7517898ce936219436ab709893cfed92891c5c2aa5d76770e
 EBUILD include-what-you-use-0.17.ebuild 1172 BLAKE2B 758c323e44dd94287cf1c124e8a9bc79826bce4de8c342b3d93ecc4ec1294e198904f55dfed08111268ff6836b37f47af3c9d32cb557f6174a6700b2ba9d9731 SHA512 44864473c3040630c1892e62e77ce064d48e1cc3abdf7eea78bab7337f1e87082cb102865dda4b230f74331725a62a1f680c39563f3121b0b93eda364bdfad1d
+EBUILD include-what-you-use-0.18.ebuild 1207 BLAKE2B c8ece8dd5b79e1ef94102aa8359c6bfbd6de355c5f1e74271e1a2945ab13ed2e49b7e0d3f508107d9f30620d47b014c19b94d0c778383972417c7d621f61442e SHA512 672512e904e2e534ae363709ba6d3db70a5c1b31e1dbe2ae6ed912c734623bdc8338f6b82098146fcc7368a4af5795fc015b4fd7e7361c49f2eef6b314dca353
 MISC metadata.xml 353 BLAKE2B 2d95f026ce60294177b001cddd8904988aeddb3fb257a73bcf1d028bebd747b0b9467322a0fb87a5de1f7074721ebc2b9931eaa1c519fcef0388a61a8924fea9 SHA512 88e999a1bb1d9993d150347db7b1ec340978594cd2543191646e54d8fb5e125a68063916f048cc1a7166ccd646d66ea33f7f37d94ff20ed21abc7b7c8413e222
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.16.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.18.ebuild
index db8bccadbbf1..2afa1f67ebcc 100644
--- a/dev-util/include-what-you-use/include-what-you-use-0.16.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-0.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake llvm python-single-r1
 
@@ -13,17 +13,18 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=14
 
 RDEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}=
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	sys-devel/llvm:${LLVM_MAX_SLOT}
 	${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 07606d1fbde0..87ffdb1368e0 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -6,8 +6,10 @@ AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.10713.tar.gz 8489446 BLAKE2B 063b938ae6d32f3a64decf943215c54ea45eafdb828fdec467941f9e4288977332a3e5e0703193c95412c287f20944b5c2951310c6eb678233cd16dfdd3377b0 SHA512 a6c568d339c0316400f88e318a290a92f842eeb2ab92abd0c23ff155e6b90e2d8e012ac8714a9695a66a509ffef66574919d92bc03ff06b773a79896546fe1a6
 DIST intel-graphics-compiler-1.0.10778.tar.gz 8515512 BLAKE2B 56d7a0b54ce026d93179737fe199d006923398b7f85d582487469f1cfa665ae5351bc160c6babda5d8bf2bf6173a051277b2fb11c9ccf4b888cd0e06295161c4 SHA512 e8fcdab3a8c70f8560f49288db42a926f1e8e82d3e433bb897fcd1648acdf0f8fe425a1cd8dae5bfabc7d0a91fe0c985550e35c6396fe46778091852e185e750
+DIST intel-graphics-compiler-1.0.10840.tar.gz 8526951 BLAKE2B 08497e7c3259f33cb5dbdc43a0554f7f83173f43e2d39249d3845e6a4592035c085242d6534719dbb15f14351e301344598618790232db43ea3cee6fa2b7c5af SHA512 268b118732a6e5828a13eddc396b38aef5e7b746f8db0786dce76323fadcfe2a64b0bac87b6557c5bb7ddb000ec31e08f7b2557acfa612d960516e93cec78c81
 DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3 SHA512 dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
-EBUILD intel-graphics-compiler-1.0.10713.ebuild 2529 BLAKE2B 1f3dc2f992387aa44093a630cc1c318873b946fcfb8df7bd9e933801fc402be926743cff604fd4b78e40f829ade9ad7b13810e084fed30e3b391d32f33f4c411 SHA512 d7f0e579756040368ea7c870761a304f3b9a89fe4cabfa61b1b1d88669aa17687938fac8aa689259a1b201ead85090f44b16485ff6c37d83db29bd46809f2744
-EBUILD intel-graphics-compiler-1.0.10778.ebuild 2454 BLAKE2B 0ad651fc0267ae6f778ba3eabe472587d5fa6805e58d80979b867ac2025d73dbc603758c3303db2858e0da3c9a7673d551c8726a2565609b4050b0e6bed6c315 SHA512 7b5e16a35e1b56643022f6e674370e897e1981769cbc73a1d92a3d61272b6f9f92323583641dd3ad8137e24c7f2b3526d77830388aa2b035ff0493c00bf879d9
+EBUILD intel-graphics-compiler-1.0.10713-r1.ebuild 2563 BLAKE2B 140fc5a13dca0f1db2319654408ed9c85cb0715ff6eeaffd2912af41a643f6c1f002a543b5612afdd9820f8c3098def091b2b7d368ae91507e773eb030f2f1a8 SHA512 8a880b9543accfdb14626bdc46fc6439b6566cc5b5e5ac05e511a48d81c2ad7faec3bdefba04c89e7d5177f8df6a8b47769326c0331e39693477b1894154d4d9
+EBUILD intel-graphics-compiler-1.0.10778-r1.ebuild 2488 BLAKE2B 1244c1cce52c3b1b1ccc4ba1281e1e5d558f0fdc1290d396d539fb866619683af76aea0f79834da09f8cdb19b76447cf867023a81f549b9fccb584e099815b02 SHA512 9cae6ca91189253ac4ccd7635d3fdf9ec43a3e7463707b9757c15d897e923a749c8b7394a9f8c837912817a8c7a69114145519482328bf4ee9106c6e95e7d847
+EBUILD intel-graphics-compiler-1.0.10840-r1.ebuild 2488 BLAKE2B 1244c1cce52c3b1b1ccc4ba1281e1e5d558f0fdc1290d396d539fb866619683af76aea0f79834da09f8cdb19b76447cf867023a81f549b9fccb584e099815b02 SHA512 9cae6ca91189253ac4ccd7635d3fdf9ec43a3e7463707b9757c15d897e923a749c8b7394a9f8c837912817a8c7a69114145519482328bf4ee9106c6e95e7d847
 EBUILD intel-graphics-compiler-1.0.8744.ebuild 2150 BLAKE2B 217fa07639962ee989287889658a1816c9a21237f862fa0a40f0d96c149769c6c778c798b95ef4e2dfef31dede8bfa0b17723b69b3f96fae5f654cad026b5256 SHA512 35be130f95ef04a171293c885c9c3d7df549cbfd21e28f454d0dc4fa3c575e8a40c91988cd2e9a70ac6df05facc44bda036828154014fb00fbb64c4e29e9c1f4
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
index d0d4c3c1272a..1bd12b64e774 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
@@ -24,14 +24,15 @@ IUSE="debug"
 DEPEND="
 	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
 	dev-util/spirv-tools
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
 	sys-devel/llvm:${LLVM_MAX_SLOT}=
 "
 
 RDEPEND="${DEPEND}"
 
 BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
 	${PYTHON_DEPS}
-	>=sys-devel/lld-${LLVM_MAX_SLOT}
 "
 
 PATCHES=(
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
index 1869d0071897..7934a1f20302 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
@@ -24,14 +24,15 @@ IUSE="debug"
 DEPEND="
 	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
 	dev-util/spirv-tools
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
 	sys-devel/llvm:${LLVM_MAX_SLOT}=
 "
 
 RDEPEND="${DEPEND}"
 
 BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
 	${PYTHON_DEPS}
-	>=sys-devel/lld-${LLVM_MAX_SLOT}
 "
 
 PATCHES=(
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild
new file mode 100644
index 000000000000..7934a1f20302
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="13"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-1.0.10713-allow-external-spirv-tools-last-fix.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+
+		# Compilation with VectorCompiler causes currently a segfault.
+		# See https://github.com/intel/intel-graphics-compiler/issues/236
+		-DIGC_BUILD__VC_ENABLED="OFF"
+		# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
+
+		# This will suspress some CMake warnings,
+		# which cannot be fixed at the moment.
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index c90a880bb47c..04db2015aaa8 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,8 +4,10 @@ AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090b
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 DIST jenkins-bin-2.319.3.war 72258627 BLAKE2B 03a60bd43c1a962ab93c30b257c30eeab09d97236785790140178126072d31377505a8ba1ff2908b64620756eed3a3e3f26af21ec9c662d315900952b38c36d7 SHA512 d6d952c064cf0a52d94db7ccd1903d726b10dcc6f41b20a23ca319a6e64ad8d8259c308cf44183e37ad9e6583b71a4d904da7aacb892a68b8dda826c71a9a425
 DIST jenkins-bin-2.332.1.war 94952903 BLAKE2B 33514a443efa44d6d0c1af8d30cbc87cf6a0ba8e8d6fbc91297e7d2fc6e02113ec8c92990ff6b6eebac7fa80c76d7456cf65e741e81a9cb6743383e9bb36c6de SHA512 2a082cd5132bb4206f4df66b4efec331dff4358f6ca3f872c422e5e88a6be0ab278efd908401b5f660eebfc57ff3868ae48bd6bc46c25be7f21cb0d5cd47e9f2
+DIST jenkins-bin-2.332.2.war 94953148 BLAKE2B d92454636038a53fa2da87da9c2bb8877aa9d35a75bd7efd70e415e1efd3d19c9f8a10cb7e6152f3c57da6a3dc87f3e53d6795777a8848d87a80669af2ad6c1a SHA512 07bf298c0e13049108181c7ade58e70b72223f2ad49419b4707586171c13ee9eef88188a4ca8ed45e46c7334b976b11b7efafe0769ee30bbdf782b926390c406
 DIST jenkins-bin-2.334.war 94653863 BLAKE2B 83c237384723dac7c850be45b1d61cd3a9fbae91d1286bf1de3613badc311ad57619dddfa1cea935f4a1cb378948c41194a762de44b8b356b00cb744f976586d SHA512 bed2b70efab177f8c56ff3f9eb4af8821038b1b4a3f996772d07233335494cc9a335e97f24182f9467f5363b31c46127a393cfcc48eed52368773836a06b82e0
 EBUILD jenkins-bin-2.319.3.ebuild 1124 BLAKE2B 8f911bdf35ede2171671b0a926da56ad012bd9d4eea6a91a37c1c90b9bd69d5997a04b28073806fb4cc97bc79053ee1d8df36834871dd4fde0c95bae9160a8ed SHA512 f9cba320883ce0da2b5840a487ca6e0d2fa8b0bc61dab6e94a0edc9c5c753e2059b10e46513c8cf4041f65923da113836c7eeb5370ce9e8a42233770249d7e9b
 EBUILD jenkins-bin-2.332.1.ebuild 1124 BLAKE2B 8f911bdf35ede2171671b0a926da56ad012bd9d4eea6a91a37c1c90b9bd69d5997a04b28073806fb4cc97bc79053ee1d8df36834871dd4fde0c95bae9160a8ed SHA512 f9cba320883ce0da2b5840a487ca6e0d2fa8b0bc61dab6e94a0edc9c5c753e2059b10e46513c8cf4041f65923da113836c7eeb5370ce9e8a42233770249d7e9b
+EBUILD jenkins-bin-2.332.2.ebuild 1101 BLAKE2B c4912482e9f3287818e01d0b7e9d83591822145d69b39fd91439f5cf31043caa3c91b051cb556ea89129de6ab356600640b9701d538ada8145812dc880b9ada4 SHA512 ecbd288fe8594a97ffb716e582997b1e9f296d2e93754dc7975bed8b682153549e8789def16dea9eb713c73c63192fc7639591a59242c9d7b03ccdf09aade84c
 EBUILD jenkins-bin-2.334.ebuild 1117 BLAKE2B 2e124af6b9c70ec8c8157f020ca2e3bd4b9e9184400706fdf14230613be6497cb812ce366ef7fb03df827d696273ff045176d6ce1fdd3236afab7c46c83d2858 SHA512 e3f96fade1ca640425bc875b2001fb8477678e89a5321ee673388f1a4f7bbc270a53a7350c0d34273b00a36c00b13c4dd1b67e5d95ef4970e904541a3d16fb49
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.332.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.332.2.ebuild
new file mode 100644
index 000000000000..8e851381fe5b
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.332.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	virtual/jre:11"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 79756d7dcbb8..5570d9477ce0 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-21.12.3.tar.xz 1080044 BLAKE2B 6d391c0a4fda21c3b21d8ebc70e48a90b63ae398abd91de8cf0641a0aab07e16045fbb156f267c83b32e95635e3d0a04b6f7f0488bfed093fba2f57aff8fc7e7 SHA512 e35637bf6e40d100a4393ac575d11f6ea73d55131e21d9d8fafbf07eb7d7990a27614d6025591c3ffd6283e6b3a1b7246870faaca98b8edf9e21fc310d1d5ba3
 DIST kdev-php-5.6.2.tar.xz 1063520 BLAKE2B b301f2da6c0936dd08f6a8ee72599e0c247c5efe18190e3c8fc7690a291d86f40f7fdffef7d036b8e5f258f749464c8aedd549feb0249d2d4fbbdefa41254307 SHA512 781ef76536b263c80be1de138b44cb3f979a1c941a868119069fa7265560d3078b9ea45be6cec30b481392a5ac69be100fe8ec3d106fffdbacf4c777045193fc
-EBUILD kdevelop-php-21.12.3.ebuild 1236 BLAKE2B 0ac2acd6548a251f3cd2d1dab7c5e80cb337a36163a222b4a0cbb9d22d6481af912c6bf5a0f1ff055343e2cd6640fb158d03e73583bb8d2d3e806fec0f21dd9a SHA512 ceaa2b3dc4eaf3fa4241c484397ad978945d8648d9e78d7395d73a3c29ec73ebef882e4fec5a0270b33150f9c699eac3731d38a9af2bcd7184763141cd8cb82a
+EBUILD kdevelop-php-21.12.3.ebuild 1234 BLAKE2B d564669568a90e7a08e6ba3c017ac70634cac44943fcd462a70ca25e67c6cc0d392ec58b38bcc68c5126e8a1405134c4b95b0f6d1161f476130714742b1ef520 SHA512 8e82d4412d6d2ba73eacd0eade8165eba04606ea3c1cf3bdfd2698eb73bac651b4083ed514259ee8d009dbe0c125dbab20e4b4ec4c82de14735463d06ae120d3
 EBUILD kdevelop-php-5.6.2.ebuild 1268 BLAKE2B 3ea3809a2518fb945014417a737b27c3801b5b0f6167fd8dc70245a4ea2458df0ec4bb3b12e127ab8ec5aeb9e3e1f071a87c8231526ea51f1e56bcace9a9859a SHA512 20882dba1e6305ceca52b8f949e5bcf9e57e16d4cbc30a89227753c639ed14a1474f2f90baae9c90a5a00edb77cbe1a5f722ff15259da2eb6f3d17c0c18135ad
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-21.12.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-21.12.3.ebuild
index 9b46c241133e..364a4dec0b32 100644
--- a/dev-util/kdevelop-php/kdevelop-php-21.12.3.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-21.12.3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://kdevelop.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
 IUSE=""
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # remaining tests fail for some, bug 668530
 RESTRICT="test"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 657f9cbc8f3d..960307c65fc0 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-21.12.3.tar.xz 1089924 BLAKE2B 8658281280147ce4e87b6f2df9adbdb7adaab326c4bd7a107d49be47b1da876b6d31f1118d5d7103bdec826cc225209125fe07b3a18b947b42252b6cfc2b839c SHA512 06e4df638357fca9cfaba6a2d070e7977fdd0029e77cfd385c6aac80a2953ee1a4ca7a5042d4f1b14b481337e4d5e1c14ca2db86529df88d219dc6b45c44c469
 DIST kdev-python-5.6.2.tar.xz 1072212 BLAKE2B 06f75d55a6c4171f6f2cfd219cfb5c54308db82dead25e9b79538ff04c7a0edd05ca5135121a923e7e169317a124d64f53da52e2226d59793d9a6c3c1ddfa6d3 SHA512 c0ecf9c075fe8c18e31152b774e76596367bb5eca8bb5ec976e9ce90ce78512d9e42bc95daea0f1de18474ef4deee430674e186263736df0de67d7d26c81f6a0
-EBUILD kdevelop-python-21.12.3-r1.ebuild 1239 BLAKE2B bae66f12ca62c33f7c4353c11ff8266b3f285fafe4dff452e4188aed2d5f77d459bfb4816c1d1e3f94b80717e5d785888e37556ad1e4778d5c7884f7cac760b4 SHA512 1d12f7f9b410c57f90b04da13f7376f29b5d6805963a61aa8efdf6a53cf48e95afa0ce5bd4f028598d21f59957ad39b9f3c278e789add9f5e3f415372dc1bd05
+EBUILD kdevelop-python-21.12.3-r1.ebuild 1237 BLAKE2B 101699cf3a71ae0ad9af7361cc8264e9752bab7501f8173a96d80a7d23b35cf92cde90c3d44cf14ab0da9d8fb84d2bd435ba4f2e4341d5f0e2a13ab22f60ebf4 SHA512 4e6efd0e809946df994f70eba6cb02417d3a197159ebfaafdd50cdcea13b573b88e73b023c904edccb772f7f1e26c42818f7f2f29125f66e680afb5ddca92fe9
 EBUILD kdevelop-python-5.6.2.ebuild 1272 BLAKE2B 519e46354d3cc4a9b0d8ba013bf9616b0e3f8000c47fb1c60d5150981a787e7a835e104d0f86727e60dae83f061a4ce5b42d54dc4528aeb274873ad355af6292 SHA512 574179828cbc402ba196767bf1a16dc99496f44aa00b8c2edda51ce7b996a72ec4e9bafdb22e3b99949ea8ced80bf22a895b83e29bf0144b22c405736d98bc23
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-21.12.3-r1.ebuild b/dev-util/kdevelop-python/kdevelop-python-21.12.3-r1.ebuild
index 92a94e2eb391..7ea01a1c4014 100644
--- a/dev-util/kdevelop-python/kdevelop-python-21.12.3-r1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-21.12.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://kdevelop.org/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 IUSE=""
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index d87fdc81fc2a..e1c6433f81e9 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-21.12.3.tar.xz 8391560 BLAKE2B de0ee16db9de9b725431a59450c4f907103f87214a5b1ea365b17ec9916391b0be565e9d8977a8661dc6a00475bc0c162335fece0a518136ed1b18878fa47747 SHA512 963bddf8b405d818303c43c392c7c3070e8acdd00f6f3edc8c4adc9c9b946388019cb99e8f647268ef2a25337a52a046ec6591634d8d214b4e70bc39b6e1a5ad
 DIST kdevelop-5.6.2.tar.xz 7128828 BLAKE2B 605b16f1666201f49e119499007a2031c4a2b28e7eb5c3b7bbf8bcd8aa2dc069708740831dc9fe327a8c9baebeffeeda5dd6d16c24c21a2be66c7475bf194423 SHA512 d5ec09b3eda439436bee4dee88612deedf02caf949e74cb7d8405fbb40ae6f16ae1b5278da0574f41c43d186edbeec6b8c40918ef7f5fafa437e07a8c4ae92ce
-EBUILD kdevelop-21.12.3-r1.ebuild 4148 BLAKE2B ef6df4b658ebe205ccca9c71f34454a37037ad15f71019f0cdd19286f75674fcacb5dd902df3ded3ff20c73557ae4b50ec86bc11608d374615a759884d635051 SHA512 024ea9dc9c25c37811744843b253a8fdf97de4114c0dcdcc2b2b653083a59968728da17c3cea71e0c93fab0d65f68c5706adfa5f14c49e5203a0942044382cc0
+EBUILD kdevelop-21.12.3-r1.ebuild 4146 BLAKE2B a04d27e250f38f5ff7fb17db3d4d8443784d1d173f1fa770838c4983a0a96149d288beeafed5b475f649c36ac8f31ced5750fe3d05b807542dd18a85a66a6dbf SHA512 3c679ed1fe67869e466dd3fd4b3600990897a289c1c3fa37a705b69f837230e1458525b043d542eed7cff2d46f55fc3ba751cd2f73a65653af1019e92848847c
 EBUILD kdevelop-5.6.2.ebuild 4178 BLAKE2B 5c84a13004dd3f7b630626292ca843415d14521c475eb5b021b50fae0552b8e99390aa311d2647f03bb2e4eae668007ecf5e07a5484d55072490586101ff32bf SHA512 6392d3caec99dcf6b98fff6dd2c316bcf969f11c4c1a03863959ba344a9267283962feb7c4c60443803e942af854d1a86fa46f8098a77411be536ab6d30fb33d
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-21.12.3-r1.ebuild b/dev-util/kdevelop/kdevelop-21.12.3-r1.ebuild
index 3aebe6436866..e783f52707c4 100644
--- a/dev-util/kdevelop/kdevelop-21.12.3-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-21.12.3-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://kdevelop.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # see bug 366471
 RESTRICT="test"
diff --git a/dev-util/kup/Manifest b/dev-util/kup/Manifest
index 707f27ad6a50..28c7a4b9b758 100644
--- a/dev-util/kup/Manifest
+++ b/dev-util/kup/Manifest
@@ -1,5 +1,5 @@
-DIST kup-0.3.4.tar.gz 45996 BLAKE2B 37c4738df71491b3661dcb4f780f1b24a46c28bedca32669625dfd82e309b51ef72304d41ee8c695c99b761679fca9c6eaa1a4fcf00365f92a6c754029139d86 SHA512 fde61de2978f8ba76c4b89a84313aa8b8651cc2610b1512ba1d662fbd0675f269959dd66ef5e1e0ce216ba66e12f5735e58bb36f4ba1a14d90269da1a6fcee46
+DIST kup-0.3.4.tar.xz 40596 BLAKE2B 2cdb046af05803a1329b9d9f6e2ecba4dba77bc0c2da67cd29a3e1e3e4d1032a5dea771b5c4d9a63c57706fcf0adb809de3d6668411f0db64b58f4420b536f9e SHA512 b29e2aebdc0af45e96a0111933cdcb17f5227520c7be159f3bbf8c940f71cca2d688207b7a1d18087182f321c77c0fa168f3e0fe99b2b01afff1ddad2c9ce9cf
 DIST kup-0.3.6.tar.xz 41404 BLAKE2B 7c4187032b3d29ea06ddeaea813370e5a68fa94c9b85dbd92930651ad52ea103a98be26bae32b9120d136d3558b27c29323191aab36a895e4b040eb8fd83d12f SHA512 136cd179abb6b658050cd51f00a4cee2b9022b40ce17c9e50290fcdd2303de2ca21a64569b4af6a46db88959812200b3654fce06a0b3c081af0c89b5db2ded20
-EBUILD kup-0.3.4-r1.ebuild 515 BLAKE2B 522d2cd78a6614038b6cbe110ee5e2f235a96a47760810209785e709b199fe464d884775a83e509a4124ad9235c943c2ca62cc3f0d93a13d7e5dc0c92e617160 SHA512 5944c9f74d92397cf78525b79e5260e7850593508231941b2c0ee3df9413ae7b2a8f6d93d82f53373f08f96fa86f3618dc051b5011668dbbba769f83ce907577
+EBUILD kup-0.3.4-r1.ebuild 515 BLAKE2B ec22f6dd6ba9347b637488218e512065e695b39b5d65d32b6f36522b91739d42eeaae1222a62f43e892cc48e29921cd3a6509880c7d0936958a2ed121750cd02 SHA512 fae116c9765f4f084a760d537d94c8e2135e91b3c569a3bb2dc969905ea8bfa42ad2cacf75b22deb2353c0d66d0be50e00df4b05a7de5206fdd3def36b569820
 EBUILD kup-0.3.6.ebuild 514 BLAKE2B 6ffb4c9664fd181db4edc57594da35c8029c5ca8469c267778137c12e929c55db5388708e1aee5ae9b77b2f3452ec6fbed09e1709283e68cdae49daf63a58bb1 SHA512 3b8cc256ff972e1be0378cda0c9e0a16af2f09796d10a0ae4a2f0d72d2661968240a38cd6cba6af79c182d2e46c1ba5e21675548f9b5fa555658cfe901f3bfdb
 MISC metadata.xml 225 BLAKE2B 1702b2df6fd2eeef541d05e9f87af1d901036a8b9f91f497007c6e3e1f587b0a30d63e0f5334a5f61b86cec471042853c82e68302a85d1ad4cb7f149fc3aef59 SHA512 9af880d61ecd66710680d94dec379665673167f3af0839dd4134c85f4b9ef1f77862d4d25f97625bc9c40df0615b81a2ba6364c6eef8e749dec7c073aeb51646
diff --git a/dev-util/kup/kup-0.3.4-r1.ebuild b/dev-util/kup/kup-0.3.4-r1.ebuild
index 3229c75e8de5..3fe21be96734 100644
--- a/dev-util/kup/kup-0.3.4-r1.ebuild
+++ b/dev-util/kup/kup-0.3.4-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="kernel.org uploader tool"
 HOMEPAGE="https://www.kernel.org/pub/software/network/kup"
-SRC_URI="https://www.kernel.org/pub/software/network/kup/${P}.tar.gz"
+SRC_URI="https://www.kernel.org/pub/software/network/kup/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 1513f7cf079e..46672a1e7f7d 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -3,11 +3,12 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999
+DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 EBUILD lldb-11.1.0.ebuild 2305 BLAKE2B 5db45d0360ca8cbcfb1e15989d183b8583edd437bc39c1a5e15e5c969b646340dddc2b94b4e34bc843df26887421c376bb15f9ecb3321e7da05dcf23c9030855 SHA512 f63c15a9a12ee7d2bd343dae7b18cb5b0ab77477d35e051e81974c73f51d6887afab14a4dd1d593fe10a6ee5b88cb407c98019d658839b5c22565b123cfd7d90
 EBUILD lldb-12.0.1.ebuild 2443 BLAKE2B dd155b7715cd38eebf62d14c139bb0030db953a2f4f14f3c4779f64e70ccfd3c3f64067ffdad3ee407388f69cb6733420197facefcd25297b0f2111d1912044e SHA512 dca2e443a146b1baa60565eaf5a5cc86cb8deb9b9b10594ddbfcc356e62f67f99dd4ba769817c008c753a5ad854e0fb04e96f00c6e3e081bdf6faf3091291689
 EBUILD lldb-13.0.0.ebuild 2587 BLAKE2B 916ff9a21b0fb99086f4f4039f227481adc63c41c3c480a319da7f1896d8a970d16b3bf813516b0ee3a56316182ff6cc4e61da1f391253d6d3be51c2c5fab367 SHA512 18955a92513b72d3e7fe83d9ad720d650cb2e084af9896c01e3828e19b74c5e2ba7fd523197b70eb190074399f9ce6ccb9d570b1d5ed15212996e9c61b673ab2
 EBUILD lldb-13.0.1.ebuild 2588 BLAKE2B f348afcb24ff609e99c9071592d256599f678fd0e97f2676282b7240e06ef15662c9a52d2fa5ad34c2859f3c205420e0ce5e9bd49bd86504846edd5fb7c6bbee SHA512 ec34d111511cd00bf09aef78ed23c787aa0daac0de3d637cc6d5ebd89f2a666c55296db7c5ef3179cca0107a875953f23a4bfc61258c9a34262dde388317cee8
-EBUILD lldb-14.0.0.9999.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
 EBUILD lldb-14.0.0.ebuild 2591 BLAKE2B 4d9eb995301668d375f12f4d9d4bf3592fa2222ca775db1e4d7856611ed6f264b3719e217b6ed02948ec77f68e7d32421c59a66b241ca08a2d6545f0e17aa01e SHA512 9bc93320df152cd99b8120886ab4acba65a8b848b39255d913e40a5574748ff8f5d463fe480827605f09d9c05360a5eef22e125e316e20e248135cb18a7b8abc
+EBUILD lldb-14.0.1.ebuild 2591 BLAKE2B 4d9eb995301668d375f12f4d9d4bf3592fa2222ca775db1e4d7856611ed6f264b3719e217b6ed02948ec77f68e7d32421c59a66b241ca08a2d6545f0e17aa01e SHA512 9bc93320df152cd99b8120886ab4acba65a8b848b39255d913e40a5574748ff8f5d463fe480827605f09d9c05360a5eef22e125e316e20e248135cb18a7b8abc
 EBUILD lldb-15.0.0.9999.ebuild 2568 BLAKE2B dda55f6985409392b8d3e4334e1e44285ccd50e1fc979a3f9ea373c2ef12f3c2d0b49f246ea06713dae9ef532a1c67e5f7f81cf26bd7b90c222cba8d7f5158db SHA512 11cba2782f484d8aa4f43826b8fe953339290f822f1a1315bad1b50d8cf5b7a0188f02c8fa7d4c9f98e9ffa7a93da82edf39345b6fca98988dc0b0fc8f06162a
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-util/lldb/lldb-14.0.0.9999.ebuild b/dev-util/lldb/lldb-14.0.1.ebuild
index 55d8be1e2739..e728a70ba475 100644
--- a/dev-util/lldb/lldb-14.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-14.0.1.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="debug +libedit lzma ncurses +python test +xml"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index aaa69b77e7df..ddc8abe79829 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -2,6 +2,6 @@ AUX lxqt-build-tools-0.10.0-glib-2.72.patch 1053 BLAKE2B 912b25fdd9c8d4cab036b2a
 DIST lxqt-build-tools-0.10.0.tar.xz 25312 BLAKE2B 7ba08ee181353454264685f6ec7407cd4858acd55674213a5f2bab123b400e6caae0eb5e803ca4d0dc30b19ca069c0659c4531ac64ee017fcd619560e09195fd SHA512 ee7282344c6fbf09d85f845c60075b6c343ce6b6f8c233c7d664faff3b570e2836192aa2233b951242b66d86254971011d4d0bc225811344829fdc5bc83b0e5f
 DIST lxqt-build-tools-0.9.0.tar.xz 25296 BLAKE2B 9686a445c75a700a38150b4493f6c019ba0782e219b3482f67c6a324f35ffe252fddc614daefbd8616ee16ef8bc331c7e4302ddf2df870d1c3696a80cfb585a8 SHA512 9a464393ea6d871c5856ebf5b8fa3d31a89c6419ac084e7146aed675f2b20a139bb3eedde017d6ca03167ee6e30a37a62239ab4e8b76f5b6db244d26ab164892
 EBUILD lxqt-build-tools-0.10.0-r1.ebuild 628 BLAKE2B 468ee662cf12f1f4a2c90b2ae72a571a13d55a358f216c8189a6f8d7f072d61b3ca2a5f5c68182c3bb345c32e30a3cdb88e7b533462f7a189bf0a01ddb80e07e SHA512 743de128cfe94bf1d2f3a7e0e2d2fb5979067652d4c3238f3ee3f0e4378de7e9625ae0c56fa2345f8e8f5270dab681da1a60493a2f6058ba23e8d15034adb767
-EBUILD lxqt-build-tools-0.10.0.ebuild 539 BLAKE2B a2ca92eafbf48e8b8bd601c7d8492a7b77e002e2128bb155f1f176b4a74fd6c9f4acaaa2cc892aa27edb20a98cf362c50f41046489e5514cad10c1ad4366fb51 SHA512 4e7aa2c53e5ff9cfd507a645d595e8bc176fb7ba2128c969b2ca229b83646edbd5849a34b499b60d6f69f6791fcf954d1716385ae5ebbdf695092885c2dc33b3
+EBUILD lxqt-build-tools-0.10.0.ebuild 536 BLAKE2B b6d87f63056e9b7d3a4363547c21c8e3820214f42439e82a47ecd4457e57b548612df6cf49ac7d2d4e1773d426e30446ebf8c6a49ca32d34e6e3c6e2150a93d8 SHA512 5aa233934713ed222bbe8b33934a69811910ea64196eb2c32906530ebca5a5d6e91a7a74b3663a8159854d9663bd4735cc5bf1d17506366b75adf3f2a6ce0c63
 EBUILD lxqt-build-tools-0.9.0.ebuild 528 BLAKE2B 7b1f78a49c2125264ef5d4a539359f60dbd733e09f238e0bb26bb2c74b88d7bc84c4ac55bed02a6fb6c65071cd62ea8223c2a49f58962a24e32bfd4956b5347b SHA512 78fe92caaf494d6699279d55b144221cf9e141b15a8eddc6ca6d1f07467f8e9f8b5e3ecbec187383f639c635f137c6f2ba5ca5f725d1b3f1af8d4295a925e620
 MISC metadata.xml 323 BLAKE2B 23d737cdebbafa977534a82a3244d697f8d3b55b16715d344ec46da7c71eb68d480e3a4196944e800400c94c900f240f92ffffc092c68aceeeb95c8cdead9a87 SHA512 403f0f0d13ce990a814e653032166c8cab4d3ea8924aec77f46050760d94e26afb42cb1d793ca4eda3a04a402f3817646cc876c35b506d1bff80bc03a020f0f6
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild
index 60e7f2c36aad..34f93a95b5e3 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.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=8
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 9331ee871e2b..da3056a44559 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -25,10 +25,13 @@ DIST bzip2-0.4.3.crate 34195 BLAKE2B 946ff5824531de8b82241fa042638cd33e708c4b517
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
 DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
 DIST camino-1.0.7.crate 26602 BLAKE2B d0ab5d5da9036acfe8ee4f68c015c123773529b9c84f0dd365169f33ca7e23eafcb5353bb2f6db02fbced9c075a0dc356c96d02711af1c4a506ce4d1c9f2fe05 SHA512 0c22c9de3740d39d058de25b2c9b221928f11cf9340562412a15948ddfeaddcb6da38ed3f18321c322d2811847d7cb5cc1c78304f67e9702a2056e59da64bf33
+DIST cargo-options-0.1.3.crate 4935 BLAKE2B b78621cce3522f1f0ea6dc343641c2d961d8f2138346cd2ef63e8880e259bdbb3d5cd2c5ef1b0f8bea79e48f47f166fc16373be217de8eec14f2b69da3518bd2 SHA512 9670eae1f0d8733367c160df8dfd7696f030edb7571278331ec74b559af630871e730f9ba4882ac47cc3ea423cd481e3ee731863744e35676b927e897ad3e787
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo-zigbuild-0.6.6.crate 23555 BLAKE2B f2cf2e5bb22d10738900bcf47ff8862312c0434e9e31e92b06fc80d01d33cf561d7db2cd1551cfeaefc32689538385eeab999bf7c8389416753c881ad9aa2cd3 SHA512 c93ffe4c2a15c7e209fec283aeb33a3e71528fd4b48a8f2bcbffd04ce4aa9f13613e3d198c1645b8efee0c565b962c95326b83b082a3520badf14bcbfa5b0040
+DIST cargo-zigbuild-0.8.1.crate 22661 BLAKE2B 6f89a3b155c232c45c06f8497496e24fa2c90601f938a27f0cf1fff16f4efa2784d7a89f36d4aea03e109092a3f3157b9e4af27ed6e19c1ca020463ffc51fa4e SHA512 70b57ea791dd92b24e838a309ca2dc02d8ef901a7271d7ef51fb66c55583bcb0db43f6bafca40eedc55b82292f06e1753f3556891fdfb5eb55eef6dc3f1c25c5
 DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
 DIST cbindgen-0.20.0.crate 183277 BLAKE2B 51529b21879e3a3212fbb951b3bdd5c8c396dce53e9dbe568bfe1e752caf3060bc784909cb4b37a6e6e80d357d5a8e2bab8d10d4470563358407bceb814bb7fc SHA512 83c2b0da580f0a2fc9a74922f3c44d0e73ce0d1de8b5a3f5819c7fcf1c481df1ff0346e84c5b4c199a9364542c85fb81ece4e1deca3a6f12231a4478f76a7c02
+DIST cbindgen-0.21.0.crate 184825 BLAKE2B 33cd5f6018358c3888ffbf684be79104689dfc90744c0b110efdd06c75bd235d0f3b04e2bd69435b81472d2c443b24923bab791a89c486fffdd63eec477d1bed SHA512 44c5637b9705ab865d43b578fd0f6fe84d4f8980ce28c36a4ea3dccff74f5dac4d3f029590b1f243e916eea47480cc1836b5a8980de16fa8e2b0835fccc40950
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
@@ -36,9 +39,12 @@ DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb66227579
 DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
 DIST clap-3.1.6.crate 202211 BLAKE2B 9fbd6d5ad8442118716e01c10ec9388644ef6e5621019a1245ae937324265b96d50aa70777d149daeea6f812ee05414623f938a056c38a201d9f6ee0b98bded5 SHA512 397c277eeb9acafc1098f6b6aa7e428cf7c7016356a99139dbff66dd6c6e12434b14a457679fd99ea50c1fb0b54b9b96bad65f1198025986835810484e542824
+DIST clap-3.1.8.crate 206494 BLAKE2B efead669adb2f2acd231f8161da79022768d2438bd73a3f8d4e0edec91a3a7f9220b90b5993501749dc350fa09b46e24fdab3a33b7c9a78213dfe8671ac4dba8 SHA512 74787dd0a8cd25952a0019c7ec6bce454de2b3b9ce452d2f736b52bdac668d16abe00c08ca42439805296af8bcbc69bbe7f9110baead1296b93abad6b5f84271
 DIST clap_complete-3.1.1.crate 22432 BLAKE2B 8eb0696e76f3e82a8e4efa644e35d97276bd60c49d8d38b2844b4f47abf4346911bfa11bb54681eb07cc552f97b0959ab6857b2f6dba279e81eebd10fd2c10cd SHA512 73ccd96b2116e756b6d4e00b28720e1e66984cd0efde5f2ec80a8a4c00737a9a096472f96ac6430c7ab586de57e38639ab15484ea6b088ddafc9f021b4680c8f
 DIST clap_complete_fig-3.1.0.crate 9457 BLAKE2B c5c7a2b0d122dc6f11fcfac0f8b93ca681eb2358d4f3fe9da9a1d4388311287f6110e45d3c96be02cf74884a179ab80209f008b9a0a059b6e06561b9113067fc SHA512 608a07b25a8e4920a9b853a58d8b35e172c843ba80a4221823b2bdac10024a34cda4265a4fce2dafc60ac2cab5ccf3d34e1c03153155ab6b7a63c2f5a9647ec4
+DIST clap_complete_fig-3.1.4.crate 9923 BLAKE2B 61e65576e011f4dee174a5f34e66a8f18374ba6111767fc06425cb1b05468985c9e9caf353db5edeae2c48eb553715cf0ab9e23160876c448f7f3ce33877a784 SHA512 e67a2076cf251a64584ff4fb107eda112b5410e90d2c45da3c752053d8c158767ecb0d396304bc138cc2ef01ee423a59ea0ad463703a23a5b35d5bde5ae97d8e
 DIST clap_derive-3.1.4.crate 25358 BLAKE2B 05f5d65b6ae800ca6172d659d57e08e8dfa0ee741b41f285efc5aac71e0517b302a5573fce4cb9143c02257002a46c6855d9a45eb62b7b400a7ce855ecdb1640 SHA512 f55dbe26eb049610896ef31a3562c4229d5602df5ba7d4c061f13d613c58edeae8f7a183741d1d0496d0453ddfa18507495b26f4a8f98d2d4284556f5ced3cfb
+DIST clap_derive-3.1.7.crate 25363 BLAKE2B d9c92e19357988e850ade69d8350f4a0cf0f9d8cc8ee6b52014eafdf8b105f6f81e43b920896bbddd95a209e874729e104119f9561fdac86f03707096f241985 SHA512 7f34c1b7c67bddbdbc1b159fcde366babe37f355637cc1f12748a51d0ecf89ce3e6aaf5ed140aae6539f12182ac8e2ca93c2790ea2dc84657487066c9d77a869
 DIST combine-4.6.3.crate 132015 BLAKE2B f15e0781bf64a6c88373ecac53dbbc8b50252078adc405a15b64c0d259a0b69f906c57a569e0f8d0338cb9a12b2cde2ce068330202fec60a7daaafc2049b9e57 SHA512 495f9703efc2b9271dad2fdd2626aa9a1843fd3e10e63d0c8b9e42d4c7e3137a4740aa476c0206ad8dbf2683d0eeafde36f70581bdeb30299fa08e077f9183f3
 DIST concurrent-queue-1.2.2.crate 15859 BLAKE2B 97eb49d7f6270999f24d37e7a3967c0abcbf584637388c4507f89fd5284120759c9845219c463cf066f6568191b874fefddd7edee9292ed02183123161074514 SHA512 84e348dc3d40c73c11c54ecd0f1e6cf7fd6c7033f4723a428ed1c09bc9548cf317a0d8182144b689cb9781190b9c8ce4374717012eccee54a11ed0869dee10fc
 DIST configparser-3.0.0.crate 21163 BLAKE2B ba44fd6c6bd3541a15dc77f1e9435236a7b3ade77a5d2edb993e07975da39b3444347b424acadf1dd85b6465a01db7be0e9f1c55fad435eb6dd6835da1aaf28e SHA512 3d4c1061cb58f7d388c611409e835001bc0c817e5e6969c5af5960d11872f76d8145300b03dd104338bccea15a558784f9e6a5a879d6df70531cb9ace9e2ddc7
@@ -46,8 +52,10 @@ DIST console-0.15.0.crate 23507 BLAKE2B 49694683baddb53e0f35584403aa93616164c2d3
 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
+DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
+DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f
 DIST crypto-mac-0.10.1.crate 9531 BLAKE2B 6a26505762d8d466275fe7674de1c4f95686b7a5fe107442361c892ba3123213e3f7cfb8d5516219e84c44496ef342ab534ebca724732e509d33fb9300027ef4 SHA512 39b7d966ef2df4f01a6b6f43838ec30c9df4a51106ee42d8d349f2d826722834ad5f7875bf68d7359799015d53ed45942d71a10f701fd080e264b21a89879dfe
 DIST data-encoding-2.3.2.crate 19159 BLAKE2B 43208abc26b243537e9a2556bc3ec5db53ff1aa0cc9c0111728d51b4fce6c6b4314ba445bbb9ac7d813bea57ab600a3a671c5167257f0c344e5e3b149a01f6dd SHA512 b62d0c9a937df59f3c84d4c27bafdac9088370a250d3b85e259258cb0843ee32ccd0a9fb1a01ecc5929dcb22e36bf82f7c1edbc9981acec70f5a1a01f00731c4
@@ -57,9 +65,11 @@ DIST digest-0.10.3.crate 18990 BLAKE2B 871a9939e5a4352781dfcb1bef82aba66ddc32e77
 DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
+DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding_rs-0.8.30.crate 1370089 BLAKE2B dae26cea51a7814536d1fba835f36cf7b0d536be0f26390fc4c1785720521a37651bc33acd9f7692f4967a3658d056da11a870aea071f53e803a71036d42448c SHA512 0addba12c6021a1211639cf80a956b50a5fc8bda90f127f73920941980d11a265e43de83e91f9ab423ec520ab11f6111c0d982da2d73e640128bb12aab1083f3
+DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
 DIST enumflags2-0.6.4.crate 10713 BLAKE2B 86219df31b9c8a60470f676a365f0f0890892baa7c9e3101a385d9475f9398ff8b62ce3295ca318a266f551c85048e02f26fa67ea9ac689e94a5ccafcb8f5ea3 SHA512 5814f58a8d22f093b94eb71611b9a5c8bf2145db9544397255d93126fdae220c261010d1dd2a278475e7e3c76bb9e67bd671c44f1edddc620924fd6fdc7dc03b
 DIST enumflags2_derive-0.6.4.crate 3659 BLAKE2B b49a73fe2977e8f62af37c367f1452979cdc0575b532d086e612b84495113041221bd508cbf2b72e3179d929a2eabad59b9913db98b21491186a1f1bcf571a9a SHA512 a8a166ed48c77a3d23c1b1afe4dec1812c2a440736cb6c6059e46b90a0a216c81cb45ae6e439ed5b3dcd656faf1bb6dace4e46b908dd02321b4a59351240911b
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
@@ -84,6 +94,7 @@ DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
 DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getrandom-0.2.5.crate 27719 BLAKE2B 881c4d498cecb55b2d89b1b382dc26e9f2f26df487460bf923b250e8d3131cac56fad42a35ffd4349cfc33cf8d890112578cab1ee6865a9e89090b35dc14c0c2 SHA512 4ae1e046a143c4ab818d130bb86c9fdd51dc55b70ad3e8a0378359341402636f69df27f7480f9c0caa26ac98b45ec88aea47b66ff000e2dd22e1ce52ba99e644
+DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
@@ -99,6 +110,7 @@ DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d9
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
 DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
+DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
 DIST indoc-1.0.4.crate 13122 BLAKE2B f7a352bc2d19f3f2d1479b6add45daf841e02bba563ce9af115118b9bacea6bd39ab2a663bc992b2302de73b52bac1024130aab3dcd79c5b4286c93dd7305928 SHA512 b2d90f074f9a34e330d7d6e6313bd569cd857c791b8ff79191a70f19064fa53ea2ede30bbd16587fb438e69ccce4c3e2fbb127610ba8e470daf076d7373f0213
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
@@ -108,19 +120,27 @@ DIST keyring-1.1.2.crate 30205 BLAKE2B c2f3c48daa6c06b0de4c9f459d563d70b483764e5
 DIST kstring-1.0.6.crate 20728 BLAKE2B 28d5fc4553d44658bcc0eb06e79ac08aa3b2e86971e354ea50e51f349d8e5e74edda491c5c3cfadf9111dbcd19ecc42d73a44f7f3fe0590225342f8f4517ff84 SHA512 e1920ab6da39e414e0f89e0728a1993a516d201149a922e58a326c5392891919746891a61847f0c56b67d9ef5d3bc346cb00b2da1325191dff7d9661a5a12ba4
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lddtree-0.2.7.crate 11159 BLAKE2B 939a0da239b7281dc2323b6baf0d7253eedd82265f222a692ec73017cb4a1b294af81553d5fe03115e8fa28e237979092ca81c7ed9fd3ba4e6f58a1c56481381 SHA512 86cc5ea594dacce6daf949c9ce9f17a5e53e2f07660e02a946172e9c8bea06a1e7544e0392d64a819e74ed804da96a065b04320313d9ed3d964f38e28ac4fec2
+DIST lddtree-0.2.9.crate 11163 BLAKE2B 19994b60d263e80408917110cd932f99298e149c000de599194c46b4a186cff271e34ea70a3e4ce13241500a63fbd29c60436504e1763cd5f55a32b5ea489d8e SHA512 812f9febd86c4e5d8182a47d37630485030c3feac7a27d904db43fcdc685217abd7e8e5a94e26d863d8fd6cedaba3e767687fee368bd9597c37e00e1ea8ba612
 DIST libc-0.2.119.crate 575749 BLAKE2B 5fa2bf66a4d642e1380335fde0fd190d5168dca58376379caeb52171a3382e5342c727eb4d92f1e27adde58a24d00352896a73c45309d947f56787a99f2753f8 SHA512 a43f8d1cac7a0d8c1bf6f2125695c03d91243498d2dea19a3a674ccb2c64fd00bac4040c42130a1a096b2148451f62e1292c5c71f424f51f888d6a37c7db0bcd
 DIST libc-0.2.120.crate 574677 BLAKE2B e9deaa26d610c1085f12acc6bd9d3c71ad9d7586d1749141066ea47f14df7143f8dad8173020e549fe81aef65a72d7ba189fdd3ee0038f62bde75dce362f4f5d SHA512 42aadea2670f63d6a2c38d4d6949d9071c535395ecf458a694751a7a17f2a4a6495ea1dbdcbcb5340cb62e3a40419419141ca39c4d4dcda8cccbe480aa34a014
+DIST libc-0.2.121.crate 574702 BLAKE2B bae9215a7318e5b5b6d821d2320ce28e883d04af0bca40ede49b9c5d575d28307b07077b3d59be28347bffc4c69d6c9dd334733f0c519c16de704360f6fa8738 SHA512 aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953
+DIST libc-0.2.122.crate 577366 BLAKE2B 042727ae8bc7f768852baf42fe46404f2bed4b8d9cf5c99e2d76ec9866ac38d4afba9d3084db3ecab2015f9e612324dee74bf64a64b9d66906bd404d2ca38c6c SHA512 dabd14a1344174fa83e34dc0fb0c2b6bc00b9871063fa1ce7c6ffcd236e74262f453cbfdb04cd7625bb3b8e5e08e6591d51213246eea695b0ee78d480277da89
 DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
+DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
 DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b5494ba582c333e09de6263769869b5a4903ec2d62cab7a032635fa5d28f00f3f80337b968221e386e252f842cf36 SHA512 c7557f741c170c421d5ccef8cb771fce544b3f3da0475b170f82116c00cdd7522fe29fc8bb4dfa20735345b2c72e12af0bcc4317d9ada412b59f9ff4266e14ac
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maturin-0.12.11.tar.gz 282327 BLAKE2B 893d2015d960a89e8691d65fad84f97c6ce2d9d2db4ac32646157c6588e4d35ff852686bfaa63995130d48293fb9f54ae8425613d0f5429aeb3ab207793ac580 SHA512 46b70c51efc7dd0e9628d860d26deaf2306bc5032ecb2b8e9186207a621a50b3ed7ada4b736217d86dd674d4114007af9e4865be67042c18146c57338b7fd639
+DIST maturin-0.12.12.tar.gz 286876 BLAKE2B 4c0b6e37304aceb7b30397218647eb574e91226fec8bccfbf6d6ef3d2658c57bc572653750cede5f82c52595ff5aacf470d2cc044d262ae3f1d801823d5a8869 SHA512 bcadb9fb6fc9b4aa6bf7ae5c8ce52f725e8664068ee8405cc235433a6fc5b6a7c18fd57fefa6453779be54137c8549e041c903670bc6c5fa8411ca8774c7870a
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
 DIST minijinja-0.14.1.crate 91836 BLAKE2B 2f6ff66a3e47b6131cdc3c5963d11ee965e68b82a2252f16cc03d052936ccb2d6e2bcb4414bcbe9f6f3c22f397cd46234cf350a5015eaa94fb2c29b1b7155f0e SHA512 cbbabcc4ca744fa308fa25ac846182e7fcba4bee04d9aa8a2f330bddfb2f4f2f7d7654418ec2b3f22f7ed4a61068b435636c9d1f800cd13b75e0cc5ba6b76d10
+DIST minijinja-0.15.0.crate 93033 BLAKE2B c69b65bac7814b728999cd91481a60e41fcc00b4ad889e59a7c4b5f7439aee9d0e3831c387e8cd7ac95ca33addc87cf2c6ee219f7886a28f23db36ba17c2372e SHA512 b236b143be91e621a4295f704f3dd5a75c9bb848b1c4500731efe38ddd9a13c63696350313360ad0651013636eec899238257cdae297b70ac42d375c4a18479d
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST multipart-0.18.0.crate 62797 BLAKE2B 438abdd6041c3a52e836b7627bb0a490494b6a0c4ab47d27905480fcdde27e7c18497ef4cae550c14b8c4c34e661176ee640806cc427e3b2e570c38be31d868e SHA512 a34036e1c05c241f130ed30eb7a2d96c2590ea8c0cb7e6cf98c160ca0fc6e0f1227192b45d8166abd7221633c36c57718fdb0ccfa8ff4254d4eeb3abb5210704
+DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352
 DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7
 DIST nb-connect-1.2.0.crate 8126 BLAKE2B 7c43883af6b2e8bb8a845c7b27defb89507409e71826e701a1b9c856b8958a9eafa8c187474752c231e8349a5b6575e1000f0321716c8deafda0a1c9036cad46 SHA512 29a615f1956da23f76b8d29ad05dc008d0287504fe9c835386d6ccb9168d005e00bdefbcf668314d1430b00a9d536c4f3845b46f9dee6519707fb1c69c348061
 DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
@@ -131,6 +151,7 @@ DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d
 DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
 DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST num_threads-0.1.5.crate 7109 BLAKE2B b5a1055937a87c3f3b758ad527fce0a14c812b40c3bbda530bfc0e03f43dd3155c17e1eaa210c512a98919da802d9d48fec4e3c8464072fe4d309b9a402d9b61 SHA512 3ad2234945ea20f47efdd8381de2f0f05790163bb1e4b28d9e630a2da4d86c99e596558ed231e2e9d62d84ae85f8f5422dc11c323ba899e37ad1e654e3c4fdd1
 DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
@@ -142,12 +163,15 @@ DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4a
 DIST os_type-2.4.0.crate 8022 BLAKE2B f37d9f43bfb242f1df0f2a5928923265a3ee44b29ffb119475098fcc7ff46340ba70bbc51e00b6e0b29c4f63aa50531f3f825db82ada46b19c429b3aaa52c7fe SHA512 2860d1798e146e4e476c2bd76085e031cd999188a42519ce86ca7bd168a2eb1907d690e15176beff21966135e68ef0cb45b05ee143e74240c2f8d3c1a5c35bf8
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
+DIST parking_lot_core-0.9.2.crate 32254 BLAKE2B ef53a3e10228569dd38e1c5a8816fadfdf6b02ce01bf8b7099c7e3f1f71b4fb6c4d8ece8e52c9ddfc9a5ece6c273def2d9bf5aad8afd76ebdcea8b1ce08ad7e7 SHA512 0443dcd867d8be6e5d1b6ff0af8e31bde6378789e30865442bb15f48ac955beb847ab5954be4336fa47aadb7478606bd217b745134de50c16486c26e07fb10b5
 DIST path-slash-0.1.4.crate 5771 BLAKE2B cb4ef02743efb500d37669eaf83b276c9b47d79d460366d8a210fa89e15a145e36aa3a7892ace4093730e3e56e7fdc744b6f0928395ba0054f9f3530b09225ea SHA512 c0d14ce827e80c4efbfcf1abd67459c3327686b2c8644b0af16909bbb9a8952c14e91c1b68b988396f99c85edb4bb57dff9bed1d3a4f53e77edd9bf3d80284f3
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pin-project-lite-0.2.8.crate 27847 BLAKE2B a9f192e644ee443904becb1ff5cc2179c7c9a6aba5b64d2e9998f9b4b8f8e95f5d54b46963910756832d0ab1b55bbc66cf85edc94b0d04e9a8b3f4ecd4719602 SHA512 9ecb86d550f4440e19eb16c6a9a418b5c4ad859ed2449b02f77d4b07b1e3e3e6b6b7ffba44a358958679342eb21222992fe6fdfe6d9bcb7a699a3e5816f1bfa8
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
+DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
 DIST platform-info-0.2.0.crate 11571 BLAKE2B 4cb4f50d878175e080144f6d96b3ee3f53a49c1c889e96a9fc45595518db45c46e4f24d491dec20ea27b336942023118ed0a8bf01a17e1d2d6cb5218825c86db SHA512 9420f1fdde9e3b47720c312eea5056970c38422829a5768cb280dcb876f12c631e5a64b73a0f4120732a823fa75abcb3a45c117777e453b48b2e47659d378f62
 DIST polling-2.2.0.crate 21616 BLAKE2B b431e4d31a677ee3d0d36710b27fe98b5df11bd37ac1dfdc464b8a0864dee56985125be388afe9f4c5f8e8c556f668578b2566a6de85f0797d6ecce285d42953 SHA512 6592682d6abf61341e18e5b7e6aedccc31de36016c323ee4e01ca4247d5a40be14f9f60e0602f828ce6ed55e29daa3e601e62a1d472a7ab3a75d760fb1fbd99b
@@ -158,29 +182,40 @@ DIST proc-macro-crate-1.1.3.crate 8758 BLAKE2B 6069127f50c5ee4ae53d95645ced75c2d
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
+DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
 DIST pyo3-0.16.1.crate 350244 BLAKE2B 4d46e905224ce3a148d714d9a93d610dcfcb9b5aa5b8688af16c9d39868f0a2a28fdf030c5686803696cdc92c260ecda544f5ce1f5356cb787d030219c02aeda SHA512 f3d166e2bc613e87758edf7a2a8dae0c2a551c73058e2fbb2459d1b68eca80b8da13d66667271c90d3fad97230dbf5fa2acea0c0c2378c4473608a03b343df5d
+DIST pyo3-0.16.3.crate 359499 BLAKE2B 289cd9e65af7ff34b2159706ca7dbd869d79330f30a06733767113b1c73b70c8352b51b82971d4e9d58e28e044bc620ab397d801f981c566b89a58713e12ce3a SHA512 4ac5be4e24d5a2049c3fd35d5069b4d86927ef31d85a9155d98669834d929f21b33f87284532ebecdb7b59180e7a7d4e5f8029e2b39a8eeb7dcc64c104596e6c
 DIST pyo3-build-config-0.16.0.crate 23471 BLAKE2B 4c5cfc692ec3851d74e6d25ff3e18248f96c03731cbdfc1d7661a56dc9394802c16a3a16a2142b91758c91d1bd66550765061f7994accd73835a1703a8105c2c SHA512 b60fcc760d5ee5468b4d308106ac6be105c34b23612b2db5e95f0da50fdbae253cee2dfe185e0bfe8c25c2469e9ec6bd31823731ddd67004423652585c5b25ac
 DIST pyo3-build-config-0.16.1.crate 23508 BLAKE2B e5b38783e74d3104d2e05ce5122e06b4a3bdc19f6b273d548d5726b6ab67ceb4d96c75bafb970ffb13b17e7a5929846fb657c2c51c9cf6d47caf2b6846d207ba SHA512 1103bf5d668b6c67c036629c9b74ad6ebc0b58f3392db03aa1b0eec200686e23febb93fa543c1b19f2734dad450831286c81dc4472eb194e55fa0ad66fe05cf7
+DIST pyo3-build-config-0.16.3.crate 26976 BLAKE2B 2c2324d7c17d25d3850521578ed4f28a4cbd9fcb86b4a8d5d7e09a5d165d8e649d7172368120e46b746bbcb17b4a39f38ec41d94258574f40978fdaae131e44e SHA512 30f95460f7ace4e5cfe1f1d85b755fe9aca58f58683ae3261947d0729b58c8165e91bf9b39b81cb2ed00a82b282d9c59517b394269ce8199ef2ea718fae3c46b
 DIST pyo3-ffi-0.16.0.crate 60232 BLAKE2B dcbdd5132e65f14cbc35fc49d5aca07b0ca7d1f84c12a7c632c398a4093d7faa6dbcdc98c7401907761694b9dd12adc8d457ed573fc2229d3f81ba52694da05c SHA512 eb7b7b87358b010ab746b7c5b415f7e9543d33d08c49d57e7751a0c4cad43fa10b9e4271d3a9c260837fb349afba33fcc1776a1b329c244a57295f14cdb94b52
 DIST pyo3-ffi-0.16.1.crate 60233 BLAKE2B 55031bc3cf445b41f701ed6b20d9ca056bea6226995927bb44646545d320885ecaf496cd5b12201a78f3486f69f20cfd014f6623abc27e07d34172535352cc8a SHA512 edeb493c8a5665d99a98bb2f67624240d91317454b7ef89ab585de424bbd291418a9ecad4d95431bc5fb73c68f99e2392d79a31c06645fd478741544bcac9e56
+DIST pyo3-ffi-0.16.3.crate 60306 BLAKE2B 3fea4ae298a747883022852c1ea4c9e4dc321ebc4fc09f173220d7f08b4c231760b725e542ddca49469e57666e0dadea2e2c74b29237513f245c834ec4af029f SHA512 d5ac2d763362b0af7998fe732473906f38fb351ce689df2787a234beadcf5c63adf997ded115c2358bcd1d6f407921ef1a59ebd178f05d22d4c464b40df31ec8
 DIST pyo3-macros-0.16.1.crate 8028 BLAKE2B d002f59724c1a73938aef69a3d2ec29c38a2895266225382293a841b9b020ba0957df915d0493066e4c76ee73a76fc2c0bfeea9aa9bd7f585aca76eb857e10d6 SHA512 b102ec88aa82d112fa5f9d43ce375181b35f49de2a3d959f5b163aec11dc020d054a1c91f01abd96b79de1ded7bda14a530d6db874c1eb2c8e3cfb76bdb14c13
+DIST pyo3-macros-0.16.3.crate 8425 BLAKE2B f376660121b4f145db0d7d7d569f11c98b961d130e7841415ffa0ee8ca66648ed34b77b9534a579c14de5cce219870ff39fd0d93b71f70ee88588402d7845c6f SHA512 7e96d06b96b835ccb466f89c5ce7e8f472e50e943329de34fd5e20654095eb0156214055b868ac32fde1974a01fcd753b8915a405ace15820fb6ae5d31f4a511
 DIST pyo3-macros-backend-0.16.1.crate 49383 BLAKE2B a59c5dda51eba714842307c5d0f792e706ef2a88ded0dc52023f6a8e455334bdd5ac27e77bbbaa0c9eb88e3bbcb7d701e07aca36bcf16e0f83653f12fff48363 SHA512 36aa72129a60fc9b4b0d189549061a1b3226e805bc6225e6ff5a2e0f794f76758bf2e6dbae911d45fa0e103f09caa804ce35f3ad6c05aff932288a2d58287e04
+DIST pyo3-macros-backend-0.16.3.crate 49188 BLAKE2B b0b39d25aaa0e13f703751ad6f711217c94b51d04ce1f984ace081bf56a091794069538ce5a59e027863df7749365d4ee4cc6ab87f3eb95ab258b0c990ce8bd2 SHA512 64cebf06384355249fd0be1afec3443ee803225fd16fb02ca01d254c1a4d1290f3c4934fd5d7f72a05fea46004c22a9c1e1b59431d316f623e953f80a25c4141
 DIST pyproject-toml-0.3.1.crate 4536 BLAKE2B a51454289467647437738c2a46a6d166f18c8025a62d7da744f48f7fa7ba395b4b01a9e030eaf9116e0f10af8e3d0afe699a393acfbc8db92cdc3fc3c08c56e4 SHA512 ee2cfe91d4204f97c17243f278dd2b05de6c8fba962dadaafdf47d7f5401845018df3625b7b7e80c2be32b6917c6b244b2705e9d44c5f0030d65ada87cabb2c0
 DIST python-pkginfo-0.5.1.crate 199667 BLAKE2B e12e6249293c708598329a0396d117ba574ec853fde7a611a6a6ddc8572e1d7acf289616d3918ba52095d223529cf61ed73b0a78a79a8559ea8e8164f77c8f85 SHA512 536afdfd8dbf4cbeed6621389f902800c05ca0fee28d67b81bace5a94587143d9c67f61ee4a24ad67b11db72adf559ecdffc1546f2371381c535e87016e880d2
+DIST python-pkginfo-0.5.4.crate 199520 BLAKE2B 4e6a23dfdde6d51ad9a81732f02a42c2c9aea56b36518e140cfa42c78e0c534b0f62a7da32965f18aaef1f416226f94df352e6f9c3cdfd95521debe7d9510b09 SHA512 7afbdfb4f2e06b4e76726c371dc6bc8904e3a7259cd455bac27172dc10abf6295c37eb6ba91c90be4347aaceaf211ca312b011568ce4d779286c5af016448aa2
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
+DIST quote-1.0.17.crate 28629 BLAKE2B f4c586b9869e9fa24e0b5a2eb9b4dda7aa55924c6a7f6349825c5c9a55ce170397af975d9c6b319009791cf48f51fdc0aa38530ea31efb45fc0659f07c30ca32 SHA512 d34fa0c864e3b9007449269ad5ea8736bbaa359e61eeb454e9c1cc30f9739a96778a04421e2a014879aeee417d8b51e20c6c41ebdab6878567af027096ff9ebd
 DIST quoted_printable-0.4.5.crate 6237 BLAKE2B d1f9e7ab512948454c7aaac1fb05f1514a0bea17bb3455fb092500a84baef1c469fe468663875b3962aaf6032bffd61f15aaa744afe22497727da0bf8b718e15 SHA512 e3b165705bf0861be724d0655ed7c9fc735dee335b7c641d301c9c1b4c45a8f1218dccb0d43874a4a40cc4dbe62195e9bdf9cfc17bbcd795b88792b918306a18
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST redox_syscall-0.2.11.crate 24032 BLAKE2B 28d71b8c1419e34c4b0a0a1e0ca1bcc34bdf97614a1e33a5f58f867d743a0430ed19e6f76601702802e366c2801d245a3a88c9bd657bf8aaebdda463aeaeea86 SHA512 dcdc6335a0db6a01a31b61aaf9eb684f264b36868a351094d3e2fb3fe84f0c4269db89ad40b9e0fedfe1ebe2096baa20e7a6232a4de5a3dda3b7876eaaca75fc
+DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
+DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 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 rfc2047-decoder-0.1.2.crate 6023 BLAKE2B 75d98aadeaed734cca80e21fe8d94e8a4a87f6eabc7cfee63052c51d257058f5589d87c757d2e40f223ef8c4bdd6f5c8335160f67e8f5367b80807ca8c7486c3 SHA512 302893aba05b32dc8262fa9b034fee2f760a09f7af860f99e2e5463bb7f3ee8f9b984d8f9b41b0acbd0703b38373ed7722923b85dee766d7c5f25571b2d842e6
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rpassword-5.0.1.crate 11109 BLAKE2B 4d040a920673de6ad2f2cd55104a7c2dfdd7425368c77aa3c8a1f3f99e51cba4d86b2afb16ee51637d948e444ddf060f7a0c82de5d6f0696023c527e630eeb56 SHA512 bcd20c2920734a2f281b9ff924138605ea409d0bea9721ee96100f45eed14dffe65a8bdc8feed7c36d3564c8d902e78e0d2306b3736d03b8f195a9d212792feb
+DIST rpassword-6.0.1.crate 11505 BLAKE2B e637ad3199e65e8ea44eec0ab7115073a68acdadd4c39e2f583c52989912487145c43cf91f7066b1aacbcb52f74e244139cb81a0525281d2059eacfb92c47a2d SHA512 280487f364bd0ab28abe0264e7698fe188e763cc9bb4a67f904d534f8f60c8b7e1baf22854492d67385d37e87051caabed7b5a219103be950eb04cb595352c1c
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustls-0.20.4.crate 256347 BLAKE2B 96989d813691a70066958b5c30554237cf86f25bf06e0ccd098044b4329d26fff19bc5863f8c2390c03813aedc67be5f4da433d82b5a9c6b120efaaedf51dc2c SHA512 897e93f7fd06be64773db0630a06dc440c0f5b43f12d5780523b2419d11bdec62ece3ce12a317badc2ec8cb1536d8bfd82d7c69105196929e7fa5471b29d0462
@@ -196,6 +231,7 @@ DIST secret-service-2.0.1.crate 26355 BLAKE2B 01d0457e7fe16a2f86a67a3e96c6acb3b6
 DIST security-framework-2.6.1.crate 71688 BLAKE2B 45236a76721bde18400aa286263b5dc389db66a02a5b8feb38fc6ca576fca305cdc5f7e7d6984ebef1379209740ebef3180c4598d5117b04394562de5ceb52d8 SHA512 e4690acf5609f52c89cbe0b577c68a22caf0763d8dc781817010e695824dae44dc27f58c9ffec4254a8461e88040892b89f9628d6a71102d06ab5441b84800a4
 DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
+DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
 DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
@@ -204,6 +240,7 @@ DIST sha2-0.10.2.crate 20213 BLAKE2B 9e8942b4f4a4a86f5fdb0e1c237d6bfac8f3f29622c
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
 DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
 DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca
+DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
 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.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
@@ -213,6 +250,8 @@ DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e49
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST syn-1.0.86.crate 235126 BLAKE2B 89973130279128cab73443ee36c8e0d7bc83364ef91d0f086a40c136e26e612428b867a54a1da8ee5b1778cedeafc7403180bd84df2c21017ad5bb76bc0c9138 SHA512 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
 DIST syn-1.0.88.crate 236112 BLAKE2B 7d652d9685cfe275c57154a6f3e2b0ec741e498316a512f73664de67aa85541c3ac135007003d72a912714c7a9040c710a6292fe95fbba70dac7a4b185248e97 SHA512 a342b635859cba36b41bc82c204b76c83a3032c5cceddf3aa11137b21238a4f4ebd75f3bffe39eecb9aab9559b04639891f02d77b38011b268b5ddcc8d9ffa61
+DIST syn-1.0.90.crate 235956 BLAKE2B 671d79ecd54cc7ea913301e8ac0e598a0b748575d4c22982e4132172f00957b3faadbd6e58ff23317f0bb44b5aa57c475dc4ba381372bd979dbc889c825347b5 SHA512 367638bd9d768a93392e7191f1ed5f094d787be5c6ece03632f87e9b54be176b43ab357b4d4f19df95a182b14552024852d540b0f9e0c0b302af793e2e052784
+DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST tar-0.4.38.crate 49158 BLAKE2B a344a65951c5c39212ffa3cfdc7dc68c40a85dbc5e4aa08cfe7cf22f0216443fa081ddba5e8fadc48968cc8e70e08d23391a6caefdf359310e5880741c9d6730 SHA512 4b6458734811e1913cb7e348f32db16f9402fd0e0027ae867db81aecac250b35d07d9478cdae4e27a609ce0f29c9d61683934296cfc3b371119df9f2c380a84f
 DIST target-lexicon-0.12.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
@@ -223,10 +262,13 @@ DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
+DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST toml_edit-0.13.4.crate 104817 BLAKE2B 7a75d97b84012795dea220c457c713d03420432ea76d5dcef8b597793c6ae5216a1cfa13958f50929fcf2850c907b09a84a1f0103ae1e62020c6747e0996bf2c SHA512 7a1c915eb4e916d976882f64f5956c1a1ac2a1842882fd307b2a6044d644b25058be7c559b276b4632238b1d24418ed79c68ea4d7af0a13a47fef45d4338a328
+DIST toml_edit-0.14.2.crate 104837 BLAKE2B 9b8c3770e5dcb723a5d2b41cecbfe71351d07257d3c96bf4a46b5e7fa626186d214d91b5b7052bbc2453d93eeadd9040b06e9d5fad52b64ca8adec3737282abd SHA512 667efe47d83e50b2a9e41b9f2774d3311b725dbeceb3ed6964ae6c9f740bdf2297e8461fef7cb6cc5fef76e3be7ebc9f0109f9a9b95bbf4d11b7777c02c46775
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
@@ -259,11 +301,19 @@ 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-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.34.0.crate 3369228 BLAKE2B 301f89dd2cc7e60980269deeb7f328d8895c80acad9f0056b3c510e339c7eb6963a152d7dd2c69380c802b17a630cd6df269399f18c298aefd8e9cc53e19042b SHA512 e12b2ddac3e1b841630639c6896f1389e6bb69c33da278e6499e0d31fde5d5b197ac636f430a52ccea6c3bc622e4410618d13819ba4d4c272ef2ea599be356d8
+DIST windows_aarch64_msvc-0.34.0.crate 674445 BLAKE2B cba324bb4fdcde12f4d89384450c5adfbd6f728ac47bd162b33a12c5adf0654c8374d4b0f1e9347d48d2e7d014f701fe85763709824f75df21b42d01341b53a2 SHA512 974c6f3c4bdbd217d9deac7e973b00c115e8b9b831f8b9d933455b11b8b6eb59782f7c7a06c9a4d81fdd41729858e303051eb0d56b971fea1025e86d2b702710
+DIST windows_i686_gnu-0.34.0.crate 772343 BLAKE2B 7c3fb8d9b375ea82ab3e28da0c462c912a5286236a6bb8bb3c5eb68013d527dde064c368e1d452e73e26efcb1b832933b2891c2255673824c27045be9edd954d SHA512 e388b214d45ec14182af4c72e7b27f22dc7ac17725ce833e05cef9770b677dc929a20ffc1c28f604d5c8100f68d7bf4427feb2aeaf6edb776dc5bc1b505a94fd
+DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82dfdb8a050ca331dc3edae6a786c2a10fad88ae99906959334b396c1972d88dc40010dacf655fbf9f5d39a6bd78bacf2025bd SHA512 86771e1fed40e7398d3ce65bee46fcbfeb630e0f77766eeb1da0e5b2c47f94bd728f645a5c799ea8f7ef6653b37903d476b5b3eb763218bf10dd7af6b31c76dd
+DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
+DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST zbus-1.9.1.crate 62908 BLAKE2B 3b443cfa9ea778b95574382784ad23308b08ab810e5b42908d92bb3bd02c439416c99d66de1c9e673284dad9a4023f5c53d8d3935f78779c165013f7e49a1269 SHA512 95b6018bcbec9656dfc8e38b72ff78d9c6cc43209e0930969f0fe2a1a2c4ba2b2437397dc2de0321a75fc5689595994e9b9769c0b0f25a0ddca9f227a64a3800
 DIST zbus_macros-1.9.1.crate 14675 BLAKE2B 36da6420fd908febb695e9ea767f4928f34b7deb2be286ce14b77e0fc5fffdeec950b6e130d374a3eaf0d2a28b826ed7cb55f1c7e17f31eda1872b4c13f18179 SHA512 05a84bb3db5b773c132db27a63123dd8d22acab62f2db5aaef8373d049a27e7fe994ec16e959d512fc280c34b42cdc979506417a30ba8a1626131f37c4d27f10
 DIST zip-0.5.13.crate 48237 BLAKE2B 0ffd9c41535f3e49d091b831925e8b639f3128702deafc75e0ea712b67df6f0900ec79628dd2640eb9b91fba7e828abd8b5c9edad87fbe7b22e042ef9909b07f SHA512 b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01
+DIST zip-0.6.2.crate 60077 BLAKE2B 3353cb0b8557ad1f16f3a3964a5c6d992bd044eebe3857e42ee235bd479875811619001ad54378fa7bcacce8acbe7dca30199eaf88ddc47a91e47f15e0396e22 SHA512 a044090643e22d792a83600631d2828b3fffdc25260bfd7de703d20871c23deb6cfb121dbee9cdd5540125c96d113a9516f26b9f07cbf6f260725627166f130f
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.12.11.ebuild 6863 BLAKE2B 2cefb4b5e39614e9d68d0abee1aa41c9b7d80089422da43414eaabfad9fa025028f80a25a641a01ffb0a47901be54b7e62c07a069ed95cb44d6cf2257d6b2503 SHA512 d68fde4486922c617c08772aea53db181899221bec57f6c3ad8cf8662e843b11a2a599c2132e05f309b6745712d77f7c541bb33c51d4d139f31604ae068a4f36
+EBUILD maturin-0.12.12.ebuild 7056 BLAKE2B 033f73ba34c31e6c32009aaadf3f4f12c0a6a1f00ce5c6352d9a611878391052061f3a9302440f859062a101bb1bfaed5ef980f635ce554e51880fc23fc777bc SHA512 17e4b92e449f072ae54c63fc097e7fe8e61a07beebf4aee43e03426bf6c7c2a962cd22d7972b6df2e22b91ebf2fa28e968f105847f9e2fd2a0d73d9204364146
 MISC metadata.xml 536 BLAKE2B a94fef48d69a1f23ab4cb0c676c47c8b3b3337f78f2095384e9ef73fcf04a9c117766b633cca82c8bde782e70051a944d7508863e36e69f821de7399ea4afab8 SHA512 b66a31403684e70656c7cc25cb0654ac04e4e5c79f822ef3c4ae8aa9ff44fbd13914a90290c922e98c2e55e90a06f9250b93d71fdab51a7d2a727c33d872f247
diff --git a/dev-util/maturin/maturin-0.12.12.ebuild b/dev-util/maturin/maturin-0.12.12.ebuild
new file mode 100644
index 000000000000..5eb7714ddc79
--- /dev/null
+++ b/dev-util/maturin/maturin-0.12.12.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.17.0
+	adler-1.0.2
+	aes-0.6.0
+	aes-soft-0.6.4
+	aesni-0.10.0
+	aho-corasick-0.7.18
+	anyhow-1.0.56
+	async-io-1.6.0
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.64
+	base64-0.13.0
+	bitflags-1.3.2
+	block-buffer-0.10.2
+	block-buffer-0.9.0
+	block-modes-0.7.0
+	block-padding-0.2.1
+	bstr-0.2.17
+	bumpalo-3.9.1
+	byteorder-1.4.3
+	bytes-1.1.0
+	bytesize-1.1.0
+	bzip2-0.4.3
+	bzip2-sys-0.1.11+1.0.8
+	cache-padded-1.2.0
+	camino-1.0.7
+	cargo-options-0.1.3
+	cargo-platform-0.1.2
+	cargo-zigbuild-0.8.1
+	cargo_metadata-0.14.2
+	cbindgen-0.21.0
+	cc-1.0.73
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	charset-0.1.3
+	chunked_transfer-1.4.0
+	cipher-0.2.5
+	clap-3.1.8
+	clap_complete-3.1.1
+	clap_complete_fig-3.1.4
+	clap_derive-3.1.7
+	combine-4.6.3
+	concurrent-queue-1.2.2
+	configparser-3.0.0
+	console-0.15.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.2
+	crc32fast-1.3.2
+	crossbeam-utils-0.8.8
+	crypto-common-0.1.3
+	crypto-mac-0.10.1
+	data-encoding-2.3.2
+	derivative-2.2.0
+	dialoguer-0.10.0
+	digest-0.10.3
+	digest-0.9.0
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	either-1.6.1
+	encode_unicode-0.3.6
+	encoding_rs-0.8.31
+	enumflags2-0.6.4
+	enumflags2_derive-0.6.4
+	env_logger-0.7.1
+	fastrand-1.7.0
+	fat-macho-0.4.5
+	filetime-0.2.15
+	flate2-1.0.22
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	fs-err-2.7.0
+	futures-0.3.21
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-executor-0.3.21
+	futures-io-0.3.21
+	futures-lite-1.12.0
+	futures-macro-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	generic-array-0.14.5
+	getrandom-0.2.6
+	gimli-0.26.1
+	glob-0.3.0
+	globset-0.4.8
+	goblin-0.5.1
+	hashbrown-0.11.2
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hkdf-0.10.0
+	hmac-0.10.1
+	human-panic-1.0.3
+	humantime-1.3.0
+	idna-0.2.3
+	ignore-0.4.18
+	indexmap-1.8.1
+	indoc-1.0.4
+	instant-0.1.12
+	itertools-0.10.3
+	itoa-1.0.1
+	js-sys-0.3.56
+	keyring-1.1.2
+	lazy_static-1.4.0
+	lddtree-0.2.9
+	libc-0.2.122
+	log-0.4.16
+	mailparse-0.13.8
+	matches-0.1.9
+	memchr-2.4.1
+	mime-0.3.16
+	mime_guess-2.0.4
+	minijinja-0.15.0
+	miniz_oxide-0.4.4
+	multipart-0.18.0
+	native-tls-0.2.10
+	nb-connect-1.2.0
+	nix-0.17.0
+	num-0.3.1
+	num-bigint-0.3.3
+	num-complex-0.3.1
+	num-integer-0.1.44
+	num-iter-0.1.42
+	num-rational-0.3.2
+	num-traits-0.2.14
+	num_threads-0.1.5
+	object-0.27.1
+	once_cell-1.10.0
+	opaque-debug-0.3.0
+	openssl-0.10.38
+	openssl-probe-0.1.5
+	openssl-sys-0.9.72
+	os_str_bytes-6.0.0
+	os_type-2.4.0
+	parking-2.0.0
+	path-slash-0.1.4
+	percent-encoding-2.1.0
+	pin-project-lite-0.2.8
+	pin-utils-0.1.0
+	pkg-config-0.3.25
+	plain-0.2.3
+	platform-info-0.2.0
+	polling-2.2.0
+	ppv-lite86-0.2.16
+	pretty_env_logger-0.4.0
+	proc-macro-crate-0.1.5
+	proc-macro-crate-1.1.3
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.37
+	pyproject-toml-0.3.1
+	python-pkginfo-0.5.4
+	quick-error-1.2.3
+	quote-1.0.17
+	quoted_printable-0.4.5
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	redox_syscall-0.2.13
+	redox_users-0.4.3
+	regex-1.5.5
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	rfc2047-decoder-0.1.2
+	ring-0.16.20
+	rpassword-6.0.1
+	rustc-demangle-0.1.21
+	rustc_version-0.4.0
+	rustls-0.20.4
+	ryu-1.0.9
+	same-file-1.0.6
+	schannel-0.1.19
+	scoped-tls-1.0.0
+	scroll-0.11.0
+	scroll_derive-0.11.0
+	sct-0.7.0
+	secret-service-2.0.1
+	security-framework-2.6.1
+	security-framework-sys-2.6.1
+	semver-1.0.7
+	serde-1.0.136
+	serde_derive-1.0.136
+	serde_json-1.0.79
+	serde_repr-0.1.7
+	sha2-0.10.2
+	sha2-0.9.9
+	shlex-1.1.0
+	slab-0.4.6
+	smawk-0.3.1
+	socket2-0.4.4
+	spin-0.5.2
+	static_assertions-1.1.0
+	strsim-0.10.0
+	subtle-2.4.1
+	syn-1.0.91
+	tar-0.4.38
+	target-lexicon-0.12.3
+	tempfile-3.3.0
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.15.0
+	thiserror-1.0.30
+	thiserror-impl-1.0.30
+	thread_local-1.1.4
+	time-0.3.9
+	time-macros-0.2.4
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	toml_edit-0.14.2
+	typenum-1.15.0
+	unicase-2.6.0
+	unicode-bidi-0.3.7
+	unicode-linebreak-0.1.2
+	unicode-normalization-0.1.19
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	untrusted-0.7.1
+	ureq-2.4.0
+	url-2.2.2
+	uuid-0.8.2
+	vcpkg-0.2.15
+	version_check-0.9.4
+	void-1.0.2
+	waker-fn-1.1.0
+	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
+	wepoll-ffi-0.1.2
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	xattr-0.2.2
+	zbus-1.9.1
+	zbus_macros-1.9.1
+	zip-0.6.2
+	zvariant-2.10.0
+	zvariant_derive-2.10.0"
+CRATES_TEST="
+	libc-0.2.119
+	libc-0.2.121
+	lock_api-0.4.7
+	once_cell-1.9.0
+	parking_lot-0.12.0
+	parking_lot_core-0.9.2
+	proc-macro2-1.0.36
+	pyo3-0.16.3
+	pyo3-build-config-0.16.0
+	pyo3-build-config-0.16.3
+	pyo3-ffi-0.16.0
+	pyo3-ffi-0.16.3
+	pyo3-macros-0.16.3
+	pyo3-macros-backend-0.16.3
+	scopeguard-1.1.0
+	smallvec-1.8.0
+	syn-1.0.90
+	windows-sys-0.34.0
+	windows_aarch64_msvc-0.34.0
+	windows_i686_gnu-0.34.0
+	windows_i686_msvc-0.34.0
+	windows_x86_64_gnu-0.34.0
+	windows_x86_64_msvc-0.34.0"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cargo distutils-r1 flag-o-matic
+
+DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+HOMEPAGE="https://maturin.rs/"
+SRC_URI="
+	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)
+	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
+
+LICENSE="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl
+	doc? ( CC-BY-4.0 OFL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/tomli[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( app-text/mdbook )
+	test? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/boltons[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-zig-tests.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# TODO: migrate to pep517, deleted meanwhile for bug #836597
+	rm pyproject.toml || die
+
+	# use setup.py only for pure python and handle cargo manually
+	sed -i 's/cmdclass.*/packages=["'${PN}'"],/' setup.py || die
+
+	if use test; then
+		# used to prevent use of network during tests
+		cat > "${T}"/pip.conf <<-EOF || die
+			[install]
+			no-index = yes
+			no-dependencies = yes
+		EOF
+
+		# run plain 'python' from eclass rather than auto-detect 'python3.x'
+		sed -i 's/"build",/&"-i","python",/' tests/common/integration.rs || die
+	fi
+}
+
+python_configure_all() {
+	filter-flags '-flto*' # undefined references with ring crate
+
+	cargo_src_configure
+}
+
+python_compile_all() {
+	cargo_src_compile
+
+	use !doc || mdbook build -d html guide || die
+}
+
+python_test() {
+	local -x PIP_CONFIG_FILE=${T}/pip.conf
+	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
+
+	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock
+}
+
+python_install_all() {
+	cargo_src_install
+
+	dodoc Changelog.md Readme.md
+	use doc && dodoc -r guide/html
+}
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index fcfc00e3224d..f9c7bbda8d58 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -4,6 +4,6 @@ AUX mdds-1.7.0-rtree_test.patch 1673 BLAKE2B c5913765972b2c6346a8414cc9b980337e7
 DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a
 DIST mdds-2.0.2.tar.xz 415824 BLAKE2B 47b720b96fec4a4410dcb15c86c19ddaa502b9d45905905609a28ba9cbb2e6021ce20c82d26e28cd2374e76d779361e1805a7401134c2ee30fd09fbf6ac35d79 SHA512 eba7dc5a5961e69208c8e605995355c0fef392eb4273e8391d529aa9c49b24e491675f443767abef80ff30440bd9fcbaf0f1fbd5bad9c0ecb6b761033efd6f27
 EBUILD mdds-1.7.0.ebuild 1429 BLAKE2B b04b3825a006f761fa9c887dbb404deed36f3f0bd66c86377ae753134fb3492495d8588ae7b6ba4decca52fbe994846c5cfa2c46fdb9e1a9d02ad37eceb9cb88 SHA512 885cfe58f6ba20cbbd4a222a340ff2154faf8054a54dba61d15e80de782dda7999d1126db3c8865a5309687009454f2a193868c7d7681c764967d620df35dd90
-EBUILD mdds-2.0.2.ebuild 1401 BLAKE2B 5435300974536c9612328db5b9fe3a77d854eae4e18d2a527ddc4b0c225419bf380b4f7e1ad763b30c5aed5d7e0ae8e27861468b783681df5baba46ee2e0587c SHA512 afaab9d10b13681ac330aba668798005cb9307fbc1c66f72238298fc4e71bfc3afd560f010466e29aa2a2af890aaac7be80915194d83d56abed949b3af8fa822
+EBUILD mdds-2.0.2.ebuild 1327 BLAKE2B c777e854710018f2b5c2405e87ee7e5336bea351fce28b0fec82786651dcfca4967afcf87e20c7ff1c9856390ff5072a966f1ab3ab9e45b56b2e929ed1c7b714 SHA512 5c472c474ceb9a16b2017f9618744eac47379dc30501b1752831afc4bac89b293fe996c642b3433f7b308ed3a8f2098edc3eb6709958e58e227ce2806450fc8a
 EBUILD mdds-9999.ebuild 1327 BLAKE2B c777e854710018f2b5c2405e87ee7e5336bea351fce28b0fec82786651dcfca4967afcf87e20c7ff1c9856390ff5072a966f1ab3ab9e45b56b2e929ed1c7b714 SHA512 5c472c474ceb9a16b2017f9618744eac47379dc30501b1752831afc4bac89b293fe996c642b3433f7b308ed3a8f2098edc3eb6709958e58e227ce2806450fc8a
 MISC metadata.xml 457 BLAKE2B 571d7e12d435c01accaf935cda5f1847ef38c5d8f996c098dcf689e63e6b03c2401e52b05552f03b0ac9a466b72a3359ba3cfc7a36c0dff1b2536d2f627faa38 SHA512 cc5b5a07a05e8bc74ceb3a53965b7d7256d66134c60ed933c9d75054be8cc9aef833b3383a00bac3efe360943f5bf8cd886a5da3c5dd44943e50da0f7055aa1c
diff --git a/dev-util/mdds/mdds-2.0.2.ebuild b/dev-util/mdds/mdds-2.0.2.ebuild
index dff89f19daf2..6abe223c7965 100644
--- a/dev-util/mdds/mdds-2.0.2.ebuild
+++ b/dev-util/mdds/mdds-2.0.2.ebuild
@@ -8,8 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
-	# Unkeyworded while libreoffice has no release making use of this slot
-	# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools toolchain-funcs
 
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 15b898d69346..add9a13c2952 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,10 +1,11 @@
 AUX mingw64-runtime-7.0.0-fortify-only-ssp.patch 637 BLAKE2B 3a8eff14b3150446da51354324a3b29e327982fd586339e5f8df4309de2bbdb2722773e0d145d87363183ff70fd02fcdcbc46c560bef9a5111dc33ee8105bede SHA512 991d4294d81a05bfa86d2bed102b3f5bf58435ef02b0a38abe905cc4a0416896b01ffc3a2fe64e78d44e78c9c65051428426b7d19561bd337a229bf7281c7040
 AUX mingw64-runtime-8.0.0-__rdtsc.patch 773 BLAKE2B 8ec970049ee9d1003caed099a6eb0301f066cd3f0986895f08b2912b14248d3c41c87558a1df40b7f452e73d382da73215942827f4e5e551df65d779eda23eef SHA512 df986f2b24ea1e4db7babad2a837a55a59e1abd20f41ef03f438907477829561238a69fa8e8891ede1a45eef6dca36deb82c6be61293ce0f39e7f94f82483cad
+AUX mingw64-runtime-8.0.0-udivmod.patch 865 BLAKE2B 848b45fb68c775baa5b285293df0a986a11f98e1768f4a55e7c22bd870f1df12d60fd03c378d1fe24e5049886a48527aee894e1f0d58555cc686a807815a3a7b SHA512 0d5c27e8b30efd8b0e938f66f0fd8ddc2a279c79a1ae99d776fc2b1595f97489083f8cc2caa6c3d78ed7a0394e707efe6e6792fec768e90dc170ac6c9fc84146
 DIST mingw-w64-v7.0.0.tar.bz2 9071231 BLAKE2B da00794ec456ede5913a565248c79255407c058469cb7338cf81b8d03c1e39f4189016b01734b786c0ad8f18166a24fdb95ca72edc954f31151e5d3aa2b2a899 SHA512 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
 DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e
 DIST mingw-w64-v9.0.0.tar.bz2 9537758 BLAKE2B 298b97f50c7632972aee2c75e90de0776f64c1dd5aaeb52d4e4be10a8e0365efee82c93179990cc090cc7b9f83525a7abf51a5d069b7a3e39abb37fdb733a70c SHA512 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386
 EBUILD mingw64-runtime-7.0.0-r1.ebuild 2982 BLAKE2B 8f053374e0a9efb5d5bf80f2da61ba9e3c5b4fdc46c70b68bea330dff90e35aa1063b2a46634344c32af369f3f595220a5546b06f07cca8f9684a75be1330e49 SHA512 207053be905bba9e9a956d1c0fa3d4ba10280e3c92ad958f0aa3b9408ab6473333dabb6472d5217ccdfb5f4fc8343bc80f4728105b708ec75071772226ae1099
-EBUILD mingw64-runtime-8.0.0-r1.ebuild 3030 BLAKE2B 9a90af1f77827b0fb93194b28d115cd32a0ea45f78366bb07c19b8536ed93b7059fc8eaf85537988779b2a30e7cc0738306c713be944e22b27a0250cbe298bc7 SHA512 0892656f775b1d550ca486a2a02703caf4d56c46c7dd96f7e66f10b260062a97759d2e2cb5e690b1a809e8c6b09c5d3a4e4a0f98c2dac479ce6c67feb490e210
+EBUILD mingw64-runtime-8.0.0-r1.ebuild 3071 BLAKE2B 01f5baf3d0a946a1f6c4c02015fec37aea6a63537396f92117f97914097d3b488df02182a7e9e49f2810b9c986df5e8b50138e2e11ae025066f878f4e365654c SHA512 88febe6ea32f2241bdaf44cea8870b9f522263c5fbea9429d93c7fc1225c845b69a9e7e83cffa82cdb1a7abe3dabde27efef83d220cb7183b389064725fa8a19
 EBUILD mingw64-runtime-8.0.0.ebuild 2989 BLAKE2B eff772061575f14ffcc9b85a1c6d4658eb2854b19a9b103eecb8e579bbf44e31084c1e915dff3415cecfcf0ae3e41444c31b7f4d5a5559c9c0addd2a94129999 SHA512 baff94670008ee2e907924fa7c0cc6c86f7902ceb60fe39e53a4d6d3b3a093bfce0270b89bc2a11ef0c11e724d1e3fd90de04b1ab0ae3b40cb934971d834f4e3
 EBUILD mingw64-runtime-9.0.0.ebuild 3030 BLAKE2B 9a90af1f77827b0fb93194b28d115cd32a0ea45f78366bb07c19b8536ed93b7059fc8eaf85537988779b2a30e7cc0738306c713be944e22b27a0250cbe298bc7 SHA512 0892656f775b1d550ca486a2a02703caf4d56c46c7dd96f7e66f10b260062a97759d2e2cb5e690b1a809e8c6b09c5d3a4e4a0f98c2dac479ce6c67feb490e210
 MISC metadata.xml 564 BLAKE2B 80c27f80ef66df6f54f043bfce48a9f18d6965a6521032dd1d88abd51ccecf868157c943068ab8b12e3b8c5ee6034a9a28f58fed61289799de47159eb7f4449d SHA512 08aa87d7d08581508493a0649ffd176a76225596f8d5b056a4095a1ed0482202327cf9a3f50e7cc6029e7b528eb68b9679d937e421b6c28d95a08b565d109a2d
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch
new file mode 100644
index 000000000000..dcbe99878f05
--- /dev/null
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/787662
+https://sourceforge.net/p/mingw-w64/mingw-w64/ci/ab0fa5ad3c67d634fd7754d9473d1bb7051f9bf0/tree/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c?diff=6a0e9165008f731bccadfc41a59719cf7c8efc02
+--- a/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c
++++ b/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c
+@@ -121,6 +121,7 @@
+ u_quad_t	__umoddi3(u_quad_t a, u_quad_t b);
+ int		__ucmpdi2(u_quad_t a, u_quad_t b);
+ quad_t	__divmoddi4(quad_t a, quad_t b, quad_t *rem);
++u_quad_t	__udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem);
+ 
+ #endif /* !_LIBKERN_QUAD_H_ */
+ 
+@@ -573,6 +574,12 @@
+ 	return (negq ? -uq : uq);
+ }
+ 
++u_quad_t
++__udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem)
++{
++  return __qdivrem(a, b, rem);
++}
++
+ #else
+ static int __attribute__((unused)) dummy;
+ #endif /*deined (_X86_) && !defined (__x86_64__)*/
+
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild
index 3dfff3894bf5..66146673f8ce 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.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
@@ -29,6 +29,7 @@ S="${WORKDIR}/mingw-w64-v${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
 	"${FILESDIR}"/${PN}-8.0.0-__rdtsc.patch
+	"${FILESDIR}"/${PN}-8.0.0-udivmod.patch
 )
 
 is_crosscompile() {
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index c270a3c57893..ad51a50a740f 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,7 +1,5 @@
-DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
 DIST opencl-headers-2021.06.30.tar.gz 59866 BLAKE2B 7bf7b7d6f69178ae14d4ba5b012d134e0d0005acd8aa6c1c09c6d34b531ccf74381af072aaf85fa41ab1d8cb783b8c3c5fc528ddef078ba8dbb91708849fb0d0 SHA512 9d3ddf3a02ff4de00686f7e8cc7eef9f75e3c0e68920e787941c2d8a3ad895ae46d7c717894527a56144febf19ccc25ed733018d3d683509b1d8cc368d99b8ba
 DIST opencl-headers-2022.01.04.tar.gz 62719 BLAKE2B 6791a679a09248746dd6b23d46001a8b6fcb3efc0a5d7c35be14463543ca08e57d24d1a4ab3ec765c315f44e849aa9c52d574f521ee1f660f9232979e511a9b3 SHA512 7c47486f40db16b8264f7e1febedd09c0481308eb15b5f4c4b5ff37c4ffb7697ae79427d221babe921704681942cd152b676b3bed660ba79d2901a48228d14ae
-EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B 256e0ef32db80dc37bfa06a49135f081b11154dfe791752b2322058a32d074ede2b780bf6bc1354ad015de25812b05cbfe477c3bfd4d8aa38f20bca27fb40826 SHA512 3da5cc9e8e83a0ed1d96817990b16920e3172e52cd99621d10e2f59c98a89368f212533f1470267dbfae8e0eab94d54340ec3a5f62f9cb1586b251eb2f1d78ee
 EBUILD opencl-headers-2021.06.30.ebuild 502 BLAKE2B dbc937549550a6ccba57cc73ef86aea42fdc941aa5e0d24c4c0c3c94cbded49bfdc79765684330053156bcc36807043d51916c4e16ddb1e64f3e6b36d811f581 SHA512 1390696b1c4251cd94d6235897843433f4f3ef6966f6a0ea711b475f499d9933bc4a02ee96d177b28d681fa66404e984789d3cbb05524129fcf43a3a7758a886
-EBUILD opencl-headers-2022.01.04.ebuild 529 BLAKE2B d5dbea6a4ae4bab55504f94da00583c69a562752989150d556fab7f2568bf8913d1d29de1054c275e95bb3f261ab07fb900d64e8ab042bb2084b722cf27cb9a0 SHA512 118da978c4d81c5a26c85af01b6c2b10111de38e7cd6b5ecfdc67eaf3c5f83b13e5841d0a49eef21342aa768ca72f4de4e588a7ea6e9e756f34b1c87cb1e10f6
+EBUILD opencl-headers-2022.01.04.ebuild 527 BLAKE2B d6c4c3f5cdaa282127263466e5fcb7769a5e357cfbc10201dfec1bab449a3dd86c77e3220f53fad3e76abdb54d229a216a535d91a399bb70c14c99952aa4d13b SHA512 85706fff6cf1276179c87677d90bfc5a4fefe21aa4bcbfb3eb7f2592b50657399ba5b5aa96a63b8ddd8f7f7040d9b81035a060a112f0d0ecbdc4ca3ea2f08410
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
deleted file mode 100644
index b2c250d351b7..000000000000
--- a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OpenCL-Headers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unified C language headers for the OpenCL API"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# To avoid file collisions in /usr/include/CL/
-DEPEND="!app-eselect/eselect-opencl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/include
-	doins -r "${S}"/CL
-}
diff --git a/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild b/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild
index c2f92aa1c358..916a0e75b49e 100644
--- a/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 2917428f74cc..06d2a95b2669 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -6,6 +6,6 @@ DIST ostree-2022.2.tar.xz 2059592 BLAKE2B 73bb563be473f3f62ab2d0e1ec6e2b659c8c12
 EBUILD ostree-2021.3-r3.ebuild 2602 BLAKE2B ded68dcb03e707c7ff8cd573441e71152b18d8ed644488828821edce67f2c278e097ea85018251679fe708ea3500959b0848511640bf2d51abb220ab4a69dca8 SHA512 2cae33883d20ea5f29c468e086040f87c97e1168bcc31913fe5adfe25d4f6e6a915e1f6112d77e14d4f69a86e572ada54982a5afd947ca43e8aad82362f7ef18
 EBUILD ostree-2021.4-r2.ebuild 2656 BLAKE2B 3c72aec826b9cac51d78517419f2d4f68a6d36dd3ba711b13db8b1bae42fbc21c6b05ea509469086b2966091f57b807d1eb3ee58b0a8952a3f2b1726469791d3 SHA512 96631a2cab895f7be2d23f4b5d5dee20c0271708afcf7c0993601e19146421677143a45ec6ccba998a40d8f5eb4863e1874d01e0644a5ac65db78bcfd22db181
 EBUILD ostree-2021.5-r1.ebuild 2656 BLAKE2B 3c72aec826b9cac51d78517419f2d4f68a6d36dd3ba711b13db8b1bae42fbc21c6b05ea509469086b2966091f57b807d1eb3ee58b0a8952a3f2b1726469791d3 SHA512 96631a2cab895f7be2d23f4b5d5dee20c0271708afcf7c0993601e19146421677143a45ec6ccba998a40d8f5eb4863e1874d01e0644a5ac65db78bcfd22db181
-EBUILD ostree-2022.1-r1.ebuild 2656 BLAKE2B 3c72aec826b9cac51d78517419f2d4f68a6d36dd3ba711b13db8b1bae42fbc21c6b05ea509469086b2966091f57b807d1eb3ee58b0a8952a3f2b1726469791d3 SHA512 96631a2cab895f7be2d23f4b5d5dee20c0271708afcf7c0993601e19146421677143a45ec6ccba998a40d8f5eb4863e1874d01e0644a5ac65db78bcfd22db181
-EBUILD ostree-2022.2.ebuild 2653 BLAKE2B 04cb588580bbcb2c89d25d0613115a9e780ccbdfff98881652c55424db2fec000fc01d987818140553b73d108cc2bf2a81e614aa980201ebd5b162bc57faf8f4 SHA512 b4ef3ddc8c296f8a51b3e700c57e7bf5cc2e04e83594fdb2c861fd57fc2ea28c8ebc96e735e7fa2c389c6be7e488123ee2c38ab87f3b74c151df15954f351564
+EBUILD ostree-2022.1-r1.ebuild 2648 BLAKE2B 2eb78554d9fd0c1ff38ff832823209e7556ff645e8e1cd225b0f693db813d6a105fedcfff8e63fc2d9c8e63955ba181d425ac7891adf107028a51b45013ea0a5 SHA512 c01f1c3646553d4c227e7f414361ef731b528be5a2b31e9bfa02329dff6304e0ea46236775c4a79a6f52561c7c000ed2b520990e42648e99e55e54e3ada4d38a
+EBUILD ostree-2022.2.ebuild 2645 BLAKE2B 03f4a898d2553dc8fbd055c51b834270266237cf92e2fe06e614187e91ce84c276513f8bfb3d145b6786f12024a2997a6d4ded5850a875b45e1e9cb35d13ecde SHA512 e93f32725b1ab23082729e76f176c3563a0c65527dab55e090167d6a522441b3f5d9356e9809c2c2a7cb9a09fedf4390632c0791be63d54742eadb5e5b3439d4
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2022.1-r1.ebuild b/dev-util/ostree/ostree-2022.1-r1.ebuild
index 68a663e35584..43f60e37b878 100644
--- a/dev-util/ostree/ostree-2022.1-r1.ebuild
+++ b/dev-util/ostree/ostree-2022.1-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libassuan
 	dev-libs/glib:2
-	>=sys-fs/fuse-2.9.2:0
+	sys-fs/fuse:3
 	sys-libs/zlib
 	archive? ( app-arch/libarchive:= )
 	curl? ( net-misc/curl )
diff --git a/dev-util/ostree/ostree-2022.2.ebuild b/dev-util/ostree/ostree-2022.2.ebuild
index 5d869c3a5540..ffd7127f1a9e 100644
--- a/dev-util/ostree/ostree-2022.2.ebuild
+++ b/dev-util/ostree/ostree-2022.2.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libassuan
 	dev-libs/glib:2
-	>=sys-fs/fuse-2.9.2:0
+	sys-fs/fuse:3
 	sys-libs/zlib
 	archive? ( app-arch/libarchive:= )
 	curl? ( net-misc/curl )
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 0d24d89c702a..f61b9e4864e1 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -6,6 +6,6 @@ DIST dwarves-1.23.tar.xz 815076 BLAKE2B 2d89ac2d8cacb70a322b1c946356c0b18a2276f7
 EBUILD pahole-1.20.ebuild 1083 BLAKE2B e9871955c4cd61088cc6786d49f9dfbc452452b20642a3cd41c5e80dc06202c4f06440e9ff3c9932b2adb3c42810f77a140e3ef3272a99cd992b7c68c8f2fc3c SHA512 25ec68471c69b006ee099eb6cfbc4cad24fa939d08e41ac2e0d513d54487f9cf591a55b6d3fb06ac686849076b3a9466b176d045f0caa24a20b6a2dc19b67e4e
 EBUILD pahole-1.21.ebuild 1086 BLAKE2B 0b2282309ad6c03460139dcfc7a7c6e40f47c8412f2e859be4bd8903b6675ff8bbde5866004c80871ec7050eca1fafba48d357ff7c3b4dd0828d7aac8363d25f SHA512 bc23ebca73cb1614f98e06e84cbb8846377ca55768adb3bfc527681cb5fb217463e972e24decdeab1802fa725da89e6caa78f1ce9df55a02a17ddc4cc580a412
 EBUILD pahole-1.22.ebuild 1091 BLAKE2B f2aca56f27ec0f868f40d972724911e265e67c9fa2ba4d3a479d44261db18b0a758bd87db2278106ecc15a491f43eb190aacd94a149aa0a289ab7edfc954463b SHA512 5395be307e4d037a4177f73828728ec2f5c6836500079e262133e19dc7ba6b9fa656b769ae2697466fcfa1c5ab26fd78041eaba339ec3ba033345a4eeab997df
-EBUILD pahole-1.23.ebuild 1088 BLAKE2B 32e719f3a0f920b9a093826829ba9b037e10ec363f98d03988d488a2d29149d497b7b0d825cf3d327afc78abd1d401e85efac89f370eb1ad4e204ed7b56c5350 SHA512 6497e850168a8e5d22a6e05492944e9a1571da3ac261f364c003a22075e885e351b259824d8ee27b958c35be9bda3011fe8ae8b982dd0b3fc9171d2cae94fe0f
+EBUILD pahole-1.23.ebuild 1086 BLAKE2B 07532a6babe8165e7b25a4f67e632907fa30f0475396be926f69080ed9468c030bea7055268d422bec7fafe3b2670ad7b27f050bb0e2399dbad60713e0e7b052 SHA512 cf80933178cc0d355cd6e4e933bfd5d298c279d6e70fd365260364c9cd7c9ba8828b609be37670ee6919a1ff1aefed974c4e3b976272b8d1736743c6a4716b80
 EBUILD pahole-9999.ebuild 911 BLAKE2B ec5df7cbea0a1b49be0d7db79019631ed578b2a9373114d17aa3467b87f31881af3e9ec7f06045e64a2450b8195425b6e0be95154f438d6f29e26e9ed530da12 SHA512 dfbf8229bf0f96528a870b6aec5f839d7d918bf3d23f3650f94c2d77d09f0fce8fdbc7f574cdf19d5d4e2b4e90a2b67500b29fce1505e251be11504054b2d032
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.23.ebuild b/dev-util/pahole/pahole-1.23.ebuild
index 98e359f7bc29..d04b78096186 100644
--- a/dev-util/pahole/pahole-1.23.ebuild
+++ b/dev-util/pahole/pahole-1.23.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 4c9b658b549d..35b8c02141ce 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,8 +1,10 @@
 AUX perf-5.15-clang.patch 8700 BLAKE2B cfe9ab41fc2ac49d2d7cbdfe2a4b009dc1c0dad93fb1a54e5ed541208afccb2f55ae420db6321ac360c5b2f6351b04f458fff21abd581d4da5e3296608c3b3da SHA512 49a88809100bdd63241064a8b19e866ba2d91dc78dd279c979982cbb96e91061f6a93ded1a596364f1d7b3410ed10811ae21c23b046370654c3f32c9d0d468cc
-DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
+AUX perf-5.17.1-clang.patch 2350 BLAKE2B 5010e3f90feafdd340b49000f2140857e8511a771acafa017224242f1a7361abd9a60a698923288dc13d53d8346985e40a069469dc1ca346b5b7ae058622322d SHA512 03086f968bdd31a9545a45c92d461f1ad9bc62d0fbd6de8b726925f422e436ab71002cafeadb7540bba0be553b426fe5e5b69e895f974497c6777354987ad375
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
+DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-EBUILD perf-5.12-r1.ebuild 7445 BLAKE2B 5b9b2f1ba4ae9a04dcc62598f52874cae7a2808cdaffa0e7985d9f22caf8c1a7a3ccce75f193e79b607ec8c7740bf2ef30b3a9120ed604905106dac56fc8c1ee SHA512 ac9ac27d9de771928a43bdd199a90e6467548f2cccf6e3caa31e13cd2e8de21b5087bc048506edc4e5b0159810902f35413d2c5c5e3089df04b6b382d57f7cda
-EBUILD perf-5.15-r1.ebuild 7384 BLAKE2B 6dbab0d37c3e9058a8382b54d13a54e5c393fe9caae8d9b86e9d1af2e816442b4334ab53a31fca8b0e5df9baaf01766f19bc3f65f70f9dc2d492db4986a18f4c SHA512 33262ef0d7849178cd7e0c017d1ae724f16c2b4600cb52bd2e49f10e771fe15d28dd9a414aeed782cc8b590267ee72b4ef62121ff18e9399d3aad9cfba4e8693
+DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
+EBUILD perf-5.15-r1.ebuild 7377 BLAKE2B bf92d4eb770c0914cf62a241d3f1d77c6c501650924a4c40badd7e132e94b88174453aeeda60ff2b9f11dafb3ea3c00342bced52075182ecaf240e4271a1cb4d SHA512 de08779d40cf32ba70654e88a7e06b829fe462247e6f0c7c8d9c626b997beb2366c048434e22955dfedb11637f791538f09a5d5f38b00b7fe9e807f1a6382599
+EBUILD perf-5.17.1.ebuild 7333 BLAKE2B d875f3553e4b54b4af9a5f56a0edd3ff7932763415447bcd08c0fa96f51309e93c7fd2ad725f68a3850acb9cd3cbeb9470ec4634bedaed3e228af5dc20c04a78 SHA512 d0ff31084203c1c1ee9b1ffe8d950f3a0b6d8682413f5537c289e657eed5545b23838a2dc96e4dc59558093f9e443b3b88c18e44a318ceddbfefcf4ecd09e07f
 EBUILD perf-5.8.ebuild 6757 BLAKE2B 490ff9045ea6dae5b14aca9e91d322d0e6d7879f2efd4bf9a4f2e919569b752e9933ba8be586f7615e81a04be28ffb5a5ca832a7491df13cfa6e67ddaf8ad86a SHA512 da92c2600d4033fedefad6e1f73a56261f2bb3b38b3a0c0fb195347d20509b8f3797386a75f52faab5981622e85db9e38cae805fcb8a86a1d2ce6916e95f5b76
 MISC metadata.xml 1732 BLAKE2B e14f57991fca666b493d129c62f779b9889e6afbd56e32dbbdcdef223b3a5c9060028613c1e6f69dfa03b35fa34570150d03f823479dff3bb9dacaebad7fc1d4 SHA512 cdd9adc6c226b902520f5f55f93217319733295b2696d73be45652e478a7c0354b24b676eb5b3b00824df1c09b80a6658282df0104101668ef4ee7b24190b24f
diff --git a/dev-util/perf/files/perf-5.17.1-clang.patch b/dev-util/perf/files/perf-5.17.1-clang.patch
new file mode 100644
index 000000000000..73d4506146c0
--- /dev/null
+++ b/dev-util/perf/files/perf-5.17.1-clang.patch
@@ -0,0 +1,61 @@
+
+Fix building against LLVM/Clang with monolithic libraries and
+adjust header includes for Clang >= 14.
+
+--- a/tools/build/feature/Makefile
++++ b/tools/build/feature/Makefile
+@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin:
+ 	$(BUILDXX) -std=gnu++14 				\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+-		$(shell $(LLVM_CONFIG) --libs Core BPF)		\
++		$(shell $(LLVM_CONFIG) --libs)			\
+ 		$(shell $(LLVM_CONFIG) --system-libs)		\
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+@@ -312,10 +312,7 @@ $(OUTPUT)test-clang.bin:
+ 	$(BUILDXX) -std=gnu++14					\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+-		-Wl,--start-group -lclangBasic -lclangDriver	\
+-		  -lclangFrontend -lclangEdit -lclangLex	\
+-		  -lclangAST -Wl,--end-group 			\
+-		$(shell $(LLVM_CONFIG) --libs Core option)	\
++		-lclang-cpp $(shell $(LLVM_CONFIG) --libs)	\
+ 		$(shell $(LLVM_CONFIG) --system-libs)		\
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+--- a/tools/perf/Makefile.perf
++++ b/tools/perf/Makefile.perf
+@@ -417,14 +417,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
+ LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
+ 
+ ifeq ($(USE_CLANG), 1)
+-  CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
+-  CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
+-  LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
+-  LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
++  LIBS += -lclang-cpp
+ endif
+ 
+ ifeq ($(USE_LLVM), 1)
+-  LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs)
++  LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs)
+   LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM)
+ endif
+ 
+--- a/tools/perf/util/c++/clang.cpp
++++ b/tools/perf/util/c++/clang.cpp
+@@ -20,7 +20,11 @@
+ #include "llvm/Option/Option.h"
+ #include "llvm/Support/FileSystem.h"
+ #include "llvm/Support/ManagedStatic.h"
++#if CLANG_VERSION_MAJOR >= 14
++#include "llvm/MC/TargetRegistry.h"
++#else
+ #include "llvm/Support/TargetRegistry.h"
++#endif
+ #include "llvm/Support/TargetSelect.h"
+ #include "llvm/Target/TargetMachine.h"
+ #include "llvm/Target/TargetOptions.h"
+
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index d3d3cab43544..e84ed5803f1a 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
diff --git a/dev-util/perf/perf-5.12-r1.ebuild b/dev-util/perf/perf-5.17.1.ebuild
index 3d3079203e9d..a2e565d93fcb 100644
--- a/dev-util/perf/perf-5.12-r1.ebuild
+++ b/dev-util/perf/perf-5.17.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
@@ -54,8 +54,8 @@ RDEPEND="audit? ( sys-process/audit )
 	babeltrace? ( dev-util/babeltrace )
 	crypt? ( virtual/libcrypt:= )
 	clang? (
-		<sys-devel/clang-10:*
-		<sys-devel/llvm-10:*
+		sys-devel/clang:=
+		sys-devel/llvm:=
 	)
 	gtk? ( x11-libs/gtk+:2 )
 	java? ( virtual/jre:* )
@@ -83,8 +83,8 @@ S="${S_K}/tools/perf"
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
 QA_FLAGS_IGNORED=(
-	usr/bin/perf-read-vdso32 # not linked with anything except for libc
-	usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
+	'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+	'usr/libexec/perf-core/dlfilters/.*' # plugins
 )
 
 pkg_pretend() {
@@ -96,7 +96,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+	use clang && llvm_pkg_setup
 	# We enable python unconditionally as libbpf always generates
 	# API headers using python script
 	python_setup
@@ -141,6 +141,10 @@ src_prepare() {
 		popd || die
 	fi
 
+	pushd "${S_K}" >/dev/null || die
+	eapply "${FILESDIR}"/${P}-clang.patch
+	popd || die
+
 	# Drop some upstream too-developer-oriented flags and fix the
 	# Makefile in general
 	sed -i \
@@ -156,11 +160,6 @@ src_prepare() {
 
 	# The code likes to compile local assembly files which lack ELF markings.
 	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-
-	# Fix shebang to use python from prefix
-	if [[ -n "${EPREFIX}" ]]; then
-		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
-	fi
 }
 
 puse() { usex $1 "" no; }
@@ -222,9 +221,7 @@ perf_make() {
 src_compile() {
 	# test-clang.bin not build with g++
 	if use clang; then
-		pushd "${S_K}/tools/build/feature/" || die
-		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
-		popd
+		make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
 	fi
 	perf_make -f Makefile.perf
 	use doc && perf_make -C Documentation man
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 93da5259b9a2..2ed6ed694cb2 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
 EBUILD pkgconf-1.7.4-r1.ebuild 1519 BLAKE2B bb7ef98d18c414eaf498484e9d2281ab2171db86b4aebb0be79126b5090ca4fe24faaf8f081f7fb48671f0c0c20fc4a6af7c0941ae077ee515956d68ad1aa16c SHA512 f8e615a911386599c0365fc5719e5021d45a6ecfbc1ad8b5bdb4c7a573de95c381da195d24e7157b1625cbc83b2d597c95e573ee4fddf8a87c1d4a5305804b03
-EBUILD pkgconf-1.8.0-r1.ebuild 1577 BLAKE2B 6e558bfcae2a0d06f6505316acb24d96e7972fe340ff185bddf6c0e9b5d3b0632be3e00909d1d570feb5980cf5d174a987958bbbed8dc048e1c938b4e3c0735b SHA512 d7610d53af1edd12ed714b9c9d02fcf988086014c62688b5d3cda5385482cf806b7f0ccfc69508b2923e9861539f133dff0f9dfc8a4a4207fe5ac79e12632a40
+EBUILD pkgconf-1.8.0-r1.ebuild 1590 BLAKE2B b89f4321a742fdd04d3bb3349703cd50e2376862be9f98e92404393c1d6dc11f082b028a382484c11ebcd0e7211aba759ea3ce2368b91f88def0743d7eba77a2 SHA512 ddeb3d4495aef2aff20ebcd8dd69cbecf52d0209aec37bb3ab20bee786cac17723fb1e3f9677fc66ecfeaa9231d895905e1720547657ed4cc566efb4ba68cae1
 EBUILD pkgconf-9999.ebuild 1531 BLAKE2B 02e5c632a81cc0673903e44c7d708d75a002ba9e6d058626c7686a46b42496194c9e01fd7c8b2ecf228839e6be52f0fbb4bbc9bb09d35c48ec35535fa3719346 SHA512 b2499096796c0645d346e7e0d722c1b38f797b3bf6ce361f8cd76ac1ce59e4f38489c5dc8aa428a862dd4babc176723eeb6fb17f65779a638ce77d96af765844
 MISC metadata.xml 594 BLAKE2B 41e097bde16856411e4423d63898129e9d11059f77a89f8ffa5dc196fbe9c97cd8a27cac567c511eeca7eef57436826148713557ad0c5359e875b53700e88b27 SHA512 59efd28cc254a9213af4b1fd9e3b55e19353027f585edd0014e38c304cec4639132d7bd98769e329fb4a7fbe243e91ba088d2ea36aa53320d25d87e1952d255d
diff --git a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
index 2e9d453a0aea..cf76028b9ad0 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2021 Gentoo Authors
+# Copyright 2012-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index c2acbd2599ed..d1a96c6c48e5 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,6 @@
 DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
+DIST pkgdev-0.2.0.tar.gz 59836 BLAKE2B 89de7179b1365f7f4bf1359720200bc8dba53e3b3133fead12b224db8d9a6cf7accbed3c5ed89760030efd3a992d46cf525756a522ac4d9128376e4c03b2a5e9 SHA512 6bf17e8188c809e8862c1a39ce4c0c2e60ed0a261f00bf93707257df0395b03120838247bdc7f5a3375111797564a5a6b16bb8f7e571ce957efe92e173a6ed11
 EBUILD pkgdev-0.1.9.ebuild 1588 BLAKE2B 85333c27c4d55c4e226dcfee8402614336e15964b0e9c72a0707fba1ec147dddd1bea9097d729f1e445da6aca6161778a1ecf193149d8fdd341823f9b710cbc4 SHA512 89b7752b01592d67c7ee4d49fd14de38a436fe4ef05dedd6aacfa7aec830b9a48a841aacd0d9148516f0b47c4b4d776f17fba7d61da6f245a8b2f66af1467f0b
+EBUILD pkgdev-0.2.0.ebuild 1595 BLAKE2B d5cf70f42f56cdca89c88952b8c21937fc0b59dc931b77513c88770f0a5a2d5460c99b913e2bf00edb3c720afddb73601a31dbdbd6af0eb0f4fa1f891a092511 SHA512 b6a5a45a6c8642fcbfcaf884c0a20817d7a7e36f208ec3b0730d21e3be237e13625a1c430c02ae37870d3bfe686ca73408d23e0cc05a937748078f98bc4e710e
 EBUILD pkgdev-9999.ebuild 1574 BLAKE2B dab1ff6de45f7b63c8907ec5f64e36ef67d0f5e3d9560917f7ffda2ec9051a46ec1e425c1eaf6b1ab6e0e771b2562902adb6ab0260026746773441a4591c36c1 SHA512 e055493097823f7a837db0b33524c1cdc93ae9a755f0755c7ffadce3740c76a6e95882570bd53a75c8fb64bd68404a32f0e718e81fdf21b0c98b3db4fc7f7448
-MISC metadata.xml 427 BLAKE2B cfc5af84db1d37fb76a89d107ff022c011ff6aa65d6a0b98cd36b5c0134a0f1ba05ef63866425834393bca03e3a02bc3dea5a0429e83558ce726c3f199e569bd SHA512 eeb4debf1083db5d37ff042a448b7220d5384101b477cc3afdf471195cd17fc3bc76c7a1cd6540609c96a9cd56d48221cef72342e643113b4060f168040501b5
+MISC metadata.xml 538 BLAKE2B 856860c07254a3a7d051773121d85d1e227e69dc70373a1adcef4ebe08b48e48ab5f225f528fad5cb5d82c96b9a93a9bc88c5d00248598d39954f7dabfa2972b SHA512 3ec400568986c34edd550d3f55c76fa046e43b83a95c4c302c04b9707319db42424fb4bf6a06cf6c431decada9434feb80e0c6375a2e217a56e9da4f40e97ac3
diff --git a/dev-util/pkgdev/metadata.xml b/dev-util/pkgdev/metadata.xml
index 399bdc29cf92..fea86a0ce71e 100644
--- a/dev-util/pkgdev/metadata.xml
+++ b/dev-util/pkgdev/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
diff --git a/dev-util/pkgdev/pkgdev-0.2.0.ebuild b/dev-util/pkgdev/pkgdev-0.2.0.ebuild
new file mode 100644
index 000000000000..f69eaca7e6a0
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+	# We'll generate man pages ourselves
+	# Revisit when a release is made
+	# to pregenerate them, making USE=doc
+	# for generating the real HTML docs only.
+	if use doc ; then
+		cd doc || die
+		emake man
+		doman _build/man/*
+	fi
+
+	cd .. || die
+
+	# HTML pages only
+	sphinx_compile_all
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 6e7d86ef4d6c..bca04c8041a0 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,5 +1,7 @@
 DIST poke-1.3.tar.gz 6703563 BLAKE2B 7a1127d668b094f08d88fbbe1650a4604d91e4417e8bf7e1199757b6a829694d514493e1b71eb86fc56e894eec8f0ec2255784b76a3f3440af1f1671d851751f SHA512 74749c589daf17533807248febc54818445df193f4d25f665ab62f1c57be133c7f063da3b099b8af5544f88eecad79b10ca29d9d1ef18921035c0aa22e563773
 DIST poke-2.1.tar.gz 7365471 BLAKE2B 07f9e55fb5ee830e430ef7987cf65df9448dcb7d3ccec3da24b06c52a695e104f308c14fb9140008476e1ac4ebc6ea86011a6a5ab332af27df92d7c4d2165fd4 SHA512 073ba79c627d6b20811443146e9f3c5884a349eceabfd5b3648b95bf7bb2d4da749b628994240556e987cb02247d11e2fd7d54adb99d81e35d838dbddad67f9f
-EBUILD poke-1.3.ebuild 981 BLAKE2B f8832e1bf8533caa2636b076b0bf3ba9d42b2c3fdde0f411609c337b874afae0b8c367caecd23546c2f0c198dbb06e2ff1e239f7d8f6c08a3fad664241bc3847 SHA512 821b8837f1d07aa245c0a02acda9aa9dc4b098860049f5a315df0d7e78f3dddc4bdb9e134f03b42ce01321c17250cd662cdcb2fe3f1c9311efab4f12889f6921
-EBUILD poke-2.1.ebuild 891 BLAKE2B 3f9292092d07b96bcaf1accdf7b2aaa119312de5612bf4a84b47a08fcdc3bacbb8e4cbadd1b25514a964248ce49559628c43ac8a322f2ee0cf18ade6b5b45cf2 SHA512 7e2673670860d3f7222e822c1b8a4b23dc432725c37da79e9ffd9d03b862a1f271528a397bcedbaf299587205c539c5f192932276bd0f0965172d450094ae48e
+DIST poke-2.3.tar.gz 7369945 BLAKE2B fe9274099a9ddacf1f46b7cec1f98cc6c442b24f149efbf4320a74a270dc8bad7cf3f87df817c9968a13ece763573b36f0ec99699cb9c7742b7be9023a4fca39 SHA512 101ef0009676c02f72ffb4889a02c9a161f29f412685249c7166f69077b0cd1b19d940567ebb86894bacf2278a2e138354fd49456f12b05a4c1957f437ff1d86
+EBUILD poke-1.3.ebuild 982 BLAKE2B 1684fff197088dc0fc6a74dcffdb4ea032216e24c441e1404bfd4933986cf8bb3154b8b0177a3ec6d9fec2607994e7a4744ab8e9770633e9fed9c87521e6552b SHA512 58b7967d0c3ecd2112473d144a412aac2fe77c8ca630bdc8f7fcfb56e8a9d03ec2237f974b68eaaebda0c54db169cf389df3df60efeb3b9108d3e6fbb3c6ee24
+EBUILD poke-2.1.ebuild 892 BLAKE2B 3c8d0a55c7e3f73cd81cd4d31b3f1972ca7c7fa9be660054022499d9d9bacdb90d3cc3b9ee840c1e1d576bb581df08dcebdaf6247467f4000099ce12ee1c09fe SHA512 43aeb62167247388016d117bd594228c758729a4ecad0f7ad5df8ebba36f700f32be27281bde566d57896219b85471126e0809443c7284c09248c2101d13aa35
+EBUILD poke-2.3.ebuild 919 BLAKE2B d5edcf4aca522c508b2f3b3116983dda26824b50d9390e498e37c3d67f43e9f5f62391501c0dd9b77769ed649d2e177e243f32067948751a8168b7dcf93ddeec SHA512 8c7a9c529e2f32b51c7cb79e2748abbd805420254f8f398a8cc7b35136b2a5a71a44ac40e04f869e97e58286815b6037bdcc94e51184625ee7773e895e515a14
 MISC metadata.xml 290 BLAKE2B 07560f09c179b5ae7616989203f0f211b6dbd98f91d9ed22354b6b9dd7f7177faf0a392822f6e4b35e76842fff006fb5102782a5f9c37bd75bf5c8b151b96443 SHA512 282117250988d57f5a2f01c59ec3f9c1e2ccacb65049de1fee95598abb3de04dcd671e9697e5451dc998866a28e8c7fa8e691150a0a32a9d7f13972a138aa91d
diff --git a/dev-util/poke/poke-1.3.ebuild b/dev-util/poke/poke-1.3.ebuild
index 3683b23922d1..ba2205f5b177 100644
--- a/dev-util/poke/poke-1.3.ebuild
+++ b/dev-util/poke/poke-1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="extensible editor for structured binary data"
-HOMEPAGE="http://www.jemarch.net/poke"
+HOMEPAGE="https://www.jemarch.net/poke"
 
 SRC_URI="mirror://gnu/poke/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/poke/poke-2.1.ebuild b/dev-util/poke/poke-2.1.ebuild
index ed0110ced2d7..90960983c4d3 100644
--- a/dev-util/poke/poke-2.1.ebuild
+++ b/dev-util/poke/poke-2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="http://www.jemarch.net/poke"
+HOMEPAGE="https://www.jemarch.net/poke"
 SRC_URI="mirror://gnu/poke/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/dev-util/poke/poke-2.3.ebuild b/dev-util/poke/poke-2.3.ebuild
new file mode 100644
index 000000000000..239b69e1ccb0
--- /dev/null
+++ b/dev-util/poke/poke-2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Extensible editor for structured binary data"
+HOMEPAGE="https://www.jemarch.net/poke"
+SRC_URI="mirror://gnu/poke/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="machine-interface nls test"
+
+RESTRICT="!test? ( test )"
+
+# TODO: libnbd: not packaged in gentoo yet
+# TODO: gui: does not seem to do anything :)
+RDEPEND="
+	dev-libs/boehm-gc:=
+	dev-libs/libatomic_ops
+	sys-devel/gettext
+	sys-libs/readline:=
+	machine-interface? ( dev-libs/json-c:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )"
+BDEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-apps/help2man
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-gui \
+		--disable-libnbd \
+		$(use_enable machine-interface mi) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index deb9421ba631..36d7ca2c056f 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-professional-2021.1.2.tar.gz 580807899 BLAKE2B ba21f9ba000c34f3073b778b7314c727e5204de480afd34fd79e97aca2da673252324897d3f40bda998e8d6ad2645c173f9c0abfbaf745de2c58782faa18c29d SHA512 c76c3113c620084cb6a3a647998cde61b3a6b2e9ff05870469f3f980295d5853911521095e26fae365cd94d2f6843866ced39db5e510bef3495931c60094f49c
 DIST pycharm-professional-2021.3.2.tar.gz 641411471 BLAKE2B 783ec78e87663b464f8aee41ef561e2bb4d44b2b5eb87cf320f32d5edcb36a36da294639f76ef13588aaac45a9ffe4db0fe91032a1fbdf62581990ad7df3f672 SHA512 abb59cfa74afa1fc7bc0590cfb6fe8afa3bf3adbc25a4eccc2f80974f43f47300f3587edba269f3044cd84e9ccff346e9a78c6ce43e6159945b3740afb9685c1
 DIST pycharm-professional-2021.3.3.tar.gz 640922827 BLAKE2B c1b622b7e633b4855c3b5bf7d5ebe470b383238c7a91bbdac6b80c5fa297710542ae409043b999f97c79ce99c4d30b5be88e95eca9e642c8a3bd8235dd26c7cf SHA512 6d2ea59716129b30fca15900b8af4a5845d183042febfd33d1553443367dae2d9e80a5386d621ba6128ee67f7c2bc70c2b1da785eb287d4aa7091da75f23b3a1
-EBUILD pycharm-professional-2021.1.2-r1.ebuild 3268 BLAKE2B 6faa46fe37be0396878a12d2fdc26ac332d6dbf75ba108b0aa81880af6bc316003b89afba7b67bdbfcb9947454f68cff6fd305d1075d350259206460b6b8830d SHA512 8694257403d8db978feec69b73546c59bc90db1c618ab10eaa1df56223f8e0d9cc07f15f05851e8781150c9cf1735917a592da6053208f77482e47aa1c238882
-EBUILD pycharm-professional-2021.3.2.ebuild 3260 BLAKE2B 70b0a61bcec3e6b907a69ae02da1bae7ffc6b08f7b78174907afbd2272299943d22421f479b92375d6ea9001411c0338da65e69a1e854eb45821f43f20929e59 SHA512 65ca41e817a9b2dc892dcaf47c9f09f58b048701c38ecc32c2e76901923e9833bb01c06d791ab1474b7c7db999783cc641ea2ac933ad5fd58e5904a7f2bd404a
-EBUILD pycharm-professional-2021.3.3.ebuild 3260 BLAKE2B 70b0a61bcec3e6b907a69ae02da1bae7ffc6b08f7b78174907afbd2272299943d22421f479b92375d6ea9001411c0338da65e69a1e854eb45821f43f20929e59 SHA512 65ca41e817a9b2dc892dcaf47c9f09f58b048701c38ecc32c2e76901923e9833bb01c06d791ab1474b7c7db999783cc641ea2ac933ad5fd58e5904a7f2bd404a
+DIST pycharm-professional-2022.1.tar.gz 676891799 BLAKE2B fc115fd2fa8d8c73f48bf7369bccafcc1f80bed36d4fdb3225377631ac546b76452ac84d3b4230ff7b2278b93a7f13723e1b6429e902d6a240d21f36fbc1c9b3 SHA512 92afed366063dcba17e1ebc74da0900061055bc998180378a416cde6c6ded5a572869b793f1a8b74d5499ef2da2fb19ca3725e003de788c222193b45d045bf84
+EBUILD pycharm-professional-2021.1.2-r1.ebuild 3270 BLAKE2B 74891abea1516de972e5e9bb0391297e51e4a4678522a726d0d5df6efb6284dc031920bb2539b4419a1331c9a61d23240cfe4a66fcbdf3c2f74f856b34726207 SHA512 f1a8c8c7306835c7296ad952cca89b77e876d7ffb432d9e6c4f929b7b10a2a68e99d58243b1930624d472f3174ef830cf824a468966ba578e6748e564cb82489
+EBUILD pycharm-professional-2021.3.2.ebuild 3262 BLAKE2B 5aa2a1c6825ee0d06124ec95ceb8b42aeb180d07547b1a14d1f7b01e02569f42715afc369168c180bdf15f5b328ba97ff04e0cf757e51bdfdd1b274bca309410 SHA512 d4741a489607ef02507971cada067fed69b096b2df3a9fc2f4a184c52ddec6c8b52c1cbd0131b3c9c7677772cf312c9638307ebe14da2c7fbe00a30c26581eb4
+EBUILD pycharm-professional-2021.3.3.ebuild 3262 BLAKE2B 5aa2a1c6825ee0d06124ec95ceb8b42aeb180d07547b1a14d1f7b01e02569f42715afc369168c180bdf15f5b328ba97ff04e0cf757e51bdfdd1b274bca309410 SHA512 d4741a489607ef02507971cada067fed69b096b2df3a9fc2f4a184c52ddec6c8b52c1cbd0131b3c9c7677772cf312c9638307ebe14da2c7fbe00a30c26581eb4
+EBUILD pycharm-professional-2022.1.ebuild 3337 BLAKE2B bdee169ed2ff79e8bdbe5cd87a3b2eac39ff9c007a9c7dff6bcce640eec3749da84f33175bd8705f0c3f1cbae4e5fa2e2ba9c5ea7d5cf4d8a70bf57a1da92c8b SHA512 d94b9b75695d1b84606dc48789738a968fa11a603ca4d1201d9ce9a353ee079ddfb48b981be49542d715e72eb4aed93df2bfe45bb123571db4c9734c0f4b8921
 MISC metadata.xml 229 BLAKE2B 1b25fb59c17f81a5c4b6dce7e07acb9de3bc64fef368805a0e1b45043dc13ab4898990b02b35d25ec3eb586aa67e236cc56519ed9a6bdb0d940f91b280e83141 SHA512 fcff4719a8e6c3cb446c48872c2278fa50ace7765d204b58d24f9ac0d47cb9fdaa7ed37080290ebc06d8dae864ccfdd8a48c9d9251a69862a6e5b58d5c26969b
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild
index e720741472c2..7f49ff573948 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.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
@@ -6,8 +6,8 @@ EAPI=7
 inherit desktop readme.gentoo-r1 wrapper xdg-utils
 
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild
index 6812ec1659ec..75ca0a7db25d 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild
@@ -7,8 +7,8 @@ inherit desktop readme.gentoo-r1 wrapper
 
 MY_PN=${PN/-professional/}
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild
index 6812ec1659ec..75ca0a7db25d 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild
@@ -7,8 +7,8 @@ inherit desktop readme.gentoo-r1 wrapper
 
 MY_PN=${PN/-professional/}
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2022.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2022.1.ebuild
new file mode 100644
index 000000000000..416add3a4327
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2022.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop readme.gentoo-r1 wrapper
+
+MY_PN=${PN/-professional/}
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="https://download.jetbrains.com/python/${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
+RESTRICT="mirror"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	dev-python/pip
+	media-fonts/dejavu
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/freetype
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/zlib
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/cairo
+	x11-libs/pango
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+"
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_prepare() {
+	default
+	local remove_me=(
+		help/ReferenceCardForMac.pdf
+		lib/pty4j-native/linux/aarch64
+		lib/pty4j-native/linux/arm
+		lib/pty4j-native/linux/mips64el
+		lib/pty4j-native/linux/ppc64le
+		lib/pty4j-native/linux/$(usex amd64 x86 x86_64)
+		plugins/remote-dev-server/selfcontained
+		plugins/performanceTesting/bin/libyjpagent.so
+		plugins/performanceTesting/bin/*.dll
+		plugins/performanceTesting/bin/libyjpagent.dylib
+		plugins/python/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+		plugins/python/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
+		plugins/wsl-fs-helper
+	)
+
+	rm -rv "${remove_me[@]}" || die
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo" \
+		bin/idea.properties || die
+
+	local file
+	for file in jbr/lib/{libjcef.so,jcef_helper}; do
+		if [[ -f ${file} ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+	local jre_dir="jbr"
+
+	insinto ${dir}
+	doins -r *
+
+	if ! use bundled-jdk; then
+		rm -r "${jre_dir}" || die
+	fi
+
+	fperms 755 ${dir}/bin/{format.sh,fsnotifier,inspect.sh,ltedit.sh,pycharm.sh,restart.py}
+
+	fperms 755 ${dir}/${jre_dir}/bin/{jaotc,java,javac,jcmd,jdb,jfr,jhsdb,jinfo,jjs,jmap,jps,jrunscript,jstack,jstat,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+	fperms 755 ${dir}/${jre_dir}/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+
+	make_wrapper ${PN} ${dir}/bin/pycharm.sh
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	insinto /usr/lib/sysctl.d
+	newins - 30-idea-inotify-watches.conf <<<"fs.inotify.max_user_watches = 524288"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 48c3ef4edd3a..3ed41ba1e371 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,4 +1,18 @@
+AUX rebar-3.18.0-bootstrap-vendored.patch 1292 BLAKE2B e91914c48e355e675be853282e5d9daf588dbf2c3ee57b71489d34336933a56b9638e5672d70f0d8649b2e55d90658b718e6a917bad74e6e6f0596819fc06e14 SHA512 487bc63e3951e06ffc4b55bed770f6ef82cd8465cacad21ef26c0642547e0663dc879d9b9f8021abf4242bfbf537a24d1e83f97def84511dbd50c88d0cb37480
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
+DIST bbmustache-1.12.2.tar 17920 BLAKE2B a91df2d85533de4ad2df661b19e5dea67e84b73fd0192ecac43b8c9163beeb4444872af605ad298b104725687f2a5a2107b0d142a4654213f7b817903c06aca2 SHA512 aecba4e354bdd5e09756cf9cd8c1e55af832f0e121c4c8000b71bc9a46485a4cdd86d13aae4f1838588be228745003a324956fdd440fb4c48b987cc58a9e238c
+DIST certifi-2.8.0.tar 153088 BLAKE2B 1718b805a2c340586c908059bd1e38cc5175f534136efcf6022ba970cd6f00100ef209953aa2718f2b25e76b895ddcf57c71690660f85ea519eb353d24ec612d SHA512 1c484afdf7664eb92df90251bb451208c08e76179e5654a2b069388a72889aac75e941ef626eaeec7fe0a74fdbacf359aeab5330eebd43e333ad513998e46e76
+DIST cf-0.3.1.tar 10240 BLAKE2B 0a13aca11772ea8b7a9ed6a5908a013b82248a64ca633c616ed75b3ccc0e7d52199480e53519f96c1767ceef9c863da16840ad90d1d7c6235cb6ea3291d35b8d SHA512 232fa9cd175e54599c035b087a6d44c9afb4135a5509b7498ebce8becec333cd670d0e06a3bf9e30d54c7c609ad2aecd42fc40e667cf95e68b7dc228e1fd85d8
+DIST cth_readable-1.5.1.tar 19968 BLAKE2B ecaab32aec9e327a2e39ab7312bbaf07c5ab4a88916ed6d84e064897d49f148486b9d95a761d9243cbb8b3cc0a779c9075f1eba179db0ec5e22502176e8c10e5 SHA512 8abd3f7255634e29584559e0d4b811e2af3ed047a10f32a7e2b899abd02f0ab3cef117d3ef6c9db38d34fed6285a1f47356b647350c9b636f011445d3914da7f
+DIST erlware_commons-1.5.0.tar 53760 BLAKE2B 042b321c2d0e5ae82801ab982a989618b2cacf4aef921162d6185e4bf4790346765fae265ab9ad337b58ccd0a928199b8b95823528fdd7cb8c440288efb7dc88 SHA512 215072e79da4edf51ac6889721c0d4cefbee60fd5e2a803b39acdd2735b5e91f2df690b94f14a9814f63a4cd3e4762e8d7f87f6debb3e659e542a6dda5159739
+DIST eunit_formatters-0.5.0.tar 14848 BLAKE2B 6f672235d3cfb7d5f8a6d4e870916b931ef7de2d52901a2b66c6bdb4da86db4e220981cc3a104e15e04405b1c8a232c3d5aa0462107debf83c6832bede1f03e7 SHA512 e8692ff35f979dfaf99ccac58014429d300a71ff76f2ce945814a0d4d9431821f04f988dc0271271858a37e6903a73b4dd9ae3abf215333f3135fa883ec07022
+DIST getopt-1.0.1.tar 19456 BLAKE2B 9b9deb22ddb10170603d4743190f80f7152b70b1eafc3e3511f2520599fbc8054c7aa021eec4aade28ae8e8bbfe6c9aa5a9df249173270344db15d364860a07b SHA512 859642dc26c42414474fa8af8a32fed827b0773ac6d6eb51ec19c291672408e71619ad2bb0c7f08d84ff591b33a655a7e0b6241b94372e9cc816a648ee6cdaf6
+DIST meck-0.8.13.tar 34304 BLAKE2B f2bb100bdea75079351610edd572ea7ced1503c02f86ed3378ec00e023ee63b729e859dfb3aefd521eb50541d4fc3ce70f1425beae8dd32d2dd2adb68618cc57 SHA512 adcfd3fdf69d4926dc1d9c2f0b477c8977bddba8b8ffdbfedcf1b5dc3c1af47b39b1c6263c922a43efede90f145f009d71b27178597320522960c5ebbd84a15a
+DIST providers-1.9.0.tar 14848 BLAKE2B a50e97faee63bb62335005e61e63de0a1b9ebf467f61e316fd0002485fbc6a102689bd0881878db95972a367ac2ee56c603bfcdd0b8e5efc6dfeee7e177fea8d SHA512 7227855164124425b89996b0295a786e36bbc2fadee9949d0b3d9ad518b3be9204650e5fa9e027e72cc4c2d2e8b968bddfc2015ceaf4cc00d865a35132defe76
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
+DIST rebar-3.18.0.tar.gz 436403 BLAKE2B 827fcb8a3fb9f3b93a19260696546697f766ea83a498cf79943568dd811c2afcd05a1c666b6813116428d0c1e6f522617244b69fe19cebda2701efdc3ec68763 SHA512 4fcaa1867fba7462df0b9a64fa442f4a887e83530635fdcd19f4b5dcee14ace3e7403c27f35e5e6055fb6bf89c98a91a3ff1e2036ab6e67e3de028f91233e4ed
+DIST relx-4.6.0.tar 75776 BLAKE2B 1e9b6043781ee2835f2cd7ff37755456de63e34702fa1e2d8c5326bc58f953700f1a5acf4b1bf073b4d30ff2587d4fdc505a0c1dc0848675ed98a10b9277df1a SHA512 a0ae0447815e78b7f296b721be1430897305bb21b8b183191ed1bb0cc33ee1060f5b1ee2452d86ff7a782f29450896e8b01e90f00847c7e4bad62f3c5a786678
+DIST ssl_verify_fun-1.1.6.tar 14848 BLAKE2B 31f8a92881803b1b93e2f65cf070449cd53af21b50f6aae7a9d036e28c17b2c093b2cb6238279191663ba011aab7fd604af8366ed8ae91b7b1d7c333f9de9ea8 SHA512 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
-MISC metadata.xml 249 BLAKE2B ee8ba34c48d139bed72da360fbdd5ef69ad16b1e80f24d58748761e6c05400daebb68b319b98c1b39b4072302d1b1c16d2a24f0373c00c34bea87ea7054736a2 SHA512 052f268b8ccf03630f422a42718ad3d920e9f659c48e8e485bf3e204a02c0329be029886377c25c600ff43631eb2e0ec3320653f6208ce994e5b0bbff660728d
+EBUILD rebar-3.18.0.ebuild 2462 BLAKE2B e5df0b420999f45da8b983b8cf9d968db63ae4593c99c9b28dc7b8846f9edb5806021909b50eaf4467c49862e446486b71614b47e6039e06bf4efb8f8d68e241 SHA512 385d79a2509a83c17a5ae6cb42a4bb49504cbaabd424bb28dcae558988ddd0f02b729acd6918970c21f5c95cc804252477856ff2e2ffb53e29d9bd3954a47991
+MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch b/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch
new file mode 100644
index 000000000000..633a74e174d4
--- /dev/null
+++ b/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch
@@ -0,0 +1,36 @@
+From 4c4b0d39dba07911a707f8b8f17711900d2ee786 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Viktor=20S=C3=B6derqvist?= <viktor.soderqvist@est.tech>
+Date: Fri, 5 Nov 2021 09:46:29 +0100
+Subject: [PATCH] Make bootstrap use _checkouts
+
+This makes it possible to run the bootstrap offline by placing the deps
+in the using the already documented _checkouts directory in advance.
+---
+ bootstrap | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/bootstrap b/bootstrap
+index 9632b6c77..18cc46216 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -92,7 +92,19 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
+ 
+     compile(Name, ErlFirstFiles).
+ 
+-fetch({pkg, Name, Vsn}, App) ->
++fetch(Source, App) ->
++    Dir = filename:join([filename:absname("_checkouts"), App]),
++    case filelib:is_dir(Dir) of
++        false ->
++            fetch_from_hex(Source, App);
++        true ->
++            io:format("Using ~p from ~p~n", [App, Dir]),
++            Dest = filename:absname("_build/default/lib"),
++            ok = filelib:ensure_dir(filename:join([Dest, "dummy"])),
++            cp_r([Dir], Dest)
++    end.
++
++fetch_from_hex({pkg, Name, Vsn}, App) ->
+     Dir = filename:join([filename:absname("_build/default/lib/"), App]),
+     case filelib:is_dir(Dir) of
+         false ->
diff --git a/dev-util/rebar/metadata.xml b/dev-util/rebar/metadata.xml
index 79e93157a1b7..7204475d3cdb 100644
--- a/dev-util/rebar/metadata.xml
+++ b/dev-util/rebar/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>matthew@gentoo.org</email>
+    <name>Matthew Smith</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">rebar/rebar</remote-id>
+    <remote-id type="github">erlang/rebar3</remote-id>
   </upstream>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-util/rebar/rebar-3.18.0.ebuild b/dev-util/rebar/rebar-3.18.0.ebuild
new file mode 100644
index 000000000000..4f02c6cc4e21
--- /dev/null
+++ b/dev-util/rebar/rebar-3.18.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN}3
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://www.rebar3.org https://github.com/erlang/rebar3"
+SRC_URI="
+	https://github.com/erlang/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://repo.hex.pm/tarballs/bbmustache-1.12.2.tar
+	https://repo.hex.pm/tarballs/certifi-2.8.0.tar
+	https://repo.hex.pm/tarballs/cf-0.3.1.tar
+	https://repo.hex.pm/tarballs/cth_readable-1.5.1.tar
+	https://repo.hex.pm/tarballs/erlware_commons-1.5.0.tar
+	https://repo.hex.pm/tarballs/eunit_formatters-0.5.0.tar
+	https://repo.hex.pm/tarballs/getopt-1.0.1.tar
+	https://repo.hex.pm/tarballs/providers-1.9.0.tar
+	https://repo.hex.pm/tarballs/relx-4.6.0.tar
+	https://repo.hex.pm/tarballs/ssl_verify_fun-1.1.6.tar
+	test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
+"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="Apache-2.0 MIT BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/erlang
+	!dev-util/rebar-bin
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# The build directory (where dependencies are usually stored) gets
+	# cleared before each build.  Make the fetch function first look in
+	# a _checkouts directory before going out over the net.
+	"${FILESDIR}"/${PN}-3.18.0-bootstrap-vendored.patch
+)
+
+src_unpack() {
+	# Unpack the rebar sources like normal, but extract the hex.pm
+	# dependencies separately.  The outer tarball contains another
+	# tarball named contents.tar.gz that actually contains the code.
+
+	local archive
+	for archive in ${A}; do
+		case "${archive}" in
+			# Assume that the .tar files are our hex.pm dependencies.
+			*.tar)
+				local dest="${S}"/_checkouts/"${archive%-*}"
+
+				mkdir -p "${dest}" || die
+
+				# Extract the inner tarball
+				tar -O -xf "${DISTDIR}"/"${archive}" contents.tar.gz |
+					tar -xzf - -C "${dest}"
+
+				assert
+				;;
+			*)
+				unpack "${archive}"
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	./bootstrap || die
+}
+
+src_test() {
+	./rebar3 ct || die
+}
+
+src_install() {
+	dobashcomp priv/shell-completion/bash/${MY_PN}
+	dobin ${MY_PN}
+	dodoc rebar.config.sample
+	doman manpages/${MY_PN}.1
+
+	insinto /usr/share/fish/completion
+	newins priv/shell-completion/fish/${MY_PN}.fish ${MY_PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins priv/shell-completion/zsh/_${MY_PN}
+}
diff --git a/dev-util/ropper/Manifest b/dev-util/ropper/Manifest
index 7e29253ea8fb..5cd3b60b58e1 100644
--- a/dev-util/ropper/Manifest
+++ b/dev-util/ropper/Manifest
@@ -3,4 +3,4 @@ DIST ropper-1.13.7.tar.gz 1491228 BLAKE2B 24e3f4d2454cad2b4ba8f365a4da4060f0aadc
 EBUILD ropper-1.13.6.ebuild 1102 BLAKE2B e52ef8a6bc3a1aa70d72d0b5d1b172312cc943ac029ab53281afe52d72bc2c9666fccdaf06a4475b5811e2114cde8b8d8c800168e137e7757240c26b891f3132 SHA512 e8302bfe62bb3c97bc1260537b4c2561d2d18e21832e81cab4693a1870e614cb74a4bc9a81e3af2eb6010ddfd66690c95a9fd052b278e47c4825cbbb8a8daf04
 EBUILD ropper-1.13.7.ebuild 1102 BLAKE2B e52ef8a6bc3a1aa70d72d0b5d1b172312cc943ac029ab53281afe52d72bc2c9666fccdaf06a4475b5811e2114cde8b8d8c800168e137e7757240c26b891f3132 SHA512 e8302bfe62bb3c97bc1260537b4c2561d2d18e21832e81cab4693a1870e614cb74a4bc9a81e3af2eb6010ddfd66690c95a9fd052b278e47c4825cbbb8a8daf04
 EBUILD ropper-9999.ebuild 1102 BLAKE2B e52ef8a6bc3a1aa70d72d0b5d1b172312cc943ac029ab53281afe52d72bc2c9666fccdaf06a4475b5811e2114cde8b8d8c800168e137e7757240c26b891f3132 SHA512 e8302bfe62bb3c97bc1260537b4c2561d2d18e21832e81cab4693a1870e614cb74a4bc9a81e3af2eb6010ddfd66690c95a9fd052b278e47c4825cbbb8a8daf04
-MISC metadata.xml 742 BLAKE2B b5f76f0022f4e73f749cc26c4302d940b598d96352a9bd5ff783d5c7bbbe937f13c16d5d0fbbd794e63d19b7299cefd7321dc13277b5ee615666f4d074ae28bc SHA512 ddb1ea4d6594260ddc0b8865b3d667f1a484c8014c98b13b89c47609e141ca327c8bf2679c95dc6c5634a3e7dbe65a0260b4efb7ea32950d3bef2cbbdd6b4de9
+MISC metadata.xml 786 BLAKE2B 1080932503cd360d0ecac2d9f135bb4e52c5590944adf0f491eac763fef40e4d95361fc81a9144469d86d1c75f6448623662f179030ec7b01634e0edb8202a8e SHA512 4dbd1c561976731b60ad27d9c71128151b2063e4a9c28291e4e53aedfe829110f1bdbc89b0a3ffabc95236dbe30830489f034280c3c0e9bf90a572960654cba3
diff --git a/dev-util/ropper/metadata.xml b/dev-util/ropper/metadata.xml
index a1652b1a8756..5c40d8c11dc6 100644
--- a/dev-util/ropper/metadata.xml
+++ b/dev-util/ropper/metadata.xml
@@ -19,5 +19,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">sashs/Ropper</remote-id>
+		<remote-id type="pypi">ropper</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index ad13eaca0e74..6652f10f0254 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,3 +1,3 @@
-DIST uglifyjs-3.15.3.tar.gz 511292 BLAKE2B 405112e7898c743cddf036527e9add28cd570f53a43959b514711683efca7e26bfb34fccadb7d63dcb540ed7a4a6b9aa7f3fa28faa66623b2b7c290758feb47a SHA512 c36b41dfe2bc323c189926f4caff67980be13ad14286b109e7f3a326a5e2b4fe4c7e864d2fcee91d1c0a9799ab7941f2c9d17b6c04d4b399b4ddb1f69c32f2fa
-EBUILD uglifyjs-3.15.3.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
+DIST uglifyjs-3.15.4.tar.gz 512680 BLAKE2B 428d18b412a7b30fb9fd0491e0bca1f8ad0d176726885bba9afe155622860abfd2d723d11c03b2381cb500074f3c1041f7ae4d35c3f1f3b8e3713c39ee3d5069 SHA512 203d06eeda62ce0810c0188640b88ae08e567610bb0573f962341c4cd4b39ca63ce0d0fcd1e4749384afbc6f64079db6bc101eab31af95caefc1088c2e0dca59
+EBUILD uglifyjs-3.15.4.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
 MISC metadata.xml 328 BLAKE2B 74d4d808f158dcb49e996da74b67d65fe12956d7486b91941b03f3bb237d7d13387ac629b9689ebce8bd0580b0ce24d359a788911134fef6f006546c5365f2d8 SHA512 3db3efc0f0f5f0f3c7d453d4edae27d0ddfc62aa7cb778684d58460cfd55187fdd90c06bfb2629fb0d84874ff378dbccbc7ef182a10e35fd4b85991c5777a213
diff --git a/dev-util/uglifyjs/uglifyjs-3.15.3.ebuild b/dev-util/uglifyjs/uglifyjs-3.15.4.ebuild
index 1a44c1a32320..1a44c1a32320 100644
--- a/dev-util/uglifyjs/uglifyjs-3.15.3.ebuild
+++ b/dev-util/uglifyjs/uglifyjs-3.15.4.ebuild
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 481994d3f807..127f601e0da0 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,7 +1,9 @@
 DIST umockdev-0.17.6.tar.xz 486668 BLAKE2B 973c195b8fccd1c080665b65ffd47f8fe110118de9c541d5dda383e51e4dbcc36f77eeda6af5c774f4570a7b839190130fe95559fb3148e9937dae19dace6331 SHA512 05a86e2a583972d02fb3cfa26b017d44600831b6ed1415769d7cc7344357f484d34228b1593de2cfbfcce302611c0c22f045ee9fbd7fea76d8ae0b4ccd28d6ef
 DIST umockdev-0.17.7.tar.xz 486964 BLAKE2B f3c4021198c8adea47383f3d0c111f921c35550ca9b70c0711e71799ba89a44031356a687b88cc80aa51b1bf4606cfcf48a1d24d16501b0ea08f805e4e30cf83 SHA512 6fc611787c9679f450ce7cdf7dccb93a5d7435470b0b5f5cb1803036cf3c8ce73521af9e7777bec68485834cddfddba0ed9379a0818bfb072bb643cf6419c17d
 DIST umockdev-0.17.8.tar.xz 487220 BLAKE2B 6a5cb31462ef5836f6a4329fe0e612dd6bb6f00ecc899cb3d1b093771727361bfbc952c7cf7acb7943b78989cacb1faa2d7a2ee62d9c752ed959ac7b1931333c SHA512 e5e6ba2934e1df9323a4e64ee1fc066ab4abeaf75ad0d7f1f6d387b06315f30877f48664e5992f4b138fe1b76d08860359599249d5b9de516777cf8bdb1b228f
+DIST umockdev-0.17.9.tar.xz 487592 BLAKE2B 9b96ab26d31d927de240fcbbc3139f86ca3108240cbcc4d330a7793472b8b716aa3a573a7ee6a899562411192a6cffed707118a4e648802c84089c211dd870c3 SHA512 f56cc9a1513d05747eda2d36cd7c632502d7f70ccc612e11bdcd1610c96a2be9cf8e883282d024406485c44fb3cedc80dc803a12216ed61f593030d12ece21c9
 EBUILD umockdev-0.17.6.ebuild 1136 BLAKE2B 7e0cd8feada039c7012bb371c21afcf09de79d13d6a66f44caa6254d51a5144d185e0973d97009462028761a615a5c3294966b4613e8d09f3cfd62dae64e3532 SHA512 393815b0d56229ada097d84c2ca78726b1679dfc6d9f295eee260cf783573269c860898ebcc4a9af51dada2a14471477beda9172265870ffe5e4ddbf16d76a1a
 EBUILD umockdev-0.17.7.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
 EBUILD umockdev-0.17.8.ebuild 1137 BLAKE2B b3f02d4752d54e1398b03df38ce2c786500d1f6c907b477d93cbfb9c8e08bd792f9fe8936002a3dd4198fa4db17f77d8dae03bfd378d32d30e67b6c1a1d9f0b1 SHA512 348bf94ed27295c28b7296c59b21dd33bfca009a33930e1fbb40150d5c83123d6919dc6fbd7593a93aaa72dcf3fb265ec2f50a3038bd10ad30868ce983f44cce
+EBUILD umockdev-0.17.9.ebuild 1137 BLAKE2B b3f02d4752d54e1398b03df38ce2c786500d1f6c907b477d93cbfb9c8e08bd792f9fe8936002a3dd4198fa4db17f77d8dae03bfd378d32d30e67b6c1a1d9f0b1 SHA512 348bf94ed27295c28b7296c59b21dd33bfca009a33930e1fbb40150d5c83123d6919dc6fbd7593a93aaa72dcf3fb265ec2f50a3038bd10ad30868ce983f44cce
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.9.ebuild b/dev-util/umockdev/umockdev-0.17.9.ebuild
new file mode 100644
index 000000000000..c1f80ba0b6d7
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.17.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap[${MULTILIB_USEDEP}]
+	virtual/libudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	)
+"
+BDEPEND="
+	$(vala_depend)
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+multilib_src_configure() {
+	export VALAC="$(type -P valac-$(vala_best_api_version))"
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --no-suite fails-valgrind
+}
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index ef75ba3832c7..c80c488140a9 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -83,9 +83,9 @@ DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd
 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 wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST watchman-2022.03.21.00.tar.gz 3782647 BLAKE2B 5a484d4900abf453fc5c6b2083367c5447131a832bb25e63d5edb98680d27ff3dc409a709a4335ccdd96133294e092e86fca889dfc6cc51f0eb6ca7b515ac09c SHA512 954a80e761f59e56b779355bb4fbc70b3e72ce95adaa2da9500927c4d3b0803eeb7f5e1f9ffa4e5ef164f99ee4afc23117a71af9067e823d01d71a585766522b
 DIST watchman-2022.03.28.00.tar.gz 3781468 BLAKE2B 5db1f60c7149af418037a0ce7a00656bc652ec90a4bae261dd48c0bc21d2424ad30e049fe1142b072b5a01ca1380a5cd495fafa74d5c10785e097685f8fb5b21 SHA512 3275e66fe522fc45b3f0c8c458d6d2f61ee314f04d6b12935100535bc060603cafe76c8b13c0b8d334c13b63320ff4b84dc8dfb0f5ce09efc28d94e5d7a5974d
 DIST watchman-2022.04.04.00.tar.gz 3781625 BLAKE2B bc91cf10f89407eaad6a5b4c79752a9b05c939fadfd9f831c09afb04eaaab0a529119db10f2d5ed8eb92c713d9329d67f0673f1a514b0d4b6e333311882e19fb SHA512 bd4ef4e423164b27f690b75c70d478778f4ca98d556169abfebf79abe5aa7675cc3f1c6cd8d447595f8bd8393338ded13b9b5f994eb52767fbb91d079f56c398
+DIST watchman-2022.04.11.00.tar.gz 3783345 BLAKE2B 0b4b4cadfb45e5a894428ab27fde3e7b70e3e3021d0cf76a15f7d072e0c86589d4b9f8c32d75e0c055a8dd30832360e669cc3d7f86061d214a3e18adc61a3781 SHA512 129eaded13ecaff0f4bfa2ffcd5fd27a1685a5f98e53d7b9dba837ad09054c9f8054992d92009580e20f80f367eb71276edab11bfbd4604ade353b08a29076d7
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 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
@@ -95,7 +95,7 @@ DIST windows_i686_gnu-0.32.0.crate 772251 BLAKE2B 60a6e4fe3783361fe773aa90aa2696
 DIST windows_i686_msvc-0.32.0.crate 733422 BLAKE2B fa1c9c2e5a879797212caff8cbaf17043d4019bb88070eeba39ea64fae46eb4d4c254527a74f21b5604a817859c5a5647b631e743d412e0c3a92bc523f778053 SHA512 3d8b8db6ce629f8a3598b00f4a11f8af81cd8da1b9ed5f14e0b200c0512539118a7206866e9c63bb73528877ce74b33e92bbcc88f036afefe07936298eaff932
 DIST windows_x86_64_gnu-0.32.0.crate 744209 BLAKE2B 76106af387f443f2a24a0cd15d53b59a9e66977df8a0a4074993b4efded7cf63f88d18ddd0bfae467bf37b47b4f9400bdcd3db9cec31bc8febaabef995f406d6 SHA512 35cf64bf981a16a011b2276dbbb65200834235075d369fe60ca06092e1c0631c114c402eb43db223ec885f0ab07a77aa9f1822d1db44c5e6747645c65a7ac182
 DIST windows_x86_64_msvc-0.32.0.crate 669835 BLAKE2B f8c9dc578d652c2abf0d689dfa9681da29f760bc45ecec83b7d994e7df7c04f91fbcebee464ebd94d5fe7eb0dea90ac7c04578b56264d89ca9d91213fd89b17f SHA512 4720246d2aed3c3b3c252cda7773096642e78891b1a9776c920da908b2d3741e9e341060424327f1c16e4cb47b6e22af1be229589a51b5a3a04d2a6447275332
-EBUILD watchman-2022.03.21.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
 EBUILD watchman-2022.03.28.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
 EBUILD watchman-2022.04.04.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
+EBUILD watchman-2022.04.11.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
 MISC metadata.xml 691 BLAKE2B 68506bb31b8d7524b07a12bd2a237ed985215701eb2a28bacfd63ba5f3d61713b0369523a369c5880392e2f4790da4f908538627f3c3d58fe7c78faf9ebc9a15 SHA512 71c073c60fd880455dee0af9193a4279975ba34558144cfe03baa50d2a7c2c5074631a53fb89504d852e9782478f0add9dcea361f36cefe8a42f8f94ae27831a
diff --git a/dev-util/watchman/watchman-2022.03.21.00.ebuild b/dev-util/watchman/watchman-2022.04.11.00.ebuild
index da684483d094..da684483d094 100644
--- a/dev-util/watchman/watchman-2022.03.21.00.ebuild
+++ b/dev-util/watchman/watchman-2022.04.11.00.ebuild
author	V3n3RiX <venerix@koprulu.sector>	2022-04-16 13:07:24 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-16 13:07:24 +0100
commit	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch)
tree	464c922e949c7e4d5d891fb2cdda5daee5612537 /dev-util
parent	e68d405c5d712af4387159df07e226217bdda049 (diff)