Merge updates from master

2026-07-18 03:23:20 -04:00 · 2022-03-26 00:49:16 +00:00
parent 795aae25e9 86a53ebfe4
commit deb192986b
46 changed files with 547 additions and 157 deletions
--- a/dev-R/MASS/MASS-7.3.56.ebuild
+++ b/dev-R/MASS/MASS-7.3.56.ebuild
@@ -18,3 +18,10 @@ DEPEND="
 	!dev-lang/R[-minimal]
 "
 RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	dev-R/lattice
+	dev-R/nlme
+	dev-R/nnet
+	dev-R/survival
+"
--- a/dev-R/MASS/Manifest
+++ b/dev-R/MASS/Manifest
@@ -1 +1 @@
-DIST MASS_7.3-54.tar.gz 506246 BLAKE2B 91e675bd32eae973bb5815e7cc89ecd7e9d8337015e4a9beff15dad991426d17e659e4bfb5e84e2a7b320cbb07a0a1e8d771fa1afa1b1cb431fa28c4ba9e37ee SHA512 2e88d6e6be8f522f20db4b7f4f1b591ab4af7b2810ce4d4b8e4c89e03bd7c512afef4745327cc047afef479758dea384b1b73adb2eee174d8316ce91a4096d20
+DIST MASS_7.3-56.tar.gz 508061 BLAKE2B f3f6044e10c2bddc085e7aa2adc61e56ffdbf07ce8125421888bab7aaf9ee67b216ef97a4275ea2d84456aa6a00b7e9217a19d396ccd65339c610c9626f481d9 SHA512 1672b31a3a3e54b33f093f0c39e14cd5382b6e2245d5da4601311f623260b3f9fe756d2ac8752ffd5996875981e61c0c783b9c5525a51d72801f708d9f539d08
--- a/dev-R/Matrix/Manifest
+++ b/dev-R/Matrix/Manifest
@@ -1 +1 @@
-DIST Matrix_1.3-4.tar.gz 2050384 BLAKE2B a0c415d3a3ee7b6ee186ac12f87b732a51480cca526906389b7813cd57cf16dd09eb18d859fe0cfaf09c9dbdfdc39973f14c0cf63df2d10c4c494498dc11f7d5 SHA512 7fafc0db9b695587e54884faff14b23a4110c71b6961eb71ea17696fe12997a8a508df5e94fa4a0f065124c35ca85c015dc8010ab3524f31d4555ba192833f74
+DIST Matrix_1.4-1.tar.gz 2862737 BLAKE2B d245df947662c9e5ec27b6047abe70e78f8653cf8b96d004bf72d130d5671c8477a70ccafcfb4294b0863993c3af350f42e077d8c96e95c21ba82bac756bd1f4 SHA512 a2f1e4cf3f51e5201797055fafb63e653ff49a12b0f18f1d16e98e00ef410cd4af47fb6bbb1ebe4ba6f5144bd4191536d18e49c6bf7c63dc0ae14718261dfaf5
--- a/dev-R/Matrix/Matrix-1.4.1.ebuild
+++ b/dev-R/Matrix/Matrix-1.4.1.ebuild
@@ -19,3 +19,8 @@ DEPEND="
 	virtual/lattice
 "
 RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	dev-R/expm
+	dev-R/MASS
+"
--- a/dev-R/fansi/Manifest
+++ b/dev-R/fansi/Manifest
@@ -1 +1 @@
-DIST fansi_1.0.2.tar.gz 480902 BLAKE2B a8df16e8f9032c2750bf1ae6eff7756c867d93d6c167d143978d3792dd16f130be175ed40121aedd7c7d2dcaaf4db4a5e4a63c2fbe08c912213afd1d7850e37d SHA512 9f3afc22f942101b63177b43053b87dfeea483ead8a5932379c9536570160e4e85e4a047f10326646da66f7117310f5aa15877c798fd549e813639e1994df097
+DIST fansi_1.0.3.tar.gz 481163 BLAKE2B 1c2d62f7dd47a439e8c0ba33a1432e5272e02493a6cbdb48d98890b97d47c9dd6b3568381f611ba85234003731921b995ff9e0717cd678b283db015a14f87c75 SHA512 383b15178c559ab1dd36dfc65a66e0f9029cd7328e2116cc13dd66170c3fdb16343c385786c07686aafbca6ef3155d8e116fb69d630abb9f3e2dcdbd630f518b
--- a/dev-R/fansi/fansi-1.0.3.ebuild
+++ b/dev-R/fansi/fansi-1.0.3.ebuild
--- a/dev-R/knitr/Manifest
+++ b/dev-R/knitr/Manifest
@@ -1 +1 @@
-DIST knitr_1.37.tar.gz 895567 BLAKE2B c49470fc0fc5df287a97bbff652e7ef86ae76bbd147b1901ce3f1c95c2f3d33caeccb1681e8c4d2b111ae85eac96ea9f936cf91612e4d1e8b5f6747848e56412 SHA512 ad4adeac96cf1b14b0d37ff584220a40d5685545d98970d0660e22f0630c279a34257afba87a003fa204e2c6e7f65c515600fecb205eafa90c71a2e0b6636865
+DIST knitr_1.38.tar.gz 898373 BLAKE2B f7f5ce5150fe4520039a39fab92fb41296f20823317e0e8eab9cd34fbe4d5b186df3976be7af017741ff38e836df4aef337de5f2433f3575a6c4d674b930ee4d SHA512 4ae22fa21d10d4251bfa75803b700f1cbd3fab0203e45b5e9e4243b837ece5d30b86f637fa99d0d95d56c2fb5728d1153ce82dac7cb90c5246a2ea670cf8efaa
--- a/dev-R/knitr/knitr-1.38.ebuild
+++ b/dev-R/knitr/knitr-1.38.ebuild
@@ -11,10 +11,10 @@ LICENSE='GPL-2+'

 DEPEND="
 	>=dev-R/yaml-2.1.19
-	>=dev-R/xfun-0.27
-	>=dev-R/evaluate-0.10
+	>=dev-R/xfun-0.29
+	>=dev-R/evaluate-0.15
 	dev-R/highr
-	>=dev-lang/R-3.2.3
+	>=dev-lang/R-3.3.0
 	>=dev-R/stringr-0.6
 "
 RDEPEND="
--- a/dev-R/mgcv/Manifest
+++ b/dev-R/mgcv/Manifest
@@ -1 +1 @@
-DIST mgcv_1.8-36.tar.gz 1207096 BLAKE2B 9d27e2638760b797eac8ff2e70e13cbb8343e762875bb81c67dee113307e3319df23f0190a593ad01de55eedc1f4edb42a0f22f34285ff6183b807cbcbc22478 SHA512 55f382fcb2650b170375b103207333db0f448652fdefbba04a7f4f74551673d75d9c6bb12d63ac506c7607f4444edd5e8271ffd47b0521e832c9b71d764b5954
+DIST mgcv_1.8-39.tar.gz 1208343 BLAKE2B 921d455198a3c3d706d892446f1921703ad928da579107ad8cecf4b1c819d6f4997a08c1388a617dd322bf87a8ce312082c4b02e61a4205fa80971ad72c2f7ba SHA512 f664dceaa3680ec9a5a89781bef1d8206f2874f8397c0e9d639634cc7df044ccd738c950504418cbe82158432a92eb4e5911b1500434e820098eecfb1a58988a
--- a/dev-R/mgcv/mgcv-1.8.39.ebuild
+++ b/dev-R/mgcv/mgcv-1.8.39.ebuild
@@ -20,3 +20,8 @@ DEPEND="
 	virtual/Matrix
 "
 RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	dev-R/survival
+	dev-R/MASS
+"
--- a/dev-R/nlme/Manifest
+++ b/dev-R/nlme/Manifest
@@ -1 +1 @@
-DIST nlme_3.1-155.tar.gz 806854 BLAKE2B 6c0b011edca6d8f4dac604485c94d7189776ee4c9486af741b356f2c8d088aa50fd8b590afb53ee346ce065d5f6ab2fa476c00290df03277fb909cde20a7b351 SHA512 1dcb7b1bffd75e2907237143eb31c46f30da0248be4f3731cbe2e3c85d42f1074db8be47f94fb98bc3b0a5cd2dbc5292627c457677d4c5565cdc676428c21656
+DIST nlme_3.1-157.tar.gz 846225 BLAKE2B fe455f9100b17a56991fdac97234870af11f2a990685e6c0986af93bd8ec550da6021689154116297b645806ad5d44799c680989151f2e6a98ec311e9206e777 SHA512 a3976fa2bc514cd6405a52394bb914adc27a05e466dee84d10336006cbc328a3893debf40b7125e2137948faf173a1d06d35e86432e4621010f0d25ad3aa119c
--- a/dev-R/nlme/nlme-3.1.157.ebuild
+++ b/dev-R/nlme/nlme-3.1.157.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 LICENSE='GPL-2+'

 DEPEND="
-	>=dev-lang/R-3.4.0
+	>=dev-lang/R-3.5.0
 	!dev-lang/R[-minimal]
 	virtual/lattice
 "
@@ -23,4 +23,5 @@ RDEPEND="${DEPEND}"
 SUGGESTED_PACKAGES="
 	dev-R/Hmisc
 	dev-R/MASS
+	dev-R/SASmixed
 "
--- a/dev-R/processx/Manifest
+++ b/dev-R/processx/Manifest
@@ -1 +1 @@
-DIST processx_3.5.2.tar.gz 141424 BLAKE2B 383db517c9829087938a3d6dc77b5b65cb9c9fe12a74c32dd6529baab2294b1fdf5b397565cb03fcb131b40fe764a037a39e31fe9599502fdd43578ad632ba52 SHA512 1f7bcbc6acbb28e34286525e4b43979afec077f8ace823516ed8779cbae75f6252363aa4d722e6fad3049f8835190700b4abe094188ccb68ce6436bfa7ad0c7b
+DIST processx_3.5.3.tar.gz 141998 BLAKE2B 0e4b79b9bd59342c3465754d6ac4e66359c71c3854e09e6926e6ae6d91e0396060e9e68204f19e7aef9de0eed70f9010af5c63892589d0914cc9e641296d0cb2 SHA512 65873967e3ff14be0bbff9bae94894784d05f5bb7f29f92f17b404d75e60e0e8fcd40bc78b97d5e3ebcae4749826714a24d04f9359bead4a73dfc7dd54ddb968
--- a/dev-R/processx/processx-3.5.3.ebuild
+++ b/dev-R/processx/processx-3.5.3.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
@@ -10,7 +10,19 @@ KEYWORDS="~amd64"
 LICENSE='MIT'

 DEPEND="
+	>=dev-lang/R-3.4.0
 	>=dev-R/ps-1.2.0
 	dev-R/R6
 "
 RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	>=dev-R/callr-3.7.0
