Merge updates from master

2026-07-18 11:33:15 -04:00 · 2021-12-30 14:51:29 +00:00
parent 139fdd3c3a 9993c68ffb
commit c054bcc381
57 changed files with 1065 additions and 163 deletions
--- a/app-crypt/pgp/Manifest
+++ b/app-crypt/pgp/Manifest
@@ -0,0 +1 @@
+DIST pgp263is.tar.gz 607982 BLAKE2B 956afb5e4cdb61716b1aee5c02461410ee2d4fb3c5958af8d2f329cd9974115dfb2944bb80194059b5daf61eab277b130c24677f2845c8f9adf942cd1246d609 SHA512 ced42d884f8dbbc7afc2dfbe485716333df5fa04a5727dc63fa3c7504e53447a7561d7406a057fba18e6239836e40cc13de4b30f2223552c6dc3dae0664a4374
--- a/app-crypt/pgp/files/pgp-2.6.3a-alpha.patch
+++ b/app-crypt/pgp/files/pgp-2.6.3a-alpha.patch
@@ -0,0 +1,14 @@
+--- a/src/md5.h
+++ b/src/md5.h
+@@ -1,11 +1,7 @@
+ #ifndef MD5_H
+ #define MD5_H
+ 
+-#ifdef __alpha
+ typedef unsigned int uint32;
+-#else
+-typedef unsigned long uint32;
+-#endif
+ 
+ struct MD5Context {
+ 	uint32 buf[4];
--- a/app-crypt/pgp/files/pgp-2.6.3a-getline.patch
+++ b/app-crypt/pgp/files/pgp-2.6.3a-getline.patch
@@ -0,0 +1,47 @@
+--- a/src/armor.c
+++ b/src/armor.c
+@@ -343,7 +343,7 @@ copyline(FILE * in, FILE * out)
+  * idea.
+  */
+ static int
+-getline(char *buf, int n, FILE * f)
+get_line(char *buf, int n, FILE * f)
+ {
+     int state;
+     char *p;
+@@ -376,7 +376,7 @@ getline(char *buf, int n, FILE * f)
+ 	    return 0;		/* Out of buffer space */
+ 	}
+     }				/* for (;;) */
+-}				/* getline */
+}				/* get_line */
+ 
+ #if 1
+ /* This limit is advisory only; longer lines are handled properly.
+@@ -547,7 +547,7 @@ armor_file(char *infilename, char *outfi
+ 	    return 1;
+ 	}
+ 	fprintf(outFile, "-----BEGIN PGP SIGNED MESSAGE-----\n\n");
+-	while ((i = getline(buffer, sizeof buffer, clearFile)) >= 0) {
+	while ((i = get_line(buffer, sizeof buffer, clearFile)) >= 0) {
+ 	    /* Quote lines beginning with '-' as per RFC1113;
+ 	     * Also quote lines beginning with "From "; this is
+ 	     * for Unix mailers which add ">" to such lines.
+@@ -1231,7 +1231,7 @@ LANG("\n\007Unable to write ciphertext o
+ 	for (;;) {
+ 	    ++infile_line;
+ 	    nline = status;
+-	    status = getline(buf, sizeof buf, in);
+	    status = get_line(buf, sizeof buf, in);
+ 	    if (status < 0) {
+ 		fprintf(pgpout,
+ LANG("ERROR: ASCII armor decode input ended unexpectedly!\n"));
+@@ -1249,7 +1249,7 @@ LANG("ERROR: ASCII armor decode input en
+ 	    /* Copy trailing part of line, if any. */
+ 	    if (!status)
+ 		status = copyline(in, litout);
+-	    /* Ignore error; getline will discover it again */
+	    /* Ignore error; get_line will discover it again */
+ 	}
+ 	fflush(litout);
+ 	if (ferror(litout)) {
--- a/app-crypt/pgp/files/pgp-2.6.3a-includes.patch
+++ b/app-crypt/pgp/files/pgp-2.6.3a-includes.patch
@@ -0,0 +1,25 @@
+--- a/src/md5.c
+++ b/src/md5.c
+@@ -15,6 +15,7 @@
+  * will fill a supplied 16-byte array with the digest.
+  */
+ #include <string.h>		/* for memcpy() */
+#include "usuals.h"
+ #include "md5.h"
+ 
+ #ifndef HIGHFIRST
+
+--- a/src/rsaglue2.c
+++ b/src/rsaglue2.c
+@@ -52,9 +52,8 @@ char signon_legalese[] = _LANG("\
+ Uses the RSAREF(tm) Toolkit, which is copyright RSA Data Security, Inc.\n\
+ Distributed by the Massachusetts Institute of Technology.\n");
+ 
+-#include <global.h>
+-#include <rsaref.h>
+-#include <rsa.h>
+#include <rsaref/rsaref.h>
+#include <rsaref/rsa.h>
+ /*
+  * The functions we call in rsa.h are:
+  *
--- a/app-crypt/pgp/files/pgp-2.6.3a-sparc.patch
+++ b/app-crypt/pgp/files/pgp-2.6.3a-sparc.patch
@@ -0,0 +1,23 @@
+--- a/src/sparc.S
+++ b/src/sparc.S
+@@ -7,7 +7,7 @@
+ !
+ ! other sources must be compiled with UNIT32 and HIGHFIRST defined
+ !
+-#ifndef SYSV
+#if !defined(SYSV) && !defined(__ELF__)
+ #ifdef __STDC__
+ #define ENTRY(name)	_##name ; _##name##:
+ #else
+
+--- a/src/platform.h
+++ b/src/platform.h
+@@ -179,7 +179,7 @@
+ #define PLATFORM_SPECIFIED
+ #endif /* i386 */
+ 
+-#ifdef sparc
+#if defined(sparc) || defined(__sparc__)
+ /*
+  * Needs sparc.s
+  */
--- a/app-crypt/pgp/metadata.xml
+++ b/app-crypt/pgp/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>cyber+gentoo@sysrq.in</email>
+	<name>Anna</name>
+</maintainer>
+<longdescription>
+PGP (Pretty Good Privacy) is a public key encryption package to protect
+E-mail and data files.  It lets you communicate securely with people
+you've never met, with no secure channels needed for prior exchange of
+keys.  It's well featured and fast, with sophisticated key management,
+digital signatures, data compression, and good ergonomic design.
+
+This is PGP version 2.x which understands only RSA keys.
+</longdescription>
+</pkgmetadata>
--- a/app-crypt/pgp/pgp-2.6.3a.ebuild
+++ b/app-crypt/pgp/pgp-2.6.3a.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Public-key encryption and digital signature utility"
+HOMEPAGE="https://web.archive.org/web/20170319101112/http://www.pgpi.org/"
+SRC_URI="https://archive.netbsd.org/pub/pkgsrc-archive/distfiles/2021Q3/pgp263is.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="PGP-2"
+SLOT="0/2"
+KEYWORDS="~amd64"
+IUSE="bindist debug"
+
+RDEPEND="bindist? ( dev-libs/rsaref )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sparc.patch
+	"${FILESDIR}"/${P}-alpha.patch
+	"${FILESDIR}"/${P}-includes.patch
+	"${FILESDIR}"/${P}-getline.patch
+)
+
+DOCS=(
+	readme.1st readme.usa setup.doc
+	{de,en,es,fr,pgp}.hlp
+	doc/{appnote,changes,keyserv,pgformat,politic}.doc
+	doc/{blurb,faq,mitlicen}.txt
+)
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/pgp263ii.tar
+}
+
+src_configure() {
+	append-cflags -ansi
+	append-cppflags -DUNIX -DIDEA32 -DMAX_NAMELEN=255 -DPORTABLE -DMPORTABLE
+	use bindist && append-cppflags -DUSA
+	use debug && append-cppflags -DDEBUG
+	use x86 && append-cppflags -DASM
+}
+
+src_compile() {
+	emake -C src all \
+		CC=$(tc-getCC) LD=$(tc-getCC) CFLAGS="${CFLAGS}" \
+		OBJS_EXT=$(usex x86 "_80386.o _zmatch.o" "") \
+		RSALIBS=$(usex bindist "-lrsaref" "") \
+		RSAOBJS=rsaglue$(usex bindist "2" "1").o
+}
+
+src_install() {
+	dobin src/pgp
+	doman doc/pgp.1
+	einstalldocs
+}
--- a/app-misc/ssmtool/Manifest
+++ b/app-misc/ssmtool/Manifest
@@ -1 +1 @@
-DIST ssmtool-0.4.1.tar.gz 59559 BLAKE2B 20905c6fb54a644c8aae7bece2ea11cc59b29bb94a76e82d92b094a16fbd8749c485e098a696178e6cabb9b82ee39156ed3e957653e195f6aa5393e7f1bee3a8 SHA512 2210aba0b8a4113fa784acee67abcc1f45a1ae3bf1ec27bbef8d0788a440093dec61e638c6e21d7edce512642f4b070638675c57d22778e07582acef8e231b92
+DIST ssmtool-0.5.3.tar.gz 60818 BLAKE2B ab5a00226b206347bd80dbdda6b758ce28c5b772815daeeec887cb732e020202b5c893e50adea43714dacc7c5867ceceb78d5f88c05e66bed4b9ea66e7fa052e SHA512 a5abd9532cd98c7f9d3e74480299dad7cfe7140c129d81b84204cb5fe99a957f39cf28e5e67eac55d3a8e920b095b63da8dcf75c46105a0062403029cdc0875d
--- a/app-misc/ssmtool/ssmtool-0.5.3.ebuild
+++ b/app-misc/ssmtool/ssmtool-0.5.3.ebuild
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1 @@
-DIST open62541-1.2.2.tar.gz 3644878 BLAKE2B e95cada67461be699d0cc8038c479f955df92117626a2e35764df98191a0836a8e59db74c38f2f60d8acc06cfe5dd89d31c806ceb32de5c92ea9c104678a60ed SHA512 e6a1ec2208ec29d8685d2a957fae6f3fedc0e847d6ab1bb8ac5c7980223bc377692334c87575956b53bb37a9b71c5dedd1b5c4f19f122561543d04661fefe1d5
+DIST open62541-1.2.3.tar.gz 3645511 BLAKE2B 3cebe1a4200cb026916cd801303937509d8e59c10af5400f5a212c16006c1744bc403fad25b40fb7bcf9043982649f1661c13aa16df8a07db6334f7e2fc55872 SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2
--- a/dev-libs/open62541/files/open62541-1.2.3-headers.patch
+++ b/dev-libs/open62541/files/open62541-1.2.3-headers.patch
--- a/dev-libs/open62541/files/open62541-1.2.3-tests.patch
+++ b/dev-libs/open62541/files/open62541-1.2.3-tests.patch
--- a/dev-libs/open62541/open62541-1.2.3.ebuild
+++ b/dev-libs/open62541/open62541-1.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 PYTHON_COMPAT=( python3_{8..9} )

