Merge updates from master

2026-07-17 19:13:13 -04:00 · 2022-06-14 18:48:10 +00:00
parent 8803884155 7d5efc7b83
commit f0477a9e45
63 changed files with 641 additions and 131 deletions
--- a/TODO.md
+++ b/TODO.md
@@ -38,10 +38,8 @@ Name | Buildsystem | Category | User | Need help | Dependency
 [graph-tool](https://graph-tool.skewed.de/) | autotools | visualization | Alessandro-Barbieri | ✖ | ✖
 [tides](https://sourceforge.net/projects/tidesodes/) | autotools | math | Alessandro-Barbieri | ✖ | ✔
 [Cakeml](https://cakeml.org/) | autotools | ML | Alessandro-Barbieri | ✔ | ✔
-[temanejo](https://www.hlrs.de/solutions-services/service-portfolio/programming/hpc-development-tools/temanejo) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔
 [geopm](https://geopm.github.io/) | autotools | power | Alessandro-Barbieri | ✖ | ✔
 [warewulf](https://warewulf.lbl.gov/) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔
-[scalasca](https://scalasca.org/) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔
 [jmodelica](https://github.com/jnorthrup/jmodelica) | autotools | science | Alessandro-Barbieri | ✔ | ✔
 [flux-core](https://github.com/flux-framework/flux-core) | autotools | cluster | Alessandro-Barbieri | ✔ | ✔
 [GPI-2](https://github.com/cc-hpc-itwm/GPI-2) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔
--- a/app-misc/aw-client/Manifest
+++ b/app-misc/aw-client/Manifest
@@ -0,0 +1 @@
+DIST aw-client-0.11.0.tar.gz 45734 BLAKE2B d377a261fd74d6b0722e55da6d5c3c6f11a18463fca085fcfaaba193fd4c047385b1bd133b95726aa857e090cbe65bfc97f8b2a4926a3f89e88e16e2527c8e78 SHA512 93baaeb4cc5792a0256d70563a7d779543e64f952daa02beaf69af1d00d7741ecc62109696a600c9698a8de89c62e933910a9fb80ca2f0928b122d33414635df
--- a/app-misc/aw-client/aw-client-0.11.0.ebuild
+++ b/app-misc/aw-client/aw-client-0.11.0.ebuild
@@ -12,15 +12,16 @@ DESCRIPTION="Client library for ActivityWatch"
 HOMEPAGE="https://activitywatch.net"
 LICENSE="MPL-2.0"

-inherit git-r3
-EGIT_REPO_URI="https://github.com/ActivityWatch/${PN}.git"
-EGI_COMMIT="f7a8dbb3f81be81224368970054fd33d2814c9d7"
+COMMIT="f7a8dbb3f81be81224368970054fd33d2814c9d7"
+SRC_URI="https://github.com/ActivityWatch/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

-KEYWORDS=""
+KEYWORDS="~amd64"
 SLOT="0"
 # Test tries to connect to aw-server
 RESTRICT="test"

+S="${WORKDIR}/${PN}-${COMMIT}"
+
 RDEPEND="
 	app-misc/aw-core[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
--- a/app-misc/aw-core/Manifest
+++ b/app-misc/aw-core/Manifest
@@ -0,0 +1 @@
+DIST aw-core-0.11.0.tar.gz 74757 BLAKE2B 192d5a101e9e01e8de65a5c2aa20a9636ff0476d294951f765b344889ff41ac2dbb0c8b5d2d1b884f96c963219541088b629794f1cf97c9b41c6bda29235c3ec SHA512 4d48d8debb12530c78ef09b1a12530bb10ab2caac4d2a7da1c642afffe26f08b9db60c21576b5d711fd10e47c9b905dbd3a2fb5f72998077e5f7393f9c6edde6
--- a/app-misc/aw-core/aw-core-0.11.0.ebuild
+++ b/app-misc/aw-core/aw-core-0.11.0.ebuild
@@ -12,14 +12,15 @@ DESCRIPTION="Core library for ActivityWatch"
 HOMEPAGE="https://activitywatch.net"
 LICENSE="MPL-2.0"

-inherit git-r3
-EGIT_REPO_URI="https://github.com/ActivityWatch/${PN}.git"
-EGI_COMMIT="8aaa35376a4f0b270a1927dff4b4d34caee7707b"
+COMMIT="8aaa35376a4f0b270a1927dff4b4d34caee7707b"
+SRC_URI="https://github.com/ActivityWatch/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

-KEYWORDS=""
+KEYWORDS="~amd64"
 SLOT="0"
 IUSE="test"

+S="${WORKDIR}/${PN}-${COMMIT}"
+
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
 	dev-python/deprecation[${PYTHON_USEDEP}]
--- a/app-shells/fzf-fish/Manifest
+++ b/app-shells/fzf-fish/Manifest
@@ -1,2 +1,2 @@
-DIST fzf-fish-8.2.tar.gz 6486432 BLAKE2B ea23434254cc4365acd8a22ff9b157efeae4d34c2911179944108732026c6f7f7cd1e679769d0eea2822bb876a172a263c691a7fc80d14ebf50b4d4c9328914d SHA512 851f111a280a165905e0461ee90825d47d782793a38ba15a9934e0b183ac8d641b3ceeef04c36a9b6b63a675b2355d3a0aa216da2d31b628f262d806867f5abc
 DIST fzf-fish-8.3.tar.gz 16448 BLAKE2B 913eb6ac2154905ee87356dfe26443ab2151221760e23587433736dc9b7f160a61f52b8e2c052fc2524cb079a87dd46563042c6759c937eaef6a4200d63d0c7d SHA512 eb79f4a458ca4daa4fdf56ff91f1609661a1f7f736709569ae1120addc4fb3f87134b2fbcedf760bab1e275e934bc40b975f9cedad15dac9a422ddd6c29b5b9b
+DIST fzf-fish-9.0.gh.tar.gz 16863 BLAKE2B 1ea0c289668c50235baaec643a018dca67d20ce7fa2bd2f1524e066fec62485507aec58caac3a652c48c572285a3f36b49dad943e51853afef0e2d97e55d4e25 SHA512 e6d4c7ea8307dd67defdf1c208a8b8662cae987585c980e2b26789cd82f4e1fe64941a43f92408710572f191e226386267490d102f80a4aa139af1619d04afd7
--- a/app-shells/fzf-fish/fzf-fish-9.0.ebuild
+++ b/app-shells/fzf-fish/fzf-fish-9.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DESCRIPTION="Augment your fish command line with fzf key bindings"
 HOMEPAGE="https://github.com/PatrickF1/fzf.fish"
-SRC_URI="https://github.com/PatrickF1/fzf.fish/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/PatrickF1/fzf.fish/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/${PN/-/.}-${PV}"

 LICENSE="MIT"
@@ -14,13 +14,13 @@ KEYWORDS="~amd64"
 IUSE="test"

 RDEPEND="
-	app-shells/fish
-	app-shells/fzf
-	sys-apps/bat
-	sys-apps/fd
+	>=app-shells/fish-3.2.0
+	>=app-shells/fzf-0.27.2
+	>=sys-apps/bat-0.16.0
+	>=sys-apps/fd-8.3.0
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
 		app-shells/clownfish
 		app-shells/fishtape
--- a/dev-R/processx/Manifest
+++ b/dev-R/processx/Manifest
@@ -1 +1 @@
-DIST processx_3.5.3.tar.gz 141998 BLAKE2B 0e4b79b9bd59342c3465754d6ac4e66359c71c3854e09e6926e6ae6d91e0396060e9e68204f19e7aef9de0eed70f9010af5c63892589d0914cc9e641296d0cb2 SHA512 65873967e3ff14be0bbff9bae94894784d05f5bb7f29f92f17b404d75e60e0e8fcd40bc78b97d5e3ebcae4749826714a24d04f9359bead4a73dfc7dd54ddb968
+DIST processx_3.6.0.tar.gz 148342 BLAKE2B ba3c6e8953674611357113a37ee68dd56a04415307d387d6f63e8a776052b1b33fe09bb9433c5b0895104720636e0fb0e25254d78298456457ea6ed78723e646 SHA512 2236937978a1c5f8a0f6e34ea2c40a83d48792fbc6d7c4ade1107c57f5969eeaadb1459bb4287a5dfe3f55974e1f139ea34451a10bbc45ae1eb68d49bd73bdb8
--- a/dev-R/processx/processx-3.6.0.ebuild
+++ b/dev-R/processx/processx-3.6.0.ebuild
@@ -6,6 +6,12 @@ EAPI=7
 inherit R-packages

 DESCRIPTION='Execute and Control System Processes'
+HOMEPAGE="
+	https://cran.r-project.org/package=processx
+	https://processx.r-lib.org/
+	https://github.com/r-lib/processx
+"
+
 KEYWORDS="~amd64"
 LICENSE='MIT'

--- a/sys-cluster/KVTree/KVTree-1.2.0.ebuild
+++ b/sys-cluster/KVTree/KVTree-1.2.0.ebuild
--- a/sys-cluster/KVTree/KVTree-1.3.0.ebuild
+++ b/sys-cluster/KVTree/KVTree-1.3.0.ebuild
--- a/sys-cluster/KVTree/Manifest
+++ b/sys-cluster/KVTree/Manifest
--- a/sys-cluster/KVTree/files/KVTree-1.2.0-no-static.patch
+++ b/sys-cluster/KVTree/files/KVTree-1.2.0-no-static.patch
--- a/sys-cluster/KVTree/files/KVTree-no-install-readme.patch
+++ b/sys-cluster/KVTree/files/KVTree-no-install-readme.patch
--- a/sys-cluster/KVTree/metadata.xml
+++ b/sys-cluster/KVTree/metadata.xml
--- a/sys-cluster/dyninst/Manifest
+++ b/sys-cluster/dyninst/Manifest
--- a/sys-cluster/dyninst/dyninst-11.0.1-r1.ebuild
+++ b/sys-cluster/dyninst/dyninst-11.0.1-r1.ebuild
--- a/sys-cluster/dyninst/dyninst-12.1.0.ebuild
+++ b/sys-cluster/dyninst/dyninst-12.1.0.ebuild
--- a/sys-cluster/dyninst/files/dyninst-11.0.1-remove-executable-flag-from-dyninst_heap-section.patch
+++ b/sys-cluster/dyninst/files/dyninst-11.0.1-remove-executable-flag-from-dyninst_heap-section.patch
--- a/sys-cluster/dyninst/metadata.xml
+++ b/sys-cluster/dyninst/metadata.xml
--- a/sys-cluster/shuffile/Manifest
+++ b/sys-cluster/shuffile/Manifest
--- a/sys-cluster/shuffile/files/no-static-0.0.4.patch
+++ b/sys-cluster/shuffile/files/no-static-0.0.4.patch
--- a/sys-cluster/shuffile/files/shuffile-0.1.0-no-static.patch
+++ b/sys-cluster/shuffile/files/shuffile-0.1.0-no-static.patch
--- a/sys-cluster/shuffile/metadata.xml
+++ b/sys-cluster/shuffile/metadata.xml
--- a/sys-cluster/shuffile/shuffile-0.1.0-r1.ebuild
+++ b/sys-cluster/shuffile/shuffile-0.1.0-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="test"

 RDEPEND="
-	>=sys-cluster/KVTree-1.0.2[mpi]
+	>=dev-libs/KVTree-1.0.2[mpi]
 	sys-libs/zlib
 	virtual/mpi
 "
--- a/sys-cluster/shuffile/shuffile-0.2.0.ebuild
+++ b/sys-cluster/shuffile/shuffile-0.2.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="test"

 RDEPEND="
-	>=sys-cluster/KVTree-1.0.2[mpi]
+	>=dev-libs/KVTree-1.0.2[mpi]
 	sys-libs/zlib
 	virtual/mpi
 "
--- a/dev-python/fastavro/Manifest
+++ b/dev-python/fastavro/Manifest
@@ -1,2 +1,2 @@
-DIST fastavro-1.4.11.tar.gz 733536 BLAKE2B 6a2ceea6d72f49c08ea655c4927967e492bbf70e34d4168b9a751b61778d1d488dbe3e80e7667ef8530142c61744f053c262cb89fbecd8e9ba947cc5d6e48cd9 SHA512 0376395bfb1cf53eaeca90cdefa99394bc0e3499858bd62a62acda841da5135c3d82ba7ff613c96a4b4f9f8058e2f933b1180b8bd34070c48c48473835212ea2
 DIST fastavro-1.4.12.tar.gz 760518 BLAKE2B 7422e6e664ff6ceface6b3d8d39e6437233b12d62f771d1516920e7e7c3a0c8d23ac2fc82ff2acdac5d21314c0f2978b97fce96bbe2fedb587001672e3984e10 SHA512 fe5de909081dfaa4fa8575355f03d533ebe628182bc9716529a7f6c668444a34e8975ae90bc4d588dac2271a0913a49ac6457db0d256c54637995e16cd98281d
+DIST fastavro-1.5.1.tar.gz 761574 BLAKE2B fd520edaf533120022cbe6f3cabe5919c952b43bd4d131bb2aacbaded6fbda4d60e8610c12850310c28ac0fc5696301f4ef725c8369057dff9c73b9b35653ada SHA512 6fa2169d4cc26c2176e61da159129e6456296d99bce2d973916d6a0f071feec7b930f985167d7e1e3e0939ec2a5ff387f67e221ff6f52523015af99d4823bf1e
--- a/dev-python/fastavro/fastavro-1.4.11.ebuild
+++ b/dev-python/fastavro/fastavro-1.4.11.ebuild
@@ -3,6 +3,7 @@

 EAPI=8

+DISTUTILS_USE_PEP517=setuptools
 # https://github.com/fastavro/fastavro/issues/558
 EPYTEST_DESELECT=(
 	tests/test_fastavro.py::test_cython_python
@@ -31,6 +32,7 @@ RDEPEND=""
 DEPEND="
 	${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
@@ -42,9 +44,4 @@ BDEPEND="
 	)
 "

-src_configure() {
-	export FASTAVRO_USE_CYTHON=1
-	default
-}
-
 distutils_enable_tests pytest
--- a/dev-python/sphinx-click/Manifest
+++ b/dev-python/sphinx-click/Manifest
@@ -1,2 +1 @@
-DIST sphinx-click-4.0.2.tar.gz 21218 BLAKE2B 6590e5604bd6c07249f9a7aeb5c43660e913e24d889dad046012e53dc682f981d80df0c6955c7a930c98986378731fb16037ed5e9cd50b45c4a4299d183eadb6 SHA512 f44a3ada5e2a73fed1d4b92d6868b6875cc3c1790b427c8db71e4c8e50e86eec8ef00a46762a34ff539f5061cc3e258494523ba25e9035beaa92c41560ab554a
-DIST sphinx-click-4.0.3.tar.gz 21251 BLAKE2B dc6c5fa888168661c067206b063517f12ccaa6dec634b8c0f3743cd19264223043b196a4d3b2417fe5c28b350838386905ccbe0478a7e7cad792d95cc63d6472 SHA512 e5d6f82c49cd50309026b9697ea41827a216cf27001d1a38a9fc3f7fa6d0dacbbb7793853b27304e2cb5b584bb4eed491476595d543bcce9ddfbd21832cacb16
+DIST sphinx-click-4.1.0.tar.gz 21146 BLAKE2B 0510bdcfa051e1272796ef049b4fe40e936526937b99bec5c20b714507d285a5524bd341f41042a74c1b6715fbda7a892e14aee08a397df61ff47f39b2ebc52a SHA512 a57efbcfe8ab4f82298917937b573480401a51ce81889eb37b56f6eac0b2d6123a94a877f5bc460c4998c55040072453a48400f9c94d902a7cab6cd622d13d62
--- a/dev-python/sphinx-click/sphinx-click-4.0.2.ebuild
+++ b/dev-python/sphinx-click/sphinx-click-4.0.2.ebuild
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx plugin to automatically document click-based applications"
-HOMEPAGE="
-	https://github.com/click-contrib/sphinx-click
-	https://pypi.org/project/sphinx-click/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-"
-BDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs --no-autodoc
--- a/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild
+++ b/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )

 inherit distutils-r1

--- a/dev-python/types-requests/Manifest
+++ b/dev-python/types-requests/Manifest
@@ -1,2 +1,2 @@
-DIST types-requests-2.27.27.tar.gz 11345 BLAKE2B 41239c8c64af3cae256f28b518f5ef89b1b3743730d382a3de5f0aa0b332358b3cee6e2acc3db0ecd2f52412ea4fbc0f648cbd1d856bf2d524a747c9d57fc8b8 SHA512 68bd04b7c7c0a712dbadb3f92f28547a95ddf3b03c372f4dff0f7ce45bfabe0f3f896cad65694adec13f6bbb20a5104eef98939ba0a5f8141812a5c16eda3347
 DIST types-requests-2.27.29.tar.gz 11366 BLAKE2B 4791fbcc95bbb16de6aa341afdf7b08d5f147628d3f2bc5b43c512e9df509a8fcdf95ac4f9c7f4f924aa5463040157730b33953a15144afd2d9b4adb7c16e48a SHA512 136acd5d1ae2334ecbe19c2dcac59d2c8d7c567bb5c4a0d15c279bcf61be1abebfb934743d5ad3c2792eaca6c6cc76756e9efa550448a831727de0846548f0a9
+DIST types-requests-2.27.30.tar.gz 11473 BLAKE2B 717e3c68b24a7123259f755ffcd427811fc8a45a1eb0c22708ac676f29b55af257c2a8bcdb21b35e019aa9efccd96c38ddc6b0dd1d8321456f8f0117efbdb6d0 SHA512 edebb63b1f5c64604de40462b2acd9cc86839f2e5affcfa0fab91afebf3b0050e4a713cdabb4d12a6f5203eee78637c33e173ba73b9f1b953d94633dc21354a0
--- a/dev-python/types-requests/types-requests-2.27.30.ebuild
+++ b/dev-python/types-requests/types-requests-2.27.30.ebuild
--- a/dev-util/rust-analyzer/Manifest
+++ b/dev-util/rust-analyzer/Manifest
@@ -5,6 +5,7 @@ DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585
 DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
 DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
 DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
+DIST anymap-1.0.0-beta.2.crate 13073 BLAKE2B dea93fe2d1ba0015cbb66bc59b8b53b9978c41aff8225100f73af9ff95dc43359f2f347a32d73455c11fbc3fe602dcddd366529743a95bc4ced3e98bc8af52ce SHA512 7f9286df59823b5d8488cb5f6ff29653b4239af5b9529f8a084a5d6a1178bd7c7a74ec1a189895f49c4a87eb2745ff1a6aa9ee6b718db78d6a1a6682c7d61c01
 DIST arbitrary-1.1.0.crate 26225 BLAKE2B 784334aaa16037fc72afc63ab64c9175f974231fda3514a86b8f90bc772cbdee9d85659f6700c3ac9c91bec531e2106b7fdb57cc2308092ad85b1843f115d935 SHA512 5807bfbec481516df8f5a9e829abd889b87ac70fcea7df21db868203bdbe6bf5b0a2f5ddf94907fbfb9b8d4be3af13f93fe14b1840342f89e875329c4cf7524b
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -13,6 +14,7 @@ DIST backtrace-0.3.65.crate 74129 BLAKE2B b10a78685e7e90ab7e02b769d5445ee24753fd
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST camino-1.0.7.crate 26602 BLAKE2B d0ab5d5da9036acfe8ee4f68c015c123773529b9c84f0dd365169f33ca7e23eafcb5353bb2f6db02fbced9c075a0dc356c96d02711af1c4a506ce4d1c9f2fe05 SHA512 0c22c9de3740d39d058de25b2c9b221928f11cf9340562412a15948ddfeaddcb6da38ed3f18321c322d2811847d7cb5cc1c78304f67e9702a2056e59da64bf33
 DIST camino-1.0.8.crate 29300 BLAKE2B d4395b29d0b449ac3d7fc55f6cd112bfe380883087af2a686ac264c1c6dd58ce809b7eebe4c4cac053faadb0adcbe76eb1916ff3fba9f6cb65c7e330abdaa807 SHA512 81b70ee09ea788e0093a86ede0733c8f487d22db05bf2c6e81914e19ece81378aafdad7b6cd12ae6d8dbc3c5ab65880fffaa58a02465e0772f4b79eef9f51973
+DIST camino-1.0.9.crate 29357 BLAKE2B 7d855e08bed677242235197765a9f1f82e2743a0c439fa7ce4febc3b4595a5f9f66b23469d6cd610f4caf4a7bd1dbb1db4a7b6211ce43f08b4fb85a131e69d6d SHA512 5aca5f7a0639c97f5d5898fbbff9fa7ace9603047596941c62c611abb125525cbe5a4672057f4bbaecd7e34d907191ec5800415fba6aa0e6de9f52faee6f5363
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
@@ -29,6 +31,7 @@ DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee
 DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST dashmap-5.2.0.crate 20221 BLAKE2B 50f410d93f21a6e55f273d4e8b7eb288861d8ae15e272467ef0d279c5acffa339196041ab16d211e9dc2d7f2dcfd716201b558c49ef06cbb16f85ea2d4b0718b SHA512 d1f9c2c46d5fc9e22dbf409848679f2b10d56262f4780f1ab073178120cb9e2cbafb811563133f3ed8bcc923e9e0ab5e6dbae49ff55b7a05b94c1db7b5ffda5f
+DIST dashmap-5.3.4.crate 22826 BLAKE2B 65932f6ff7a60ae1eb309b8e75f31c4ec8beba09ccd2345b0c133237e3504833efa66d9f811aee123681034360112686c04dd47766537ffe300c0dd8ab86263b SHA512 95310bc2b9e4ab46acc056ed0be8e75bb6e27e6bdb2bf2e0917482cdc86e64e5fb9159307016895f25282771fe3a367731d0e2c68c6aa5435154945cda52b6df
 DIST derive_arbitrary-1.1.0.crate 7438 BLAKE2B 0a190293a6b7bd9f8d757c19cdefb6d1018fd1cc035af3acdd8793ff4a5b3419e49036e5d223c01c4307c120f8c4b29d12a44876458564684c94fb51b93a2e6c SHA512 369708c86706399c30d39dbb4ac0d6074089e499d2446ce09de3c0085575a08afea78998e341720d64e29b48990ce11b7e08aceb8b5e4f978c5c82828f4788da
 DIST dissimilar-1.0.3.crate 28403 BLAKE2B 79f9f6b2cd754c1fc49959ad3fc081bec521669ce276c48dd5e6e2a29669f00e5398b391067a40f4bc08336408f95305e4b736485f7dbb2b882f1aa269bf761b SHA512 0c05cbee349bfa775ae37ec84642b204838599b4887f3eace9cfb34464cf747f43caeea9c741d342bf5d8b142269c2eb66d848556b6babe19e878a1e2afac529
 DIST dissimilar-1.0.4.crate 28793 BLAKE2B a841b6cebe9642139ad0caed18ab46c52f09291f3acdf8b19ef6e50a3b750745ca2c209f1f245dcd008a9ab257667cd5796b8749978487b59a473e14448c0ab0 SHA512 782f8b98ed734a37cec33722ab5add2a082f909a5e08c23b961e5049288e8304f68679fe33e4a7a87b2f4d45226c90978075253cc01f9d4f5ce9c379fadc9d54
@@ -37,9 +40,11 @@ DIST drop_bomb-0.1.5.crate 6859 BLAKE2B d115c842c3642e070cbf91c8155e09a10fd51f77
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST ena-0.14.0.crate 23052 BLAKE2B ac9a4141d831bd16cfd260a162572b43e9389b5cee4319cc22a23b550b25370cf49856c320fd4489633171a4fca91cf7091e974418ddbb1649fec8730c9cd2c9 SHA512 bcf842f8f5da8a7e9b8e51df50bdf3f00234534f1d59d96bb1e45b0ee4fa74847eb8b9b5ca615a66d84d23c629d7386f28294a5c64d22efdf2903bc89faab2d4
 DIST expect-test-1.2.2.crate 12293 BLAKE2B 7c90caf4195613b8437f86fce5e4243c7f734fa49968e0733adfbb82db5d513d336dad821ebe36b91f0f523dbace79d07eb30d596df1c1edf98144da882ef3aa SHA512 6c580a73cb71d66670c8838bb89125b84638306adb8affaf0b9c30eab8906c3b4fc2e6ffe16db90146238ce6659acdb64a817466ef481122269252fb13359ecd
+DIST expect-test-1.3.0.crate 13279 BLAKE2B 26f47395c54d50235ac074be431d6aadb97554a5a4cf6678840fb2729446512d1801528fd604cd13220ba23c7ed54c105109ab57ba723abddba04344fbb51b8a SHA512 32f5f6492614248316f6f604139918cd77a3031e628a82e9b6bc7100221f549f512b3aab6ffe095c26cb8da1aad64ada420fa99b345dd492daa42bba45f5b78e
 DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST fixedbitset-0.2.0.crate 13597 BLAKE2B cfbdb06fefda131509b04cfa780c9e9574ef0acb902479d7ef98f32ab45b18d78cb1cc94fba78bd023267a7f2a081aab29171f81a9e90912d4aad9f5fc17ba3d SHA512 44642b270d52f71637a87e5311f70ac77baa2a377f94254d1bd728b4ff02a3176f3a5d07732c0c4fb9bf303dbeecf327432ae01e2779d966cc13b5fb97cbc28c
 DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
+DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
@@ -53,6 +58,7 @@ DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b6
 DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
+DIST indexmap-1.8.2.crate 53219 BLAKE2B 6af0e386dcb4306505d93cae23fd47601c3e1c7159058f02ac435b312697da40538b1cbb0d17c3f2c4be579a4b0a9e8b59c2e145677a69c2f885d3d24afd5229 SHA512 f7780b2a478e2b95568bfa1d10167a02bd174fb9bbbf8ea84e6ff185a03d43be0ef403c2106df8289d399657584abfac6039d7cdb96b52300d7016452808c0f0
 DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
@@ -79,10 +85,12 @@ DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memmap2-0.5.3.crate 24967 BLAKE2B 743b61983108eeb82e547b216c71039ad8606d2fe533694415233d73accc14388cfbdaf9048fcf13448abfb4a49ecc3f3c961a8ea8a364a428626fed499eadce SHA512 b570f0ea37ba18a8eb22c9207dc952456864fdabf0296bac63c4741e0aec424ac7932fc0dbbd0292ad94406b1e6911826406fa00d11b7590c54816fb7898df5d
+DIST memmap2-0.5.4.crate 25473 BLAKE2B 16bf84fe06887015a3970fe437b59a8b7312ba3334d0783c21aa4c47532c498cc78fc05ac4da1c21a1adec19984decdb547c56511e3be7e8744be1d989106e12 SHA512 f7c84c614a547a1885303a19e3475772d9d11509fb610166a03162b1914079c42a062431e634a214b45e4af22bfe82b8d0b92fb246a8d367a5572a3ade4a54ad
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mimalloc-0.1.28.crate 4987 BLAKE2B 01c419515664332335f4f017c2a651ad84607230640921d9d3cfd8c95d319473e1892dc64da1333132b9b7e0bc3641eab1e558258f3b87eff2b05eab20069229 SHA512 07725666f13c3681c58dc646aae9cd916459932140fed34a41eb651d1a5b03b36e48e8bb3fb470d95923140c9c1368c0ee6e526d5ffcc7df2242aabc71918a39
 DIST mimalloc-0.1.29.crate 4988 BLAKE2B 8e63c21496e730ce63003b6f9128c703b5b50f845a640a1cc3364a649d4d3a5f8fa9a09f25fff9c94a7714c87ed2d43ee71c194ab5b98a29803561611d8dc743 SHA512 a3713c049b9d3b044746665c8d50b56d5e5f39738b1d023f4e5f9fb9e41a9a8bb1bd4b8e3b8f93e64904d96c288323b33356aca7ebbf3db672652645549785b1
 DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
+DIST miniz_oxide-0.5.3.crate 53452 BLAKE2B ae99baa01c493b5eb779595be0d77a064c4624397676d3a023cc2a54941b0b3e7c80492ac47c8a28d78ec36e2f04aebe5af79f0e714380061c5e0139b9dfd9fb SHA512 cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5
 DIST mio-0.8.2.crate 88272 BLAKE2B f704802aeec66cb47a011989709e6c35352b55bc7330dac7631ea144ed71bc86a433ef742207e3e37c47417bcd7ebb505287baebb839294e5833d228a2514c57 SHA512 c82ea0afc0de8acf162188a6131373f3cb3e7f3abb3094dd51fa9094e42a36806954f267840b3fed18c0ac3ee75af0451dfea5509ab65a94dcc93057c7d37393
 DIST mio-0.8.3.crate 92506 BLAKE2B 4ae9e7f68921d7102274cd8afe2dbdd59393f9a0f63a1d4a1d9418ba8978e31d521ea73eac7ed1b27bf31d67450952b28964f6d35b14eabf2325c08aee43bbea SHA512 c6eaff99cbfe797dd97e6d29da09a6bbb2a46b3f3ddab7d75fb756950d463545199d13ccb2d51d367a2499d18f88500fce8084b82b2f020865dec0d9d9ccdfbb
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
@@ -95,9 +103,11 @@ DIST object-0.28.3.crate 233545 BLAKE2B 241e399112a4962c034f1aed3c651eb810c1cead
 DIST object-0.28.4.crate 237248 BLAKE2B eaea0931cec7c2c71f859b56a70719c71ee06cf78eedd0141467eb4afadff514eb8a996976032b7625a08dc9105e28bc6929890f2e721f7156fe21e3dfcac56c SHA512 32a20452ed62b789c859c442009faf905ba4bc28f11bddfad3da3509861afd8dbe54e5bc0523c0eea5d5ce19cb94dee2e74f218f79df52d95ad22657d571839f
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.11.0.crate 31121 BLAKE2B 02ff93cd8845bbc3f7741d0e05fee11df5e1c35961b505b2717e697b9c503891a89e15b2c71b76a66f5f239c5ee650f2ed6105b445a4f977578a4243b4dac96e SHA512 3769223beed1a7c8c5625e18dc000b3ab296c7c3af21bb6cb563ad9d130bbbcd447d420d0ec591e6366652727de11dc76dc8f7720110de50be7cbf177587cb15
+DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 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-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 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 parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
@@ -119,12 +129,16 @@ DIST rayon-core-1.9.2.crate 65221 BLAKE2B 44b1bcf748e0bf19e7341c032eed6ea348f284
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST rowan-0.15.4.crate 39346 BLAKE2B 164be51df54c081cac11526d930567a23e87665929aeb964eeab78a7456ee63c4b19d3d22b0f746460d6f53037521b91f1ec2a9d8b9a02ad355e20ac83b5a764 SHA512 aaa804f8dc90fcd1009553e1f3475862d865d24b10894e63c3d1005a31a1c4bdac243320b49aa9c9f71ad0c8cf166d0cc3863f50c1de4a9b4ff07a2e6ddb1e33
+DIST rowan-0.15.5.crate 39437 BLAKE2B 1c5c7c0ff9a0d599c409fdacae1371177382cffed7843837e5fb485744a83326ab20c7bf33ffda05b131226a8b265616508a38dba51c5805c9c34aa762406631 SHA512 e2ac5d9007e6a2768cb1dcc6913672a2e9e35850874f05352a2c1015b673a5bf7b4f1cae30193d65267263915a6064fc13f4e2705031f77df5df5c5bab8971de
 DIST rust-analyzer-20220509.tar.gz 2211403 BLAKE2B 8d61411935421cc3ff135ecff6985430f971aa96f9a46ba960a347fd238061a2f459f75c9f0f72b20db666ad14beae87ab81a07e4f9b7d748876bde26cc8b47f SHA512 347c530a158dd7430a35e8330b556030eaa3747645d37dcbdb432fdbd0b1f12971fe586c159fd5c73d6a3b074b266fe7a8f9e622a20f591f9dd9469ec7282f5e
 DIST rust-analyzer-20220517.tar.gz 2231002 BLAKE2B 2f54f607b2a76ed11f417c7b2108323dc2a7fe1738258b8aad70edf34d723cdd833a9edba4f7fc979c35a7d05413c5a7c76e96cb8736f1ef40aeb4a08d8eaf94 SHA512 0f244489979ad05e38cbf33d7e65002be56059947bce341e7324b1f969f6115d5dbd3568d0dada85ecfacf3fa4e6fd03190dd0a2ba5d6d2f94ea65a0d44432cc
 DIST rust-analyzer-20220606.tar.gz 2244430 BLAKE2B 0b04ca050c7f6656c37e5b886a97995e2b7513aaaa37a4b94da66d37618cdc2f229f997168c0028920666ae9272fd48ef8685ad2b879b41820e2a51246ced2fc SHA512 8c61f89c9993ea4260482e184f3ae0168cc7a3268f687235b75755a1f968ba10f54eb8485ee364250e5642d80d87a37debdee1a893e6252689e6e27aefe2470e
+DIST rust-analyzer-20220613.tar.gz 2278073 BLAKE2B 40118271cd2d515b350f1d7743578d7ab35ea352a17d125280be95447040215559363f69ce2e2a44719b6d589b284343545aac0052f25f5590da5b430e0f0091 SHA512 e05308fae95cc996ed9707375fc71fb31791c90b1ebae736796581796f1e49eeb27a4d4bae8f104464f6ab647c800e5088167759e33840eca010bb69bc72d549
 DIST rustc-ap-rustc_lexer-725.0.0.crate 14086 BLAKE2B f918e3a6f1dceca79aaca92b919b4c013fc0ec4df0a1ef0482c26656e7e05766ec73305a7e8a32e24e5337d7e204d67d3cc9e091f182b19dd4f53deed8687ea4 SHA512 4239c4762d7ca351698be015ab251193f65487bda73a9dfaae5788e5b8395656c12d7f9cb5ee16cbd8c03dd5b9828dfb7d507498f40dc83d6a85ed3d59cc657a
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
@@ -135,6 +149,7 @@ DIST salsa-macros-0.17.0-pre.2.crate 15358 BLAKE2B edcd8a0adf04114de829aab88d6e2
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST semver-1.0.10.crate 30912 BLAKE2B e0addb727cfec75ac00d0941bec66433f549c5e731a86cf19954c1c402cb5a6721f20af11f1da87370791fd71f95b1febc1b9c90acba8d5416987fe97502cd5f SHA512 92f01a95f6d20bca1e9101f17cd7a7be7e002d55a0ad792c0a1b6b47c510c8e902a8dc33f683ac35800e39020453b0300b79a41fc32f29c8eda9a9d57d456fbc
 DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
 DIST semver-1.0.9.crate 30843 BLAKE2B 52c90056ec744bccbeb4a603b8e138a9b980a063c05462011d3b4cd11c5272c5284d0eec427ffd1e838d73f97a21af70a6c7f8094b6faecd3c18adb1b0be1449 SHA512 23da181209ca26a9e78d8111444c465273cdaac23ef6023b1e9a9a10e2ab9dfb13baf51f8b6f597598bde84c36910e0a45bae4f14555d731a9c9a3e94f37214a
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
@@ -151,24 +166,31 @@ DIST smol_str-0.1.23.crate 13208 BLAKE2B 3ee60b98fec9c8ed6ec765ea47863cecd83cb92
 DIST snap-1.0.5.crate 33022 BLAKE2B 0ce3c4379f4ab122e7785c23b42d463c657cee3179d2dfe909797c11a3730d65b6dd660d8626d0fabeb4344356b5cab8e632809845fb7c21e904bdc41594d52e SHA512 d9181f1ffc6605bf7628ab51479956f9769eca85c0942494dfdcf2c7e805173ee3d3bfc17510e72dad6e5c89b80b2a3f9c40b85464eeb79fd6d26de6bee66fab
 DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
+DIST syn-1.0.96.crate 236896 BLAKE2B 57445f4925169212c3b794312f388c2829bc343fd60f37f60d46bc944c946c02476b1ec64f17ec8b91e84c112dbbf04bf64feba9a3fd3512dad0d4b3376f4869 SHA512 f53b9e97b6b19d18a35d13aaa9c58b8fdd0da96443aaad76ed027e9ac7d438b574ae052b02b9bef410f25fbab851a5af3cc64fafaefffe47932827e6ca02209c
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 DIST text-size-1.1.0.crate 12380 BLAKE2B 0fb559e971e7f33bb4ee6e20e796f813023ef1798713b224ba42827ce3a8cbc6dc1991c653ddf7219a3d3696a3d1718d6fea7b72b60ae8f543597f5e19d8f0e8 SHA512 24e9d77e37c62b6ad05ee7dcdb5c9fe60c0f5cea1418bc0bf462ce789a1c13704b317e6503db533eff47527c87728bb98f9a34e473f8e09df35e21c08ca93048
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
 DIST tikv-jemalloc-ctl-0.4.2.crate 19153 BLAKE2B 59c4556605dac98657991280e1e5515b953c49e77c30bda65d1db2673cb84185e4736423083a8fb175c3c0f62c9dbd00789f75ea4b1dbbcbba3918a80865f338 SHA512 14c4c784eebc1c5e47092128569b265dc0a7789920c9090cbadde31823b3f3c62c9bf86e2cfaebc10923c52a30f3869bd17c742046193d29b2db4bfb972ecfd3
+DIST tikv-jemalloc-ctl-0.5.0.crate 19183 BLAKE2B eeef610a2b2d8ecb4930a9fd46f6796bcbd21729415fc4986fb024e91603e3c899bb3b0187f78adac32c3815fbf2c1884e1c2f3c4e6582bf2f48d41b9ac758bf SHA512 6db6baebe23c06ec4cf395721297231c7514a33ffb7b93988c6da9dd592e43f73d8ec45d270f2127433fd1bfaa52f8e5e3e116e073c77ab33d708e27ff415012
 DIST tikv-jemalloc-sys-0.4.3+5.2.1-patched.2.crate 660226 BLAKE2B 3ddcc8e619d71f1e3d1c9e04c59592f599199e76fb990ad8f964bdfdd79f0b9d83b4a5f9727ea11d28c3ed918f02fad9b0a1094834d152af5616e720adbbdd34 SHA512 5233d082252f376fd16d52a7d95d37a40b3bd24d9382b18eb69169da283002a13e600ee41e305e4cde7bf5ffe1c1253875737355f4346ffdc4e71c75a011c0ec
+DIST tikv-jemalloc-sys-0.5.0+5.3.0.crate 880302 BLAKE2B d3f4e029729583ed8d2b5e37c1a8b7f8ae5aedf5a02eff550a13f0c44cdd2d5db83e87f6a0f481b5dd97382cce8bff3ff70e23da57a8966a885692ff11edd006 SHA512 171f6ad0658cadc7c5b1e7902efd6d6eb7bd20d0b7d1d30863faf399790a61fc075ed8da0d195befc9137b4c43d1ed3360a94bf8d92b7845f704f610d3051409
 DIST tikv-jemallocator-0.4.3.crate 14846 BLAKE2B e166e73a740d07dab133b2817fc4d3af015b499c62162813e7fb1e682559861c0998afd48f3ed428444f613584590df97222f9d93e79eeb716f7b3515a0f816e SHA512 1dee5afe2d3c07512310d6c2175fac330951c1b1e78277e4538687765792549cdc1d548b5f24b7a96e68bc16d9eff9ff06da18b3f82628d80c4c5f34e704a083
+DIST tikv-jemallocator-0.5.0.crate 9382 BLAKE2B e241742cb04b07164c08b4bd3a044dc7c473a2119e96a492c8b3eec04adfc3f728ece98c95e1e944af3fedec75da72b03f5aab56c8e7e97d54e0f8e5df6ab88f SHA512 13773bf6d5468e16ffac2bb8824f968ecc5240d89ce63c18cf454c54d9b2e20f25eab84786029fb333f70833f5c99a01eb17182615b5e2dd1e54ee97899abf55
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tracing-0.1.34.crate 72775 BLAKE2B afdcc78ba29f68f3e87e401a89e4c5944da620890823d56f3d345c2e97a2268c19c342014903aa4a62b8d39b67a5313506563a7be0a555b86cd93aa9db4dbae4 SHA512 d4641f3f239d158547d7c811a80cbd2d1d7df366122dcc678d01844988ef3c5f5db637707e7e91bfb2ea16bef5463d52f8a481d1a9804bac197157453b5877d8
+DIST tracing-0.1.35.crate 72680 BLAKE2B e3f07d2c7bdc72b6845be0a18473a3a24ec0d5212a88eb1bae34795319b6500d6b8c52ff674842f5ded1f0c8cf983977a66964c16779ce1511a2e0d81cc3855a SHA512 939f649d1578e569b974ced1f28678e494f4c42fa5e6c981f38188dcb2d960f71140627e4f60b86d926d44473b311bc855e85f8d90e43932ec3ac7eca7c02394
 DIST tracing-attributes-0.1.20.crate 26316 BLAKE2B 33d5d160d4de0d117bc45e33ca76f2dbb0838021bd7b3cee07603ec86e328b27e4fea993becaa9cdda11f4c6fced74575ae9a4a25bba64b26646d72b72942156 SHA512 8ae65a131ba700a03a2e35646a1bdaf043f04b4d5de00f5c58022caf06346b50cd88e1917bcad3a3ad591921fbf2dcef3b49793b8569604eddeea2470627a0c6
 DIST tracing-attributes-0.1.21.crate 27552 BLAKE2B 999e6e257c8778f01cf43365db21d97b9f055019bebba5462968a806e173fc7effc35cacbb60696e3db45d3487627ec3858c282458b38fad74f2f49bdcaa75c0 SHA512 a48da3338cd86e7d9a196e06505d53a6d60278bcd3b709e175219c8d1cbd9c0191af07c335b6401a157563e22d75dd13d5be664c02913c289079bfa667f99e65
 DIST tracing-core-0.1.26.crate 53727 BLAKE2B 1e3efbd8e5ad0617ce15ea14eb6365752067f580504a4cc90f1f486ad3eb7e59087c0f332e3e93ae32a2f4c42a42482a9ecbe180f43dcf34a427babd5290fc61 SHA512 b9d44c307d0fee51675bef07ed7f7d2eb8de8a6ffb37256994f3485f7f80e40f1fa9de1663e5360f945270f10d22e42cd9af60193449bd0a0d323895e994bdbb
+DIST tracing-core-0.1.27.crate 58328 BLAKE2B 3461f13caa1042fc63d7defed2e3f49a286d870e0dee51776a90ee8558a2036781c5561923afd9b858b8029bc95a224bef973009b928c9ae050fe4a20d42a8d7 SHA512 8627b2cf4285e461b47288d885ac627bc6cef1083111e1413e2608dccb9c65e55fd2cf1a979d8a507891cf8bf11de40af32a434e9ddec4ff57f7d4c04e3bede0
 DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
 DIST tracing-log-0.1.3.crate 20549 BLAKE2B 1e2b5f1d96983b0dcf3e61f71132536e21dc19af0d532dcff7cc91db45e60cbdc1f8b5b7a7b2c13214dda4e3becd4f3d62262def1b608a99fa330ccf1d716323 SHA512 440cb8ddd5823cd0d86b68bbbf29f6886d5800f95d0aaa9477f98f188013fd009c2b9bc982b17efd08abd071bc70ca511f988b9db8c21d8e3d323fb67614d289
 DIST tracing-subscriber-0.3.11.crate 184827 BLAKE2B 83686c5affeb40a84e95c161b121dcdd533b782151896b86752f4d9a922683847dc350482a7436fee23a23cbadbb9522dcb7966993e877fb84fa8e6deda050e2 SHA512 5d45d5108742aece42bfe7d6f6ed71b0bee81c3e3e3a3117489ec5d4d4ee9c23c157077ad5020b74b019d212fb2a46623e93dc57a7f6bc0a1a853981ea097493
 DIST tracing-tree-0.2.0.crate 17099 BLAKE2B a91a63cdcc3c26cdc6924200e1f9f04f4ba1913bbb237a199fa6bf82447c0be80dcd650ba8bac8ab0ee5016c0d6a27f47b05a4765aa231670aebd3c948dfb0f5 SHA512 b10fc9abfc3aa092ea8816db3911f86fc27bf50f6eb3da701a78d8d9bfa5fe9b017a8dc06ff3a179750a29f6dceccb90756d8e3a3f1ec20fac8a6bd9e4f22fdc
+DIST tracing-tree-0.2.1.crate 17191 BLAKE2B 05d33d7d7f13b43c83c46ae1160411b4cdd9db3e6854ef8723f67cf01195aee1d253a03b966d7eca07b9bcd4ae387e88925e61634170e6baf9cd7a88764db541 SHA512 9fee8dcf216d86c9c3f96cbe175c17a1774208e222ade5b4b5f0367db1685d8daf7ed127115bca956335fc04436067ab3c085fc172548aa64da40f155d08813d
 DIST typed-arena-2.0.1.crate 11439 BLAKE2B b5bd230a22894c5545966279b40a8493940719fdf79bed144ad41c363e7f73bfd40e1492efa8d96fb9b5b32e3a31405ef9dbddd55d10bb900ac082d41a034b03 SHA512 182fdac0ef9b494fc2966005ece2107a3c53b6eafe4eebe9be3d552aebe143e05f3db2b51693c253831744fc265ec2a557d31ee42cf0ba5991b38d075278415d
 DIST ungrammar-1.16.1.crate 8383 BLAKE2B 95f96d2d8576b029c57ea946ab9564af58f0e49249ca4c10396dd782a164d6eec15d80f5716af388ff8958eda29d2a2111340ab5016fb1c11dd99e2ca429c7b9 SHA512 5810f1911f22324db712fd1104577e4fb759abcbdd77e0b60c278e4c6d0769f2fe1e476df630735ad9fd5f1d8df14c68d2e7b4adbb4a4c44b06eb1f8712a27c0
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
@@ -210,9 +232,12 @@ DIST write-json-0.1.2.crate 7414 BLAKE2B 8527f2f2db543a5866e4dff949b1c67f73f901a
 DIST xflags-0.2.4.crate 9932 BLAKE2B e76d081e02015889f54bb5ff0ba8999e11bf1530f997518264d0a121d2e550ad212ca7e195e066b24bed5857e92460fa0d2816ed2fc5259c93117498c3421340 SHA512 1bcc4ed61ca04d54dd3a87498ef13d9d1179b9614f8161221bd301a94b0c75f47ddbcc2487f3d4034210eb124dc01527d70786dde7c1435625163533b3d820fa
 DIST xflags-macros-0.2.4.crate 10740 BLAKE2B a5ed80034908868e899586b0ba235b262462b217bf07933f7aed36698d4921f943d4747e12daa5c5d0a2d99b66e9dec1ab696f740e4605a93fe284900fa773ad SHA512 073ab7315b499be0b0a807f865992b83e43f5557ab5c798c8bf05926d488f68d439a332607e336d1112bf3f7dec3a73da784ebf8db031455c725d5f1c4cb6de0
 DIST xshell-0.2.1.crate 23704 BLAKE2B 79bfc4f6faf0f5f9b0153cd71df177e02f65b036ea798c8ce3c147d5fd063a52b02a1ec521d65306c5f2279ee6fc33515810071a77570600decf6c1787af9f7d SHA512 93b69791fa325f95472061d27c8674059618f06b4245d56cc1caefd1afd6157645bce9946cb9c48e6fcf5b62852037f5b2a81a5376b5c82e2558661255a4b6f3
+DIST xshell-0.2.2.crate 23846 BLAKE2B 7dec5f7268e52b02a5df8aa9a9e206984e291d21c2d4357f6c0c21fec3f9e65bcfa6d4a315f591703e7977fecaa25b0e2bb7af2f05e3cadc79ad513aa3ce0dc9 SHA512 b260b101b189e8e4f2238759ba005d776ac0026b705a2fe2ea3f99b5117b758cb3beb362deb637275f183680f95f7f442b963823b6bf97910ccfe269e23c2af8
 DIST xshell-macros-0.2.1.crate 2849 BLAKE2B 2c2e91d1ccee6480f1752d7c9586d0aea7a202e3e5b9180758ceacf7369bcc7d98be4b88ceec30f6d570fae5d5cc9e9fc4bccd46a8e3c3961d54102c3d49fb5a SHA512 dd1d31fa327a7d03ec36c304dfdeeff8df1b3eeaec21c99e53b957d4e361639141604c4ad81e1c420a1aa68094745cedba30560bed9a67547e182bd3d61d2b31
+DIST xshell-macros-0.2.2.crate 2848 BLAKE2B 1adedea7dff653a2f781e0300582eb088545a794d0f94729c630f54e3ca25e293af76913851d44c4d7c7da02882610527a2479e4abc87c138f3c37869fc7f2b5 SHA512 a477f18810d2b647c78cbc06d59b8b84817ee5e54cc8785897ecae743d263c6d0fab3563f66aed6a5e81b790bab317871162513c8ff14364d936afaa082f1ff4
 EBUILD rust-analyzer-20220509.ebuild 4463 BLAKE2B 30772bc60e70445d0e36c31ce860353fba24c4df9bed884c8b5b47c952e6ceb9409b378842f526991776d8027e6264fa4da545c872b5dbe3b41b3a83453392c8 SHA512 7de8f7cd17aa38c77c8a7de8fbf9b88df4f5ddc146d73f948c68c6f7deea89441a6791369b1d1998ffa9263fa256a687054bfcff95c9f49fc7f070d406df962b
 EBUILD rust-analyzer-20220517.ebuild 4445 BLAKE2B 4010e226b0a23942570fb5cf2887ea2517788f71b9fbc77c76f0bf7f752454aae22b39f36fefaf5ffeba3e4573480e6a411492ab13f7d7d6e9548388298b8dcd SHA512 4aa087e9eeefe2693fa0671299e4769b7c28c111e99be462881b6496067a8e41147b00de40a23ea72e3db92fcac3e05721c3472eabca7d1c54ea448b5e610f78
 EBUILD rust-analyzer-20220606.ebuild 4442 BLAKE2B 1bb7ed5188a2c5f428bf46f769cca311652bfc1a2a825d1ac63d2a37a354c16dd3d02dc7653077ba3dc7ab73afe0bb0a0ac914f716807bb0bbbde451e495fd21 SHA512 23acfea41271419affac064fa32e9f2f78a8791197429f083a567159e8179572943d3c4ec840c14bcfdac1b1dcee733ea5b43eff76fc22ababc37d59eb6d637a
+EBUILD rust-analyzer-20220613.ebuild 4453 BLAKE2B f3b3d5c85a97091ec2b1f73d84c454af81264b53262db74b49252c6ddffc8180972c441bd070bb43dd038b3db6c7b33b41c9e7f03790bd9dad397952b5713f4c SHA512 af3d607c6b5c561b8c6081b0afb31e8307b8c733a51ec7798292499a3c70af49f9951233fc905b4e43869e936c3e4814bb1235896f66dff9e230598acd34bab2
 EBUILD rust-analyzer-99999999.ebuild 1181 BLAKE2B 2111a7939562371d6cb444c3e924196201b5d1a809d5667f610c503f4ad877ecdd231fac22ad6992299e9d7ea44d4d9c1de80f07f3eef6740a342e507229b8a5 SHA512 57a65ed842a39c65f691ac738f4ee2efdf89c374a3742a52f521922fea62830bd57ccda06008c345eb9b2a90ee854665fece064ddc746f844abff6c724f89352
 MISC metadata.xml 579 BLAKE2B 39100936a1606a3af6cf31b7f7f550c68f9cac93cf18f0a289a98b41d52b56f126a19b86318b460394db873efd66810cbfef9251bbcebf3514eba30d591d29ee SHA512 3d72a6e67f2a0aa14e596ab6a0e005a759980047460085663b2623c951cdac84252dc5be98d33f92ca7dbeac89507dbdbfe9c65d1dc5af6788680e747c852b0e
--- a/dev-util/rust-analyzer/rust-analyzer-20220613.ebuild
+++ b/dev-util/rust-analyzer/rust-analyzer-20220613.ebuild
@@ -0,0 +1,219 @@
+# Copyright 2020-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
+	always-assert-0.1.2
+	ansi_term-0.12.1
+	anyhow-1.0.57
+	anymap-1.0.0-beta.2
+	arbitrary-1.1.0
+	arrayvec-0.7.2
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.65
+	bitflags-1.3.2
+	camino-1.0.9
+	cargo-platform-0.1.2
+	cargo_metadata-0.14.2
+	cc-1.0.73
+	cfg-if-1.0.0
+	chalk-derive-0.82.0
+	chalk-ir-0.82.0
+	chalk-recursive-0.82.0
+	chalk-solve-0.82.0
+	countme-3.0.1
+	cov-mark-2.0.0-pre.1
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	dashmap-5.3.4
+	derive_arbitrary-1.1.0
+	dissimilar-1.0.4
+	dot-0.1.4
+	drop_bomb-0.1.5
+	either-1.6.1
+	ena-0.14.0
+	expect-test-1.3.0
+	filetime-0.2.16
+	fixedbitset-0.2.0
+	flate2-1.0.24
+	form_urlencoded-1.0.1
+	fs_extra-1.2.0
+	fsevent-sys-4.1.0
+	fst-0.4.7
+	gimli-0.26.1
+	hashbrown-0.11.2
+	hashbrown-0.12.1
+	heck-0.3.3
+	hermit-abi-0.1.19
+	home-0.5.3
+	idna-0.2.3
+	indexmap-1.8.2
+	inotify-0.9.6
+	inotify-sys-0.1.5
+	instant-0.1.12
+	itertools-0.10.3
+	itoa-1.0.2
+	jod-thread-0.1.2
+	kqueue-1.0.6
+	kqueue-sys-1.0.3
+	lazy_static-1.4.0
+	libc-0.2.126
+	libloading-0.7.3
+	libmimalloc-sys-0.1.25
+	lock_api-0.4.7
+	log-0.4.17
+	lsp-types-0.93.0
+	matchers-0.1.0
+	matches-0.1.9
+	memchr-2.5.0
+	memmap2-0.5.4
+	memoffset-0.6.5
+	mimalloc-0.1.29
+	miniz_oxide-0.5.3
+	mio-0.8.3
+	miow-0.4.0
+	notify-5.0.0-pre.15
+	num_cpus-1.13.1
+	object-0.28.4
+	once_cell-1.12.0
+	oorandom-11.1.3
+	parking_lot-0.11.2
+	parking_lot-0.12.1
+	parking_lot_core-0.8.5
+	parking_lot_core-0.9.3
+	paste-1.0.7
+	percent-encoding-2.1.0
+	perf-event-0.4.7
+	perf-event-open-sys-1.0.1
+	petgraph-0.5.1
+	pin-project-lite-0.2.9
+	proc-macro2-1.0.39
+	pulldown-cmark-0.9.1
+	pulldown-cmark-to-cmark-10.0.1
+	quote-1.0.18
+	rayon-1.5.3
+	rayon-core-1.9.3
+	redox_syscall-0.2.13
+	regex-1.5.6
+	regex-automata-0.1.10
+	regex-syntax-0.6.26
+	rowan-0.15.5
+	rustc-ap-rustc_lexer-725.0.0
+	rustc-demangle-0.1.21
+	rustc-hash-1.1.0
+	ryu-1.0.10
+	salsa-0.17.0-pre.2
+	salsa-macros-0.17.0-pre.2
+	same-file-1.0.6
+	scoped-tls-1.0.0
+	scopeguard-1.1.0
+	semver-1.0.10
+	serde-1.0.137
+	serde_derive-1.0.137
+	serde_json-1.0.81
+	serde_repr-0.1.8
+	sharded-slab-0.1.4
+	smallvec-1.8.0
+	smol_str-0.1.23
+	snap-1.0.5
+	syn-1.0.96
+	synstructure-0.12.6
+	text-size-1.1.0
+	thread_local-1.1.4
+	threadpool-1.8.1
+	tikv-jemalloc-ctl-0.5.0
+	tikv-jemalloc-sys-0.5.0+5.3.0
+	tikv-jemallocator-0.5.0
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	tracing-0.1.35
+	tracing-attributes-0.1.21
+	tracing-core-0.1.27
+	tracing-log-0.1.3
+	tracing-subscriber-0.3.11
+	tracing-tree-0.2.1
+	typed-arena-2.0.1
+	ungrammar-1.16.1
+	unicase-2.6.0
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.0
+	unicode-normalization-0.1.19
+	unicode-segmentation-1.9.0
+	unicode-xid-0.2.3
+	url-2.2.2
+	valuable-0.1.0
+	version_check-0.9.4
+	walkdir-2.3.2
+	wasi-0.11.0+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
+	windows-sys-0.28.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.28.0
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.28.0
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.28.0
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.28.0
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.28.0
+	windows_x86_64_msvc-0.36.1
+	write-json-0.1.2
+	xflags-0.2.4
+	xflags-macros-0.2.4
+	xshell-0.2.2
+	xshell-macros-0.2.2
+"
+
+inherit cargo
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rust-analyzer/rust-analyzer"
+else
+	KEYWORDS="~amd64"
+	MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+	SRC_URI="https://github.com/rust-analyzer/rust-analyzer/archive/${MY_PV}.tar.gz -> ${P}.tar.gz $(cargo_crate_uris)"
+fi
+
+DESCRIPTION="An implementation of Language Server Protocol for the Rust programming language"
+HOMEPAGE="https://rust-analyzer.github.io"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD BlueOak-1.0.0 Boost-1.0 CC0-1.0 ISC MIT Unlicense ZLIB"
+RESTRICT="mirror"
+SLOT="0"
+IUSE=""
+
+DEPEND="|| ( >=dev-lang/rust-1.57.0[rust-src] >=dev-lang/rust-bin-1.57.0[rust-src] )"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/rust-analyzer"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		mv -T "${PN}-${MY_PV}" "${P}" || die
+	fi
+}
+
+src_test() {
+	# Requires out of source git repo.
+	cargo_src_test -- --skip "tidy::check_merge_commits"
+}
+
+src_install() {
+	cargo_src_install --path "./crates/rust-analyzer"
+}
--- a/eclass/R-packages.eclass
+++ b/eclass/R-packages.eclass
@@ -37,9 +37,9 @@ BDEPEND="sys-apps/pkgcore"
 # <dest> will contain symlinks to everything in <source>
 _movelink() {
 	if [[ -e "${1}" ]]; then
-		local rp1="$(edo realpath ${1})"
-		edo mv "${rp1}" "${2}"
-		edo cp -rsf "${2}" "${rp1}"
+		local rp1="$(realpath ${1} || die)"
+		mv "${rp1}" "${2}" || die
+		cp -rsf "${2}" "${rp1}" || die
 	fi
 }

@@ -49,7 +49,7 @@ _movelink() {
 R-packages_src_unpack() {
 	unpack ${A}
 	if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then
-		edo mv "${PN//_/.}" "${P}"
+		mv "${PN//_/.}" "${P}" || die
 	fi
 }

@@ -57,9 +57,9 @@ R-packages_src_unpack() {
 # @DESCRIPTION:
 # function to remove unwanted files from the sources
 R-packages_src_prepare() {
-	edo rm -f LICENSE
+	rm -f LICENSE || die
 	default
-	edo mkdir -p "${T}/R"
+	mkdir -p "${T}/R" || die
 }

 # @FUNCTION: R-packages_src_configure
@@ -99,35 +99,35 @@ R-packages_src_compile() {
 # documentation and examples to docsdir, symlinked back to R site-library (to allow access from within R)
 # everything else to R site-library
 R-packages_src_install() {
-	edo pushd "${T}/R/${PN//_/.}"
+	pushd "${T}/R/${PN//_/.}" || die

 	local DOCS_DIR="/usr/share/doc/${PF}"

-	edo mkdir -p "${ED}/${DOCS_DIR}"
+	mkdir -p "${ED}/${DOCS_DIR}" || die

 	for i in NEWS.md README.md DESCRIPTION examples CITATION INDEX NEWS WORDLIST News.Rd ; do
-		edo _movelink "${i}" "${ED}${DOCS_DIR}/${i}"
+		_movelink "${i}" "${ED}${DOCS_DIR}/${i}" || die
 		docompress -x "${DOCS_DIR}/${i}"
 	done

 	if [[ -e html ]]; then
-		edo _movelink html "${ED}${DOCS_DIR}/html"
+		_movelink html "${ED}${DOCS_DIR}/html" || die
 		docompress -x "${DOCS_DIR}/html"
 	fi
 	if [[ -e doc ]]; then
-		edo pushd doc
+		pushd doc || die
 		for i in * ; do
-			edo _movelink "${i}" "${ED}${DOCS_DIR}/${i}"
+			_movelink "${i}" "${ED}${DOCS_DIR}/${i}" || die
 			docompress -x "${DOCS_DIR}/${i}"
 		done
-		edo popd
+		popd || die
 	fi
 	if [[ -e doc/html ]]; then
 		docompress -x "${DOCS_DIR}/html"
 	fi
 	docompress -x "${DOCS_DIR}"

-	edo rm -rf tests test
+	rm -rf tests test || die

 	insinto "/usr/$(get_libdir)/R/site-library"
 	doins -r "${T}/R/${PN//_/.}"
@@ -139,7 +139,7 @@ R-packages_src_install() {
 R-packages_pkg_postinst() {
 	if [[ -v SUGGESTED_PACKAGES ]]; then
 		for p in ${SUGGESTED_PACKAGES} ; do
-			pexist=$(edo pquery -n1 "${p}" 2>/dev/null)
+			pexist="$(pquery -n1 ${p} 2>/dev/null || die)"
 			if [[ -n "${pexist}" ]]; then
 				optfeature "having the upstream suggested package" "${p}"
 			fi
--- a/eclass/octaveforge.eclass
+++ b/eclass/octaveforge.eclass
@@ -38,8 +38,8 @@ OCT_PKGDIR="${OCT_ROOT}/packages"

 # @ECLASS-VARIABLE: OCT_BIN
 # @DESCRIPTION:
-# full path to octave binary
-OCT_BIN="$(type -p octave)"
+# octave binary name
+OCT_BIN="octave"

 SRC_URI="mirror://sourceforge/octave/${P}.tar.gz"
 SLOT="0"
@@ -60,19 +60,19 @@ octaveforge_src_unpack() {
 octaveforge_src_prepare() {
 	default

-	_generate_configure
+	_generate_configure || die

 	if [[ -e "${S}/src/configure.ac" ]]; then
-		edo pushd "${S}/src"
+		pushd "${S}/src" || die
 		eautoreconf
-		edo popd
+		popd || die
 	elif [[ -e "${S}/src/autogen.sh" ]]; then
-		edo pushd "${S}/src"
+		pushd "${S}/src" || die
 		edo ./autogen.sh
-		edo popd
+		popd || die
 	fi
 	if [[ -e "${S}/src/Makefile" ]]; then
-		edo sed -i 's/ -s / /g' "${S}/src/Makefile"
+		sed -i 's/ -s / /g' "${S}/src/Makefile" || die
 	fi
 }

@@ -82,7 +82,7 @@ octaveforge_src_compile() {
 	export MKOCTFILE="mkoctfile -v"

 	cmd="disp(__octave_config_info__('octlibdir'));"
-	OCTLIBDIR=$(edo octavecommand "${cmd}")
+	OCTLIBDIR=$(octavecommand "${cmd}" || die)
 	export LFLAGS="${LFLAGS} -L${OCTLIBDIR}"
 	export LDFLAGS="${LDFLAGS} -L${OCTLIBDIR}"

@@ -91,25 +91,25 @@ octaveforge_src_compile() {
 	fi

 	if [[ -e src/Makefile ]]; then
-		edo mv src/Makefile src/Makefile.disable
+		mv src/Makefile src/Makefile.disable || die
 	fi
 	if [[ -e src/configure ]]; then
-		edo mv src/configure src/configure.disable
+		mv src/configure src/configure.disable || die
 	fi

-	edo pushd ..
-	edo tar -czf "${OCT_PACKAGE}" "${PKGDIR}"
+	pushd .. || die
+	tar -czf "${OCT_PACKAGE}" "${PKGDIR}" || die
 }

 # @FUNCTION: octaveforge_src_install
 # @DESCRIPTION:
 # function to install the octave package
 octaveforge_src_install() {
-	DESTDIR="${D}" edo _octaveforge_pkg_install
+	DESTDIR="${D}" _octaveforge_pkg_install || die
 }

 octaveforge_src_test() {
-	DESTDIR="${T}" edo _octaveforge_pkg_install
+	DESTDIR="${T}" _octaveforge_pkg_install || die

 	# cargo culted from Fedora
 	cmd="
@@ -118,7 +118,7 @@ octaveforge_src_test() {
 		unlink(pkg('local_list'));
 		unlink(pkg('global_list'));
 	"
-	edo octavecommand "${cmd}"
+	octavecommand "${cmd}" || die
 }

 # @FUNCTION: octaveforge_pkg_postinst
@@ -127,10 +127,10 @@ octaveforge_src_test() {
 octaveforge_pkg_postinst() {
 	einfo "Registering ${CATEGORY}/${PF} on the Octave package database."
 	if [[ ! -d "${OCT_PKGDIR}" ]] ; then
-		edo mkdir -p "${OCT_PKGDIR}"
+		mkdir -p "${OCT_PKGDIR}" || die
 	fi
 	cmd="pkg('rebuild');"
-	edo octavecommand "${cmd}"
+	octavecommand "${cmd}" || die
 }

 # @FUNCTION: octaveforge_pkg_prerm
@@ -143,16 +143,16 @@ octaveforge_pkg_prerm() {
 		l = pkg('list');
 		disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir);
 	"
-	oct_pkgdir=$(edo octavecommand "${cmd}")
-	edo rm -f "${oct_pkgdir}/packinfo/on_uninstall.m"
+	oct_pkgdir=$(octavecommand "${cmd}" || die)
+	rm -f "${oct_pkgdir}/packinfo/on_uninstall.m" || die
 	if [[ -e "${oct_pkgdir}/packinfo/on_uninstall.m.orig" ]]; then
-		edo mv "$oct_pkgdir"/packinfo/on_uninstall.m{.orig,}
-		edo pushd "$oct_pkgdir/packinfo"
+		mv "$oct_pkgdir"/packinfo/on_uninstall.m{.orig,} || die
+		pushd "$oct_pkgdir/packinfo" || die
 		cmd="
 			l = pkg('list');
 			on_uninstall(l{cellfun(@(x)strcmp(x.name,'${PN}'), l)});
 		"
-		edo octavecommand "${cmd}"
+		octavecommand "${cmd}" || die
 	fi
 }

@@ -162,7 +162,7 @@ octaveforge_pkg_prerm() {
 octaveforge_pkg_postrm() {
 	einfo 'Rebuilding the Octave package database.'
 	if [[ ! -d "${OCT_PKGDIR}" ]] ; then
-		edo mkdir -p "${OCT_PKGDIR}"
+		mkdir -p "${OCT_PKGDIR}" || die
 	fi
 	cmd="pkg('rebuild');"
 	edo "${OCT_BIN}" -H --silent --no-gui --eval "${cmd}"
@@ -173,7 +173,7 @@ octavecommand() {
 }

 _generate_configure() {
-	edo cat << EOF > configure
+	cat << EOF > configure || die
 #! /bin/sh -f

 if [ -e src/configure ]; then
@@ -181,14 +181,14 @@ if [ -e src/configure ]; then
  ./configure $*
 fi
 EOF
-	edo chmod 0755 "configure"
+	chmod 0755 "configure" || die
 }

 _octaveforge_pkg_install() {
 	TMPDIR="${T}"
 	DISTPKG='Gentoo'

-	edo pushd ../
+	pushd ../ || die
 	if [[ "X${DISTPKG}X" != "XX" ]]; then
 		stripcmd="
 			unlink(pkg('local_list'));
@@ -203,19 +203,19 @@ _octaveforge_pkg_install() {
 			disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir);
 			${stripcmd}
 		"
-		edo oct_pkgdir=$(edo octavecommand "${cmd}")
+		oct_pkgdir=$(octavecommand "${cmd}" || die)
 	else
 		cmd="disp(fullfile(__octave_config_info__('datadir'),'octave'));"
-		shareprefix=${DESTDIR}/$(edo octavecommand "${cmd}")
+		shareprefix=${DESTDIR}/$(octavecommand "${cmd}" || die)
 		cmd="disp(fullfile(__octave_config_info__('libdir'),'octave'));"
-		libprefix=${DESTDIR}/$(edo octavecommand "${cmd}")
+		libprefix=${DESTDIR}/$(octavecommand "${cmd}" || die)
 		octprefix="${shareprefix}/packages"
 		archprefix="${libprefix}/packages"
 		if [[ ! -e "${octprefix}" ]]; then
-			edo mkdir -p "${octprefix}"
+			mkdir -p "${octprefix}" || die
 		fi
 		if [[ ! -e "${archprefix}" ]]; then
-			edo mkdir -p "${archprefix}"
+			mkdir -p "${archprefix}" || die
 		fi
 		cmd="
 			warning('off','all');
@@ -224,7 +224,7 @@ _octaveforge_pkg_install() {
 			pkg('local_list',fullfile('${shareprefix}','octave_packages'));
 			pkg('install','-nodeps','-verbose','${OCT_PACKAGE}');
 		"
-		edo octavecommand "${cmd}"
+		octavecommand "${cmd}" || die
 		cmd="
 			warning('off','all');
 			pkg('prefix','${octprefix}','${archprefix}');
@@ -234,7 +234,7 @@ _octaveforge_pkg_install() {
 			disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir);
 			${stripcmd}
 		"
-		oct_pkgdir=$(edo octavecommand "${cmd}")
+		oct_pkgdir=$(octavecommand "${cmd}" || die)
 	fi
 	export oct_pkgdir
 }
--- a/gui-libs/cubegui/Manifest
+++ b/gui-libs/cubegui/Manifest
@@ -0,0 +1 @@
+DIST cubegui-4.7.tar.gz 10789553 BLAKE2B b0c00985ed910f57e5a32ef340007bbb547ee2948b9d64868227679c86481e953edca75c9cceac8eefb73f1392c5417d27bee809b430288d6a37f054074b0a6a SHA512 48c9cc5a32190d0702d79572f8ad49893016476cc966351b0496e21c5ae8c0a33f0632f07e659eea3c3c062eae8099a531f0a7ff4d129d8b333ec51ecfe12cf9
--- a/gui-libs/cubegui/cubegui-4.7.ebuild
+++ b/gui-libs/cubegui/cubegui-4.7.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 qmake-utils
+
+DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
+HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x"
+SRC_URI="https://apps.fz-juelich.de/scalasca/releases/cube/${PV}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="concurrent debug scorep webengine"
+
+RDEPEND="
+	concurrent? ( dev-qt/qtconcurrent:5 )
+	scorep? ( sys-cluster/scorep )
+	webengine? ( dev-qt/qtwebengine:5 )
+
+	dev-libs/cubelib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	sys-apps/dbus
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-doc/doxygen[dot]"
+
+PATCHES=( "${FILESDIR}/${P}-autotroll.patch" )
+
+src_prepare() {
+	default
+	pushd build-frontend || die
+	eautoreconf
+	popd || die
+	eautoreconf
+}
+
+src_configure() {
+	export CC=gcc
+	export CXX=g++
+	export QT_LIBS="-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Network -lQt5Core"
+	use concurrent && export QT_LIBS="${QT_LIBS} -lQt5Concurrent"
+	use webengine && export QT_LIBS="${QT_LIBS} -lQt5WebEngineWidgets"
+
+	local myconf=(
+		--disable-platform-mic
+		--with-cubelib="${EPREFIX}/usr"
+		--with-plugin-advancedcolormaps
+		--with-plugin-barplot
+		--with-plugin-cube-diff
+		--with-plugin-cube-mean
+		--with-plugin-cube-merge
+		--with-plugin-heatmap
+		--with-plugin-launch
+		--with-plugin-metric-identify
+		--with-plugin-metriceditor
+		--with-plugin-source
+		--with-plugin-statistics
+		--with-plugin-paraver
+		--with-plugin-sunburst
+		--with-plugin-system-statistics
+		--with-plugin-system-topology
+		--with-plugin-treeitem-marker
+		--with-plugin-vampir
+		--with-qt="$(qt5_get_bindir)"
+
+		$(use_enable debug)
+		$(use_with concurrent)
+		$(use_with scorep plugin-scorep-config)
+		$(use_with webengine web-engine)
+	)
+	if use scorep; then
+		myconf+=( "--with-scorep=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-scorep" )
+	fi
+
+	econf "${myconf[@]}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" "${myconf[@]}"
+}
+
+src_install() {
+	MAKEOPTS="-j1" default
+	mkdir -p "${ED}/usr/share/doc/${PF}/html"
+	mv "${ED}/usr/share/doc/${PF}/guide/html" "${ED}/usr/share/doc/${PF}/html/guide" || die
+	mv "${ED}/usr/share/doc/${PF}/plugins-guide/html" "${ED}/usr/share/doc/${PF}/html/plugins-guide" || die
+	rm -rf "${ED}/usr/share/doc/${PF}/guide" || die
+	rm -rf "${ED}/usr/share/doc/${PF}/plugins-guide" || die
+	docompress -x "/usr/share/doc/${PF}/html"
+	mv "${ED}/usr/share/doc/cubegui/example" "${ED}/usr/share/doc/${PF}/examples" || die
+	docompress -x "/usr/share/doc/${PF}/examples"
+	rm -rf "${ED}/usr/share/doc/cubegui" || die
+
+	newbashcomp "${ED}/usr/bin/cubegui-autocompletion.sh" cubegui
+	rm -r "${ED}/usr/bin/cubegui-autocompletion.sh" || die
+
+	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
+++ b/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
@@ -0,0 +1,32 @@
+--- a/build-config/m4/autotroll.m4
+++ b/build-config/m4/autotroll.m4
+@@ -742,29 +742,6 @@
+ #                             | sed -e "s,-lQt,-L${QT_PATH}/../lib -lQt,g"`
+   ])
+ 
+-  echo "Adjust Qt libraries list to the cannonical one"
+-  # replace list of .so files by the -l libraries
+-  AS_IF([ test "x$QT_PATH" != "x" ],
+-  [
+-    LIBPATH=`echo $QT_PATH | sed "s,/bin,,g"`"/lib"
+-  ],
+-  [ # in case of standard installation -> path to the libraries is encoded in the path to .so libraries
+-    for i in $at_cv_env_QT_LIBS; do
+-        _LIBPATH=`echo $i |  grep '.so'`
+-        AS_IF([ test "x$_LIBPATH" != "x" ],  # test if the path has been line .so , other wise try the next one... (for the case of list -l... libraries)
+-        [
+-            LIBPATH=$(dirname $_LIBPATH)
+-            break
+-        ])
+-
+-    done
+-  ])
+-AS_IF([ test "x$LIBPATH" != "x" ],  # perform correction only if one has found .so libraries instead of -lXXXX
+-[
+-  at_cv_env_QT_LIBS="-L$LIBPATH "`echo $at_cv_env_QT_LIBS | sed "s,.so , ,g;s,.a , ,g;s,$LIBPATH/lib,-l,g;s,$(readlink -m $LIBPATH)/lib,-l,g"`
+-  echo "Fixed libraries are: $at_cv_env_QT_LIBS"
+-])
+-  AC_SUBST([QT_LIBS], [$at_cv_env_QT_LIBS])
+ 
+ 
+  # Find the Compiler of Qt (Should have been named )
--- a/gui-libs/cubegui/metadata.xml
+++ b/gui-libs/cubegui/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="concurrent">Enables usage of the QtConcurrent for the the parallel calculations</flag>
+		<flag name="scorep">Enable scorep support</flag>
+		<flag name="webengine">Enables usage of the QtWebEngine for the HTML Documentation</flag>
+	</use>
+</pkgmetadata>
--- a/sys-cluster/evpath/Manifest
+++ b/sys-cluster/evpath/Manifest
--- a/sys-cluster/evpath/evpath-4.5.0_p20220601.ebuild
+++ b/sys-cluster/evpath/evpath-4.5.0_p20220601.ebuild
--- a/sys-cluster/evpath/metadata.xml
+++ b/sys-cluster/evpath/metadata.xml
--- a/profiles/updates/2Q-2022
+++ b/profiles/updates/2Q-2022
@@ -4,3 +4,7 @@ move media-video/mpv_thumbnail_script mpv-plugin/mpv_thumbnail_script
 move media-video/mpv-mpris mpv-plugin/mpv-mpris
 move net-misc/bee-node net-misc/bee
 move kde-misc/skanpage media-gfx/skanpage
+move sys-cluster/KVTree dev-libs/KVTree
+move sys-cluster/shuffile dev-libs/shuffile
+move sys-cluster/dyninst dev-libs/dyninst
+move sys-cluster/evpath net-libs/evpath
--- a/sys-cluster/AXL/AXL-0.5.0.ebuild
+++ b/sys-cluster/AXL/AXL-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -15,8 +15,8 @@ KEYWORDS="~amd64"
 IUSE="test"

 RDEPEND="
+	dev-libs/KVTree
 	sys-libs/zlib
-	sys-cluster/KVTree
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
--- a/sys-cluster/AXL/AXL-0.7.0.ebuild
+++ b/sys-cluster/AXL/AXL-0.7.0.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="~amd64"
 IUSE="test threads"

 RDEPEND="
+	dev-libs/KVTree
 	sys-libs/zlib
-	sys-cluster/KVTree
 "
 DEPEND="${RDEPEND}"

--- a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild
+++ b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild
@@ -68,6 +68,7 @@ RDEPEND="
 		sys-cluster/extrae[${PYTHON_SINGLE_USEDEP}]
 		sys-cluster/mpi-benchmarks
 		sys-cluster/osu-micro-benchmarks
+		sys-cluster/scalasca
 		sys-cluster/scorep[mpi,unwind]
 	)

@@ -106,7 +107,6 @@ RDEPEND="

 "
 #	perf-tools
-	#scalasca
 	#tau

 #	slurm-server
--- a/sys-cluster/adios2/adios2-2.8.1-r1.ebuild
+++ b/sys-cluster/adios2/adios2-2.8.1-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-libs/perfstubs:=[timers]
 	dev-libs/pugixml
 	net-libs/enet
-	>sys-cluster/evpath-4.5.0
+	>net-libs/evpath-4.5.0

 	blosc? ( dev-libs/c-blosc:= )
 	bzip2? ( app-arch/bzip2 )
--- a/sys-cluster/er/er-0.1.0.ebuild
+++ b/sys-cluster/er/er-0.1.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
@@ -15,9 +15,9 @@ KEYWORDS="~amd64"
 IUSE="test"

 RDEPEND="
-	sys-cluster/KVTree[mpi]
+	dev-libs/KVTree[mpi]
+	dev-libs/shuffile
 	sys-cluster/redset
-	sys-cluster/shuffile
 	sys-libs/zlib
 	virtual/mpi
 "
--- a/sys-cluster/er/er-0.3.0.ebuild
+++ b/sys-cluster/er/er-0.3.0.ebuild
@@ -15,9 +15,9 @@ KEYWORDS="~amd64"
 IUSE="test"

 RDEPEND="
-	sys-cluster/KVTree[mpi]
+	dev-libs/KVTree[mpi]
+	dev-libs/shuffile
 	sys-cluster/redset
-	sys-cluster/shuffile
 	virtual/mpi
 "
 DEPEND="
--- a/sys-cluster/extrae/extrae-4.0.1.ebuild
+++ b/sys-cluster/extrae/extrae-4.0.1.ebuild
@@ -43,8 +43,8 @@ CDEPEND="
 	clustering? ( sys-cluster/clusteringsuite[treedbscan] )
 	dyninst? (
 		dev-libs/boost:=
+		dev-libs/dyninst
 		dev-libs/libdwarf
-		sys-cluster/dyninst
 		virtual/libelf
 	)
 	inotify? ( dev-libs/libevent )
--- a/sys-cluster/extrae/metadata.xml
+++ b/sys-cluster/extrae/metadata.xml
@@ -22,7 +22,7 @@ process). Extrae generates trace files that can be later visualized with sys-clu
 		<!--<flag name="cupti">CUPTI is used to instrument CUDA calls</flag>-->
 		<flag name="doc">Generates the documentation of this instrumentation package</flag>
 		<flag name="dlsym">Use dlsym instead of PMPI</flag>
-		<flag name="dyninst">Build with <pkg>sys-cluster/dyninst</pkg></flag>
+		<flag name="dyninst">Build with <pkg>dev-libs/dyninst</pkg></flag>
 		<flag name="heterogeneous">Enable support for heterogeneous tracing</flag>
 		<flag name="inotify">Enable inotify support</flag>
 		<flag name="java">Enable support for tracing Java. This is necessary to create the connectors between |TRACE| and Java applications.</flag>
--- a/sys-cluster/parsec/parsec-3.0.2012-r2.ebuild
+++ b/sys-cluster/parsec/parsec-3.0.2012-r2.ebuild
@@ -7,7 +7,7 @@ DOCS_BUILDER="doxygen"
 DOCS_DIR="docs/doxygen"
 PYTHON_COMPAT=( python3_{8..11} pypy3 )

-inherit cmake edo fortran-2 docs python-single-r1
+inherit cmake fortran-2 docs python-single-r1

 DESCRIPTION="Parallel Runtime Scheduler and Execution Controller"
 HOMEPAGE="
@@ -98,10 +98,17 @@ pkg_setup() {
 }

 src_prepare() {
-	edo sed \
-		-e "s|\${CMAKE_INSTALL_PREFIX}/|${D}/\${CMAKE_INSTALL_PREFIX}/|g" \
-		-e "s|--prefix|--root ${D} --prefix|g" \
-		-i tools/profiling/python/CMakeLists.txt
+	# cannot use ${D} in src_prepare, just skip this directory, it doesn't get installed
+	sed -i -e '/profiling/d' tools/CMakeLists.txt || die
+
+	# 810970 remove unwanted flags from parsec.pc
+	sed -i -e "s/ @EXTRA_CFLAGS@//" -e "s/ @EXTRA_LDFLAGS@//" parsec/include/parsec.pc.in || die
+
+	# 810961: 2 tests fail, 2 time out
+	sed -i -e "/unit_dtd_war_shm/d" -e "/unit_dtd_war_mpi/d" tests/interfaces/superscalar/CMakeLists.txt || die
+	sed -i -e "/unit_haar_tree_mpi/d" tests/haar-tree-project/CMakeLists.txt || die
+	sed -i -e "/unit_merge_sort_mpi/d" tests/merge_sort/Testings.cmake || die
+
 	cmake_src_prepare
 }

--- a/sys-cluster/redset/redset-0.1.0.ebuild
+++ b/sys-cluster/redset/redset-0.1.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
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="slurm test"

 RDEPEND="
-	sys-cluster/KVTree[mpi]
+	dev-libs/KVTree[mpi]
 	sys-cluster/rankstr
 	sys-libs/zlib
 	virtual/mpi
--- a/sys-cluster/redset/redset-0.2.0.ebuild
+++ b/sys-cluster/redset/redset-0.2.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="slurm test"

 RDEPEND="
-	sys-cluster/KVTree[mpi]
+	dev-libs/KVTree[mpi]
 	sys-cluster/rankstr
 	sys-libs/zlib
 	virtual/mpi
--- a/sys-cluster/scalasca/Manifest
+++ b/sys-cluster/scalasca/Manifest
@@ -0,0 +1 @@
+DIST scalasca-2.6.tar.gz 10799514 BLAKE2B 0a4b70a01394a41a7be9791baf6f6b4fef796a9f6c9e765ff7de413deb99e80896cd1afa444644383b049274c0a3216578b94f0620f2f9ab1c20e9c8360cbb5d SHA512 a57de4e7b095d7093c9c2ca2404c1af253bfbb459be768335cf1b547c2486c0c952b0062c9347e4a959c88fa8b4bb077569ef4c27eeb483327d622b558675a2b
--- a/sys-cluster/scalasca/metadata.xml
+++ b/sys-cluster/scalasca/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+</pkgmetadata>
--- a/sys-cluster/scalasca/scalasca-2.6.ebuild
+++ b/sys-cluster/scalasca/scalasca-2.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Scalable Performance Analysis of Large-Scale Applications"
+HOMEPAGE="https://www.scalasca.org/scalasca/software/scalasca-2.x/download.html"
+SRC_URI="http://apps.fz-juelich.de/${PN}/releases/${PN}/${PV}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+openmp"
+
+RDEPEND="
+	dev-libs/cubelib
+	dev-libs/cubew
+	gui-libs/cubegui
+	sys-cluster/otf2
+	sys-cluster/scorep
+	sys-libs/binutils-libs
+	sys-libs/zlib
+	virtual/mpi
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	rm -r vendor || die
+	default
+}
+
+src_configure() {
+	tc-export CC CXX FC F77 CPP
+
+	export MPICC=/usr/bin/mpicc
+	export MPICXX=/usr/bin/mpicxx
+	export MPIF77=/usr/bin/mpif77
+	export MPIFC=/usr/bin/mpifc
+
+	export MPI_CFLAGS="${CFLAGS}"
+	export MPI_CXXFLAGS="${CXXFLAGS}"
+	export MPI_CPPFLAGS="${CPPFLAGS}"
+	export MPI_F77LAGS="${F77FLAGS}"
+	export MPI_FCLAGS="${FCFLAGS}"
+	export MPI_LDFLAGS="${LDFLAGS}"
+
+	local myconf=(
+		--disable-platform-mic
+		--disable-static
+		--enable-shared
+		--with-cubew="${EPREFIX}/usr"
+		--with-libz="${EPREFIX}/usr"
+		--with-otf2="${EPREFIX}/usr"
+		$(use_enable openmp)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	mkdir -p "${ED}/usr/share/doc/${PF}/html" || die
+	mv "${ED}/usr/share/doc/${PF}/manual/html" "${ED}/usr/share/doc/${PF}/html/manual" || die
+	mv "${ED}/usr/share/doc/${PF}/patterns" "${ED}/usr/share/doc/${PF}/html/patterns" || die
+	docompress -x "/usr/share/doc/${PF}/html"
+
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/sys-cluster/scorep/scorep-7.1.ebuild
+++ b/sys-cluster/scorep/scorep-7.1.ebuild
@@ -51,7 +51,7 @@ DEPEND="
 #PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" )

 pkg_setup() {
-	llvm_pkg_setup
+	use llvm && llvm_pkg_setup
 	fortran-2_pkg_setup
 }

--- a/sys-cluster/scr/scr-3.0-r1.ebuild
+++ b/sys-cluster/scr/scr-3.0-r1.ebuild
@@ -29,10 +29,10 @@ RDEPEND="
 	${PYTHON_DEPS}

 	app-shells/pdsh
+	dev-libs/KVTree
 	>=sys-cluster/AXL-0.5.0
 	sys-cluster/dtcmp
 	sys-cluster/er
-	sys-cluster/KVTree
 	sys-cluster/rankstr
 	sys-cluster/redset
 	sys-cluster/spath
--- a/sys-fs/dwarfs-bin/Manifest
+++ b/sys-fs/dwarfs-bin/Manifest
@@ -1 +1,2 @@
 DIST dwarfs-0.5.6-Linux.tar.xz 5051444 BLAKE2B 35ef9a6b7a34e2b8a70dccecc85bcf570bd96250bfe4c2337872e67e8cef143b41ff7c5bdef5f198ba6622fd99c5bdd0c056db07b6116772b35ca1c74620a00b SHA512 41087ca4b5217810237fd8e97a138ea51a1c1dc4e984c7efe3626aebdea52f07c7794baf3e1dca2ef28de686a4caab75721ee09d4a2495c4144f92c3ebbac6ec
+DIST dwarfs-0.6.1-Linux.tar.xz 5849676 BLAKE2B 0bf7faf3466bed4c22130f11125e5933ce9a7bde066b18a818b037b9a4f2db620ea8d9487258a3ef6b487fc12414825be5938aeca4947b7cc30ac0139189eb72 SHA512 d8e1b199a60c877b36e946a1f7f71ca02773c8ce0e80377229e930a1a66fd3162b9dc11115e2016720e86c0f3af9da5887b1ea90608da05d616712ec6d7976c1
--- a/sys-fs/dwarfs-bin/dwarfs-bin-0.6.1.ebuild
+++ b/sys-fs/dwarfs-bin/dwarfs-bin-0.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Static version of a fast very high compression read-only FUSE file system"
+HOMEPAGE="https://github.com/mhx/dwarfs"
+SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/dwarfs-${PV}-Linux.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sys-fs/fuse:3
+	!sys-fs/dwarfs
+"
+DEPEND="
+	${RDEPEND}
+"
+S="${WORKDIR}/dwarfs-${PV}-Linux/"
+QA_PREBUILT="
+	sbin/dwarfs
+	bin/*
+"
+src_prepare() {
+	default
+	einfo "Removing legacy fuse2-related stuff..."
+	rm sbin/dwarfs2 sbin/mount.dwarfs2
+	einfo "Done. Correcting man paths..."
+	mkdir -p usr/
+	mv share/ usr/
+	einfo "Done."
+}
+
+src_install(){
+	mv "${S}"/* "${D}"/
+}
+
+pkg_postinst(){
+	elog "You may find more information in the"
+	elog "${HOMEPAGE}"
+	elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md"
+	elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md"
+}
				`@@ -0,0 +1 @@`
				`DIST aw-client-0.11.0.tar.gz 45734 BLAKE2B d377a261fd74d6b0722e55da6d5c3c6f11a18463fca085fcfaaba193fd4c047385b1bd133b95726aa857e090cbe65bfc97f8b2a4926a3f89e88e16e2527c8e78 SHA512 93baaeb4cc5792a0256d70563a7d779543e64f952daa02beaf69af1d00d7741ecc62109696a600c9698a8de89c62e933910a9fb80ca2f0928b122d33414635df`
				`@@ -0,0 +1 @@`
				`DIST aw-core-0.11.0.tar.gz 74757 BLAKE2B 192d5a101e9e01e8de65a5c2aa20a9636ff0476d294951f765b344889ff41ac2dbb0c8b5d2d1b884f96c963219541088b629794f1cf97c9b41c6bda29235c3ec SHA512 4d48d8debb12530c78ef09b1a12530bb10ab2caac4d2a7da1c642afffe26f08b9db60c21576b5d711fd10e47c9b905dbd3a2fb5f72998077e5f7393f9c6edde6`
				`@@ -0,0 +1 @@`
				`DIST cubegui-4.7.tar.gz 10789553 BLAKE2B b0c00985ed910f57e5a32ef340007bbb547ee2948b9d64868227679c86481e953edca75c9cceac8eefb73f1392c5417d27bee809b430288d6a37f054074b0a6a SHA512 48c9cc5a32190d0702d79572f8ad49893016476cc966351b0496e21c5ae8c0a33f0632f07e659eea3c3c062eae8099a531f0a7ff4d129d8b333ec51ecfe12cf9`
				`@@ -0,0 +1 @@`
				`DIST scalasca-2.6.tar.gz 10799514 BLAKE2B 0a4b70a01394a41a7be9791baf6f6b4fef796a9f6c9e765ff7de413deb99e80896cd1afa444644383b049274c0a3216578b94f0620f2f9ab1c20e9c8360cbb5d SHA512 a57de4e7b095d7093c9c2ca2404c1af253bfbb459be768335cf1b547c2486c0c952b0062c9347e4a959c88fa8b4bb077569ef4c27eeb483327d622b558675a2b`