+	>=dev-R/cli-1.1.0
+	dev-R/codetools
+	dev-R/covr
+	dev-R/curl
+	dev-R/debugme
+	>=dev-R/testthat-3.0.0
+	dev-R/withr
+"
--- a/dev-lisp/PSL/Manifest
+++ b/dev-lisp/PSL/Manifest
@@ -0,0 +1 @@
+DIST PSL-6.1_p20210604.tar.gz 391030 BLAKE2B 7a26d6c03a9533e43075d545da692917225bd50206202212f0cccb9ae881f0f137c4b496a53972d542e45687146f35026a559ff72de03766e7aadd191bbadd05 SHA512 65f4892699a4574d130c606904ba18c8ecda128e4b01286256266eccc4c980173e1eeb2aec83f2629dff63834b69c6a938964ef2e239accbf745abcc29d51628
--- a/dev-lisp/PSL/PSL-6.1_p20210604.ebuild
+++ b/dev-lisp/PSL/PSL-6.1_p20210604.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="f489ea67801d04d44cc65d63365d187cdd58dbe9"
+
+DESCRIPTION="Portable Standard Lisp"
+HOMEPAGE="https://github.com/blakemcbride/PSL"
+SRC_URI="https://github.com/blakemcbride/PSL/archive/${COMMIT}.tar.gz -> ${PF}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+IUSE="doc"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="
+	doc? (
+		app-text/texlive-core
+		dev-texlive/texlive-latex
+	)
+"
+
+DOCS=( README.md README.2 manual/sl.pdf manual/lispman.pdf )
+PATCHES="${FILESDIR}/${P}-respect-flags.patch"
+
+src_compile() {
+	default
+	emake sizes
+	if use doc; then
+		pushd manual || die
+		emake all
+		popd || die
+	fi
+}
+
+src_install() {
+	newbin lisp standardlisp
+	exeinto "/usr/libexec/${PN}"
+	doexe sizes
+	einstalldocs
+}
--- a/dev-lisp/PSL/files/PSL-6.1_p20210604-respect-flags.patch
+++ b/dev-lisp/PSL/files/PSL-6.1_p20210604-respect-flags.patch
@@ -0,0 +1,56 @@
+--- a/Makefile
+++ b/Makefile
+@@ -11,10 +11,10 @@
+ all: lisp lispc LISP-INI
+ 
+ lisp : lisp1.o lisp2.o crc cri
+-	gcc -ggdb -O0 -o lisp lisp1.o lisp2.o -lm
+	${CC} ${CFLAGS} ${LDFLAGS} -fPIE -o lisp lisp1.o lisp2.o -lm
+ 
+ lispc : lisp1c.o lisp2.o lispc1.o
+-	gcc -o $@ $^ -lm
+	${CC} ${CFLAGS} -fPIC -o $@ $^ -lm
+ 	./cri comp
+ 
+ LISP-INI : $(COMPILER_FILES) cri
+@@ -34,25 +34,25 @@
+ 	./crc comp
+ 
+ lisp1.o : lisp1.c
+-	gcc -ggdb -O0 -Wall -pedantic -c lisp1.c
+	${CC} ${CFLAGS} -fPIC -Wall -pedantic -c lisp1.c
+ 
+ lisp2.o : lisp2.c
+-	gcc -ggdb -O0 -Wall -pedantic -Wno-parentheses -c lisp2.c
+	${CC} ${CFLAGS} -fPIC -Wall -pedantic -Wno-parentheses -c lisp2.c
+ 
+ $(COMPILER_FILES): compiler.lsp lap.lsp lisp
+ 	./compile-compiler
+ 
+ cr1 : cr1.c crfile.h
+-	gcc -Wall -pedantic -o cr1 cr1.c
+	${CC} ${CFLAGS} ${LDFLAGS} -fPIE -Wall -pedantic -o cr1 cr1.c
+ 
+ cr2 : cr2.c crfile.h
+-	gcc -Wall -pedantic -o cr2 cr2.c
+	${CC} ${CFLAGS} ${LDFLAGS} -fPIE -Wall -pedantic -o cr2 cr2.c
+ 
+ crc : crc.c crfile.h
+-	gcc -Wall -pedantic -o crc crc.c
+	${CC} ${CFLAGS} ${LDFLAGS} -fPIE -Wall -pedantic -o crc crc.c
+ 
+ cri : cri.c
+-	gcc -Wall -pedantic -o cri cri.c
+	${CC} ${CFLAGS} ${LDFLAGS} -fPIE -Wall -pedantic -o cri cri.c
+ 
+ clean:
+ 	rm -f lisp*.c *.o *~ *.bak
+@@ -62,7 +62,7 @@
+ 	rm -f lisp lispc cr? LISP-INI
+ 
+ sizes :  sizes.c flags.l
+-	gcc -Wall -pedantic -o sizes sizes.c
+	${CC} ${CFLAGS} ${LDFLAGS} -fPIE -Wall -pedantic -o sizes sizes.c
+ 
+ install: lisp
+ 	mv lisp /usr/local/bin
--- a/dev-lisp/PSL/metadata.xml
+++ b/dev-lisp/PSL/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+  <upstream>
+    <remote-id type="github">blakemcbride/PSL</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/fontFeatures/Manifest
+++ b/dev-python/fontFeatures/Manifest
@@ -0,0 +1 @@
+DIST fontFeatures-1.6.4.tar.gz 1236722 BLAKE2B 0efcda0175de36d5e3d78c02fc6e835f3f39a14e6d050340d23dbf391ecf6cee9385822e8a005ed45d783bb467f25b087c1b473f4af1186dff98d7d9502c6b4e SHA512 fef775845b1d6dbd2b81a7f44429586ba63bdbcc3f2a5124e4dda41e8af62ac81b143e6d7e1443c3bb90e12f7f592b512bcd90bcbdc18e5eb07de195956cc196
--- a/dev-python/fontFeatures/fontFeatures-1.6.4.ebuild
+++ b/dev-python/fontFeatures/fontFeatures-1.6.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for manipulating OpenType font features"
+HOMEPAGE="https://github.com/simoncozens/fontFeatures"
+SRC_URI="https://github.com/simoncozens/fontFeatures/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/fs[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.28.0[${PYTHON_USEDEP}]
+	>=dev-python/glyphtools-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/beziers-0.1.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
--- a/dev-python/fontFeatures/metadata.xml
+++ b/dev-python/fontFeatures/metadata.xml
@@ -0,0 +1,35 @@
+<?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>
+    <upstream>
+        <bugs-to>https://github.com/simoncozens/fontFeatures/issues</bugs-to>
+        <remote-id type="github">simoncozens/fontFeatures</remote-id>
+        <remote-id type="pypi">fontFeatures</remote-id>
+    </upstream>
+    <longdescription lang="en">
+fontFeatures library
+The purpose of this library is to provide a middle ground for representing features in a machine-manipulable format, kind of like the abstract syntax tree of a computer programmer. This is so that:
+
+    features can be represented in a structured human-readable and machine-readable way, analogous to the XML files of the Unified Font Object format.
+    features can be more directly authored by programs (such as font editors), rather than them having to output AFDKO feature file format.
+    features can be easily manipulated by programs - for example, features from two files merged together, or lookups moved between languages.
+
+Components
+
+fontFeatures consists of the following components:
+
+    fontFeatures itself, which is an abstract representation of the different layout operations inside a font.
+    fontFeatures.feaLib (included as a mixin) which translates between Adobe feature syntax and fontFeatures representation.
+    fontFeatures.ttLib, which translates between OpenType binary fonts and fontFeatures representation. (Currently only OTF -> fontFeatures is partially implemented; there is no fontFeatures -> OTF compiler yet.)
+    fontFeatures.fontDameLib which translate FontDame text files into fontFeatures objects.
+
+And the following utilities:
+
+    otf2fea: translates an OTF file into Adobe features syntax.
+    txt2fea: translates a FontDame txt file into Adobe features syntax.
+    </longdescription>
+</pkgmetadata>
--- a/dev-python/gabbi/Manifest
+++ b/dev-python/gabbi/Manifest
@@ -1,2 +1,2 @@
-DIST gabbi-2.3.0.tar.gz 220806 BLAKE2B 40f5a34d9982123cb61062f666be93c292ca3732b7377edf636afd5a0eb30a9ff74bcb19e395f74fde1fc7de9032d4238bc4714df32a2d677081b962cd11cd39 SHA512 e383b90c8e3e647a2490a654227d241e04b68c6a7cd883f50c8f39ca44954676e4bf4e371f7273246c9c02df52a18d65760fe7b1d8e290fab694bf755573f82b
 DIST gabbi-2.4.0.tar.gz 221729 BLAKE2B 3b8e97aa50434d119a4e9465df5a946e19679e5b190b738bd8dad355c6a03801bdbb7d75cd82e268c0517843e9ccc42c3de2053c1e3ef90ddd55538589ddf97f SHA512 0485ac87f223f9ae95bb9a73cdc7e95ad49d8471f9e19625596e720ecc4dac358411dc9415409944855fa363db255479e5a623893063cc0967a3207321623306
+DIST gabbi-2.7.1.tar.gz 223087 BLAKE2B 4362cc2c5a66d56603e5a2c25d69064544d116c3a71ac3afdb050b28e45c318447a92ad0d0147d447cb9f3e6a4841a79b1642c4c89c9bc084ea5da4b0c828457 SHA512 f12171051179c3ca88c2a3924319c00a51e8eab761c50e291553b22d3925474e9de9e73181697907e3749e34b249034f6978311781af28f700ad49584bdeed95
--- a/dev-python/gabbi/gabbi-2.7.1.ebuild
+++ b/dev-python/gabbi/gabbi-2.7.1.ebuild
@@ -3,14 +3,14 @@

 EAPI=8

-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )

 inherit distutils-r1

 DESCRIPTION="Declarative HTTP testing library"
 HOMEPAGE="
 	https://github.com/cdent/gabbi
-	https://pypi.org/project/gabbi
+	https://pypi.org/project/gabbi/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