--- a/dev-libs/rsaref/Manifest
+++ b/dev-libs/rsaref/Manifest
@@ -0,0 +1 @@
+DIST rsaref-2.0.tar.Z 144092 BLAKE2B 341dc102e01ffad31386e1a0f9a60bb20ced4cdf385faaff2fee3efbdc90721d2b1e17e045bb8ad2c1ac86d55ba28aafe2c94d9dbecf99dbef11724a6e5848e5 SHA512 70cf6fe7bbf91ab5b5e09af02e8a9b732d94f1126df720fcdf23fb6f5b4d46515573cb18241eb7354c9a40faadfcf30942044cd4a3a8507de6c783fadec03422
--- a/dev-libs/rsaref/files/rsaref-2.0-global.patch
+++ b/dev-libs/rsaref/files/rsaref-2.0-global.patch
@@ -0,0 +1,47 @@
+--- a/source/global.h
+++ b/source/global.h
+@@ -7,23 +7,17 @@
+ #ifndef _GLOBAL_H_
+ #define _GLOBAL_H_ 1
+ 
+-/* PROTOTYPES should be set to one if and only if the compiler supports
+-     function argument prototyping.
+-   The following makes PROTOTYPES default to 1 if it has not already been
+-     defined as 0 with C compiler flags.
+- */
+-#ifndef PROTOTYPES
+-#define PROTOTYPES 1
+-#endif
+#include <sys/types.h>
+#include <sys/cdefs.h>
+ 
+ /* POINTER defines a generic pointer type */
+-typedef unsigned char *POINTER;
+typedef caddr_t POINTER;
+ 
+ /* UINT2 defines a two byte word */
+-typedef unsigned short int UINT2;
+typedef u_int16_t UINT2;
+ 
+ /* UINT4 defines a four byte word */
+-typedef unsigned long int UINT4;
+typedef u_int32_t UINT4;
+ 
+ #ifndef NULL_PTR
+ #define NULL_PTR ((POINTER)0)
+@@ -33,14 +27,6 @@
+ #define UNUSED_ARG(x) x = *(&x);
+ #endif
+ 
+-/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+-   If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
+-     returns an empty list.  
+- */
+-#if PROTOTYPES
+-#define PROTO_LIST(list) list
+-#else
+-#define PROTO_LIST(list) ()
+-#endif
+#define PROTO_LIST(x) __P(x)
+ 
+ #endif /* end _GLOBAL_H_ */
--- a/dev-libs/rsaref/files/rsaref-2.0-includes.patch
+++ b/dev-libs/rsaref/files/rsaref-2.0-includes.patch
@@ -0,0 +1,72 @@
+--- a/source/des.h
+++ b/source/des.h
+@@ -4,6 +4,8 @@
+ #ifndef _DES_H_
+ #define _DES_H_ 1
+ 
+#include <rsaref/global.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+--- a/source/md2.h
+++ b/source/md2.h
+@@ -22,6 +22,8 @@
+ #ifndef _MD2_H_
+ #define _MD2_H_ 1
+ 
+#include <rsaref/global.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+--- a/source/r_random.c
+++ b/source/r_random.c
+@@ -8,7 +8,7 @@
+ #include "global.h"
+ #include "rsaref.h"
+ #include "r_random.h"
+-#include "md5.h"
+#include <rsaref/md5.h>
+ 
+ #define RANDOM_BYTES_NEEDED 256
+ 
+--- a/source/rsa.h
+++ b/source/rsa.h
+@@ -5,6 +5,11 @@
+      Inc., created 1991. All rights reserved.
+  */
+ 
+#ifndef _RSA_H_
+#define _RSA_H_ 1
+
+#include <rsaref/global.h>
+
+ int RSAPublicEncrypt PROTO_LIST 
+   ((unsigned char *, unsigned int *, unsigned char *, unsigned int,
+     R_RSA_PUBLIC_KEY *, R_RANDOM_STRUCT *));
+@@ -17,3 +22,5 @@
+ int RSAPrivateDecrypt PROTO_LIST
+   ((unsigned char *, unsigned int *, unsigned char *, unsigned int,
+     R_RSA_PRIVATE_KEY *));
+
+#endif
+$NetBSD: patch-af,v 1.2 1998/08/07 11:13:48 agc Exp $
+
+--- a/source/rsaref.h
+++ b/source/rsaref.h
+@@ -8,9 +8,9 @@
+ #ifndef _RSAREF_H_
+ #define _RSAREF_H_ 1
+ 
+-#include "md2.h"
+-#include "md5.h"
+-#include "des.h"
+#include <rsaref/md2.h>
+#include <rsaref/md5.h>
+#include <rsaref/des.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
--- a/dev-libs/rsaref/files/rsaref-2.0-libtool.patch
+++ b/dev-libs/rsaref/files/rsaref-2.0-libtool.patch
@@ -0,0 +1,44 @@
+--- a/install/unix/makefile
+++ b/install/unix/makefile
+@@ -4,8 +4,7 @@
+ O = o
+ 
+ # commands
+-CC = cc
+-LIB = ar
+CC := ${LIBTOOL} --tag=CC --mode=compile ${CC}
+ 
+ # name of temporary library script
+ TEMPFILE = $(TEMP)/temp.mak
+@@ -14,18 +13,18 @@
+ STDINCDIR=/usr/include
+ 
+ # The places to look for include files (in order).
+-INCL =  -I. -I$(RSAREFDIR) -I$(STDINCDIR)
+INCL =  -I. -I$(RSAREFDIR)
+ 
+ # name of main executable to build
+ PROG = all
+ 
+ # Normal C flags.
+-CFLAGS = $(INCL) -O -c -DPROTOTYPES=1
+CFLAGS += $(INCL) -c -DPROTOTYPES=1
+ MFLAGS = -I. -I$(RSAREFDIR)
+ 
+ # The location of the common source directory.
+ RSAREFDIR = ../source/
+-RSAREFLIB = rsaref.a
+RSAREFLIB = librsaref.la
+ 
+ # The location of the demo source directory.
+ RDEMODIR = ../rdemo/
+@@ -41,8 +40,7 @@
+ $(RSAREFLIB) : desc.$(O) digit.$(O) md2c.$(O) md5c.$(O) nn.$(O) prime.$(O)\
+   rsa.$(O) r_encode.$(O) r_dh.$(O) r_enhanc.$(O) r_keygen.$(O) r_random.$(O)\
+   r_stdlib.$(O)
+-	$(LIB) r $@ $?
+-	ranlib $@
+	${LIBTOOL} --tag=CC --mode=link cc -o $@ ${?:.o=.lo} -rpath ${LIBDIR} -version-info 3:0 ${LDFLAGS}
+ 
+ rdemo.$(O) : $(RDEMODIR)rdemo.c $(RSAREFDIR)global.h $(RSAREFDIR)rsaref.h
+ 	$(CC) $(CFLAGS) $(RDEMODIR)rdemo.c
--- a/dev-libs/rsaref/files/rsaref-2.0-rsa.patch
+++ b/dev-libs/rsaref/files/rsaref-2.0-rsa.patch
@@ -0,0 +1,73 @@
+--- a/source/rsa.c
+++ b/source/rsa.c
+@@ -11,10 +11,10 @@
+ #include "rsa.h"
+ #include "nn.h"
+ 
+-static int RSAPublicBlock PROTO_LIST 
+int RSAPublicBlock PROTO_LIST 
+   ((unsigned char *, unsigned int *, unsigned char *, unsigned int,
+     R_RSA_PUBLIC_KEY *));
+-static int RSAPrivateBlock PROTO_LIST 
+int RSAPrivateBlock PROTO_LIST 
+   ((unsigned char *, unsigned int *, unsigned char *, unsigned int,
+     R_RSA_PRIVATE_KEY *));
+ 
+@@ -33,6 +33,9 @@
+   unsigned char byte, pkcsBlock[MAX_RSA_MODULUS_LEN];
+   unsigned int i, modulusLen;
+   
+  if (inputLen+3>MAX_RSA_MODULUS_LEN) return (RE_LEN);
+  if (publicKey->bits > MAX_RSA_MODULUS_BITS) return (RE_LEN);
+
+   modulusLen = (publicKey->bits + 7) / 8;
+   if (inputLen + 11 > modulusLen)
+     return (RE_LEN);
+@@ -78,6 +81,9 @@
+   unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+   unsigned int i, modulusLen, pkcsBlockLen;
+   
+  if (inputLen>MAX_RSA_MODULUS_LEN) return (RE_LEN);
+  if (publicKey->bits > MAX_RSA_MODULUS_BITS) return (RE_LEN);
+
+   modulusLen = (publicKey->bits + 7) / 8;
+   if (inputLen > modulusLen)
+     return (RE_LEN);
+@@ -129,6 +135,9 @@
+   unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+   unsigned int i, modulusLen;
+   
+  if (inputLen+3>MAX_RSA_MODULUS_LEN) return (RE_LEN);
+  if (privateKey->bits > MAX_RSA_MODULUS_BITS) return (RE_LEN);
+
+   modulusLen = (privateKey->bits + 7) / 8;
+   if (inputLen + 11 > modulusLen)
+     return (RE_LEN);
+@@ -168,6 +177,9 @@
+   unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+   unsigned int i, modulusLen, pkcsBlockLen;
+   
+  if (inputLen>MAX_RSA_MODULUS_LEN) return (RE_LEN);
+  if (privateKey->bits > MAX_RSA_MODULUS_BITS) return (RE_LEN);
+
+   modulusLen = (privateKey->bits + 7) / 8;
+   if (inputLen > modulusLen)
+     return (RE_LEN);
+@@ -212,7 +224,7 @@
+    Assumes inputLen < length of modulus.
+    Requires input < modulus.
+  */
+-static int RSAPublicBlock (output, outputLen, input, inputLen, publicKey)
+int RSAPublicBlock (output, outputLen, input, inputLen, publicKey)
+ unsigned char *output;                                      /* output block */
+ unsigned int *outputLen;                          /* length of output block */
+ unsigned char *input;                                        /* input block */
+@@ -252,7 +264,7 @@
+    Assumes inputLen < length of modulus.
+    Requires input < modulus.
+  */
+-static int RSAPrivateBlock (output, outputLen, input, inputLen, privateKey)
+int RSAPrivateBlock (output, outputLen, input, inputLen, privateKey)
+ unsigned char *output;                                      /* output block */
+ unsigned int *outputLen;                          /* length of output block */
+ unsigned char *input;                                        /* input block */
--- a/dev-libs/rsaref/metadata.xml
+++ b/dev-libs/rsaref/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>cyber+gentoo@sysrq.in</email>
+	<name>Anna</name>
+</maintainer>
+<longdescription>
+RSAREF is a free, portable software developer's library of popular
+encryption and authentication algorithms. The name "RSAREF" means
+"RSA reference." RSA Laboratories intends RSAREF to serve as a free,
+educational reference implementation of modern public- and secret-key
+cryptography.
+
+RSAREF 2.0 supports the following algorithms:
+
+     o    RSA encryption and key generation, as defined by RSA
+          Laboratories' Public-Key Cryptography Standards (PKCS)
+
+     o    MD2 and MD5 message digests
+
+     o    DES (Data Encryption Standard) in cipher-block chaining mode
+
+     o    Diffie-Hellman key agreement
+
+     o    DESX, RSA Data Security's efficient, secure DES enhancement
+
+     o    Triple-DES, for added security with three DES operations
+</longdescription>
+</pkgmetadata>
--- a/dev-libs/rsaref/rsaref-2.0.ebuild
+++ b/dev-libs/rsaref/rsaref-2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Encryption/authentication library, RSA/MDX/DES"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://archive.netbsd.org/pub/pkgsrc-archive/distfiles/2021Q3/${PN}.tar.Z -> ${P}.tar.Z"
+S="${WORKDIR}"
+
+LICENSE="RSAREF"
+SLOT="0/3"
+KEYWORDS="~amd64"
+
+BDEPEND="sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-global.patch
+	"${FILESDIR}"/${P}-includes.patch
+	"${FILESDIR}"/${P}-libtool.patch
+	"${FILESDIR}"/${P}-rsa.patch
+)
+
+DOCS=( doc )
+
+src_unpack() {
+	default
+
+	cd "${S}"/source || die
+	mkdir ${PN} || die
+	cp *.h ${PN} || die
+}
+
+src_compile() {
+	# XXX: fails with slibtool
+	emake -C install -f unix/makefile librsaref.la \
+		LIBTOOL=libtool LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	dolib.so install/.libs/lib${PN}.so*
+	doheader -r source/${PN}
+	einstalldocs
+}
--- a/dev-python/Pyro5/Pyro5-5.13.ebuild
+++ b/dev-python/Pyro5/Pyro5-5.13.ebuild
@@ -13,15 +13,13 @@ SRC_URI="https://github.com/irmen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND="
 	>=dev-python/serpent-1.40[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
+BDEPEND=""

 distutils_enable_tests pytest

--- a/dev-python/desktop-notifier/desktop-notifier-3.3.1.ebuild
+++ b/dev-python/desktop-notifier/desktop-notifier-3.3.1.ebuild
@@ -13,12 +13,13 @@ SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${PV}.tar.gz -> $

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/python-dbus-next[${PYTHON_USEDEP}]
-	python_targets_python3_8? ( dev-python/importlib_resources )
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
--- a/dev-python/dropbox-sdk-python/dropbox-sdk-python-11.25.0.ebuild
+++ b/dev-python/dropbox-sdk-python/dropbox-sdk-python-11.25.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND="
 	>=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
@@ -21,9 +21,7 @@ DEPEND="
 	>=dev-python/stone-2.0.0[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
+BDEPEND=""

 distutils_enable_tests pytest

--- a/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
+++ b/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
@@ -14,15 +14,14 @@ SRC_URI="https://github.com/jaraco/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> $

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND="
-	>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
 "

 distutils_enable_tests pytest
--- a/dev-python/pydispatcher/Manifest
+++ b/dev-python/pydispatcher/Manifest
@@ -1 +0,0 @@
-DIST PyDispatcher-2.0.5.tar.gz 34437 BLAKE2B eefc2e0f22c9d91b22acd1352d76f1bd69d7161efdf0827f1bcb42ccf0a5c98576dbc25817e0a6c4cb3327b5fad39281cd19a784f0f477ba1b20690e644e867c SHA512 b361463f006a775e1f22cfe07520951649f76c26be35a80ca016620c8ef466129c4abeafe42f0ffdc605e7523287b1e804967f19d951089d24e052fe10d88e6f
--- a/dev-python/pydispatcher/metadata.xml
+++ b/dev-python/pydispatcher/metadata.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@aisha.cc</email>
-		<name>Aisha Tammy</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-inherit distutils-r1
-
-DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
-HOMEPAGE="https://github.com/scrapy/pypydispatcher https://pypi.org/project/PyPyDispatcher/"
-MY_P=PyDispatcher
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
-S=${WORKDIR}/${MY_P}-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests unittest
--- a/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild
+++ b/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild
@@ -13,13 +13,11 @@ SRC_URI="https://github.com/altdesktop/${PN}/archive/refs/tags/v${PV}.tar.gz ->

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND=""
 RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-python/pytest )
-"
+BDEPEND=""

 distutils_enable_tests pytest

--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -1 +1 @@
-DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3
+DIST bb4242-sdnotify-0.3.2.tar.gz 3302 BLAKE2B add938bb947d8834abc9cbfaae28dfd85d9e9580d130f6dac0660a1f06f291723b909eac61eb39023d999566568985f93ab07587ab235bdfe79fe09efca28874 SHA512 08fbbd2865ac075f0faa4ee3c1a9e5afb824318a4863cc603bc544ebb173d9f1caf4941df19470c0c506b4f518cc1f30ec1d8be70b03a46afadf490765af2e55
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -10,11 +10,11 @@ inherit distutils-r1

 DESCRIPTION="Python implementation of the systemd sd_notify protocol"
 HOMEPAGE="https://github.com/bb4242/sdnotify"
-SRC_URI="https://github.com/bb4242/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/bb4242/${PN}/archive/refs/tags/v${PV}.tar.gz -> bb4242-${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND=""
 RDEPEND="${DEPEND}"
--- a/dev-python/stone/stone-3.2.1.ebuild
+++ b/dev-python/stone/stone-3.2.1.ebuild
@@ -13,16 +13,14 @@ SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND="
 	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
+BDEPEND=""

 distutils_enable_tests pytest

--- a/dev-python/survey/survey-3.4.3.ebuild
+++ b/dev-python/survey/survey-3.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${PV}.tar.gz ->

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND="
 	>=dev-python/wrapio-1.0.0[${PYTHON_USEDEP}]
--- a/dev-python/wrapio/wrapio-2.0.0.ebuild
+++ b/dev-python/wrapio/wrapio-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${PV}.tar.gz ->

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND=""
 RDEPEND="${DEPEND}"
--- a/dev-ruby/rbspy/rbspy-0.10.0-r3.ebuild
+++ b/dev-ruby/rbspy/rbspy-0.10.0-r3.ebuild
@@ -154,3 +154,8 @@ QA_FLAGS_IGNORED="usr/bin/${PN}"
 LICENSE="Apache-2.0 BSD-2 BSD CDDL ISC MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/ruby )"
--- a/dev-ruby/ruby-install/ruby-install-0.8.3-r1.ebuild
+++ b/dev-ruby/ruby-install/ruby-install-0.8.3-r1.ebuild
@@ -10,6 +10,10 @@ SRC_URI="https://github.com/postmodern/ruby-install/archive/v${PV}.tar.gz -> ${P
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PROPERTIES="test_network"
+RESTRICT="!test? ( test )"

 DEPEND=">=app-shells/bash-3.0:*"
 RDEPEND="${DEPEND}
@@ -20,6 +24,12 @@ RDEPEND="${DEPEND}
 	app-arch/bzip2
 	sys-devel/patch
 	|| ( >=sys-devel/gcc-4.2 sys-devel/clang )"
+BDEPEND="test? ( dev-util/shunit2 )"
+
+# XXX: `make check` seems to be broken (violates shellcheck tests)
+src_test() {
+	emake test
+}

 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" install
--- a/dev-util/rust-analyzer/Manifest
+++ b/dev-util/rust-analyzer/Manifest
@@ -2,10 +2,8 @@ DIST addr2line-0.17.0.crate 32260 BLAKE2B 23c3715820a04260460a41695d535da3565f76
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 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.45.crate 35468 BLAKE2B 0a6e6bb7a04315e6aab21ad1da743b4087ed95e7bfb7f143b4c5b1cb9527c1e1f9c334bf94c8aaf7bb98f3fc6b0b0cb87244d13808cb86fb76d07555304db90f SHA512 a2ea3a764024dc5d5c176890e22aa9e91e18c4252e04548baeb6ed8cbc11ba8e3b0220758e7b1a670e934da0f40e747ce02520788c0e557cf9ed05b19806fd50
 DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
 DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
-DIST arbitrary-1.0.2.crate 25056 BLAKE2B 8a9e8c7ca229cf52dba3b4213dd128c1d793bf7d2dab0168b0ddeed41b4b19ed9847d1bda7b8b165a4d7b318974343f29e52d696d453d9ba7747205a5170814b SHA512 165256d634334ded55ca0c6b2dc90a84c8ec6f7b662c34ec02a907d7ce3d4af8cc0674ee3cc550d1af86d929a8517885fd2d9651e5d24b47c1296ef9b049dbc1
 DIST arbitrary-1.0.3.crate 25159 BLAKE2B da6c84b33a62bb82afdf56f56170d5a6e4603d9487ebee09a84f98e11b6d07ffd3a962fb2600ea92634464ac1e4d2f91f18f9e23d82dde7d500d737fdc467cdf SHA512 76f5df7369c7fe61f73007e572f1e8a1c79e8055daf36741c8f6f386b3f9c674dbd9777c7e4c7db4ca592952aa07c290a70a8c7136699f444b35be9a226dba04
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -15,21 +13,14 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST camino-1.0.5.crate 29642 BLAKE2B c345be490622b50f3a744f9c42392d12e02e286d75e09f4eaa8a1c6f86cc849c5a752aa7cb5fb1f697ed8beb741c7d9cea951f4f5ce7049dcaf6de5ec69a60d7 SHA512 1131997ca090426a25daf3be2fcd6e559d980078dd71fbf3f16b4d593531a24c0f030aa6c9652080fdc02b5420da98991b9c93115ce1c0cad8c0fad4437b1d59
 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 cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chalk-derive-0.73.0.crate 3437 BLAKE2B f03ed06dc449b87e6e208f20b6dd158d48902b95f6b5b20295dc0bc855057fd14dcebd54bb6e7eafa311b0af212481ae17aeb7980112806c4af0322d493389f2 SHA512 dd651d3ec67bf03891b6a6dabb383c10f007aecc8f1682915ace034f851a8411f7ef92d56bc69fbeba6bc7d9ed6db732f8c5a4b391b791c856c4cf32b4de5176
-DIST chalk-derive-0.74.0.crate 3448 BLAKE2B b2a4dffa1277311470eca01b764fcf14bbc902d1c7145faabb0411c5abd30d6b6c8d25754779e633e0a574245cc63a8974f86cb8e40e45f821b1389b62d01b9a SHA512 d2bb99182341ddc30f3cbceb05bf033dfaa2b54c58bcdf15c43290dbf48f8de75836c8feceb16d45a16fc5cc3ca9b6e5d347777b6600298cf1be24ee935f3e3e
-DIST chalk-ir-0.73.0.crate 51273 BLAKE2B 80d5dd6c0b062df3e91c6cbe5e4aa728b8c73e41de59eb35f672fc2d7e8b7291d3b417f7e9e14ba89e1aa494b68b173f339da8420390fb0989910126cfffc5bb SHA512 ac859da9108afd467bdac9e4ab4a118864f3b66aef5d0e9824cd75487992556166d246b16cb7c81af2a2e3e6bf40cc5a8ea9b2f736295e7e8265be58f7cd7d00
-DIST chalk-ir-0.74.0.crate 51393 BLAKE2B 13a2b43c82a3a5515b5c104ec13f4070175b68dad18ca7c1a3f0cc126e321f25f4a11d720c53cedd75ee1821ed72cdce692462943af8452f67262aa398ca26c4 SHA512 652bd0b66d6d681adcda7c2b3f04317aaa5489ff5cd45740396a5a9dd7109b35addfed0baf6402e8c51edcd427101c68b8c79ddad45a4df67a62ee961a888143
-DIST chalk-recursive-0.73.0.crate 14635 BLAKE2B 01ad1ff8a1de770c5d1d073e77feeab99549cb8a40a3449e2eb81abf927ec5bba403f27d68dacd48dba1528ae9c8c70ca105bdbd09d458aab131398c187b6b70 SHA512 08612a989ae6b89e8f722be7807bd812afbc0910973de8a904734f360971042bb4638b5132b63f9ac8900c0296296b9449013cfcee8bcddc2fbea4c21aec7f8e
-DIST chalk-recursive-0.74.0.crate 14630 BLAKE2B 2d368a6d279d5b5caf6a19e9d471865ee532cc61dd5fc8ff5586e0c253ab494218b08d29a3ffd66ecd43980b7e5c6d0113d4d89c04c08d875a1a7be6d4b3d3ce SHA512 5a7dfe5c6b48675f7d16ea29005cd4f513b07dbd4ed65f87b32640b53d26b808528c8bf498428bd43b25af3cd1550ba08670681823464a49da83e30dad4bad75
-DIST chalk-solve-0.73.0.crate 97598 BLAKE2B 963679f17f4e85d360a8079154d1c1b38620431bc7006974a59475821b1106d2cffe462a76b0fdd17f4c928fd97a28637bf40b4f6e716b31e3d7afee7e8332d1 SHA512 9f7f552d65a14add614c275946a6cd6fcc53e0e634b2b36e26e555f2e0668b9a452839af16fdaf25aefbec93ab7b952cd7fa4151241a4a64c10f84e50b319f61
-DIST chalk-solve-0.74.0.crate 98370 BLAKE2B 6010b54347c5adf9897196eda43d7c95b8013b9f813a83936a30341a6d9aad3e37f2524891452ee2a93794e8fa77b772dc3ea131ea79b762c8c08a12864ad2c0 SHA512 14b4f7609ad63be5b6f33c11a177b53373dc60786c0da95b60b7536f5de3c0611d4811f5a0b3f7e444d98ab9733908d14032ec21503c40a0673be28622650754
-DIST countme-2.0.4.crate 9128 BLAKE2B 07841d1db911757deb4624948631a642f183bcc0e4b48b9742f9f4c5c9f21c317ab8bf2078087a412ef29547fc517036ec3c7960ff8f65951be358be282cfaeb SHA512 34181504348d1309963ca83f9fd7abdab1e2860e62f7412dec3b30ec2b4e093de080aeca0c8c9cb94733ffc12033c127c895c132b85ed634af8cbd58ce3e7d88
+DIST chalk-derive-0.75.0.crate 3431 BLAKE2B f791d05b8441f3e1f0385ae117eb03d69373aadf5b3f371e67a4cddd8ad522c85506fb90dbd41a21c4a121c779850a7150eea4df12d936c8e5c9b90e62ea5f61 SHA512 f64d123921ee34c6e39e7d9094fca720b418f0dce69643752329a6b769a16e1a26c3ac003556556d4b2825490387854902eaa98e03826e6a866a8232226dc155
+DIST chalk-ir-0.75.0.crate 51203 BLAKE2B 710807e2dbee1b79d9deb04d60a50d68cccc6c31078eb98e6f2b3ff9123c382090bb10b1498a3dc93fde0e4d29766e48bd976faa96f20ef43da1d125ace20db6 SHA512 b4a31892cd366c1e0b837f421f5814d159e84ce8a2c618a0eaa9699ccaefe95dfc25b61af8ec6abd49b40d7ee2ed15d45023d80b59b244b42903ad6aec3f57ee
+DIST chalk-recursive-0.75.0.crate 14637 BLAKE2B 865a07a644341ee35d2ab9fb43263a7e6402caa2f74c0cb47db5961bfdd99b6fc90f8b660891ccacca8b15d07f9612a4932f657d0c250e72909e15312823302d SHA512 d1fb6fd5663af2e453f5ffa3183743ca17567bc87d7685755994cde44fb3cfd013eb922441d429544178abb6626be546903992495012fe18f00b6893ac5276c7
+DIST chalk-solve-0.75.0.crate 98300 BLAKE2B 447929d9a49485fe8e3d64966be1c65a0b76427ad0cd9c9b9d7567896787815248830a29c26309aa8f3aa45679ffa6abb1beca30bf96c67d51bfcd665e354f79 SHA512 4edf1d045e174560b5e177047ed1adc41c2a3f5d58b36850638b898640f18ea164325c726248283aa0236c09e13327e93be96c59528ef8e3efa3dc638030544a
 DIST countme-3.0.0.crate 9903 BLAKE2B 8da4f18fa18c914354f68594f18330f7114861c917b22fe5eccd6f2fbdfa6de90144994783c7751ae6a61a4d68c3e7be3739f2ce5834e8359d2935efff29dc7e SHA512 b608f8e87d4c929ef3438d59e78da7faa118485ecfff18e53315a4fd6a56e68292328ae43386125ee098b739f96aceec49fa0e29b6dd40ea88fe0a8dffb2656b
 DIST cov-mark-2.0.0-pre.1.crate 8324 BLAKE2B ea1acdf5ca1e7d88445a7b532368b96eb36f432342dabea3398c40541fa7cbdb3b91e83c47f58afe1d9a79f143f5bf80a40e6b59139f767ed0bd77370ff6c108 SHA512 c0057dc9ba4949f35842de756ed7a9af84a61ff19d4bf53551d0a85596ab7ea8468f9ef9abfd4059a2e7bb39f02c4923996d4da5809d5ea67479bb80cad3bb8e
-DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
@@ -42,8 +33,8 @@ DIST dot-0.1.4.crate 17701 BLAKE2B d608505bd8988e98a4b90b0f812c00735eddc04ff83dd
 DIST drop_bomb-0.1.5.crate 6859 BLAKE2B d115c842c3642e070cbf91c8155e09a10fd51f772b2f491d7ac16ddb983e9a6334fad23415670caf24fc3dc2f37a894f6b39443453ca394d9227e8783d5519b4 SHA512 b4b33e275506a52a062d4d3c6beff14b4081b56c4491fcc28f4aaee645f6dec103fc0b67994cf7816d36313ad5383478aca28dc4d6cf619486a517f136d7b344
 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.0-pre.1.crate 10738 BLAKE2B 59418ab020b28e51f4022a08bd900bd2658dcde195d1a96615ba353839d075cb80e16ff3d916cd297927159bdaea556e5d09248fe15e714efc7f5cecbcd9735e SHA512 54fcd02edccc20efca8b150ceb45649d02b67dce521d8611b45927af6b1356e670e17679f5d63e1ea64d637e3423a8be7408275c16ccdd09919de5ef28f2e457
 DIST expect-test-1.2.1.crate 10919 BLAKE2B 3e789987b393745385432f125fa7c53df6daae49a6beaa979c8b6cc2e429e2d9d11c709ce6d340032655af2cb36066d482dd002014cf5bb33a4f347f3cbd5af4 SHA512 f892f9db82dad474c546788bc60cd71f05a3479b0a2823646c9c5ab9a600a7757fd7200d85d10b42b66bd3ac794e5d7dd1bf5f922704c6bf8db3d46e6ae67067
+DIST expect-test-1.2.2.crate 12293 BLAKE2B 7c90caf4195613b8437f86fce5e4243c7f734fa49968e0733adfbb82db5d513d336dad821ebe36b91f0f523dbace79d07eb30d596df1c1edf98144da882ef3aa SHA512 6c580a73cb71d66670c8838bb89125b84638306adb8affaf0b9c30eab8906c3b4fc2e6ffe16db90146238ce6659acdb64a817466ef481122269252fb13359ecd
 DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
 DIST fixedbitset-0.2.0.crate 13597 BLAKE2B cfbdb06fefda131509b04cfa780c9e9574ef0acb902479d7ef98f32ab45b18d78cb1cc94fba78bd023267a7f2a081aab29171f81a9e90912d4aad9f5fc17ba3d SHA512 44642b270d52f71637a87e5311f70ac77baa2a377f94254d1bd728b4ff02a3176f3a5d07732c0c4fb9bf303dbeecf327432ae01e2779d966cc13b5fb97cbc28c
 DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
@@ -61,29 +52,24 @@ DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77
 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
-DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
-DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
+DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
+DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST jod-thread-0.1.2.crate 6322 BLAKE2B 8e27300e03c4d34265be761212b8d23dbea90fa6f443a55437a23df8b769e76a341f060c6ced8dd5a036d4142b08461b9d0a68a46b593fcf772fb0d3a7e78cec SHA512 fe3a3feb983b273bf86ec26dcf4edbb1fc0c5f583c3115cedcc63279cb72f0b40bf4134f95d673d5f3e532bcbeafff09759509f55543c98850e750aea39711e2
 DIST kqueue-1.0.4.crate 11771 BLAKE2B 3a428dc381fccb406ad4f6cb040a5ffc5371386c1abf552e8edd8e24977584fd028d865998b7c9b04b1a9c38b756fe4ddbdea4590b9ce7f847bbee48b14cb96e SHA512 b836195dedb4eca9022c24b95fd74d4c2fe473ee5c05d10a2c3db3e512c3fa49ff78e23d4853d4214c44ce29a68f1882ea84267bdc0f05400ced6c958db33910
 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.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
-DIST libc-0.2.108.crate 559475 BLAKE2B eb8b0250136aa57e89d256d8401fb590d74a1447039324ab4572786185a2f4b7a955c356c8cab63b019619617313fafd5b7c44dd09cfa3cc92dbb9b7fb714580 SHA512 a29f0c5cc7e4b653c2bc33c92dc90b5d3a7132d4409d6b92b94fa9fe1391d8cf57a63d339ca0602f2efac28d3dc3beb854cf9a6d03bf027fef5e5276fc5b1487
-DIST libloading-0.7.1.crate 26336 BLAKE2B 2dd8d1fbd0a1a3c1b07ffbdbe367f9bc248a08fd235a7ffeb121aceb7aad95d7f947fff3df276d9161e5ccb8dbc9990f834e364357bd1574a7e5cc3eef8855f2 SHA512 b06a668868bc6b4ca0c39dcd83faa71e5c28ba0be772f96f8445a61feddef797d40be1d1180f51b2dad1a77abde2a40a55204d91b1ee9033fef22544968ac0df
+DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libloading-0.7.2.crate 27229 BLAKE2B f85ba948aa88e7e3e32984e4a74e34efc01d3c35354ea30bc3d8f0a873094eff8d0c30b8583fbbb57e6afec8d505d4b53c8f2b7bf879921c986d5908ec6354ec SHA512 235ecd8750baef122f3f6ce673e4feae621d806851e842f33f95e8a414915776c33c11e6253da449faa12855f5e444f691c591cbe66efffcbe221d6ca2d32a67
-DIST libmimalloc-sys-0.1.22.crate 908612 BLAKE2B cde50b1556fd49412736c6f6e42360cdd002d3aecf1ac32cb85f514ec559a14587436d0d6d6ab86aa32cf9d62ae4377778a3c941c81aad20370a11034e6d1a96 SHA512 6ed4965552898ef0c51c6e3fc6962793c6694bea79459c08bed2af211887cba3d605b3949cec2734c59a2314c305fcf78b871d2e688ba3756441e53bd49697f1
 DIST libmimalloc-sys-0.1.23.crate 913601 BLAKE2B 9f531556eebb46b6c17e7b5f204aa7bbbdf6b8c0442c4761684de55b815ed05e67238d96f13d3db2ec1b6a7f5697fbab36088ebf6fc011ae851fe675714925aa SHA512 4861e791721f0cda1ced5d0a0fdd054f2203a938033739445946baec693d5e0ab7ff35e0aa50e418e99d8cb8767447d867ff2f0024e03582088ada90a8caf3e6
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST lsp-server-0.5.2.crate 15018 BLAKE2B 90567a348794c9b53929cd0f1b877e7820e204ca39747d1ccad5bc53a98cfa3b0bb73137b8f121a2f3dc4b3e774eb78f943687345e72aa500511f53afb704296 SHA512 deac4de563a8f1fd4bf475f62b6597946ff287a4000b17f6e7736b2d30b5837c17c6dee0f41c0b0f9b4f6f76ac56dd587471168663f38711bbb95cdc1c5e6129
 DIST lsp-types-0.91.1.crate 54922 BLAKE2B dacc338ebbe9496bc0bd42b27cc74858f7a0f0674cc2425b8919ad8b3894b19a91bcf406703f88765d202373a25635fccf0d90cf0e27ea5bb9494b16ce90af4d SHA512 a7b51c83b32464e97bcf5791ac208e2be123e2516973a35b39403b0ed026039585a04bb030cf60d318775cfb740d774f7d13f55505ad5345973e6a39f57a8a87
-DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
+DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST memmap2-0.5.0.crate 20760 BLAKE2B 5723352d203e97b8b9e6e898e1e93f2838a820ca4773c430264f6b44887daffd007fcc499931bb21f764d4a402cdf7edaf53e855094c5ca08c6b5dde17da2817 SHA512 cbb1a74f3a8a0671e4e5153633fb0284c7badfc9711569b48ac899c70ea9e2de3cf4b89fb3c959e844b6270206cb8db3f69998d7f09a20cc929ec496106290f0
-DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
-DIST mimalloc-0.1.26.crate 4977 BLAKE2B 2a13862c07b5df2cd4d8c4a6d55178a63d89850b84b22ced5ab985c86fd252bc2e899fef81a16d6e2adc4ecec70c680c3e4dbf291e393d9ce4c1ef4de6e9f108 SHA512 d385f187e61d88366576b3fa84d173af14a955ab476f1c837ee719e35929c9a91f1e02d13398160abb0c20e53ba90e9d100aeaefb651e0c264e9472021d4a3a2
 DIST mimalloc-0.1.27.crate 4968 BLAKE2B 35122f591d8afd55b97fef3e9d31ce8fb309cf153160b95b2b134e82e6660089097f0e62a169f9d5ca7379b02fb7dea20c963064a8d6c5f85fdf66a383accd6a SHA512 ca835665a84b9d5fe25b4e781ac84e9356204bba7542741b37a74f175c05612bf6f6d16f986c1814a2ccf10942ae6c2aa6d5fa7335e7ecd5d42d502cf47a9800
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
@@ -93,7 +79,8 @@ DIST notify-5.0.0-pre.13.crate 52883 BLAKE2B ba491e82bd105ebad96c772bc7f3634c249
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
-DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
+DIST object-0.28.1.crate 231661 BLAKE2B 6dbfb622178d9576827557ddfe01f9a3c01d09a37f37903377dd0d80ba3257a8ee5f6796c831fdc409ee84fd616660f98f5bc6c7695965db7d7d0027315ac0b2 SHA512 48500ef26422d8cdfe3e42951e993945bc9f06194080b78336c2bb47fa481ffac5eca8f408b78d03455493f98a4168dc0e99f0b12f11a5499cc28f689a895727
+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
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
@@ -103,10 +90,9 @@ DIST perf-event-0.4.7.crate 21279 BLAKE2B 241bfe486bd5d53aaf2e55293a75b967d8154a
 DIST perf-event-open-sys-1.0.1.crate 23460 BLAKE2B 02a61cf08400391a8f6b5370c21dfd20296f118f9081ba2054c102abe388bf97d89937057267a1b9c47a7d299d31546771e48b526209ce7027519c284b2c020c SHA512 4e8fd8a3c8e02166073e4bb146430fe627821b881b59c8097e978cd89d5ba7a47a9f1a6ad7001ef1e64e1cec156614737e19e49d5a3a2ea763516350972a7288
 DIST petgraph-0.5.1.crate 147173 BLAKE2B 3b74b2965ecdb37a82439111ad849581254698c8701d8d5bdb050f4a30cce05016511928443cf65dac394dd45584279a933435a77ef3c610a64c73cc5a68ff9a SHA512 c3d5f53b1a0900084b0693a6f3a849bb9b443b1b6fd1ad88bce8beb12ed1b45f2399b68db3366ba15f33c2d5682e052b733dbde76fb1b646b7bb1e660a38d8bd
 DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
-DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
+DIST proc-macro2-1.0.34.crate 41072 BLAKE2B 6b507e95802fd8dfca422deace25e328b1e4c5a9515c83ae55f8a34b1c1d34ce427afea7d7a748f582abf903245ed8c2b3f4175d78c8c9dc9f467c9805329d47 SHA512 960036a077c3869386ecb5c2019816adc70e9a9b32ceeacd4b14b39a91dbffe0b21764ead7237ab3aa553b26cb6732bbeccacbaf83c8dca9069b11b9a85dd1f8
 DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
-DIST pulldown-cmark-to-cmark-6.0.4.crate 8069 BLAKE2B 5d6358fd1b96d4853617487efedf60c68f89279da54706e1aaf1d896e8feca87a9e172bcc1e744676bbbd339f99b31908d4adf7431204d3e417f5d508c3fe8f9 SHA512 4aafeca13aff10e7780e367bf7309a2d8b50565a231dcb57485283f19eca6f5127faf41b69ec1cbaa9ca1f91778cd69e13c09617f3d1d25f19ef5ed8ceca667a
-DIST pulldown-cmark-to-cmark-7.1.0.crate 14341 BLAKE2B 8510b396530bc8c8145c8e8b7cba0498b4d9ea9355662c88c1dc6153b52cd571132a3e733afce55c89c0717ddf9d3800579666e645db728f44f1a69949d68675 SHA512 d97165d660d20a43bd2cb57b6a2f45a40259ecc41db45d4f54fd401440d4388310f92194b7bd82cd4a295c17dd4a2a1cf70287efc6633d4eddf317657e1d4742
+DIST pulldown-cmark-to-cmark-7.1.1.crate 14520 BLAKE2B 23905d871d58de852e08f8e6f4ac2b4e4fff136989acf577b9fe37b2791448dd7dbd8adeccf44183b474eb90a0725d6b232267b25a445dac953c55d7608b192e SHA512 07329f51fc37fe89c92a9016d74f0bfae1d0eeea85da24c0cbdefcbe99d07bc3e7099047537f476b6adeed85c5b854ff5a207fcde04b26cb6a67e2f2d52ed61d
 DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
@@ -114,49 +100,44 @@ DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c6
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 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.14.1.crate 37695 BLAKE2B 761a2ec18af21dc87d2d88e93a2376857378123e91931181455d9a53e50cdd03c861a52dac7f63c78be29f90dbbedb8d4327e34c8e7dedf9ac2135d3b4fc4f21 SHA512 a15232348349fcf52eebb1901a15b073e181f70a92aad9159fbfbf273439e6fffd550de16d0b775b33900cedab5fd9f5c96d175f2b1b0eac02c46c8c8addc2a7
-DIST rust-analyzer-20211129.tar.gz 2176576 BLAKE2B b92035f3fbff11ea07da39e3f5f0fc32468370a1c7348d8cbbaba55b02147f1791f9007b5a1acf388b4cb1ce19242c375d912e46dd41cae322458c5093e084fd SHA512 be13c947d30fec02a94282537a86985ad54f441b160fe1971395f75abe6335f988d3826e4d402ce2c4f8895461cef21a60655312fe5ca07ad10bd416b9665da2
-DIST rust-analyzer-20211206.tar.gz 2189907 BLAKE2B dedf038f753444a3278bcf9307d8d15a3eec969055c68b5208de4fa31c9be1dbd4615a6a309d4b7c4e9a3627c53797761d8ad70a00f34269af10cda8c97db013 SHA512 8ad065b84e30243eb131d72286513e1856e0c76023b40a022364ad4c9ce80d557045e3fe9bcbecbbf13359af80ffca0d42593471f416f77f9ed55b9bbc413b7c
+DIST rowan-0.15.2.crate 39158 BLAKE2B 1138f87948e18b4495b9b0985027a7103394fc4bfe753725dcbdfa3bd71ef89dd9df70e99a36a42d104e972e011d511e51a2512a51c592bbf86dea7181f3beee SHA512 4025a5071a1791a39403067d4a333e3a76e4e779d92e6605f9f25a388501231a2770fe8e755a6f9b89b446fb8a7c037b6257c71be94aef54e04da2816100fb46
+DIST rust-analyzer-20211220.tar.gz 2189691 BLAKE2B 570975b8546c76321e78029a27ed80dc10432eb07497994e4ec971364f71e8dc22bac757ff652fba6ac94fa846b2fac75c60d7f960a2fb5cf73ee36a0272c4bc SHA512 846d442d603d1a8d6cefd0461d2143373134ec834ecefbe6b86c89cf637e736724c4788384ff97bdc33fa8bbcb44983a0723eda45a9cf6193093023a4ee54037
+DIST rust-analyzer-20211227.tar.gz 2239396 BLAKE2B e6cd806d3ee59640b839ab5e2e75d70701b1c76468d8c6f8b154e0056c401ef57c7379800965020aaafb229d9b1d3e7b5cc1b85c7df436db76b53ab940cb3ac6 SHA512 1b81e34cd6dc26658c766450de060803257239130604cf37aabd76274aeb0fcaeb36cf5a77f1406b982e6f48c8eca9142204bc739b6a56d3da9d1c98f6fcd982
 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
-DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST ryu-1.0.6.crate 50032 BLAKE2B 13e805124f80de0d8175fe8b315b20b06f0ef188049e835843b91ffb90322bbfa54ddd0fe1617af851e8f5b59c1f076252b705394ed3408b5fb577059a46273f SHA512 175da99ee31a942800eb33ab5addcdf89b2bba95b6289be1560746d030acda547a5bc3e8cba714c252230a93bcd991b9593a7c94421222833bf089694ccf1655
+DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST salsa-0.17.0-pre.2.crate 441448 BLAKE2B a5487a1a30eaa3f6fd1cc393c4b8157a5f66389e4795351412587acd0aea62cf4b0ed32da38ef2cabc9773ceccccc6e6616cd443b2e5bd6ec6ca66378817bf6e SHA512 fb6c072538e40ecd9a2c1707832fb08f668fa694157962437b67e30b41ab9789d1446ffda89521aa53a5e29950f252f43a6780d99bb218630d5041dd11207abf
 DIST salsa-macros-0.17.0-pre.2.crate 15358 BLAKE2B edcd8a0adf04114de829aab88d6e2001fbb04a8a52f1809bcff98fdee129889c37f929370e28c0abb431f8a8db98ec00aaafa075cc5ff805e7663f1d81197c0a SHA512 7aa768980b241d160cee00ad1ab73021465c9afa232def3beabfd27d15d8dc9e4b3c885b8606ada6fc805d9453f19db333d01ed186f088cc2a88967cbd91133e
 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.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
-DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
-DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
-DIST serde_json-1.0.69.crate 115218 BLAKE2B 3ee34530b19cdace9bfdf6417553a53465bde10c049fe4a66db327683e164d14a28eb55dfe82ccd0dbe9d66e02a9d364d6573b933fb888d536aa271df5eecc32 SHA512 4c74ddc935b905708ccd09e8c4ce9e6d4dbb3b0b978228d7947df4659620ac9fa74e8a5e87626ae7e6c79b77b0ac00666888ee62273a13168b53ae55ba1da941
-DIST serde_json-1.0.72.crate 115888 BLAKE2B 0770707160014ef19f54ab6acb6bf8cad8ae65ab47c184912aa534b927c0743e66273e93c7e3190102428bc71914ab4648bfe0c2cae9416afe6ea1d7da217996 SHA512 e48129cb5c36b4999751302fcee811b80f2113780c12e122b13d9fc7a31af7452183ff89de1793994edfdcae61a80db37aa492250a0d69e9180659418a10063b
+DIST serde-1.0.132.crate 75364 BLAKE2B 7485bcf0ae578f02f7c7dcdb284fcd6d8ccb4022b7d487e19593f3b3c9bd03a369410307dbe5ecde8071ca3ab6c7e45a5ddfe332e43076b84d67444d1f105b7b SHA512 8dac512547074a6934315ebae3e7540ef8baa225cdd58f11416b4565a1335ab317e659901fd626beffd6514c5dc6ec9fc705cc1d15e9cdd2051bd28649cca555
+DIST serde_derive-1.0.132.crate 54725 BLAKE2B 10ba0e55a498cfb469f1a36368f66515ab3e331f337b9441b08aba857dd6c824ccb718fdc33ab467413bd755db31370d4eb52039bb28e4a6c0775e2be87db896 SHA512 04f1a738b133de752fd1f4d70ffa35bbc144208bc3495ead56cda8ce65a72c501ea9c8e5e6d088cee94a878bf62509fc9f75dfadb320eb942042ee5ea80dc76a
+DIST serde_json-1.0.73.crate 115922 BLAKE2B 5f304d127c3cee17d06cf30ace0fa8c75374293b64751e45938a283a9451e3809ccc0a1cc1b64b33f526585744073b4b35a366a404772fd37856e4fdc128d786 SHA512 0d7bcf06eb2d78f768c4bf54429439a1f6e8b7097fda6e7547b4edee1933a69307ba9b758fabb6ac918cda216c7744a0b906d7a38fd13c51e16e6e25881df748
 DIST serde_repr-0.1.7.crate 10173 BLAKE2B 30bca6a616e55f44def56ab1f85cbb141727a872466f161f562798db005473d520e6a4dba89b631cfe11f1a38cbc1db2fb0ef921f0245e0990a6744f9987e95a SHA512 4e3e87b1c97ee587e88be56d67f287e43252de474a3becdefb4b768eda661db5d78f665d7d93720a40d9f5bd27fd9ab6213d66713ec89bcc2063092b16625a18
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
 DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 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.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
 DIST syn-1.0.82.crate 234316 BLAKE2B 1d115a4fd61cfebf62657f8faf7fe8786b3715ecf0413a5d117289853b4ecad399611d92d7bed26e590236a4689bff5599787c04f83de1db7f6c771eaa032853 SHA512 9406f62404f1dec3ea37a5e583a8dd7daf646fd5a1b11359aea3004010b3b416a44e4457695ba5beb12b3cbb9fe437de6f73018faa364c4e48060f6aab8ada1d
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
-DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST text-size-1.1.0.crate 12380 BLAKE2B 0fb559e971e7f33bb4ee6e20e796f813023ef1798713b224ba42827ce3a8cbc6dc1991c653ddf7219a3d3696a3d1718d6fea7b72b60ae8f543597f5e19d8f0e8 SHA512 24e9d77e37c62b6ad05ee7dcdb5c9fe60c0f5cea1418bc0bf462ce789a1c13704b317e6503db533eff47527c87728bb98f9a34e473f8e09df35e21c08ca93048
 DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 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-jemallocator-0.4.1.crate 15530 BLAKE2B c97e217aedf3e5cb9f4512233665af5d221fbb829b0c40c32d7b1dd0d680a3ca5124877d75a9902a0217fc4caae054ffecedce59726f634043d2f83831b06645 SHA512 c3c1c9917b45f360b940fe6eb85db133744f72b271b9243eace5957cd033113ecda5085abcf1355d1bec7cd844a41c8bf552734677900349dd30ba592215e2b7
-DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tracing-0.1.29.crate 72444 BLAKE2B 637f52a1890ee8b2ce20eabb8491b100de680088792be87008107455e5404c9efdb2d2e97129fbed6ce29296a880ecfca370535ccefdea2fea49d9457ad6b683 SHA512 8b9c58aa6d236485cbd8e6c3b39a1cc05d30169dd9ddb377ba464ba72c774af69b0eecce1551660d26fa6735e5483f45463cfcd196513c0b4c351c900cf4c7d8
 DIST tracing-attributes-0.1.18.crate 22779 BLAKE2B 46fe07f2e2b8df2e510624981a8e882c27cdebac3e6b6cb282bbc5acc69fe8335461203f0ce4b87dd23c5412108aa3ab2ebb906ba40ce5f2bd2669a5a90c5d8b SHA512 69417ae19fb88742ce609724113945fcc3c28615c84780ee169f4149d3f479dec5fcd39c95aeb2b64a4a2678ec72f53a93cc02996ce2f46a0d3f1ef4754216d3
 DIST tracing-core-0.1.21.crate 50683 BLAKE2B dc48e0fd6586b8ac0059469a26049c6746b44a06a4e7768d129822bbd2f6ce719c63964ee3e4f9543ce278566efda8fd957c8b4be8b696ef12724f899b2830dc SHA512 2c3e00674c02023ee3e9a114878ad8941253a9489312082b2cf9a163b04fb8d23767f00892874645f59f30b6f620dfb83dab8680c64db5510208678b52f2db9c
 DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
-DIST tracing-subscriber-0.2.25.crate 149469 BLAKE2B 4624243b66571b88ade80cdd7ea4a9ab1ddb44f62bd0c373b3d4b121103f4001ed6c0276fd25920dd308dbf3aa73b98f04fb5105224eafe14d721bc27ab24a81 SHA512 edefa55a94b4abc1641df4190ad4da121320d402f8c413d00697b05d35100133f8955ab672c32bd795fc0965ac5b5e6ce09cab5147e8c77c262b8f9340647712
-DIST tracing-tree-0.1.10.crate 12828 BLAKE2B 13a8c7f6c544ea1975d8301d42e899eff717597de8659335eba6cd9a6d2f13cbe3e2e49d6943a6a73bb0d1a448e5f9f542dae5144d41911f1f9191cf782f393b SHA512 42d1fb14fb0a01aa3eed5a9aa6aa4dcb6439ebf5e32ebfcf85c416e0007be13952cc223ea15665bbb5fab2138593bb7ec315689bf8fc03a3dc45899672e63af9
-DIST tracing-tree-0.1.11.crate 17151 BLAKE2B 5924661f6909119cc14b6a952321117eee99be655578075d0426da6d8c5ff865d02c112fc060f1a88dd17662c7c7e236eecf264882fbbfd693a4a2fc94055179 SHA512 532e490d594562e0ad0f0dc5125ca80070472d693b1506520776e48117fde1a479a91e25d897ce94189573aa515f0682b0e40cd9fb26c1030aba8c3b4a7d16c2
+DIST tracing-subscriber-0.3.3.crate 158037 BLAKE2B 670aa9baf496d317f4117dce3bb9d14753450b127c552d0e256b8c70ba023d1354f46f6a3db8872dabde6687fec9303e933078adddfc5918e3e1327d1375e239 SHA512 0ffc0bce4dfc8b35370736aa5c11e48d42da9304d864f013bf8c451304a71ef20ce962a9304ab2e468b582d8e6d03e8e62cab7176f5da25c29ad4a6299e0abf3
+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.14.9.crate 8365 BLAKE2B 235d42d8ef945a8344ad7345c6c642eab53680140782625e7477b336b40d03e98a9144d026ce0f2f1bcfd98ae8f7d23e1730ebaa793eb3fff79e50d020897357 SHA512 a03f5740579407b196ab2c742da47e8461aaa20081f4e06eb6cdeda675892634c155d265002faacb87dd3ae3b8d6fa6abd63414938ac495e619ebf368db390f7
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
--- a/dev-util/rust-analyzer/rust-analyzer-20211220.ebuild
+++ b/dev-util/rust-analyzer/rust-analyzer-20211220.ebuild
@@ -21,11 +21,10 @@ CRATES="
 	cargo_metadata-0.14.1
 	cc-1.0.72
 	cfg-if-1.0.0
-	chalk-derive-0.74.0
-	chalk-ir-0.74.0
-	chalk-recursive-0.74.0
-	chalk-solve-0.74.0
-	countme-2.0.4
+	chalk-derive-0.75.0
+	chalk-ir-0.75.0
+	chalk-recursive-0.75.0
+	chalk-solve-0.75.0
 	countme-3.0.0
 	cov-mark-2.0.0-pre.1
 	crc32fast-1.3.0
@@ -58,20 +57,20 @@ CRATES="
 	inotify-0.9.6
 	inotify-sys-0.1.5
 	instant-0.1.12
-	itertools-0.10.1
-	itoa-0.4.8
+	itertools-0.10.3
+	itoa-1.0.1
 	jod-thread-0.1.2
 	kqueue-1.0.4
 	kqueue-sys-1.0.3
 	lazy_static-1.4.0
-	libc-0.2.108
+	libc-0.2.112
 	libloading-0.7.2
 	libmimalloc-sys-0.1.23
 	lock_api-0.4.5
 	log-0.4.14
 	lsp-server-0.5.2
 	lsp-types-0.91.1
-	matchers-0.0.1
+	matchers-0.1.0
 	matches-0.1.9
 	memchr-2.4.1
 	memmap2-0.5.0
@@ -85,7 +84,8 @@ CRATES="
 	ntapi-0.3.6
 	num_cpus-1.13.0
 	object-0.27.1
-	once_cell-1.8.0
+	object-0.28.1
+	once_cell-1.9.0
 	oorandom-11.1.3
 	parking_lot-0.11.2
 	parking_lot_core-0.8.5
@@ -95,9 +95,9 @@ CRATES="
 	perf-event-open-sys-1.0.1
 	petgraph-0.5.1
 	pin-project-lite-0.2.7
-	proc-macro2-1.0.32
+	proc-macro2-1.0.34
 	pulldown-cmark-0.8.0
-	pulldown-cmark-to-cmark-7.1.0
+	pulldown-cmark-to-cmark-7.1.1
 	quote-1.0.10
 	rayon-1.5.1
 	rayon-core-1.9.1
@@ -105,20 +105,20 @@ CRATES="
 	regex-1.5.4
 	regex-automata-0.1.10
 	regex-syntax-0.6.25
-	rowan-0.14.1
+	rowan-0.15.2
 	rustc-ap-rustc_lexer-725.0.0
 	rustc-demangle-0.1.21
 	rustc-hash-1.1.0
-	ryu-1.0.6
+	ryu-1.0.9
 	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.4
-	serde-1.0.130
-	serde_derive-1.0.130
-	serde_json-1.0.72
+	serde-1.0.132
+	serde_derive-1.0.132
+	serde_json-1.0.73
 	serde_repr-0.1.7
 	sharded-slab-0.1.4
 	smallvec-1.7.0
@@ -138,8 +138,8 @@ CRATES="
 	tracing-attributes-0.1.18
 	tracing-core-0.1.21
 	tracing-log-0.1.2
-	tracing-subscriber-0.2.25
-	tracing-tree-0.1.11
+	tracing-subscriber-0.3.3
+	tracing-tree-0.2.0
 	ungrammar-1.14.9
 	unicase-2.6.0
 	unicode-bidi-0.3.7
--- a/dev-util/rust-analyzer/rust-analyzer-20211227.ebuild
+++ b/dev-util/rust-analyzer/rust-analyzer-20211227.ebuild
@@ -8,9 +8,9 @@ CRATES="
 	adler-1.0.2
 	always-assert-0.1.2
 	ansi_term-0.12.1
-	anyhow-1.0.45
+	anyhow-1.0.51
 	anymap-0.12.1
-	arbitrary-1.0.2
+	arbitrary-1.0.3
 	arrayvec-0.7.2
 	atty-0.2.14
 	autocfg-1.0.1
@@ -19,15 +19,15 @@ CRATES="
 	camino-1.0.5
 	cargo-platform-0.1.2
 	cargo_metadata-0.14.1
-	cc-1.0.71
+	cc-1.0.72
 	cfg-if-1.0.0
-	chalk-derive-0.73.0
-	chalk-ir-0.73.0
-	chalk-recursive-0.73.0
-	chalk-solve-0.73.0
-	countme-2.0.4
+	chalk-derive-0.75.0
+	chalk-ir-0.75.0
+	chalk-recursive-0.75.0
+	chalk-solve-0.75.0
+	countme-3.0.0
 	cov-mark-2.0.0-pre.1
-	crc32fast-1.2.1
+	crc32fast-1.3.0
 	crossbeam-channel-0.5.1
 	crossbeam-deque-0.8.1
 	crossbeam-epoch-0.9.5
@@ -39,7 +39,7 @@ CRATES="
 	drop_bomb-0.1.5
 	either-1.6.1
 	ena-0.14.0
-	expect-test-1.2.0-pre.1
+	expect-test-1.2.2
 	filetime-0.2.15
 	fixedbitset-0.2.0
 	flate2-1.0.22
@@ -57,33 +57,35 @@ CRATES="
 	inotify-0.9.6
 	inotify-sys-0.1.5
 	instant-0.1.12
-	itertools-0.10.1
-	itoa-0.4.8
+	itertools-0.10.3
+	itoa-1.0.1
 	jod-thread-0.1.2
 	kqueue-1.0.4
 	kqueue-sys-1.0.3
 	lazy_static-1.4.0
-	libc-0.2.107
-	libloading-0.7.1
-	libmimalloc-sys-0.1.22
+	libc-0.2.112
+	libloading-0.7.2
+	libmimalloc-sys-0.1.23
 	lock_api-0.4.5
 	log-0.4.14
 	lsp-server-0.5.2
 	lsp-types-0.91.1
-	matchers-0.0.1
+	matchers-0.1.0
 	matches-0.1.9
 	memchr-2.4.1
 	memmap2-0.5.0
-	memoffset-0.6.4
-	mimalloc-0.1.26
+	memoffset-0.6.5
+	mimalloc-0.1.27
 	miniz_oxide-0.4.4
 	mio-0.7.14
 	miow-0.3.7
+	miow-0.4.0
 	notify-5.0.0-pre.13
 	ntapi-0.3.6
 	num_cpus-1.13.0
 	object-0.27.1
-	once_cell-1.8.0
+	object-0.28.1
+	once_cell-1.9.0
 	oorandom-11.1.3
 	parking_lot-0.11.2
 	parking_lot_core-0.8.5
@@ -93,9 +95,9 @@ CRATES="
 	perf-event-open-sys-1.0.1
 	petgraph-0.5.1
 	pin-project-lite-0.2.7
-	proc-macro2-1.0.32
+	proc-macro2-1.0.34
 	pulldown-cmark-0.8.0
-	pulldown-cmark-to-cmark-6.0.4
+	pulldown-cmark-to-cmark-7.1.1
 	quote-1.0.10
 	rayon-1.5.1
 	rayon-core-1.9.1
@@ -103,42 +105,42 @@ CRATES="
 	regex-1.5.4
 	regex-automata-0.1.10
 	regex-syntax-0.6.25
-	rowan-0.14.1
+	rowan-0.15.2
 	rustc-ap-rustc_lexer-725.0.0
 	rustc-demangle-0.1.21
 	rustc-hash-1.1.0
-	ryu-1.0.5
+	ryu-1.0.9
 	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.4
-	serde-1.0.130
-	serde_derive-1.0.130
-	serde_json-1.0.69
+	serde-1.0.132
+	serde_derive-1.0.132
+	serde_json-1.0.73
 	serde_repr-0.1.7
 	sharded-slab-0.1.4
 	smallvec-1.7.0
 	smol_str-0.1.21
 	snap-1.0.5
-	syn-1.0.81
+	syn-1.0.82
 	synstructure-0.12.6
-	termcolor-1.1.2
 	text-size-1.1.0
 	thread_local-1.1.3
 	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
-	tinyvec-1.5.0
+	tinyvec-1.5.1
 	tinyvec_macros-0.1.0
 	tracing-0.1.29
 	tracing-attributes-0.1.18
 	tracing-core-0.1.21
 	tracing-log-0.1.2
-	tracing-subscriber-0.2.25
-	tracing-tree-0.1.10
+	tracing-subscriber-0.3.3
+	tracing-tree-0.2.0
+	typed-arena-2.0.1
 	ungrammar-1.14.9
 	unicase-2.6.0
 	unicode-bidi-0.3.7
@@ -152,6 +154,12 @@ CRATES="
 	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_aarch64_msvc-0.28.0
+	windows_i686_gnu-0.28.0
+	windows_i686_msvc-0.28.0
+	windows_x86_64_gnu-0.28.0
+	windows_x86_64_msvc-0.28.0
 	write-json-0.1.2
 	xflags-0.2.3
 	xflags-macros-0.2.3
@@ -178,7 +186,7 @@ RESTRICT="mirror"
 SLOT="0"
 IUSE=""

-DEPEND="|| ( >=dev-lang/rust-1.56.1[rls] >=dev-lang/rust-bin-1.56.1[rls] )"
+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"
--- a/games-arcade/SpaceCadetPinball/Manifest
+++ b/games-arcade/SpaceCadetPinball/Manifest
@@ -1 +1,2 @@
+DIST SpaceCadetPinball-2.0.1.tar.gz 1882629 BLAKE2B 55b2c4232880b065bad30371ad4c170ee2fbc485d2673d25d3afa82144d17bc6a74f70cee7dcc365992df61e95d65a97b57924e54a140b98790ee6e75b06cefd SHA512 b8a23c650a6251838c531a7f1427284199ba859fbdf8715a974404dbef3485503dffa723839f6b41d335e2afc73a85bd0fe0d670ebb7fc1462f089250f1f546f
 DIST SpaceCadetPinball-2.0.tar.gz 933826 BLAKE2B b4a079ca856ebf315202eaae59a825d4c7022acfff7f38907ffd750f0e146da6d7c4f03286ef5c59ee5e3c725d938e30c2aad2f7269d9f18e8ae8f6807af80e1 SHA512 29b3f886d6ec6507c12a59b0c2877cbb51c54eee0163d0537588bb1e0fa0eb08b530d5684e8753598a823430559d5b3b9490be40ca9a3310043dac71912994c7
--- a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.1.ebuild
+++ b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Decompilation of 3D Pinball for Windows - Space Cadet"
+HOMEPAGE="https://github.com/k4zmu2a/SpaceCadetPinball"
+SRC_URI="https://github.com/k4zmu2a/${PN}/archive/refs/tags/Release_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-mixer[midi]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-Release_${PV}"
+
+src_prepare(){
+	# the paths should be relative
+	sed -i "s|/Platform|Platform|g" CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+pkg_postinst(){
+	ewarn "This game is distributed without the data files."
+	ewarn "To play, copy the original DAT and SOUND files from a Windows or"
+	ewarn 'Full Tilt! installation and place them in $XDG_DATA_HOME/'"${PN}/"
+	ewarn "(usually: ~/.local/share/${PN}/)"
+
+	xdg_pkg_postinst
+}
--- a/licenses/PGP-2
+++ b/licenses/PGP-2
@@ -0,0 +1,58 @@
+[Note: The following is the original MIT license agreement, as included
+in the PGP 2.6.2 distribution. Please observe that PGP 2.6.3i does not
+use RSAREF, and so points 2 and 4 (first part) of this license do not
+apply to PGP 2.6.3i. Bug reports for PGP 2.6.3i should be addressed to
+pgp-bugs@ifi.uio.no, and will be forwarded to pgp-bugs@mit.edu when
+relevant.]
+
+
+Compilation Copyright (c) 1994 by the Massachusetts Institute
+of Technology.  All rights reserved.
+
+Permission to use, copy, modify, and distribute this compilation for
+any non-commercial purpose is hereby granted without fee, subject to
+the following license:
+
+1. Any copy or modification of this compilation must include the above
+copyright notice and this license.
+
+2. Software included in this compilation includes a feature that
+causes the format of messages generated by it to change on September
+1, 1994. Modification to this software to disable this feature is not
+authorized and will make this license, and the license in the
+underlying software, null and void.
+
+3. Users of the software included in this compilation agree to use
+their best efforts to provide MIT with any modifications containing
+improvements or extensions and hereby grant MIT a perpetual,
+royalty-free license to use and distribute such modifications under
+the terms of this license.  Such modifications may be provided to MIT
+by email to pgp-bugs@mit.edu.
+
+4. The software included in this compilation makes use of the
+RSAREF(TM) Cryptographic Toolkit, use and distribution of which are
+covered by the RSA Data Security, Inc., Program License Agreement
+included in this compilation.  This compilation also contains
+materials copyrighted by Philip Zimmermann under terms also included
+in this compilation.  (See the "Legal Issues" section of the PGP
+User's Guide, Volume 2.)  Users must also agree to the terms of both
+of these licenses.
+
+5. MIT makes no warranty or representation that the operation of the
+software in this compilation will be error-free, and MIT is under no
+obligation to provide any services, by way of maintenance, update, or
+otherwise.  THE SOFTWARE AND ANY DOCUMENTATION ARE PROVIDED "AS IS"
+WITHOUT EXPRESS OR IMPLIED WARRANTY INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. IN NO EVENT WILL MIT OR ANY OTHER CONTRIBUTOR BE LIABLE FOR
+DIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES, EVEN IF MIT HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+6. Users will not use the name of the Massachusetts Institute of
+Technology nor any adaptation thereof in any publicity or
+advertising, without prior written consent from MIT in each case.
+
+7. Export of this software from the United States may require a
+specific license from the United States Government.  It is the
+responsibility of any person or organization contemplating export
+to obtain such a license before exporting.
--- a/licenses/RSAREF
+++ b/licenses/RSAREF
@@ -0,0 +1,166 @@
+                           RSA LABORATORIES
+                      PROGRAM LICENSE AGREEMENT
+
+                             Version 2.0
+                            March 16, 1994
+
+RSA LABORATORIES, A DIVISION OF RSA DATA SECURITY, INC. ("RSA")
+GRANTS YOU A LICENSE AS FOLLOWS TO THE "RSAREF" PROGRAM:
+
+1.   LICENSE. RSA grants you a non-exclusive, non-transferable,
+     perpetual (subject to the conditions of Section 8) license for
+     the "RSAREF" program (the "Program") and its associated
+     documentation, subject to all of the following terms and
+     conditions:
+
+     a.   to use the Program on any computer;
+
+     b.   to make copies of the Program for back-up purposes;
+
+     c.   to modify the Program in any manner for porting or
+          performance improvement purposes (subject to Section 2)
+          or to incorporate the Program into other computer programs 
+          for your own personal or internal use, provided that you 
+          provide RSA with a copy of any such modification or 
+          Application Program by electronic mail, and grant RSA a
+          perpetual, royalty-free license to use and distribute such
+          modifications and Application Programs on the terms set
+          forth in this Agreement.
+
+     d.   to copy and distribute the Program and Application Programs
+          in accordance with the limitations set forth in Section 2.
+
+"Application Programs" are programs which incorporate all or any
+portion of the Program in any form. The restrictions imposed on
+Application Programs in this Agreement shall not apply to any
+software which, through the mere aggregation on distribution media,
+is co-located or stored with the Program.
+
+2.   LIMITATIONS ON LICENSE.
+
+     a.   RSA owns the Program and its associated documentation and
+          all copyrights therein. You may only use, copy, modify and
+          distribute the Program as expressly provided for in this
+          Agreement. You must reproduce and include this Agreement,
+          RSA's copyright notices and disclaimer of warranty on any
+          copy and its associated documentation. The Program and any 
+          Application programs must be distributed with their source code.
+
+     b.   The Program may not be used directly for revenue-generating
+          purposes. You may not:
+
+          (i)  use the Program to provide services to others for which
+               you are compensated in any manner;
+
+          (ii) license or otherwise distribute any Application Program
+               in any manner that generates income to you, including
+               without limitation any income on account of license
+               fees, royalties, maintenance fees and upgrade fees; and
+
+          (iii) license or otherwise distribute any Application
+               Program without the express written acknowledgment of
+               the end user that the Program will not be used in
+               connection with any revenue-generating activity of the
+               end user.
+
+          Nothing in this paragraph prohibits you from using the
+          Program or any Application Program solely for internal
+          purposes on the premises of a business which is engaged in
+          revenue-generating activities.
+
+     c.   The Program, if modified, must carry prominent notices
+          stating that changes have been made, and the dates of any
+          such changes. 
+
+     d.   Prior permission from RSA in writing is required for any
+          modifications that access the Program through ways other
+          than the published Program interface or for modifications
+          to the Program interface. RSA will grant all reasonable
+          requests for permission to make such modifications.
+
+3.   NO RSA OBLIGATION. You are solely responsible for all of your
+     costs and expenses incurred in connection with the distribution
+     of the Program or any Application Program hereunder, and RSA
+     shall have no liability, obligation or responsibility therefor.
+     RSA shall have no obligation to provide maintenance, support,
+     upgrades or new releases to you or to any distributee of the
+     Program or any Application Program.
+
+4.   NO WARRANTY OF PERFORMANCE. THE PROGRAM AND ITS ASSOCIATED
+     DOCUMENTATION ARE LICENSED "AS IS" WITHOUT WARRANTY AS TO THEIR
+     PERFORMANCE, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+     PURPOSE. THE ENTIRE RISK AS TO THE RESULTS AND PERFORMANCE OF
+     THE PROGRAM IS ASSUMED BY YOU AND YOUR DISTRIBUTEES. SHOULD THE
+     PROGRAM PROVE DEFECTIVE, YOU AND YOUR DISTRIBUTEES (AND NOT RSA)
+     ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR
+     CORRECTION.
+
+5.   LIMITATION OF LIABILITY. EXCEPT AS EXPRESSLY PROVIDED FOR IN
+     SECTION 6 HEREINUNDER, NEITHER RSA NOR ANY OTHER PERSON WHO HAS
+     BEEN INVOLVED IN THE CREATION, PRODUCTION, OR DELIVERY OF THE
+     PROGRAM SHALL BE LIABLE TO YOU OR TO ANY OTHER PERSON FOR ANY
+     DIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES, EVEN IF RSA HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+6.   PATENT INFRINGEMENT OBLIGATION. Subject to the limitations set
+     forth below, RSA, at its own expense, shall: (i) defend, or at
+     its option settle, any claim, suit or proceeding against you on
+     the basis of infringement of any United States patent in the
+     field of cryptography by the unmodified Program; and (ii) pay any
+     final judgment or settlement entered against you on such issue in
+     any such suit or proceeding defended by RSA. The obligations of
+     RSA under this Section 6 are subject to: (i) RSA's having sole
+     control of the defense of any such claim, suit or proceeding;
+     (ii) your notifying RSA promptly in writing of each such claim,
+     suit or proceeding and giving RSA authority to proceed as stated
+     in this Section 6; and (iii) your giving RSA all information
+     known to you relating to such claim, suit or proceeding and
+     cooperating with RSA to defend any such claim, suit or
+     proceeding. RSA shall have no obligation under this Section 6
+     with respect to any claim to the extent it is based upon (a) use
+     of the Program as modified by any person other than RSA or use of
+     any Application Program, where use of the unmodified Program
+     would not constitute an infringement, or (b) use of the Program
+     in a manner other than that permitted by this Agreement. THIS
+     SECTION 6 SETS FORTH RSA'S ENTIRE OBLIGATION AND YOUR EXCLUSIVE
+     REMEDIES CONCERNING CLAIMS FOR PROPRIETARY RIGHTS INFRINGEMENT.
+
+     NOTE: Portions of the Program practice methods described in and
+     subject to U.S. Patents Nos. 4,200,770, 4,218,582 and 4,405,829,
+     and all foreign counterparts and equivalents, issued to Leland
+     Stanford Jr. University and to Massachusetts Institute of
+     Technology. Such patents are licensed to RSA by Public Key
+     Partners of Sunnyvale, California, the holder of exclusive
+     licensing rights. This Agreement does not grant or convey any
+     interest whatsoever in such patents.
+
+7.   RSAREF is a non-commercial publication of cryptographic
+     techniques. Portions of RSAREF have been published in the
+     International Security Handbook and the August 1992 issue of Dr.
+     Dobb's Journal. Privacy applications developed with RSAREF may be
+     subject to export controls. If you are located in the United States
+     and develop such applications, you are advised to consult with the
+     State Department's Office of Defense Trade Controls.
+
+8.   TERM. The license granted hereunder is effective until
+     terminated. You may terminate it at any time by destroying the
+     Program and its associated documentation. The termination of your
+     license will not result in the termination of the licenses of any
+     distributees who have received rights to the Program through you
+     so long as they are in compliance with the provisions of this
+     license.
+
+9.   GENERAL
+
+     a.   This Agreement shall be governed by the laws of the State of
+          California.
+
+     b.   Address all correspondence regarding this license to RSA's
+          electronic mail address <rsaref-administrator@rsa.com>, or
+          to
+
+               RSA Laboratories
+               ATTN: RSAREF Administrator
+               100 Marine Parkway, Suite 500
+               Redwood City, CA  94065
+
--- a/media-video/uxplay/Manifest
+++ b/media-video/uxplay/Manifest
@@ -1 +1 @@
-DIST uxplay-1.43.tar.gz 333275 BLAKE2B 8b408c38d26a87dc1c596be9455a2d63f74eb6059bb9290db976955b618f1aa0d2fd8da8758af77245e7694037185d6f4c8f2150124af95c7f4b996093e5d09b SHA512 9ce3d03e2f5cf0341fc1d902bf74a2667f8e2999263cc323f2c446a66f5aa78d7f5f12c29dc88cd8b5743a8efb36f89378d3d0d65233b9681218524300b9d0ee
+DIST uxplay-1.44.tar.gz 338924 BLAKE2B f3a76b4299f90350fcd60906d5afa560027d38e2426404c401ae096253ca035667dfe0d3537b265fcbe12ec8e5a9b300f53f8b48c867aeb242aaf902bfe3c2aa SHA512 e6ec3dc2ebeab6fe948984110125883366f87bf00526334aa48f650b1213e33068e29a49ed63af3e4344a70e51a6b8efdcdc22156949dbe9ca0d6d2f9b50c572
--- a/media-video/uxplay/uxplay-1.44.ebuild
+++ b/media-video/uxplay/uxplay-1.44.ebuild
--- a/net-libs/dpdk/dpdk-21.11.ebuild
+++ b/net-libs/dpdk/dpdk-21.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{8..10} )
-inherit python-single-r1 meson
+inherit toolchain-funcs python-single-r1 meson

 DESCRIPTION="Data Plane Development Kit libraries for fast userspace networking"
 HOMEPAGE="https://dpdk.org/"
@@ -44,12 +44,15 @@ BDEPEND="
 	dev-lang/nasm
 "

+PATCHES=( "${FILESDIR}/dpdk-21.11-static_linker.patch" )
+
 src_configure() {
 	python-single-r1_pkg_setup
 	local emesonargs=(
 		-Denable_kmods=false
 		-Dmachine=default
 		-Dplatform=generic
+		-Dstatic_linker=$(tc-getAR)
 		$(meson_use test tests)
 	)
 	meson_src_configure
--- a/net-libs/dpdk/files/dpdk-21.11-static_linker.patch
+++ b/net-libs/dpdk/files/dpdk-21.11-static_linker.patch
@@ -0,0 +1,45 @@
+allow setting static linker
+
+diff --git a/buildtools/meson.build b/buildtools/meson.build
+index 22ea0ba..1da02ad 100644--- a/buildtools/meson.build
+++ b/buildtools/meson.build
+@@ -24,14 +24,19 @@ binutils_avx512_check = (py3 + files('binutils-avx512-check.py') +
+ # select library and object file format
+ pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
+ pmdinfogen = py3 + files('pmdinfogen.py')
+ar = ''
+if cc.get_id() == 'gcc' or host_machine.system() != 'windows'
+    ar = 'ar'
+else
+    ar = 'llvm-ar'
+endif
+if get_option('static_linker') != ''
+    ar = get_option('static_linker')
+endif
+ if host_machine.system() == 'windows'
+-    if cc.get_id() == 'gcc'
+-        pmdinfo += 'ar'
+-    else
+-        pmdinfo += 'llvm-ar'
+-    endif
+    pmdinfo += ar
+     pmdinfogen += 'coff'
+ else
+-    pmdinfo += 'ar'
+    pmdinfo += ar
+     pmdinfogen += 'elf'
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 7c220ad..c5c09b4 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -26,6 +26,8 @@ option('flexran_sdk', type: 'string', value: '', description:
+        'Path to FlexRAN SDK optional Libraries for BBDEV device')
+ option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared', description:
+        'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
+option('static_linker', type: 'string', value: '', description:
+       'Linker to use for creating static libraries.')
+ option('include_subdir_arch', type: 'string', value: '', description:
+        'subdirectory where to install arch-dependent headers')
+ option('kernel_dir', type: 'string', value: '', description:
--- a/net-misc/maestral-qt/maestral-qt-1.5.2.ebuild
+++ b/net-misc/maestral-qt/maestral-qt-1.5.2.ebuild
@@ -13,15 +13,15 @@ SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${PV}.tar.gz -> $

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND="
 	>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
 	dev-python/markdown2[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.9[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.9[widgets,gui,${PYTHON_USEDEP}]
 	~net-misc/maestral-${PV}[${PYTHON_USEDEP}]
-	python_targets_python3_8? ( dev-python/importlib_resources )
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
--- a/net-misc/maestral/maestral-1.5.2.ebuild
+++ b/net-misc/maestral/maestral-1.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/samschott/maestral/archive/refs/tags/v${PV}.tar.gz -

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DEPEND="
 	>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
@@ -29,22 +29,29 @@ DEPEND="
 	>=dev-python/Pyro5-5.10[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.6.2[${PYTHON_USEDEP}]
 	>=dev-python/sdnotify-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41.0.0[${PYTHON_USEDEP}]
 	>=dev-python/survey-3.4.3[${PYTHON_USEDEP}]
 	<dev-python/survey-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/watchdog-2.0.1[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
-	python_targets_python3_8? ( dev-python/importlib_metadata[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_8)
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-benchmark[${PYTHON_USEDEP}] )
 "

-# Skipped: Requires auth token
-RESTRICT=test
+distutils_enable_tests pytest

-distutils_enable_tests setup.py
+python_prepare_all()
+{
+	# this test requires systemd
+	sed -i -e 's/test_autostart/_&/' tests/offline/test_cli.py || die
+
+	# this test requires network
+	sed -i -e 's/test_check_for_updates/_&/' tests/offline/test_main.py || die
+
+	distutils-r1_python_prepare_all
+}

 pkg_postinst()
 {
--- a/net-misc/xmrig-mo/Manifest
+++ b/net-misc/xmrig-mo/Manifest
@@ -0,0 +1 @@
+DIST xmrig-mo-6.16.2-mo2.tar.gz 2480342 BLAKE2B cfb1078f67913f3719dd929a1a41ef2040fdf5c7696baca990e3d9f869566e609406b4d592db50d00024adc5da05427382688e826523a9a407c0a79b554d3f5a SHA512 961e52c8ac3de9a55cbbdc11d282fc65c1827e87ac55b5f892866e5193509b23ca4bc9eeb869c019d1b025be14a877142e3b55c7485b6ded6673c832df8c36c3
--- a/net-misc/xmrig-mo/files/xmrig-mo-6.12.2-nonotls.patch
+++ b/net-misc/xmrig-mo/files/xmrig-mo-6.12.2-nonotls.patch
@@ -0,0 +1,23 @@
+From ee98bfe01a94d021d81ed4c2bb11ec91c0bd81c8 Mon Sep 17 00:00:00 2001
+From: Matt Smith <matt@offtopica.uk>
+Date: Sun, 7 Jun 2020 13:20:04 +0100
+Subject: [PATCH] Don't suffix binary with -notls
+
+---
+ cmake/OpenSSL.cmake | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/cmake/OpenSSL.cmake b/cmake/OpenSSL.cmake
+index 89805301..c01c940a 100644
+--- a/cmake/OpenSSL.cmake
+++ b/cmake/OpenSSL.cmake
+@@ -59,6 +59,4 @@ else()
+             src/base/net/http/HttpServer.h
+             )
+     endif()
+-
+-    set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
+ endif()
+-- 
+2.27.0
+
--- a/net-misc/xmrig-mo/metadata.xml
+++ b/net-misc/xmrig-mo/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>me@kevinthomas.dev</email>
+    <name>Kevin Thomas</name>
+  </maintainer>
+  <longdescription lang="en">
+    MoneroOcean fork of XMRig - a RandomX, CryptoNight, KawPow,
+    AstroBWT, and Argon2 CPU/GPU miner that supports algo switching.
+  </longdescription>
+  <use>
+    <flag name="donate">
+      Set the default donation level to 1% instead of 0
+    </flag>
+    <flag name="hwloc">
+      Use <pkg>sys-apps/hwloc</pkg> for CPU affinity support
+    </flag>
+    <flag name="opencl">
+      Enable OpenCL support
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">MoneroOcean/xmrig</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/net-misc/xmrig-mo/xmrig-mo-6.16.2.ebuild
+++ b/net-misc/xmrig-mo/xmrig-mo-6.16.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MO_PV="mo2"
+DESCRIPTION="MoneroOcean fork of xmrig that supports algo switching"
+HOMEPAGE="https://github.com/MoneroOcean/xmrig"
+SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz -> ${P}-${MO_PV}.tar.gz"
+KEYWORDS="~amd64 ~arm64"
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( sys-apps/hwloc:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	newbin "${BUILD_DIR}/xmrig" xmrig-mo
+}
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -2,4 +2,5 @@ MISC-FREE AOM RtMidi Unicode_Fonts_for_Ancient_Scripts noweb sunpro
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
 FREE @FREE-SOFTWARE
 DFSG @FREE lablgtk-examples meschach VOSTROM
+BINARY-REDISTRIBUTABLE PGP-2 RSAREF
 EULA technic Typora-EULA Warframe-EULA
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -52,3 +52,7 @@ sci-physics/mbdyn superlu
 # build failure with metis
 # https://public.gitlab.polimi.it/DAER/mbdyn/-/issues/101
 sci-physics/mbdyn metis
+
+# Anna Vyalkova <cyber+gentoo@sysrq.in> (2021-12-29)
+# build failure, needs patching
+app-crypt/pgp bindist
--- a/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild
+++ b/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild
@@ -15,6 +15,8 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# tests need root
+RESTRICT="test"

 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
--- a/www-apps/jackett-bin/jackett-bin-0.20.195-r1.ebuild
+++ b/www-apps/jackett-bin/jackett-bin-0.20.195-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-libs/icu
 	dev-util/lttng-ust
 "
+DEPEND="${RDEPEND}"

 QA_PREBUILT="*"
 S="${WORKDIR}"/Jackett
--- a/www-apps/jackett-bin/jackett-bin-9999.ebuild
+++ b/www-apps/jackett-bin/jackett-bin-9999.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
 	dev-libs/icu
 	dev-util/lttng-ust
 "
+DEPEND="${RDEPEND}"

 QA_PREBUILT="*"
 S="${WORKDIR}"/Jackett
				`@@ -0,0 +1 @@`
				`DIST pgp263is.tar.gz 607982 BLAKE2B 956afb5e4cdb61716b1aee5c02461410ee2d4fb3c5958af8d2f329cd9974115dfb2944bb80194059b5daf61eab277b130c24677f2845c8f9adf942cd1246d609 SHA512 ced42d884f8dbbc7afc2dfbe485716333df5fa04a5727dc63fa3c7504e53447a7561d7406a057fba18e6239836e40cc13de4b30f2223552c6dc3dae0664a4374`
				`@@ -0,0 +1 @@`
				`DIST rsaref-2.0.tar.Z 144092 BLAKE2B 341dc102e01ffad31386e1a0f9a60bb20ced4cdf385faaff2fee3efbdc90721d2b1e17e045bb8ad2c1ac86d55ba28aafe2c94d9dbecf99dbef11724a6e5848e5 SHA512 70cf6fe7bbf91ab5b5e09af02e8a9b732d94f1126df720fcdf23fb6f5b4d46515573cb18241eb7354c9a40faadfcf30942044cd4a3a8507de6c783fadec03422`
				`@@ -1 +0,0 @@`
				`DIST PyDispatcher-2.0.5.tar.gz 34437 BLAKE2B eefc2e0f22c9d91b22acd1352d76f1bd69d7161efdf0827f1bcb42ccf0a5c98576dbc25817e0a6c4cb3327b5fad39281cd19a784f0f477ba1b20690e644e867c SHA512 b361463f006a775e1f22cfe07520951649f76c26be35a80ca016620c8ef466129c4abeafe42f0ffdc605e7523287b1e804967f19d951089d24e052fe10d88e6f`
				`@@ -0,0 +1 @@`
				`DIST xmrig-mo-6.16.2-mo2.tar.gz 2480342 BLAKE2B cfb1078f67913f3719dd929a1a41ef2040fdf5c7696baca990e3d9f869566e609406b4d592db50d00024adc5da05427382688e826523a9a407c0a79b554d3f5a SHA512 961e52c8ac3de9a55cbbdc11d282fc65c1827e87ac55b5f892866e5193509b23ca4bc9eeb869c019d1b025be14a877142e3b55c7485b6ded6673c832df8c36c3`