@@ -23,10 +23,10 @@ RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.9[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/jsonpath-rw-ext-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsgi_intercept-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/wsgi_intercept-1.9.3[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 "

--- a/dev-python/python-qpid-proton/Manifest
+++ b/dev-python/python-qpid-proton/Manifest
@@ -1 +1 @@
-DIST python-qpid-proton-0.36.0.tar.gz 384349 BLAKE2B 67b5a67a00aad8523487936706ac424a843de5d6cbb90103e542f8dd697d3ac55b5580dd7b2792b32b5f9387df4c22a6a9e25b7416f7a26896944fc0551ebbb7 SHA512 9800290411f21e93aef0699bd2f8457f99380549198fdca40c2cbc696846f688d53aea38d6ca14600c1334204f9d791015a5fc236f938595c44490eb54b2c213
+DIST python-qpid-proton-0.37.0.tar.gz 406828 BLAKE2B f6a7411e4551d6cc416246e0abc925b06742e615463db0f6578907a73fe9b63addc0b67e192dcb9aeeb23a03acb39b0de4a6f9f03853ce817d342a662d763856 SHA512 9d6cf86145e6714cffeebc2e1f4ba84c84b96d2a63150177f24bad28b753a48834344e11037f012aede86c38c809d5b3e2d71be2ace1393c302ce7696e91bfe6
--- a/dev-python/python-qpid-proton/python-qpid-proton-0.37.0.ebuild
+++ b/dev-python/python-qpid-proton/python-qpid-proton-0.37.0.ebuild
--- a/dev-python/types-pytz/Manifest
+++ b/dev-python/types-pytz/Manifest
@@ -1,2 +1,2 @@
-DIST types-pytz-2021.3.0.tar.gz 2034 BLAKE2B c104024d3758d13cd898a0a4fd3f002765bea6e7d1e5c8112e08ee772dd7298b0e9dd6d84bfb95ed30c792734dbf8ee1c4b71baf3245d4063ff389c7c7fe51a3 SHA512 2d30f0e04876b76642a475942d2059fd07294d8d5a8218f3022bdcd861d62596376f57d8450f6ec6d7380a9997296f76815278c0b61562d7bef710c371f8feb4
 DIST types-pytz-2021.3.5.tar.gz 3030 BLAKE2B 59728927f7fe6828659d915b0054b7aa9a937b62d474f694487dfac45e5e605de62d55a71bf1155ccb0eb6a2519b393f09979bd3f12c8c06998edcb6d54b7d8a SHA512 6c4c99ce685d8a6e9b3d0f8e26b64c54505880a1fa139850822c61f16f967ad3efeb5779c57a2005612974f6e35a25808585b346fe7ca97e5d7a5ef08d2ed26e
+DIST types-pytz-2021.3.6.tar.gz 3134 BLAKE2B a3be61269c8dcebb1ba6d1ff3f0c5ac383a04783d6d572c7cf5ae48aba02ceebad91092d51f7e1cff3a230597f19be6d03c3fa1b927fbcae943be3ff425a8269 SHA512 d172b3192f4b2e5cec715205507cf04cb8347db29cb0a33dd9d610a4d936e57b7a72ab05e05648c716582ac24b19b48381e16e31075d6ae3f46c904f27073de4
--- a/dev-python/types-pytz/types-pytz-2021.3.6.ebuild
+++ b/dev-python/types-pytz/types-pytz-2021.3.6.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,9 +7,9 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )

 inherit distutils-r1

-DESCRIPTION="Typing stubs for paramiko"
+DESCRIPTION="Typing stubs for pytz"
 HOMEPAGE="
-	https://pypi.org/project/types-pytz
+	https://pypi.org/project/types-pytz/
 	https://github.com/python/typeshed/tree/master/stubs/pytz
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
--- a/dev-python/types-requests/Manifest
+++ b/dev-python/types-requests/Manifest
@@ -1,2 +1,2 @@
-DIST types-requests-2.27.12.tar.gz 10092 BLAKE2B abdf17498a43843a00d00931ae2c852fefeec5535a9cabde14bcf78776145e23452433e7efd866bc057457942927ef608999c202c7b2d5aabbcc2b635dbda287 SHA512 691fb49a9f16f028fe94e7c1f7b7ebcdae46b457891914f4508de9e5b772b9cfd33fea13377b72c555385f11009ee6efbebb3cc15010a7a18dd1138a4ac0295c
 DIST types-requests-2.27.13.tar.gz 10088 BLAKE2B df9bfe125236d76a39ef37d89b5966a8a259568fcb5912bd7b0acde42e023968e783f7c8e6d9d67bca21c55b214ffbfaa939713ed2d8e1d2ae3635507b81b1bb SHA512 20084b63a0984be5f7a5f90187208fc58fdf70abc191ad9840ec1c41e672792c29ca36bc532044c00c28e813f3192e3aab4b95ef8ca0f1821b6d74ca2a8a7f19
+DIST types-requests-2.27.14.tar.gz 10258 BLAKE2B 28fefde40669a2e7298ced14e64c22a0a96f7891690023b202dfdf31cb5369130afd11d1b00ed879b78cfd487dc489c617287487e0d1db27041970661be5c8be SHA512 8f25e448688a01319432743849f27aa35e406e23bb5a6ebf43d07875db87d19359ee61831b772777df1bd5674cacd570bdadd05eb1f2eb03979509c9d966be9f
--- a/dev-python/types-requests/types-requests-2.27.14.ebuild
+++ b/dev-python/types-requests/types-requests-2.27.14.ebuild
--- a/dev-util/gftools/Manifest
+++ b/dev-util/gftools/Manifest
@@ -1,3 +1,3 @@
 DIST GlyphsInfo-e33ccf3515cc5b8005a3a50b4163663623649d20.tar.gz 576525 BLAKE2B 306146533d15e412e8e18f072a1fd55770310fd7a85e0a8cb956f1262622e40776b60c1bb729701b419c155970870a55a398cf01257e0b4f4a338c8714232c79 SHA512 7481f524273e73cbb7827ee6ddf9ae63852b44440e9ef5097c6fea643e99912195f0257e9140ca17738a208559c36d8dbec51ec9ec5f24cd9510d5989378be13
-DIST gftools-0.7.2.tar.gz 5558945 BLAKE2B 4021f6a09b401b94e048c88f1a744153f830ad550edb14ba5c4c83f6deda9089e27c449a85d643ea167e31d1697c3eb404f49c9bd1a9f2322746aa06a2655c5d SHA512 34336e6fa69722f3e7a317f09c2be15f8f74505dea673dea68d6c51c0289f448d77849cc92f3b47bc6bdb2f86ad525a82a4c24e9a4e08fc215cfd6e2e401d818
 DIST gftools-0.9.2.tar.gz 4640316 BLAKE2B 9fad40044c6d66fb8f6fe69d8f67bae62828954136b14d44108098b60f77babc964508d229eda9018fc1fd3312f1f8ecc0a6ad5f067cea71a504b58ce8d2f691 SHA512 e60d358c4754b0177532ef5f84a50734ea4a203275f13e262852819522901ac16e0e502a883eafcf6e868faa07f17440a58f923927a826364212452d96944db8
+DIST gftools-0.9.4.tar.gz 4645902 BLAKE2B e74e94d195bb3c49f453dec09372dfa2d42fc8c2abba79a23106dc605f94992efd2c239b7ace8b96e4677629cbf230c4e08d379683aebd1a0a60b6fdc4aeff1e SHA512 ab26899b844f60cbe9a15f9ad01675a3e317c64590339efcc3efc1bfb67b5a05364dfefd7dc3433246c6b5c50bd89a42d438398b4535c04782ca67c192935a3b
--- a/dev-util/gftools/gftools-0.9.4.ebuild
+++ b/dev-util/gftools/gftools-0.9.4.ebuild
@@ -1,7 +1,7 @@
-# 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

 COMMIT="e33ccf3515cc5b8005a3a50b4163663623649d20"
 DISTUTILS_SINGLE_IMPL=1
@@ -10,65 +10,63 @@ PYTHON_COMPAT=( python3_{8..9} )

 inherit distutils-r1

+DESCRIPTION="Miscellaneous tools for working with the Google Fonts collection"
+HOMEPAGE="https://github.com/googlefonts/gftools"
 SRC_URI="
 	https://github.com/googlefonts/gftools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/schriftgestalt/GlyphsInfo/archive/${COMMIT}.tar.gz -> GlyphsInfo-${COMMIT}.tar.gz
 "
+
 KEYWORDS="~amd64"
-DESCRIPTION="Miscellaneous tools for working with the Google Fonts collection"
-HOMEPAGE="https://github.com/googlefonts/gftools"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT"
 SLOT="0"

+# ufolib2 is an indirect dependency
+RDEPEND="
+	dev-python/statmake[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/ufoLib2[${PYTHON_USEDEP}]
+
+		dev-python/fonttools[${PYTHON_USEDEP}]
+		>=dev-python/axisregistry-0.2.0[${PYTHON_USEDEP}]
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/PyGithub[${PYTHON_USEDEP}]
+		dev-python/vttlib[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/babelfont[${PYTHON_USEDEP}]
+		dev-python/ttfautohint-py[${PYTHON_USEDEP}]
+		>=dev-util/fontmake-2.4.0[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		>=dev-python/browserstack-local-python-1.2.2[${PYTHON_USEDEP}]
+		>=dev-python/pybrowserstack-screenshots-0.1[${PYTHON_USEDEP}]
+		>=dev-python/gflanguages-0.4.0[${PYTHON_USEDEP}]
+		dev-python/glyphsLib[${PYTHON_USEDEP}]
+		>=dev-python/glyphsets-0.2.1[${PYTHON_USEDEP}]
+		dev-python/ots-python[${PYTHON_USEDEP}]
+		dev-python/pygit2[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/strictyaml[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/skia-pathops[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/hyperglot[${PYTHON_USEDEP}]
+		>=dev-python/fontFeatures-1.6.2[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]')
+"
+
 RESTRICT="test"
 PROPERTIES="test_network"

-RDEPEND="
-	dev-python/statmake[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		dev-python/babelfont[${PYTHON_USEDEP}]
-		dev-python/browserstack-local-python[${PYTHON_USEDEP}]
-		dev-python/fonttools[${PYTHON_USEDEP}]
-		dev-python/glyphsLib[${PYTHON_USEDEP}]
-		dev-python/ots-python[${PYTHON_USEDEP}]
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/pybrowserstack-screenshots[${PYTHON_USEDEP}]
-		dev-python/pygit2[${PYTHON_USEDEP}]
-		dev-python/PyGithub[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/strictyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-		dev-python/ttfautohint-py[${PYTHON_USEDEP}]
-		dev-python/unidecode[${PYTHON_USEDEP}]
-		dev-python/vttlib[${PYTHON_USEDEP}]
-		dev-util/fontmake[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/tabulate[${PYTHON_USEDEP}]
-			media-gfx/fontforge[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-setup.diff"
-	"${FILESDIR}/${PN}-tests.diff"
-)
-
 distutils_enable_tests pytest

 python_prepare_all() {
-	mv "${WORKDIR}/GlyphsInfo"/*.xml "Lib/${PN}/util/GlyphsInfo"
+	mv "${WORKDIR}/GlyphsInfo"/*.xml "Lib/gftools/util/GlyphsInfo" || die
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
 	distutils-r1_python_prepare_all
 }
--- a/dev-util/rust-analyzer/Manifest
+++ b/dev-util/rust-analyzer/Manifest
@@ -3,6 +3,7 @@ DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e64656907
 DIST always-assert-0.1.2.crate 7067 BLAKE2B 042aada56eff9ca11c97d1b12c538c70c08248260f043c271466d5fcf70f1a11e4cb498096f2d55d6693d4fed6dee7e47781ae5d0fe3fe09b48e986feafa9c7d SHA512 ab23c4776e98c1d38d9583fad1d4909288793498f928e560106b972df01f307247020b5db034d909975a093db5917bb42d11540c32d787336abcaafc1a7613f0
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.53.crate 44233 BLAKE2B 09033ff6e5a64456dea7d9c9039479c02334aefe3cebc449150df16486be3c0c52005bc3b6153c9a044671c52f36a16e97033ff68ffc4fa66e44cffbdcae23b5 SHA512 3c7e03a02b75982bd43f73503f0e12382e03d74136ddccde753617f6a8fd9d28eaf5b67f8fceb7d2dd70ea5414995cbaeb7ae1776bad31c6c8c084614f8376df
+DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
 DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
 DIST arbitrary-1.1.0.crate 26225 BLAKE2B 784334aaa16037fc72afc63ab64c9175f974231fda3514a86b8f90bc772cbdee9d85659f6700c3ac9c91bec531e2106b7fdb57cc2308092ad85b1843f115d935 SHA512 5807bfbec481516df8f5a9e829abd889b87ac70fcea7df21db868203bdbe6bf5b0a2f5ddf94907fbfb9b8d4be3af13f93fe14b1840342f89e875329c4cf7524b
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
@@ -13,21 +14,32 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST camino-1.0.7.crate 26602 BLAKE2B d0ab5d5da9036acfe8ee4f68c015c123773529b9c84f0dd365169f33ca7e23eafcb5353bb2f6db02fbced9c075a0dc356c96d02711af1c4a506ce4d1c9f2fe05 SHA512 0c22c9de3740d39d058de25b2c9b221928f11cf9340562412a15948ddfeaddcb6da38ed3f18321c322d2811847d7cb5cc1c78304f67e9702a2056e59da64bf33
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo_metadata-0.14.1.crate 17373 BLAKE2B 4633c48ca6a128e863e37a64e6a270108c5ab4b23731ac80ed662cefd0354a82f4b14e6ece2e4085882f40074751814c0a61063571ee73e3f2ba051e69766b81 SHA512 0c8fde74b0da60a30e024ca85ca0224ff31539fccd6ec5ab84739c7f1e9643b49222fb828546071696f797c43c4dde8613c10be9457c1cba0bd054b1b99cbd26
+DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
+DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chalk-derive-0.76.0.crate 3430 BLAKE2B d4ae490889d7fdb1b52cbf6429ce07b5dd1306678421d024dbdfdfcd7d5ce3460bc92477780fca5735fa29b6de4820bbd806b5a6a68297b9bdde4e94ce400c16 SHA512 5be297882f1e556d8f41cb2cdc862bedf935129279f434f0f5667b01296b1e9335bdec0da4ea41bf60c4e3f83bf452389f53e9089fda01f460a33e9a8f4f4c29
+DIST chalk-derive-0.79.0.crate 3432 BLAKE2B 25da0a7e84a718beaab5f133e42f86fb183f327447585ec4188dcff2e8d2dc34f64e4a3c5f516112edf1d8b454b9c5c3c04117c26d2e7e83fd784b34bcf72dd4 SHA512 2b017173ab8f0dff7f33348b78d46cf64ea631f195d94c88889392b9ea18e8ea84b0c624c8cd4129255edb878371abf900c3bacf602bfa0e8e43235035c4e805
 DIST chalk-ir-0.76.0.crate 51188 BLAKE2B 9a9c1c9d316eeb86e6268199f4975938810e3bd3bd34ffd901702b605061792cab5d389f422aaf72e96d95e9629744ca51742023231da84dbfa909187de36552 SHA512 f75993b15d8933b89f9e4b1b141a1e0d0ec044af6e967331f546cbf59e5c0376df4874dc62b2e3b66c4312f9f76f5276c69c4d860e07d3da226a262f74b087fa
+DIST chalk-ir-0.79.0.crate 51312 BLAKE2B eabb137a44828be44b64a5874855fa432e8686dd6167884575617d316092f6336346ff52435d1b03667068a70434129caa0c7a8014cd5739a6a949a9a55a8c99 SHA512 a428dafcb2e9969e3d60b5b6bfaab469cf6dc3a6b7ecf645dd5011df223e0c15c60eb743b95d572ed07109b15113316bfd9ccd02b6abfae86466c26bf68e6b21
 DIST chalk-recursive-0.76.0.crate 14634 BLAKE2B 0b5e7df79fe7a3297fd8c199265fe4c250143651674a78560561819dbe43f984b909bc9bc9bcc673281c1b3b4a0819db77a46f984679dd57fc3fcfcad0c3f974 SHA512 6b9a79350df37ce1d3443b88e20d29506d20fba915d469df9da50ba352898d0bf813842a0ea987fadb16632e26cb746f2f407627d20c606506a843e0ffdcd9d3
+DIST chalk-recursive-0.79.0.crate 14815 BLAKE2B 82d9d137ef18218d8547fa64f14208e8d860148528c41031762cfdd2f034885743ff8992b426c1f6f1fcfe6af3e868a86d83a83ef9c5e27c25a5b2a405bd325b SHA512 743c951aab40506136c22899a7eaf4dd9a806d2ce23a789681bb4deabec535befd1bd9555baea5fbac4166a4080d9dc8c1c82c549361603579fb78b3beba5708
 DIST chalk-solve-0.76.0.crate 98011 BLAKE2B 4466847fb6ce1db5530de21a630ed1300d314bd4d2ded8ef23984a84ac643f7324c9284c2c4008fdcb66436f95a4687a2992ad83703109ebd9f6a675dca43694 SHA512 9bb6e17647d7fad559cc23c12ba3af43b6cc7c0b4f7b49a8d705f19282022dd93854405fb1dd4b72dcccd4a9163a8ec5e00fc6debb595fccc6df3bb3741893d7
+DIST chalk-solve-0.79.0.crate 98194 BLAKE2B ae1a945783c38bc8ccc14ddf03ef9dcc287be74a284ad4447f4424708c00426fdf022bb993479f1869fdb5409a5dd92d8435057732458c13605f3ba21ddd5f86 SHA512 b97d77faa5d26a007b9b970ea41e3cb4f59e580c0bb2fb125f73eea29e8894cebae283eb1fdebd343645eae2f6dc6ce089c165f7d2d64f1e9cf6add709e4f40a
 DIST countme-3.0.0.crate 9903 BLAKE2B 8da4f18fa18c914354f68594f18330f7114861c917b22fe5eccd6f2fbdfa6de90144994783c7751ae6a61a4d68c3e7be3739f2ce5834e8359d2935efff29dc7e SHA512 b608f8e87d4c929ef3438d59e78da7faa118485ecfff18e53315a4fd6a56e68292328ae43386125ee098b739f96aceec49fa0e29b6dd40ea88fe0a8dffb2656b
+DIST countme-3.0.1.crate 10784 BLAKE2B de1803559fab0accab1edcf5db43279dfa3d7b2874f5c0ee300f46ccccc8ce4c5c3d92c5a3c211068430d903f2e9288ea07fff532d84e3c0f80edadb0752a803 SHA512 f4c8c0977c6871ac8b7eab15904789ca53cbb28385a6fc90d880f85afb44bf10602850198c624963c7db04dbee8c97e271865ae2eadfdf840c21792de4f2af47
 DIST cov-mark-2.0.0-pre.1.crate 8324 BLAKE2B ea1acdf5ca1e7d88445a7b532368b96eb36f432342dabea3398c40541fa7cbdb3b91e83c47f58afe1d9a79f143f5bf80a40e6b59139f767ed0bd77370ff6c108 SHA512 c0057dc9ba4949f35842de756ed7a9af84a61ff19d4bf53551d0a85596ab7ea8468f9ef9abfd4059a2e7bb39f02c4923996d4da5809d5ea67479bb80cad3bb8e
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
+DIST crossbeam-channel-0.5.3.crate 88179 BLAKE2B 4fd2b35e36ee9176341e336096d717d649087b8605d81871ba9642a9ad827569e60769cfebe8a96a55e5c79a5180cf42e79c62fb1418d50b0c65f4c711181a66 SHA512 2c1033f514a6c0cffa247031b0aa2d3a8e52bfab9b2a04d9f11c0b5050dc3779fad2325589b52c8d33c7e8d15f74b04ebf802b262b6d8d03b976619525a65bd0
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
 DIST crossbeam-epoch-0.9.7.crate 46089 BLAKE2B f0e38a9e0d4c6b4a3b81507dc9c89fad9b17fe55894c92c6355fc14898afd40af0747802a9c34a21f5250660acc444b5d2a3958d4a08fd25fc52b87f78b39e51 SHA512 f6afc55b8624fd3d4f8b0fa5f949360b7e205f7f5be92c248acc102d761e8cd1facac0e40be2f507379c824ce2bfefbf6aea6e8a87eb2ba1c20f928bb9dcc0a9
+DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
 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 dashmap-4.0.2.crate 21066 BLAKE2B 61c8cd1d52188ff071aae0c323b67e2f16b2282791c696a3f9c3d876d21efcccbad62f80bed85fc1b6a8223708c30ff5d5513b7f4a980f29980f2a6a1f8ab787 SHA512 1658183be619b781c5d9e33a2c709805053ab81187145517eb4bd22e12acb42426fef841a91618e889f4e7da792b88437bbf26e3899144222562c54575107d0e
 DIST dashmap-5.1.0.crate 19941 BLAKE2B a26c53bec5b8dbd3edf79904ed365aa520c6623e6635597c9cf83fe87a1a3a660060c266e1db10c54a59f9a0d3d7ef8b9bc5e913628eefaa646851e22027035f SHA512 57e516a7d1e6aa20ff59b6cc01417dce1101049495d6d695d778a27489ccd1d8ad6e22bf1d8f202cf6a11e60ac7ea22c2a48acf2236ca32107d5924e347ce4a3
+DIST dashmap-5.2.0.crate 20221 BLAKE2B 50f410d93f21a6e55f273d4e8b7eb288861d8ae15e272467ef0d279c5acffa339196041ab16d211e9dc2d7f2dcfd716201b558c49ef06cbb16f85ea2d4b0718b SHA512 d1f9c2c46d5fc9e22dbf409848679f2b10d56262f4780f1ab073178120cb9e2cbafb811563133f3ed8bcc923e9e0ab5e6dbae49ff55b7a05b94c1db7b5ffda5f
 DIST derive_arbitrary-1.1.0.crate 7438 BLAKE2B 0a190293a6b7bd9f8d757c19cdefb6d1018fd1cc035af3acdd8793ff4a5b3419e49036e5d223c01c4307c120f8c4b29d12a44876458564684c94fb51b93a2e6c SHA512 369708c86706399c30d39dbb4ac0d6074089e499d2446ce09de3c0085575a08afea78998e341720d64e29b48990ce11b7e08aceb8b5e4f978c5c82828f4788da
 DIST dissimilar-1.0.3.crate 28403 BLAKE2B 79f9f6b2cd754c1fc49959ad3fc081bec521669ce276c48dd5e6e2a29669f00e5398b391067a40f4bc08336408f95305e4b736485f7dbb2b882f1aa269bf761b SHA512 0c05cbee349bfa775ae37ec84642b204838599b4887f3eace9cfb34464cf747f43caeea9c741d342bf5d8b142269c2eb66d848556b6babe19e878a1e2afac529
 DIST dot-0.1.4.crate 17701 BLAKE2B d608505bd8988e98a4b90b0f812c00735eddc04ff83ddb01c88af59b417d33c4218b8d807a106bef4d140432537d3432ea4292d44b33d009d987e567f938de04 SHA512 76a88f83b082706a1b0619338609695f41cd0179c648fadcce05fcc7f6f7c28a175ac3d138a5f9821ea34c044273c1ce645a0cde166bf0cbda1b726756c540cf
@@ -60,8 +72,10 @@ DIST kqueue-1.0.4.crate 11771 BLAKE2B 3a428dc381fccb406ad4f6cb040a5ffc5371386c1a
 DIST kqueue-sys-1.0.3.crate 6673 BLAKE2B 79254d667b4cf1fa556f1773db23b00ac431bdea6c8ecf914e3c0837fe4e25a45c9b6fb76259d628e4c76a20f749df3fc285b54ea63ce3b52d21529358e81c3f SHA512 76023295abaa4415c1d7b37c844432ece522b762f78983cdf58106f65ca553ee96193bd8c93f3fd0af029d266d8414f2ba4d1b8835bcdc180acc7defa6269731
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.117.crate 566541 BLAKE2B a0ee103e6167ccf84cbaca9e41934ccaa1f4abcbaad9d7a4d4a8cccdc2f22ff36ccc46a16a295fed9c3113e1534df86a3d19eda9e0cb609bb75145acf8ca9a0a SHA512 1ff22201cad04f8a21674c25bd57e2c708738af7ff1d5677b513d728ecb99f4eec4b78e9685aa633518672de0d44d5dd2e727ee7b6b06c74718181565df3fa7f
+DIST libc-0.2.120.crate 574677 BLAKE2B e9deaa26d610c1085f12acc6bd9d3c71ad9d7586d1749141066ea47f14df7143f8dad8173020e549fe81aef65a72d7ba189fdd3ee0038f62bde75dce362f4f5d SHA512 42aadea2670f63d6a2c38d4d6949d9071c535395ecf458a694751a7a17f2a4a6495ea1dbdcbcb5340cb62e3a40419419141ca39c4d4dcda8cccbe480aa34a014
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST libmimalloc-sys-0.1.23.crate 913601 BLAKE2B 9f531556eebb46b6c17e7b5f204aa7bbbdf6b8c0442c4761684de55b815ed05e67238d96f13d3db2ec1b6a7f5697fbab36088ebf6fc011ae851fe675714925aa SHA512 4861e791721f0cda1ced5d0a0fdd054f2203a938033739445946baec693d5e0ab7ff35e0aa50e418e99d8cb8767447d867ff2f0024e03582088ada90a8caf3e6
+DIST libmimalloc-sys-0.1.24.crate 1119801 BLAKE2B a7ac3bfb48805c85566916b4ad7aa14434d21d7758d1c2f96a8b4889cdc1950ef27661223166fb2671040788e8f6a6fdfed3a0a42e5dc38b525e6100d1d9b6de SHA512 b35b72948581ec3505f569af21a1e55cab9024d3f2fe543972863e74e2c1620fc295a3632122e5548b01dbafc6230a1e2a39456070cbc9d3aadafa10fe166900
 DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST lsp-server-0.5.2.crate 15018 BLAKE2B 90567a348794c9b53929cd0f1b877e7820e204ca39747d1ccad5bc53a98cfa3b0bb73137b8f121a2f3dc4b3e774eb78f943687345e72aa500511f53afb704296 SHA512 deac4de563a8f1fd4bf475f62b6597946ff287a4000b17f6e7736b2d30b5837c17c6dee0f41c0b0f9b4f6f76ac56dd587471168663f38711bbb95cdc1c5e6129
@@ -72,15 +86,19 @@ DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275b
 DIST memmap2-0.5.3.crate 24967 BLAKE2B 743b61983108eeb82e547b216c71039ad8606d2fe533694415233d73accc14388cfbdaf9048fcf13448abfb4a49ecc3f3c961a8ea8a364a428626fed499eadce SHA512 b570f0ea37ba18a8eb22c9207dc952456864fdabf0296bac63c4741e0aec424ac7932fc0dbbd0292ad94406b1e6911826406fa00d11b7590c54816fb7898df5d
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mimalloc-0.1.27.crate 4968 BLAKE2B 35122f591d8afd55b97fef3e9d31ce8fb309cf153160b95b2b134e82e6660089097f0e62a169f9d5ca7379b02fb7dea20c963064a8d6c5f85fdf66a383accd6a SHA512 ca835665a84b9d5fe25b4e781ac84e9356204bba7542741b37a74f175c05612bf6f6d16f986c1814a2ccf10942ae6c2aa6d5fa7335e7ecd5d42d502cf47a9800
+DIST mimalloc-0.1.28.crate 4987 BLAKE2B 01c419515664332335f4f017c2a651ad84607230640921d9d3cfd8c95d319473e1892dc64da1333132b9b7e0bc3641eab1e558258f3b87eff2b05eab20069229 SHA512 07725666f13c3681c58dc646aae9cd916459932140fed34a41eb651d1a5b03b36e48e8bb3fb470d95923140c9c1368c0ee6e526d5ffcc7df2242aabc71918a39
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
+DIST mio-0.8.1.crate 88205 BLAKE2B 88bab5a31b35fccd6fe52145e937d533bd16ac0929a4fdaab46583d7ed65bb0dbd1620e3bdaaf6ebdc2230131c5793836372f1092f662ecd7e78c45e178609d3 SHA512 945e0970bdfbc0293248c3a26dfb84aa789737bc6e8101ec711da6006130eae5ea221e9c15b8f680f04a6b43b1ee1f42fe2d02035a8e2ccd94d78a759489d681
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST miow-0.4.0.crate 27567 BLAKE2B fbd395d3766c3874da8067dec37bfe40f3dd90c995af5139d2583aacb9d634cea73467b87b84af84c760cad89031c1d26670174b2c52e932ef6729d3fc98dfdd SHA512 fc974ec96a82c92492cafd15a5002c1c647841d607cc1726eb2b98645bb528a5d6adb086322d6fc1753326500ecceecb6cf26d721af26441de8ee23ef87be0f0
 DIST notify-5.0.0-pre.13.crate 52883 BLAKE2B ba491e82bd105ebad96c772bc7f3634c24948564321224d2b50f2c65585fa0bc5fe9694f1ce62f343b806fd38b791d41acbde6619e8850157f741968eabff2f7 SHA512 93a43da44218e074fbd53b27e59aae1d1f2a659720b763a3b31abe9541710f7fe841ace214ab91b3e9447fa470cdddb4b1ddfcdc40cc156c29636bcc5fae1691
+DIST notify-5.0.0-pre.14.crate 54485 BLAKE2B cdc8a9caee303a1f7b6e25eac9febb30ed04f1a4bb0a2335e9a4021bd5f9d08f9cfd03c83ff9e57bad33f8d9db2ead3a8583f9298571ae4d5cd3bbf83b678b72 SHA512 8975d11b6caede53129ec17184ac484d122bb093ab6d7f291f81a3c91164d873b2b8d598eabcc09e7199729bacb080f75bc6f008ad83b83f3cf8173968c7cf1a
 DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
 DIST object-0.28.3.crate 233545 BLAKE2B 241e399112a4962c034f1aed3c651eb810c1cead10c7c6b1d6ad4bd8bd61412794f18827979c477005ed8ec4e2fb2b2e7ffdab118083143e20862f1d3425cc03 SHA512 40dfafba5105a270be3c8378df9000efde2f6bb149b1012da50ded7415c43143f2718431b516cef1b14c739b73e1915e9a1bd4a38141db2c24008fd1d8e1f8ba
+DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
@@ -96,16 +114,20 @@ DIST pin-project-lite-0.2.8.crate 27847 BLAKE2B a9f192e644ee443904becb1ff5cc2179
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST pulldown-cmark-0.9.1.crate 114955 BLAKE2B ee295f4b65dee11c0b39054a4613cbfa1058a8dce05dc298bacc151e049dbe3f05b1739205ac345a98e70662187932d226c0d0667974b3c6a6f55882b566564b SHA512 466d6b4ceee89e1a8c71ff7ab8fc1000e7ef1d9bd22193a152358e1dad28c0c1bbe619caf71106d74eb376805dbfd2b888a0626c8c2851bd814d348873843306
 DIST pulldown-cmark-to-cmark-10.0.0.crate 16381 BLAKE2B 73c52a313a0786b5b89462cb86c631ce2fb06bda6b8798f37d2f9f319a66111b9c7d87161a8986e44dae1ee46cd40e9d62d40f4185bb16880efc32c21aa02238 SHA512 5bf98cd82e037552559c306ae648772ad6bc49da3f2a42df16aa9a556a02ecf085d72643a8ad248908de8684c5ec3e0afab2a4cc0e0688288484832a46845611
+DIST pulldown-cmark-to-cmark-10.0.1.crate 16762 BLAKE2B 0646e74cf89f7cd2cb40dc6484f7179fca6f3a7783496445f5561918017e7cf093b7f8690208cf2f197fedc469b7f8c5220b6c8577f39ce8578370b4d4032523 SHA512 fbc22754672681f778d165ce166d25cea590fbf30e249ac91bb9c6a604aca1928f426c4a9f77ec32e5bedf615d8425784781feb3d9c56778849ba72b9a90a996
 DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
+DIST redox_syscall-0.2.11.crate 24032 BLAKE2B 28d71b8c1419e34c4b0a0a1e0ca1bcc34bdf97614a1e33a5f58f867d743a0430ed19e6f76601702802e366c2801d245a3a88c9bd657bf8aaebdda463aeaeea86 SHA512 dcdc6335a0db6a01a31b61aaf9eb684f264b36868a351094d3e2fb3fe84f0c4269db89ad40b9e0fedfe1ebe2096baa20e7a6232a4de5a3dda3b7876eaaca75fc
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 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 rowan-0.15.3.crate 39158 BLAKE2B 2d81cb91022529bc01f3bfa055ebeb6f7cfeab3cc5b34d8d9fc064f8a7dd175c9792f006614060b21e5ac78e9394a6d7ec1374b88610e54568715b6a2e04eb36 SHA512 1002ab3b87ca6f929a167600bb655e4cd76be4cafdccd2a314033b3032c7f0631ff455cd2337212644dc7625d0e543ac17396b1015b6dcba193f43e937083e14
-DIST rust-analyzer-20220307.tar.gz 2124453 BLAKE2B 210d09a2308dd762269229d22429c9d0f727fba5f473c62c8743bc5f5307d60106d7cd1903b39ffba8ffd6a0812e266dfcefa449e4dc514e936e40e641e34b37 SHA512 1ec8d24533697b036c231f186169ac76d0bffb14c534e2478613899a8a58155acf25a5512c74e1c81420041c7fa6591858aba009a7d8a5d81ec252d93f11cb12
+DIST rowan-0.15.4.crate 39346 BLAKE2B 164be51df54c081cac11526d930567a23e87665929aeb964eeab78a7456ee63c4b19d3d22b0f746460d6f53037521b91f1ec2a9d8b9a02ad355e20ac83b5a764 SHA512 aaa804f8dc90fcd1009553e1f3475862d865d24b10894e63c3d1005a31a1c4bdac243320b49aa9c9f71ad0c8cf166d0cc3863f50c1de4a9b4ff07a2e6ddb1e33
 DIST rust-analyzer-20220314.tar.gz 2128215 BLAKE2B c74097e2316acfcb77987ebb7b1bc512254e51c75172b8e81455d5beac612fcd1a172d81d749e37a62b7428180783612f9c62182399e55f357aa15bf3519b310 SHA512 0ef9afda5ae9aea58901596f6b85a4cf4998ca56b0655066b24c7e9a90a956de336d2f69096f344c28cfbd27bb7186f1b52cbce99e060d1cf4951d95521d2b4a
+DIST rust-analyzer-20220321.tar.gz 2145122 BLAKE2B 39d92445457492acda88ac8a48df3554126e8d8303085d72fad77117ddcde5e51280e4aa41951e0986a03fca580b8ead0d7d97d08b3e1467c2812398916f64d8 SHA512 8f4282dc6e7543ae1f2ace5d39d21ac21bafa97eafda4c8a6f9a8b1c318866abac9c6381cffbe497b2d42275d58f720c08277bc24fa9407cb1f47bcb0c596b2e
 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
@@ -116,6 +138,7 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 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.5.crate 29943 BLAKE2B 1f5f372764d266c584c37a42a64fa8904603e31d14b0820d293ccd1bcd0576f279e05638b3d01e37a6aeb5f310078eb27fcbe780f65c745811454aa78c0f4fa6 SHA512 f877bab4a8ba61b0467ae6dfd1e0962d367c09e111c614d398824b9a714bbb01cb0695ba380a47b36a657cacf2b81f8e982b1b12e78b9868177e912c263e1e87
+DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 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
@@ -125,20 +148,27 @@ DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2e
 DIST smol_str-0.1.21.crate 12165 BLAKE2B f9ff6e366a7145e5ee1d2ffbff585467af9052eda4d0a5797c46d15002d0cb470e55981328ca9f136ddb9ecead7eea2c159723167f6bad8cfd13f211b07b9e63 SHA512 b548b21b7eaba6af6173ddbed3f0e808dfc5aec31553ca30a16fe6e487bdd0f01ddf981ffd5157e083e1901780daf2642d4d807af79d4fd1bdfcb4fff778e5ce
 DIST snap-1.0.5.crate 33022 BLAKE2B 0ce3c4379f4ab122e7785c23b42d463c657cee3179d2dfe909797c11a3730d65b6dd660d8626d0fabeb4344356b5cab8e632809845fb7c21e904bdc41594d52e SHA512 d9181f1ffc6605bf7628ab51479956f9769eca85c0942494dfdcf2c7e805173ee3d3bfc17510e72dad6e5c89b80b2a3f9c40b85464eeb79fd6d26de6bee66fab
 DIST syn-1.0.86.crate 235126 BLAKE2B 89973130279128cab73443ee36c8e0d7bc83364ef91d0f086a40c136e26e612428b867a54a1da8ee5b1778cedeafc7403180bd84df2c21017ad5bb76bc0c9138 SHA512 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
+DIST syn-1.0.89.crate 235966 BLAKE2B 8f0e5be9f04f5faeb080fc94d13df0926f03a15ff702a2a88e5eb3194215441882c6f2795506ea05cbafc66f6844de3dc61aef720495932f4675c34be0ef6ee0 SHA512 6b2a9411c015b2b0ed5c5e18cae67f357d1a735e184416c6f8533be191ba65c0963dc9341ba3829195c6616ce71d4a79cbc7768fdbaa98b798b8f67746c6ab4a
 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-sys-0.4.2+5.2.1-patched.2.crate 659964 BLAKE2B 2f81771aef41addc32fb790443f86c72bfe7cbb741416d954f6125661bb25d808fa16274526705f3129653d1bae56a28bab066d61455d70072a90bc57669ed26 SHA512 767caf8c0aa3687de2c2d21aa531357a230f51e03d1e95e33540a6ba3c975a46f587db73a29d98ab27f29fcd57bc0b4bb9818775b45e8fabd27474e9136a900d
+DIST tikv-jemalloc-sys-0.4.3+5.2.1-patched.2.crate 660226 BLAKE2B 3ddcc8e619d71f1e3d1c9e04c59592f599199e76fb990ad8f964bdfdd79f0b9d83b4a5f9727ea11d28c3ed918f02fad9b0a1094834d152af5616e720adbbdd34 SHA512 5233d082252f376fd16d52a7d95d37a40b3bd24d9382b18eb69169da283002a13e600ee41e305e4cde7bf5ffe1c1253875737355f4346ffdc4e71c75a011c0ec
 DIST tikv-jemallocator-0.4.1.crate 15530 BLAKE2B c97e217aedf3e5cb9f4512233665af5d221fbb829b0c40c32d7b1dd0d680a3ca5124877d75a9902a0217fc4caae054ffecedce59726f634043d2f83831b06645 SHA512 c3c1c9917b45f360b940fe6eb85db133744f72b271b9243eace5957cd033113ecda5085abcf1355d1bec7cd844a41c8bf552734677900349dd30ba592215e2b7
+DIST tikv-jemallocator-0.4.3.crate 14846 BLAKE2B e166e73a740d07dab133b2817fc4d3af015b499c62162813e7fb1e682559861c0998afd48f3ed428444f613584590df97222f9d93e79eeb716f7b3515a0f816e SHA512 1dee5afe2d3c07512310d6c2175fac330951c1b1e78277e4538687765792549cdc1d548b5f24b7a96e68bc16d9eff9ff06da18b3f82628d80c4c5f34e704a083
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tracing-0.1.30.crate 77182 BLAKE2B 69a1e70f118eb55c2ea91670a0dd611513835205aae2a718a89197d59bf7a9ac6191d5ec0d34339f5b3b9456cb74236447678e7cb21c2703918d1eaec1ba986d SHA512 addfa5ce47705070eeea900aa9e8c5d5c3564c163f9e080019311a0c00b6cedefe43c5a2b892a866d953696444528e6178e49e1913ead27650639354cd61584c
+DIST tracing-0.1.32.crate 77985 BLAKE2B bc48fa82223ed423ab46269de0d78c1a20d463054e8b1d54605bebd3ae18551f64284c16b2daba9d891b94c6b33d099e89ce880e03be8f5c7c54fd05b2635138 SHA512 9633647e7545817c685054bf9fa6decad2e9b42c35367221cc60fc95fff83446c9c624f96c32e2fc5d2e7e2a543a26d5e341d4ad2399c5066d5d84bd53f9dc83
 DIST tracing-attributes-0.1.19.crate 26201 BLAKE2B cdb968b00745e289a287c3588a68b98281ac370dc90176117fd857accde321cbe07c07da8e7fc918be1b1b788081970e5166bcd2ff8def2cf8096427079516be SHA512 2ec00ee73d0dbfc53dd38b137826fee32495efd0c8889f2f10195d4519e00bc513931291101a00ccdf9b7f3ff0f2377abf045f5d58f312e7260daded0ce0b640
+DIST tracing-attributes-0.1.20.crate 26316 BLAKE2B 33d5d160d4de0d117bc45e33ca76f2dbb0838021bd7b3cee07603ec86e328b27e4fea993becaa9cdda11f4c6fced74575ae9a4a25bba64b26646d72b72942156 SHA512 8ae65a131ba700a03a2e35646a1bdaf043f04b4d5de00f5c58022caf06346b50cd88e1917bcad3a3ad591921fbf2dcef3b49793b8569604eddeea2470627a0c6
 DIST tracing-core-0.1.22.crate 53199 BLAKE2B c31087b526f23340d246fe658d11cf28cd9ea579e25b73233f819e67e19b1d96b1f01ccfd72fb212dae63de8aaf07fdc2d95e7f0ccc9f2752163e5d6f14d685d SHA512 500e74a0a3a54599bb4614b6377d9d721635dd4ce0119697fb234725db8b60e6aecbb850d7dd311af4796e47b060832fe3be39324d484a039e9b8a08d36c3ab2
+DIST tracing-core-0.1.23.crate 53204 BLAKE2B d11cf54f0572e4b9521ca948853bbd3df3c3a6421912d30c253e331a74e0356ae75db67f062be6e944e638110e14bd31103fd65502948604bbaf3b2492cf8a79 SHA512 c01d58dd814d0d9d71a631284c6e8fd5881e8728d79d3715f246530d474900f3b0d396b88f9358f3521e5b171ad577003ae5dd3994d66fa3e016970f6df5184f
 DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
 DIST tracing-subscriber-0.3.8.crate 168584 BLAKE2B 5f2fcf034fb323afb4649dc727af8faef8604a375bd92a575a732f5c7497ef01e6622c4bf395b91242cbcb078d05cefdda1059946422f16cdb30a6a82819e427 SHA512 3195c012c88e6fe0b004a9dd0cb014ad4b84d277e656aa3d89333f0e950696fc6466d9aeb3b725ac021630f92c6062286b29593cfeed8c1ce14039cfa141d1d5
+DIST tracing-subscriber-0.3.9.crate 171130 BLAKE2B 9a0c91ec55acd0095f6773ef91a9fadb8d059ba3af6ab64a69665ed6b8e614667a5f91469b1cfc8450db8cb8535ed2021a6afb7148234fded11811d3d36d8ea2 SHA512 eb4a96dc635b02ea275f014582b9f1f69329c79e8ecec881a97e81a4b7ecbe4b68277000c59bae8f0a40184bef95d9603f621e49f1708d2e28e73433bc19e5e6
 DIST tracing-tree-0.2.0.crate 17099 BLAKE2B a91a63cdcc3c26cdc6924200e1f9f04f4ba1913bbb237a199fa6bf82447c0be80dcd650ba8bac8ab0ee5016c0d6a27f47b05a4765aa231670aebd3c948dfb0f5 SHA512 b10fc9abfc3aa092ea8816db3911f86fc27bf50f6eb3da701a78d8d9bfa5fe9b017a8dc06ff3a179750a29f6dceccb90756d8e3a3f1ec20fac8a6bd9e4f22fdc
 DIST typed-arena-2.0.1.crate 11439 BLAKE2B b5bd230a22894c5545966279b40a8493940719fdf79bed144ad41c363e7f73bfd40e1492efa8d96fb9b5b32e3a31405ef9dbddd55d10bb900ac082d41a034b03 SHA512 182fdac0ef9b494fc2966005ece2107a3c53b6eafe4eebe9be3d552aebe143e05f3db2b51693c253831744fc265ec2a557d31ee42cf0ba5991b38d075278415d
 DIST ungrammar-1.16.1.crate 8383 BLAKE2B 95f96d2d8576b029c57ea946ab9564af58f0e49249ca4c10396dd782a164d6eec15d80f5716af388ff8958eda29d2a2111340ab5016fb1c11dd99e2ca429c7b9 SHA512 5810f1911f22324db712fd1104577e4fb759abcbdd77e0b60c278e4c6d0769f2fe1e476df630735ad9fd5f1d8df14c68d2e7b4adbb4a4c44b06eb1f8712a27c0
@@ -151,6 +181,7 @@ DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 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.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 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-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
@@ -169,6 +200,10 @@ DIST windows_x86_64_msvc-0.28.0.crate 668950 BLAKE2B 90488fdda855494be0aaf3b4381
 DIST windows_x86_64_msvc-0.32.0.crate 669835 BLAKE2B f8c9dc578d652c2abf0d689dfa9681da29f760bc45ecec83b7d994e7df7c04f91fbcebee464ebd94d5fe7eb0dea90ac7c04578b56264d89ca9d91213fd89b17f SHA512 4720246d2aed3c3b3c252cda7773096642e78891b1a9776c920da908b2d3741e9e341060424327f1c16e4cb47b6e22af1be229589a51b5a3a04d2a6447275332
 DIST write-json-0.1.2.crate 7414 BLAKE2B 8527f2f2db543a5866e4dff949b1c67f73f901a2bc819199b4e4cbe70ceca6e4f801d08cc037e95b56b1f469d6859b3a9bd9bcdb4d4deeca90072e00496b9f86 SHA512 80d34868d5ac6858de9850385d24294d8b3d2a743207ce148cc0dfee64cdccecc85c69de0ff06bb74629cbaba5f4c69c2a934afc43f6121b5ee3ab5eb034b80e
 DIST xflags-0.2.3.crate 9943 BLAKE2B 611d0e7ddb75467ba13512355b775c4872b766a17db64ec3f525d09318c91155f1759c5eae79146be4a1a52df702dc3a77cf5807dfac8f97a1a8534338895438 SHA512 3026e3dae3c8a256564d4520f64f933ffcb89539128dcc43351bcdf89c5e0ff9b0ba14ea94512eadd58a3498dbab4529297eb1a3eddfaf8d3bca188e41294c31
+DIST xflags-0.2.4.crate 9932 BLAKE2B e76d081e02015889f54bb5ff0ba8999e11bf1530f997518264d0a121d2e550ad212ca7e195e066b24bed5857e92460fa0d2816ed2fc5259c93117498c3421340 SHA512 1bcc4ed61ca04d54dd3a87498ef13d9d1179b9614f8161221bd301a94b0c75f47ddbcc2487f3d4034210eb124dc01527d70786dde7c1435625163533b3d820fa
 DIST xflags-macros-0.2.3.crate 10622 BLAKE2B f3534240a13e51a8e7b3fc3b9c8d3f5ad7fe30faa155da4517ca0d9469f25443c112f0a4d7b2b3dda8b5ddf000b23b06e599f8e60b3e2b73588fe81a31144530 SHA512 4c0ff0304140db4bf5360ad7f7b7185c081641ff995bdf95fa597d8e7940ee0ea5eaf741b1b7e959cadd1a1a3e79ebab410bffb42e810848d3612ac59e2ffb35
+DIST xflags-macros-0.2.4.crate 10740 BLAKE2B a5ed80034908868e899586b0ba235b262462b217bf07933f7aed36698d4921f943d4747e12daa5c5d0a2d99b66e9dec1ab696f740e4605a93fe284900fa773ad SHA512 073ab7315b499be0b0a807f865992b83e43f5557ab5c798c8bf05926d488f68d439a332607e336d1112bf3f7dec3a73da784ebf8db031455c725d5f1c4cb6de0
 DIST xshell-0.1.17.crate 21019 BLAKE2B c95a09f86b5a0b11f036f9e9f5ee2d925eb3a5ea76d1d168dd5a117a2e56f130edb84b4989e342ddbfedf8a963a955cea86bb0064ae0a6ded81d1d4beb74beec SHA512 534b4c4ba6cb424e60ac4bf0def6e51d5738e4e0f982ac319b5bf7b4cb6fae67505b6db0f9778b57149258a71d1df51e4ded029d79627dc64c394da832f147f2
+DIST xshell-0.2.1.crate 23704 BLAKE2B 79bfc4f6faf0f5f9b0153cd71df177e02f65b036ea798c8ce3c147d5fd063a52b02a1ec521d65306c5f2279ee6fc33515810071a77570600decf6c1787af9f7d SHA512 93b69791fa325f95472061d27c8674059618f06b4245d56cc1caefd1afd6157645bce9946cb9c48e6fcf5b62852037f5b2a81a5376b5c82e2558661255a4b6f3
 DIST xshell-macros-0.1.17.crate 2682 BLAKE2B 8c79a2d499e7e12f56cf2801518159f26df2c70f0b7c4a6c5ff072e7f981fbc314a429a56c89ce89b74091f7e14888088da7c8e51e458e1d709e3ef6f0361810 SHA512 838f8bfc530051d8fe6c1b2a3c8e2fe7c6946705d6e6a084807b35817d5d6bae6f2941cb97a47fdf5c970aa3f4baef222aac938039bb520aadbb3fd7fd1a7bf7
+DIST xshell-macros-0.2.1.crate 2849 BLAKE2B 2c2e91d1ccee6480f1752d7c9586d0aea7a202e3e5b9180758ceacf7369bcc7d98be4b88ceec30f6d570fae5d5cc9e9fc4bccd46a8e3c3961d54102c3d49fb5a SHA512 dd1d31fa327a7d03ec36c304dfdeeff8df1b3eeaec21c99e53b957d4e361639141604c4ad81e1c420a1aa68094745cedba30560bed9a67547e182bd3d61d2b31
--- a/dev-util/rust-analyzer/rust-analyzer-20220321.ebuild
+++ b/dev-util/rust-analyzer/rust-analyzer-20220321.ebuild
@@ -8,7 +8,7 @@ CRATES="
 	adler-1.0.2
 	always-assert-0.1.2
 	ansi_term-0.12.1
-	anyhow-1.0.53
+	anyhow-1.0.56
 	anymap-0.12.1
 	arbitrary-1.1.0
 	arrayvec-0.7.2
@@ -18,22 +18,21 @@ CRATES="
 	bitflags-1.3.2
 	camino-1.0.7
 	cargo-platform-0.1.2
-	cargo_metadata-0.14.1
-	cc-1.0.72
+	cargo_metadata-0.14.2
+	cc-1.0.73
 	cfg-if-1.0.0
-	chalk-derive-0.76.0
-	chalk-ir-0.76.0
-	chalk-recursive-0.76.0
-	chalk-solve-0.76.0
-	countme-3.0.0
+	chalk-derive-0.79.0
+	chalk-ir-0.79.0
+	chalk-recursive-0.79.0
+	chalk-solve-0.79.0
+	countme-3.0.1
 	cov-mark-2.0.0-pre.1
 	crc32fast-1.3.2
-	crossbeam-channel-0.5.2
+	crossbeam-channel-0.5.3
 	crossbeam-deque-0.8.1
-	crossbeam-epoch-0.9.7
-	crossbeam-utils-0.8.7
-	dashmap-4.0.2
-	dashmap-5.1.0
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	dashmap-5.2.0
 	derive_arbitrary-1.1.0
 	dissimilar-1.0.3
 	dot-0.1.4
@@ -65,9 +64,9 @@ CRATES="
 	kqueue-1.0.4
 	kqueue-sys-1.0.3
 	lazy_static-1.4.0
-	libc-0.2.117
+	libc-0.2.120
 	libloading-0.7.3
-	libmimalloc-sys-0.1.23
+	libmimalloc-sys-0.1.24
 	lock_api-0.4.6
 	log-0.4.14
 	lsp-server-0.5.2
@@ -77,17 +76,17 @@ CRATES="
 	memchr-2.4.1
 	memmap2-0.5.3
 	memoffset-0.6.5
-	mimalloc-0.1.27
+	mimalloc-0.1.28
 	miniz_oxide-0.4.4
-	mio-0.7.14
+	mio-0.8.1
 	miow-0.3.7
 	miow-0.4.0
-	notify-5.0.0-pre.13
+	notify-5.0.0-pre.14
 	ntapi-0.3.7
 	num_cpus-1.13.1
 	object-0.27.1
 	object-0.28.3
-	once_cell-1.9.0
+	once_cell-1.10.0
 	oorandom-11.1.3
 	parking_lot-0.11.2
 	parking_lot-0.12.0
@@ -101,15 +100,15 @@ CRATES="
 	pin-project-lite-0.2.8
 	proc-macro2-1.0.36
 	pulldown-cmark-0.9.1
-	pulldown-cmark-to-cmark-10.0.0
+	pulldown-cmark-to-cmark-10.0.1
 	quote-1.0.15
 	rayon-1.5.1
 	rayon-core-1.9.1
-	redox_syscall-0.2.10
-	regex-1.5.4
+	redox_syscall-0.2.11
+	regex-1.5.5
 	regex-automata-0.1.10
 	regex-syntax-0.6.25
-	rowan-0.15.3
+	rowan-0.15.4
 	rustc-ap-rustc_lexer-725.0.0
 	rustc-demangle-0.1.21
 	rustc-hash-1.1.0
@@ -119,7 +118,7 @@ CRATES="
 	same-file-1.0.6
 	scoped-tls-1.0.0
 	scopeguard-1.1.0
-	semver-1.0.5
+	semver-1.0.6
 	serde-1.0.136
 	serde_derive-1.0.136
 	serde_json-1.0.79
@@ -128,21 +127,21 @@ CRATES="
 	smallvec-1.8.0
 	smol_str-0.1.21
 	snap-1.0.5
-	syn-1.0.86
+	syn-1.0.89
 	synstructure-0.12.6
 	text-size-1.1.0
 	thread_local-1.1.4
 	threadpool-1.8.1
 	tikv-jemalloc-ctl-0.4.2
-	tikv-jemalloc-sys-0.4.2+5.2.1-patched.2
-	tikv-jemallocator-0.4.1
+	tikv-jemalloc-sys-0.4.3+5.2.1-patched.2
+	tikv-jemallocator-0.4.3
 	tinyvec-1.5.1
 	tinyvec_macros-0.1.0
-	tracing-0.1.30
-	tracing-attributes-0.1.19
-	tracing-core-0.1.22
+	tracing-0.1.32
+	tracing-attributes-0.1.20
+	tracing-core-0.1.23
 	tracing-log-0.1.2
-	tracing-subscriber-0.3.8
+	tracing-subscriber-0.3.9
 	tracing-tree-0.2.0
 	typed-arena-2.0.1
 	ungrammar-1.16.1
@@ -155,6 +154,7 @@ CRATES="
 	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
@@ -172,10 +172,10 @@ CRATES="
 	windows_x86_64_msvc-0.28.0
 	windows_x86_64_msvc-0.32.0
 	write-json-0.1.2
-	xflags-0.2.3
-	xflags-macros-0.2.3
-	xshell-0.1.17
-	xshell-macros-0.1.17
+	xflags-0.2.4
+	xflags-macros-0.2.4
+	xshell-0.2.1
+	xshell-macros-0.2.1
 "

 inherit cargo
@@ -192,7 +192,7 @@ fi
 DESCRIPTION="An implementation of Language Server Protocol for the Rust programming language"
 HOMEPAGE="https://rust-analyzer.github.io"

-LICENSE="0BSD Apache-2.0 Artistic-2 BSD Boost-1.0 CC0-1.0 ISC MIT Unlicense ZLIB"
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD Boost-1.0 CC0-1.0 ISC MIT Unlicense ZLIB"
 RESTRICT="mirror"
 SLOT="0"
 IUSE=""
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -0,0 +1,3 @@
+DIST fs2_open-21.4.1-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-21.4.1-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
+DIST fs2_open-21.4.1.tar.gz 10441595 BLAKE2B ae59cea98420cbdd6f18832fa0b8ba332993db03a53cbea43a96827dc4c7da375b14694ce60b1633d8275daa88ac32029be7b8211b7efd427baaffdd784720d9 SHA512 a4e6821ee2513cabf8b521f672c36c45aca8fc83fd6901ba19f2c0c0c27b3516c60dabfec1bfae43d82da94c628b9160c447ce853c9927dbb5901c7298986226
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
@@ -0,0 +1,14 @@
+--- fs2_open-21.4.1/cmake/version.cmake	2021-05-22 20:20:18.448441242 +0200
+++ fs2_open-21.4.1/cmake/version.cmake	2021-05-22 20:21:05.493447003 +0200
+@@ -35,11 +35,6 @@
+     SET(FSO_BINARY_SUFFIX "${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}_${FSO_VERSION_REVISION_STR}")
+ ENDIF()
+ 
+-IF(IS_64BIT)
+-	# This is a 64-bit builds
+-    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_x64")
+-ENDIF()
+-
+ IF (NOT "${FSO_INSTRUCTION_SET}" STREQUAL "")
+     SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_${FSO_INSTRUCTION_SET}")
+ ENDIF()
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
@@ -0,0 +1,9 @@
+--- fs2_open-21.4.1/version_override.cmake	2022-03-25 22:22:13.424199518 +0100
+++ fs2_open-21.4.1/version_override.cmake	2022-03-25 22:22:30.378200320 +0100
+@@ -1,5 +1,5 @@
+ set(FSO_VERSION_MAJOR 21)
+ set(FSO_VERSION_MINOR 4)
+-set(FSO_VERSION_BUILD 0)
+set(FSO_VERSION_BUILD 1)
+ set(FSO_VERSION_REVISION 0)
+ set(FSO_VERSION_REVISION_STR )
--- a/games-engines/fs2_open/fs2_open-21.4.1.ebuild
+++ b/games-engines/fs2_open/fs2_open-21.4.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# Replace "." with "_" in version
+_PV=${PV//./_}
+
+# Current hashes of external repositories:
+HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
+HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
+
+DESCRIPTION="FreeSpace2 Source Code Project game engine"
+HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/"
+SRC_URI="
+	https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/asarium/libRocket/archive/${HASH_LIBROCKET}.tar.gz -> ${P}-ext_libRocket.tar.gz
+	https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz -> ${P}-ext_rpavlik-cmake-modules.tar.gz
+"
+
+LICENSE="Unlicense MIT Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/libtheora
+	media-libs/libvorbis
+	>=dev-lang/lua-5.1.0:*
+	media-libs/mesa
+	media-libs/openal
+	media-libs/libsdl2
+	media-libs/glu
+	dev-libs/jansson
+	app-arch/lz4
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+PATCHES="
+	${FILESDIR}/${P}-make-arch-independent.patch
+	${FILESDIR}/${P}-version-fix.patch
+"
+
+CMAKE_BUILD_TYPE=Release
+
+S="${WORKDIR}/fs2open.github.com-release_${_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mv libRocket-${HASH_LIBROCKET}/* "${S}/lib/libRocket/" || die
+	mv cmake-modules-${HASH_CMAKE_MODULES}/* "${S}/cmake/external/rpavlik-cmake-modules/" || die
+}
+
+src_install() {
+	exeinto "/opt/${PN}"
+	doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
+	insinto "/opt/${PN}"
+	doins "${BUILD_DIR}/bin/libRocketControls.so"
+	doins "${BUILD_DIR}/bin/libRocketControlsLua.so"
+	doins "${BUILD_DIR}/bin/libRocketCore.so"
+	doins "${BUILD_DIR}/bin/libRocketCoreLua.so"
+	doins "${BUILD_DIR}/bin/libRocketDebugger.so"
+	doins "${BUILD_DIR}/bin/libdiscord-rpc.so"
+}
+
+pkg_postinst() {
+	einfo "This package only generates the engine binary."
+	einfo "The retail Freespace 2 data is required to play the"
+	einfo "original game and most mods."
+}
--- a/games-util/samrewritten/Manifest
+++ b/games-util/samrewritten/Manifest
@@ -0,0 +1 @@
+DIST samrewritten-202008.tar.gz 4445087 BLAKE2B 278d2210393c79b39006e021d7e51e62e471b333719fab291cc10b8bf4d953bacd881a0f7bd93213e72063d53f448e0144624d193627cbe996bf80c35199fff2 SHA512 3034e62f0e2e523e90123c89cb356623c6ab7346a38ac066dbea30b92c8cc17a1ecb1273aece5530b6c97e1012d5ddfc4fec25e76688198e6c0805d4ce90b914
--- a/games-util/samrewritten/metadata.xml
+++ b/games-util/samrewritten/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>telans@posteo.de</email>
+    <name>James Beddek</name>
+  </maintainer>
+  <use>
+    <flag name="zenity">Support for dialog display messages</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">PaulCombal/SamRewritten</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/games-util/samrewritten/samrewritten-202008.ebuild
+++ b/games-util/samrewritten/samrewritten-202008.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Steam Achievement Manager For Linux"
+HOMEPAGE="https://github.com/PaulCombal/SamRewritten/"
+
+if [ ${PV} = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PaulCombal/SamRewritten.git"
+else
+	SRC_URI="https://github.com/PaulCombal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/SamRewritten-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+zenity"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-libs/yajl
+	net-libs/gnutls
+"
+RDEPEND="
+	${DEPEND}
+	zenity? ( gnome-extra/zenity )
+"
+
+src_install() {
+	emake LIBDIR=$(get_libdir) DESTDIR="${ED}" install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	ewarn "${P} requires Steam to be installed through the steam-overlay."
+}
--- a/games-util/samrewritten/samrewritten-9999.ebuild
+++ b/games-util/samrewritten/samrewritten-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Steam Achievement Manager For Linux"
+HOMEPAGE="https://github.com/PaulCombal/SamRewritten/"
+
+if [ ${PV} = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PaulCombal/SamRewritten.git"
+else
+	SRC_URI="https://github.com/PaulCombal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/SamRewritten-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+zenity"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-libs/yajl
+	net-libs/gnutls
+"
+RDEPEND="
+	${DEPEND}
+	zenity? ( gnome-extra/zenity )
+"
+
+src_install() {
+	emake LIBDIR=$(get_libdir) DESTDIR="${ED}" install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	ewarn "${P} requires Steam to be installed through the steam-overlay."
+}
--- a/sci-mathematics/lean-mathlib/Manifest
+++ b/sci-mathematics/lean-mathlib/Manifest
@@ -1,2 +1 @@
-DIST lean-mathlib-0.1_p20211021.tar.gz 6665360 BLAKE2B 92d7627a095fd8cbc2bbdeccd9321c86badbd36152a034a15d005eadd0507c21aeeb73ecbef8199a267104b5b881ba5b100355e48003c68785205650c4a23876 SHA512 792e8074cba39d1baab87f47af64c49f2a95043c8e9d592f41fe87d8697405c2595933954e1fbf30cb657551e2350fa274e405996d030e47db166cd078a232e4
-DIST lean-mathlib-0.1_p20220318.tar.gz 8076743 BLAKE2B d8c76b93309f5b778654ccd7f8ecd68f9fed72b9bd5e40c5909c193bce96e2af0edf530232d71893a802f5292d7b34a83783826dbda619f8e4450431e0eda153 SHA512 a3708be6c1792de80015ff7ac242ed85ac2eb2e283774721e6f778fb98dd42380556f1238a4cd880f3f22377966cc06e7b92ca62cae078c01302c44c6377d608
+DIST lean-mathlib-0.1_p20220324.tar.gz 8117563 BLAKE2B f183565927e9b957059995d301a20af45d9995ae159c7e3aa54114b91e8421908b6494ab8abfe38215c8cbf0d4e714d08b0a43f24ba85deaec58577d2ac47a5b SHA512 39effb1dbb659f0dbaeb008bc3a3181aafd4c1ad6429d6ff70aca13481ccaefb12f97335e870c9737620d08dffdcb1a94970158637dc37b9ad00faff6a700f01
--- a/sci-mathematics/lean-mathlib/lean-mathlib-0.1_p20211021.ebuild
+++ b/sci-mathematics/lean-mathlib/lean-mathlib-0.1_p20211021.ebuild
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="3c11bd771ef17197a9e9fcd4a3fabfa2804d950c"
-
-DESCRIPTION="Lean mathematical components library"
-HOMEPAGE="https://github.com/leanprover-community/mathlib"
-SRC_URI="https://github.com/leanprover-community/mathlib/archive/${COMMIT}.tar.gz -> ${PF}.tar.gz"
-S="${WORKDIR}/mathlib-${COMMIT}"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=sci-mathematics/lean-3.34.0"
-DEPEND="
-	${RDEPEND}
-	sci-mathematics/mathlib-tools
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	leanpkg configure || die
-}
-
-src_compile() {
-	leanpkg build || die
-}
-
-src_install() {
-	dodoc -r docs/*
-	rm -r docs || die
-	insinto /usr/lib/lean/mathlib
-	doins -r .
-}
-
-src_test() {
-	leanpkg test || die
-}
--- a/sci-mathematics/lean-mathlib/lean-mathlib-0.1_p20220324.ebuild
+++ b/sci-mathematics/lean-mathlib/lean-mathlib-0.1_p20220324.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-COMMIT="d04fff95f686d5c372f7895551c40e7fa683ed6b"
+COMMIT="7c48d65cd4546dcb1cfa01073cbe016fa7f3fbcc"

 DESCRIPTION="Lean mathematical components library"
 HOMEPAGE="https://github.com/leanprover-community/mathlib"
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"

-RDEPEND=">=sci-mathematics/lean-3.41.0"
+RDEPEND=">=sci-mathematics/lean-3.42.0"
 DEPEND="
 	${RDEPEND}
 	sci-mathematics/mathlib-tools
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1 +1 @@
-DIST swift-2.28.0.tar.gz 3535718 BLAKE2B 437cc8d7958b2bd16d936c980204fe313855831720c875082cf7552dc9a0f96d9d09835bc0e65926cd3ff304fe7cf21fb942f9c3d879384e858501acc5b0ad13 SHA512 ab9e8222263dd8bb93481617252cf0858b443835906ce7080c9f21170fcb4fa51af5c7b9184893fc65081a5d3b721a7897320a9d1cb828f9f9910a4872128126
+DIST swift-2.29.1.tar.gz 3583459 BLAKE2B 378b865a035c73b80b2aab0a508da1c4acc9837e987c6daf9d8a13b5642d8f4bd0d2ded5702f8760f139322b691be83a0656c19738ab6a7e92511be65c2f2fc2 SHA512 f1309ef1728f2f259ad4cc0cbc2f88697179e1c0ee823f65c49f6f3cf0d8dd0432ee8d180f83e4c362de1e8b033f1d0e351ea95d034bd13355c3dccf2c14d767
--- a/sys-cluster/swift/swift-2.29.1.ebuild
+++ b/sys-cluster/swift/swift-2.29.1.ebuild
				`@@ -0,0 +1 @@`
				`DIST PSL-6.1_p20210604.tar.gz 391030 BLAKE2B 7a26d6c03a9533e43075d545da692917225bd50206202212f0cccb9ae881f0f137c4b496a53972d542e45687146f35026a559ff72de03766e7aadd191bbadd05 SHA512 65f4892699a4574d130c606904ba18c8ecda128e4b01286256266eccc4c980173e1eeb2aec83f2629dff63834b69c6a938964ef2e239accbf745abcc29d51628`
				`@@ -0,0 +1 @@`
				`DIST fontFeatures-1.6.4.tar.gz 1236722 BLAKE2B 0efcda0175de36d5e3d78c02fc6e835f3f39a14e6d050340d23dbf391ecf6cee9385822e8a005ed45d783bb467f25b087c1b473f4af1186dff98d7d9502c6b4e SHA512 fef775845b1d6dbd2b81a7f44429586ba63bdbcc3f2a5124e4dda41e8af62ac81b143e6d7e1443c3bb90e12f7f592b512bcd90bcbdc18e5eb07de195956cc196`
				`@@ -0,0 +1 @@`
				`DIST samrewritten-202008.tar.gz 4445087 BLAKE2B 278d2210393c79b39006e021d7e51e62e471b333719fab291cc10b8bf4d953bacd881a0f7bd93213e72063d53f448e0144624d193627cbe996bf80c35199fff2 SHA512 3034e62f0e2e523e90123c89cb356623c6ab7346a38ac066dbea30b92c8cc17a1ecb1273aece5530b6c97e1012d5ddfc4fec25e76688198e6c0805d4ce90b914`